diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 8b263a2e373..a2bc8c81482 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,16 @@ +2006-11-15 Brooks Moses + + * 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 * lang.opt: Rearrange entries back into ASCII order. diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c index 5af3bd779ca..a7a04c662f0 100644 --- a/gcc/fortran/data.c +++ b/gcc/fortran/data.c @@ -61,7 +61,7 @@ get_array_index (gfc_array_ref * ar, mpz_t * offset) if ((gfc_is_constant_expr (ar->as->lower[i]) == 0) || (gfc_is_constant_expr (ar->as->upper[i]) == 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_sub (tmp, tmp, ar->as->lower[i]->value.integer); mpz_mul (tmp, tmp, delta); diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index ae4271c9cc2..25fa6b58b85 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -221,7 +221,7 @@ var_element (gfc_data_variable * new) 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 " - "statement at %C.", sym->name); + "statement at %C", sym->name); return MATCH_ERROR; } @@ -1170,7 +1170,7 @@ variable_decl (int elem) { 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); m = MATCH_ERROR; goto cleanup; @@ -2460,7 +2460,7 @@ gfc_match_data_decl (void) /* Now we have an error, which we signal, and then fix up because the knock-on is plain and simple confusing. */ 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; goto ok; } @@ -3536,12 +3536,12 @@ cray_pointer_decl (void) } 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; } else if (cptr->ts.kind < gfc_index_integer_kind) gfc_warning ("Cray pointer at %C has %d bytes of precision;" - " memory addresses require %d bytes.", + " memory addresses require %d bytes", cptr->ts.kind, gfc_index_integer_kind); @@ -3590,7 +3590,7 @@ cray_pointer_decl (void) } 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); return MATCH_ERROR; } @@ -3688,7 +3688,7 @@ gfc_match_pointer (void) if (!gfc_option.flag_cray_pointer) { gfc_error ("Cray pointer declaration at %C requires -fcray-pointer" - " flag."); + " flag"); return MATCH_ERROR; } return cray_pointer_decl (); diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 96f39c87c8d..304d7c1f00d 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -2265,7 +2265,7 @@ gfc_check_assign (gfc_expr * lvalue, gfc_expr * rvalue, int conform) && lvalue->ref->u.ar.as->cp_was_assumed) { gfc_error ("Vector assignment to assumed-size Cray Pointee at %L" - " is illegal.", &lvalue->where); + " is illegal", &lvalue->where); return FAILURE; } diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c index 3da0d2642a9..24a92090f9e 100644 --- a/gcc/fortran/io.c +++ b/gcc/fortran/io.c @@ -858,7 +858,7 @@ gfc_match_format (void) if (gfc_current_ns->proc_name && 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; } diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index cb0fb914b4e..413487d6f4b 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -2599,7 +2599,7 @@ gfc_match_namelist (void) if (sym->as && sym->as->type == AS_ASSUMED_SIZE) { 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 (); } diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index 92517d85d05..f7b45f331c0 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -2690,7 +2690,7 @@ mio_namelist (gfc_symbol * sym) check_name = find_use_name (sym->name); if (check_name && strcmp (check_name, sym->name) != 0) gfc_error("Namelist %s cannot be renamed by USE" - " association to %s.", + " association to %s", sym->name, check_name); } diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c index 6afcaa4173b..a81491072ee 100644 --- a/gcc/fortran/options.c +++ b/gcc/fortran/options.c @@ -236,7 +236,7 @@ gfc_post_options (const char **pfilename) if (gfc_current_form == FORM_UNKNOWN) { 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') ? "" : filename); } } @@ -247,10 +247,10 @@ gfc_post_options (const char **pfilename) { if (gfc_option.flag_d_lines == 0) gfc_warning_now ("'-fd-lines-as-comments' has no effect " - "in free form."); + "in free form"); else if (gfc_option.flag_d_lines == 1) gfc_warning_now ("'-fd-lines-as-code' has no effect " - "in free form."); + "in free form"); } flag_inline_trees = 1; diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 49d80d9a19b..a0e8838eef6 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -774,7 +774,7 @@ check_assumed_size_reference (gfc_symbol * sym, gfc_expr * e) { gfc_error ("The upper bound in the last dimension must " "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 false; @@ -5640,7 +5640,7 @@ resolve_fl_derived (gfc_symbol *sym) || !gfc_is_constant_expr (c->ts.cl->length)) { 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->ts.cl->length ? &c->ts.cl->length->where : &c->loc); return FAILURE; @@ -5693,7 +5693,7 @@ resolve_fl_derived (gfc_symbol *sym) || !gfc_is_constant_expr (c->as->upper[i])) { gfc_error ("Component '%s' of '%s' at %L must have " - "constant array bounds.", + "constant array bounds", c->name, sym->name, &c->loc); return FAILURE; } @@ -5952,7 +5952,7 @@ resolve_symbol (gfc_symbol * sym) && sym->ts.derived->components == NULL) { 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->ts.type = BT_UNKNOWN; return; diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index 6a5598de5c2..d867de9fcfc 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -754,7 +754,7 @@ gfc_add_cray_pointee (symbol_attribute * attr, locus * where) if (attr->cray_pointee) { gfc_error ("Cray Pointee at %L appears in multiple pointer()" - " statements.", where); + " statements", where); return FAILURE; } diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c index b1dce976115..3e658b8c00c 100644 --- a/gcc/fortran/trans-io.c +++ b/gcc/fortran/trans-io.c @@ -992,7 +992,7 @@ gfc_trans_inquire (gfc_code * code) /* Sanity check. */ 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) set_parameter_value (&block, var, IOPARM_common_unit, p->unit);