Commit e25a0da3 by Brooks Moses Committed by Brooks Moses

data.c: Remove trailing periods from error messages.

* data.c: Remove trailing periods from error messages.
* decl.c: Likewise.
* expr.c: Likewise.
* io.c: Likewise.
* match.c: Likewise.
* module.c: Likewise.
* options.c: Likewise.
* resolve.c: Likewise.
* symbol.c: Likewise.
* trans-io.c: Likewise.

From-SVN: r118880
parent 10612ddf
2006-11-15 Brooks Moses <brooks.moses@codesourcery.com> 2006-11-15 Brooks Moses <brooks.moses@codesourcery.com>
* data.c: Remove trailing periods from error messages.
* decl.c: Likewise.
* expr.c: Likewise.
* io.c: Likewise.
* match.c: Likewise.
* module.c: Likewise.
* options.c: Likewise.
* resolve.c: Likewise.
* symbol.c: Likewise.
* trans-io.c: Likewise.
2006-11-15 Brooks Moses <brooks.moses@codesourcery.com>
* lang.opt: Rearrange entries back into ASCII order. * lang.opt: Rearrange entries back into ASCII order.
2006-11-15 Tobias Burnus <burnus@net-b.de> 2006-11-15 Tobias Burnus <burnus@net-b.de>
......
...@@ -61,7 +61,7 @@ get_array_index (gfc_array_ref * ar, mpz_t * offset) ...@@ -61,7 +61,7 @@ get_array_index (gfc_array_ref * ar, mpz_t * offset)
if ((gfc_is_constant_expr (ar->as->lower[i]) == 0) if ((gfc_is_constant_expr (ar->as->lower[i]) == 0)
|| (gfc_is_constant_expr (ar->as->upper[i]) == 0) || (gfc_is_constant_expr (ar->as->upper[i]) == 0)
|| (gfc_is_constant_expr (e) == 0)) || (gfc_is_constant_expr (e) == 0))
gfc_error ("non-constant array in DATA statement %L.", &ar->where); gfc_error ("non-constant array in DATA statement %L", &ar->where);
mpz_set (tmp, e->value.integer); mpz_set (tmp, e->value.integer);
mpz_sub (tmp, tmp, ar->as->lower[i]->value.integer); mpz_sub (tmp, tmp, ar->as->lower[i]->value.integer);
mpz_mul (tmp, tmp, delta); mpz_mul (tmp, tmp, delta);
......
...@@ -221,7 +221,7 @@ var_element (gfc_data_variable * new) ...@@ -221,7 +221,7 @@ var_element (gfc_data_variable * new)
if (!sym->attr.function && gfc_current_ns->parent && gfc_current_ns->parent == sym->ns) if (!sym->attr.function && gfc_current_ns->parent && gfc_current_ns->parent == sym->ns)
{ {
gfc_error ("Host associated variable '%s' may not be in the DATA " gfc_error ("Host associated variable '%s' may not be in the DATA "
"statement at %C.", sym->name); "statement at %C", sym->name);
return MATCH_ERROR; return MATCH_ERROR;
} }
...@@ -1170,7 +1170,7 @@ variable_decl (int elem) ...@@ -1170,7 +1170,7 @@ variable_decl (int elem)
{ {
if (sym->as != NULL) if (sym->as != NULL)
{ {
gfc_error ("Duplicate array spec for Cray pointee at %C."); gfc_error ("Duplicate array spec for Cray pointee at %C");
gfc_free_array_spec (cp_as); gfc_free_array_spec (cp_as);
m = MATCH_ERROR; m = MATCH_ERROR;
goto cleanup; goto cleanup;
...@@ -2460,7 +2460,7 @@ gfc_match_data_decl (void) ...@@ -2460,7 +2460,7 @@ gfc_match_data_decl (void)
/* Now we have an error, which we signal, and then fix up /* Now we have an error, which we signal, and then fix up
because the knock-on is plain and simple confusing. */ because the knock-on is plain and simple confusing. */
gfc_error_now ("Derived type at %C has not been previously defined " gfc_error_now ("Derived type at %C has not been previously defined "
"and so cannot appear in a derived type definition."); "and so cannot appear in a derived type definition");
current_attr.pointer = 1; current_attr.pointer = 1;
goto ok; goto ok;
} }
...@@ -3536,12 +3536,12 @@ cray_pointer_decl (void) ...@@ -3536,12 +3536,12 @@ cray_pointer_decl (void)
} }
else if (cptr->ts.type != BT_INTEGER) else if (cptr->ts.type != BT_INTEGER)
{ {
gfc_error ("Cray pointer at %C must be an integer."); gfc_error ("Cray pointer at %C must be an integer");
return MATCH_ERROR; return MATCH_ERROR;
} }
else if (cptr->ts.kind < gfc_index_integer_kind) else if (cptr->ts.kind < gfc_index_integer_kind)
gfc_warning ("Cray pointer at %C has %d bytes of precision;" gfc_warning ("Cray pointer at %C has %d bytes of precision;"
" memory addresses require %d bytes.", " memory addresses require %d bytes",
cptr->ts.kind, cptr->ts.kind,
gfc_index_integer_kind); gfc_index_integer_kind);
...@@ -3590,7 +3590,7 @@ cray_pointer_decl (void) ...@@ -3590,7 +3590,7 @@ cray_pointer_decl (void)
} }
else if (as != NULL) else if (as != NULL)
{ {
gfc_error ("Duplicate array spec for Cray pointee at %C."); gfc_error ("Duplicate array spec for Cray pointee at %C");
gfc_free_array_spec (as); gfc_free_array_spec (as);
return MATCH_ERROR; return MATCH_ERROR;
} }
...@@ -3688,7 +3688,7 @@ gfc_match_pointer (void) ...@@ -3688,7 +3688,7 @@ gfc_match_pointer (void)
if (!gfc_option.flag_cray_pointer) if (!gfc_option.flag_cray_pointer)
{ {
gfc_error ("Cray pointer declaration at %C requires -fcray-pointer" gfc_error ("Cray pointer declaration at %C requires -fcray-pointer"
" flag."); " flag");
return MATCH_ERROR; return MATCH_ERROR;
} }
return cray_pointer_decl (); return cray_pointer_decl ();
......
...@@ -2265,7 +2265,7 @@ gfc_check_assign (gfc_expr * lvalue, gfc_expr * rvalue, int conform) ...@@ -2265,7 +2265,7 @@ gfc_check_assign (gfc_expr * lvalue, gfc_expr * rvalue, int conform)
&& lvalue->ref->u.ar.as->cp_was_assumed) && lvalue->ref->u.ar.as->cp_was_assumed)
{ {
gfc_error ("Vector assignment to assumed-size Cray Pointee at %L" gfc_error ("Vector assignment to assumed-size Cray Pointee at %L"
" is illegal.", &lvalue->where); " is illegal", &lvalue->where);
return FAILURE; return FAILURE;
} }
......
...@@ -858,7 +858,7 @@ gfc_match_format (void) ...@@ -858,7 +858,7 @@ gfc_match_format (void)
if (gfc_current_ns->proc_name if (gfc_current_ns->proc_name
&& gfc_current_ns->proc_name->attr.flavor == FL_MODULE) && gfc_current_ns->proc_name->attr.flavor == FL_MODULE)
{ {
gfc_error ("Format statement in module main block at %C."); gfc_error ("Format statement in module main block at %C");
return MATCH_ERROR; return MATCH_ERROR;
} }
......
...@@ -2599,7 +2599,7 @@ gfc_match_namelist (void) ...@@ -2599,7 +2599,7 @@ gfc_match_namelist (void)
if (sym->as && sym->as->type == AS_ASSUMED_SIZE) if (sym->as && sym->as->type == AS_ASSUMED_SIZE)
{ {
gfc_error ("Assumed size array '%s' in namelist '%s' at " gfc_error ("Assumed size array '%s' in namelist '%s' at "
"%C is not allowed.", sym->name, group_name->name); "%C is not allowed", sym->name, group_name->name);
gfc_error_check (); gfc_error_check ();
} }
......
...@@ -2690,7 +2690,7 @@ mio_namelist (gfc_symbol * sym) ...@@ -2690,7 +2690,7 @@ mio_namelist (gfc_symbol * sym)
check_name = find_use_name (sym->name); check_name = find_use_name (sym->name);
if (check_name && strcmp (check_name, sym->name) != 0) if (check_name && strcmp (check_name, sym->name) != 0)
gfc_error("Namelist %s cannot be renamed by USE" gfc_error("Namelist %s cannot be renamed by USE"
" association to %s.", " association to %s",
sym->name, check_name); sym->name, check_name);
} }
......
...@@ -236,7 +236,7 @@ gfc_post_options (const char **pfilename) ...@@ -236,7 +236,7 @@ gfc_post_options (const char **pfilename)
if (gfc_current_form == FORM_UNKNOWN) if (gfc_current_form == FORM_UNKNOWN)
{ {
gfc_current_form = FORM_FREE; gfc_current_form = FORM_FREE;
gfc_warning_now ("Reading file '%s' as free form.", gfc_warning_now ("Reading file '%s' as free form",
(filename[0] == '\0') ? "<stdin>" : filename); (filename[0] == '\0') ? "<stdin>" : filename);
} }
} }
...@@ -247,10 +247,10 @@ gfc_post_options (const char **pfilename) ...@@ -247,10 +247,10 @@ gfc_post_options (const char **pfilename)
{ {
if (gfc_option.flag_d_lines == 0) if (gfc_option.flag_d_lines == 0)
gfc_warning_now ("'-fd-lines-as-comments' has no effect " gfc_warning_now ("'-fd-lines-as-comments' has no effect "
"in free form."); "in free form");
else if (gfc_option.flag_d_lines == 1) else if (gfc_option.flag_d_lines == 1)
gfc_warning_now ("'-fd-lines-as-code' has no effect " gfc_warning_now ("'-fd-lines-as-code' has no effect "
"in free form."); "in free form");
} }
flag_inline_trees = 1; flag_inline_trees = 1;
......
...@@ -774,7 +774,7 @@ check_assumed_size_reference (gfc_symbol * sym, gfc_expr * e) ...@@ -774,7 +774,7 @@ check_assumed_size_reference (gfc_symbol * sym, gfc_expr * e)
{ {
gfc_error ("The upper bound in the last dimension must " gfc_error ("The upper bound in the last dimension must "
"appear in the reference to the assumed size " "appear in the reference to the assumed size "
"array '%s' at %L.", sym->name, &e->where); "array '%s' at %L", sym->name, &e->where);
return true; return true;
} }
return false; return false;
...@@ -5640,7 +5640,7 @@ resolve_fl_derived (gfc_symbol *sym) ...@@ -5640,7 +5640,7 @@ resolve_fl_derived (gfc_symbol *sym)
|| !gfc_is_constant_expr (c->ts.cl->length)) || !gfc_is_constant_expr (c->ts.cl->length))
{ {
gfc_error ("Character length of component '%s' needs to " gfc_error ("Character length of component '%s' needs to "
"be a constant specification expression at %L.", "be a constant specification expression at %L",
c->name, c->name,
c->ts.cl->length ? &c->ts.cl->length->where : &c->loc); c->ts.cl->length ? &c->ts.cl->length->where : &c->loc);
return FAILURE; return FAILURE;
...@@ -5693,7 +5693,7 @@ resolve_fl_derived (gfc_symbol *sym) ...@@ -5693,7 +5693,7 @@ resolve_fl_derived (gfc_symbol *sym)
|| !gfc_is_constant_expr (c->as->upper[i])) || !gfc_is_constant_expr (c->as->upper[i]))
{ {
gfc_error ("Component '%s' of '%s' at %L must have " gfc_error ("Component '%s' of '%s' at %L must have "
"constant array bounds.", "constant array bounds",
c->name, sym->name, &c->loc); c->name, sym->name, &c->loc);
return FAILURE; return FAILURE;
} }
...@@ -5952,7 +5952,7 @@ resolve_symbol (gfc_symbol * sym) ...@@ -5952,7 +5952,7 @@ resolve_symbol (gfc_symbol * sym)
&& sym->ts.derived->components == NULL) && sym->ts.derived->components == NULL)
{ {
gfc_error ("The derived type '%s' at %L is of type '%s', " gfc_error ("The derived type '%s' at %L is of type '%s', "
"which has not been defined.", sym->name, "which has not been defined", sym->name,
&sym->declared_at, sym->ts.derived->name); &sym->declared_at, sym->ts.derived->name);
sym->ts.type = BT_UNKNOWN; sym->ts.type = BT_UNKNOWN;
return; return;
......
...@@ -754,7 +754,7 @@ gfc_add_cray_pointee (symbol_attribute * attr, locus * where) ...@@ -754,7 +754,7 @@ gfc_add_cray_pointee (symbol_attribute * attr, locus * where)
if (attr->cray_pointee) if (attr->cray_pointee)
{ {
gfc_error ("Cray Pointee at %L appears in multiple pointer()" gfc_error ("Cray Pointee at %L appears in multiple pointer()"
" statements.", where); " statements", where);
return FAILURE; return FAILURE;
} }
......
...@@ -992,7 +992,7 @@ gfc_trans_inquire (gfc_code * code) ...@@ -992,7 +992,7 @@ gfc_trans_inquire (gfc_code * code)
/* Sanity check. */ /* Sanity check. */
if (p->unit && p->file) if (p->unit && p->file)
gfc_error ("INQUIRE statement at %L cannot contain both FILE and UNIT specifiers.", &code->loc); gfc_error ("INQUIRE statement at %L cannot contain both FILE and UNIT specifiers", &code->loc);
if (p->unit) if (p->unit)
set_parameter_value (&block, var, IOPARM_common_unit, p->unit); set_parameter_value (&block, var, IOPARM_common_unit, p->unit);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment