parse.c (next_free): Use consistent error string between free-form and fixed-form...

fortran/

	* parse.c (next_free): Use consistent error string between
	free-form and fixed-form for illegal statement label of zero.
	(next_fixed): Use consistent warning string between free-form
	and fixed-form for statement labels for empty statements.

testsuite/

	* gfortran.dg/label_1.f90: Adjust dg-error.

From-SVN: r113053

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 01b8071b78f74af51a6c0ace950542e622d18072..c9547172fb632c16825a14579f77318d89aaf7a8 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-18  Bernhard Fischer  <aldot@gcc.gnu.org>
+
+       * parse.c (next_free): Use consistent error string between
+       free-form and fixed-form for illegal statement label of zero.
+       (next_fixed): Use consistent warning string between free-form
+       and fixed-form for statement labels for empty statements.
+
 2006-04-18  Steve Ellcey  <sje@cup.hp.com>
 
        * trans-io.c (gfc_build_io_library_fndecls): Align pad.

diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index b120bbb77efadefa088dcb5a60232c807d1050d6..5fb9ce12457d035d4f5be7025c00791c370bd234 100644 (file)
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -428,9 +428,9 @@ next_free (void)
 
           if (cnt > 5)
            gfc_error_now ("Too many digits in statement label at %C");
-         
+
          if (c == 0)
-           gfc_error_now ("Statement label at %C is zero");
+           gfc_error_now ("Zero is not a valid statement label at %C");
 
          do
            c = gfc_next_char ();
@@ -600,7 +600,7 @@ next_fixed (void)
 
 blank_line:
   if (digit_flag)
-    gfc_warning ("Statement label in blank line will be ignored at %C");
+    gfc_warning ("Ignoring statement label in empty statement at %C");
   gfc_advance_line ();
   return ST_NONE;
 }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 32e2d114b62106925452509ada817639e35eb01b..e48bc78add3b175adbfed478d793980c22a5242b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-18  Bernhard Fischer  <aldot@gcc.gnu.org>
+
+       * gfortran.dg/label_1.f90: Adjust dg-error.
+
 2006-04-16  Roger Sayle  <roger@eyesopen.com>
 
        PR target/26961

diff --git a/gcc/testsuite/gfortran.dg/label_1.f90 b/gcc/testsuite/gfortran.dg/label_1.f90
index 149c79f10297129bb7c348f21073dc05d3a3aae9..94f3b5e61adebccf361c42567eb9e1581eb7f57c 100644 (file)
--- a/gcc/testsuite/gfortran.dg/label_1.f90
+++ b/gcc/testsuite/gfortran.dg/label_1.f90
@@ -3,7 +3,7 @@
 
 program a
 0056780 continue    ! { dg-error "Too many digits" }
-0 continue          ! { dg-error "Statement label at" }
+0 continue          ! { dg-error "Zero is not a valid statement label" }
   stop 001234       ! { dg-error "Too many digits" }
 end program a