This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch, fortran] Remove closing periods from error messages.


According to the GNU error-message standards, error messages should not end with periods. GFortran has a dozen or so errors and warnings that violate this rule, which I found with the following grep patterns:

  grep -A3 'gfc_error' * | grep '\."'
  grep -A3 'gfc_warn' * | grep '\."'

Whether or not this rule is appropriate for the verbose error messages of the form that GFortran emits (as opposed to the terse single-line ones envisioned by the GNU standards) is debatable, I think, but in any case it's probably best to be consistent. Thus, the attached patch at least applies consistency.

---------------------------------------------------------------------
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.

---------------------------------------------------------------------

Regression tested on i686-pc-linux-gnu. Ok for trunk?

- Brooks
Index: symbol.c
===================================================================
--- symbol.c	(revision 118843)
+++ symbol.c	(working copy)
@@ -754,7 +754,7 @@
   if (attr->cray_pointee)
     {
       gfc_error ("Cray Pointee at %L appears in multiple pointer()"
-		 " statements.", where);
+		 " statements", where);
       return FAILURE;
     }
 
Index: decl.c
===================================================================
--- decl.c	(revision 118843)
+++ decl.c	(working copy)
@@ -221,7 +221,7 @@
   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 @@
 	    {
 	      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;
@@ -2369,7 +2369,7 @@
       /* 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;
     }
@@ -3445,12 +3445,12 @@
 	}
       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);
 
@@ -3499,7 +3499,7 @@
 	}
       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;
 	}
@@ -3597,7 +3597,7 @@
       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 ();
Index: data.c
===================================================================
--- data.c	(revision 118843)
+++ data.c	(working copy)
@@ -61,7 +61,7 @@
       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);
Index: expr.c
===================================================================
--- expr.c	(revision 118843)
+++ expr.c	(working copy)
@@ -2264,7 +2264,7 @@
        && 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;
      }
 
Index: module.c
===================================================================
--- module.c	(revision 118843)
+++ module.c	(working copy)
@@ -2690,7 +2690,7 @@
 	  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);
 	}
 
Index: io.c
===================================================================
--- io.c	(revision 118843)
+++ io.c	(working copy)
@@ -858,7 +858,7 @@
   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;
     }
 
Index: resolve.c
===================================================================
--- resolve.c	(revision 118843)
+++ resolve.c	(working copy)
@@ -774,7 +774,7 @@
     {
       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 @@
 	     || !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 @@
 		|| !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 @@
 	&& 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;
Index: trans-io.c
===================================================================
--- trans-io.c	(revision 118843)
+++ trans-io.c	(working copy)
@@ -992,7 +992,7 @@
 
   /* 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);
Index: match.c
===================================================================
--- match.c	(revision 118843)
+++ match.c	(working copy)
@@ -2599,7 +2599,7 @@
 	  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 ();
 	    }
 
Index: options.c
===================================================================
--- options.c	(revision 118843)
+++ options.c	(working copy)
@@ -236,7 +236,7 @@
       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') ? "<stdin>" : filename);
 	}
     }
@@ -247,10 +247,10 @@
     {
       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;

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]