[PATCH, fortran, committed]

[PATCH, fortran, committed]

[Brooks Moses]

[-- Attachment #1: Type: text/plain, Size: 944 bytes --]

Approved by Steve Kargl in IRC, committed to trunk.

This patch changes the "In file:" lines in GFortran error messages to a 
format which is in agreement with the GNU standards for such things, and 
changes the testsuite error-parsing functions to parse the new format, so 
that no regressions arise from the change.

Many thanks to Steve and to Jerry DeLisle for regression testing the patch 
while my build machine was otherwise occupied.  :)

- Brooks


-fortran/ChangeLog----------------------------------------------------
2006-11-02  Brooks Moses  <brooks.moses@codesourcery.com>

	* error.c (show_locus): Remove "In file" from error messages.

-testsuite/ChangeLog--------------------------------------------------
2006-11-02  Brooks Moses  <brooks.moses@codesourcery.com>

	* lib/gfortran-dg.exp (gfortran-dg-test): Remove expected "In file"
	from error messages.

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

[-- Attachment #2: error.diff --]
[-- Type: application/octet-stream, Size: 1728 bytes --]

Index: testsuite/lib/gfortran-dg.exp
===================================================================
--- testsuite/lib/gfortran-dg.exp	(revision 118449)
+++ testsuite/lib/gfortran-dg.exp	(working copy)
@@ -26,23 +26,23 @@
     set output_file [lindex $result 1]
 
     # gfortran error messages look like this:
-    #      In file [name]:[line]
+    #      [name]:[line]
     #
     #        some code
     #              1
-    #     Error: Some error at (1) and (2)
+    #     Error: Some error at (1)
     # or
-    #      In file [name]:[line]
+    #      [name]:[line]
     #
     #       some code
     #              1
-    #      In file [name]:[line2]
+    #      [name]:[line2]
     #
     #       some other code
     #         2
     #     Error: Some error at (1) and (2)
     # or
-    #      In file [name]:[line]
+    #      [name]:[line]
     #
     #       some code and some more code
     #              1       2
@@ -59,7 +59,7 @@
     # Note that these regexps only make sense in the combinations used below.
     # Note also that is imperative that we first deal with the form with
     # two loci.
-    set locus_regexp " In file (\[^\n\]*)\n\n\[^\n\]*\n\[^\n\]*\n"
+    set locus_regexp " (\[^\n\]*)\n\n\[^\n\]*\n\[^\n\]*\n"
     set diag_regexp "(\[^\n\]*)\n"
 
     set two_loci "$locus_regexp$locus_regexp$diag_regexp"
Index: fortran/error.c
===================================================================
--- fortran/error.c	(revision 118449)
+++ fortran/error.c	(working copy)
@@ -134,7 +134,7 @@
 
   lb = loc->lb;
   f = lb->file;
-  error_printf ("In file %s:%d\n", f->filename,
+  error_printf ("%s:%d\n", f->filename,
 #ifdef USE_MAPPED_LOCATION
 		LOCATION_LINE (lb->location)
 #else

Re: [PATCH, fortran, committed]

[Janne Blomqvist]

Brooks Moses wrote:
> Approved by Steve Kargl in IRC, committed to trunk.
> 
> This patch changes the "In file:" lines in GFortran error messages to a 
> format which is in agreement with the GNU standards for such things, and 
> changes the testsuite error-parsing functions to parse the new format, 
> so that no regressions arise from the change.
> 
> Many thanks to Steve and to Jerry DeLisle for regression testing the 
> patch while my build machine was otherwise occupied.  :)
> 
> - Brooks
> 
> 
> -fortran/ChangeLog----------------------------------------------------
> 2006-11-02  Brooks Moses  <brooks.moses@codesourcery.com>
> 
>     * error.c (show_locus): Remove "In file" from error messages.
> 
> -testsuite/ChangeLog--------------------------------------------------
> 2006-11-02  Brooks Moses  <brooks.moses@codesourcery.com>
> 
>     * lib/gfortran-dg.exp (gfortran-dg-test): Remove expected "In file"
>     from error messages.
> 
> ----------------------------------------------------------------------

Shouldn't there be a ":" at the end of the line as well? And the output 
should start in column 2 and not 1? I.e.
foo.f:line:
instead of the current
  foo.f:line

At least I need to add that to get emacs to jump to the error line.

-- 
Janne Blomqvist

Re: [PATCH, fortran, committed]

[Brooks Moses]

Janne Blomqvist wrote:
> Brooks Moses wrote:
>>-fortran/ChangeLog----------------------------------------------------
>>2006-11-02  Brooks Moses  <brooks.moses@codesourcery.com>
>>
>>    * error.c (show_locus): Remove "In file" from error messages.
>>
>>-testsuite/ChangeLog--------------------------------------------------
>>2006-11-02  Brooks Moses  <brooks.moses@codesourcery.com>
>>
>>    * lib/gfortran-dg.exp (gfortran-dg-test): Remove expected "In file"
>>    from error messages.
>>
>>----------------------------------------------------------------------
> 
> Shouldn't there be a ":" at the end of the line as well? And the output 
> should start in column 2 and not 1? I.e.
> foo.f:line:
> instead of the current
>   foo.f:line
> 
> At least I need to add that to get emacs to jump to the error line.

You could well be correct -- I don't use emacs, so I was merely using 
the changed message format that others had suggested.

I was about to say that this should be a simple patch very much along 
the lines of the previous one, but then I looked into it a little more, 
and realized that I have no idea where the space at the beginning of the 
line is coming from.  Does anyone know, offhand?

Thanks,
- Brooks


P.S. I inadvertantly cc'ed my initial post in this thread to 
patches@gcc.gnu.org, when the real address is gcc-patches@.  Apparently 
the patches@ address is a spamtrap and anyone who sends email there gets 
automatically blacklisted (Or, at least, that's what happened to me). 
My sincere apologies, and I've already emailed the GCC postmaster to 
request removal of any blocks against your name that came from this.

[Patch, Fortran, committed]

[Harald Anlauf]

Committed to master as obvious.

Thanks,
Harald


Fortran texi: Fix description of GFC_RTCHECK_* macros.

gcc/fortran/ChangeLog:

	* gfortran.texi: Fix description of GFC_RTCHECK_* to match actual
	code.


diff --git a/gcc/fortran/gfortran.texi b/gcc/fortran/gfortran.texi
index 453b30f7c61..3b27217d369 100644
--- a/gcc/fortran/gfortran.texi
+++ b/gcc/fortran/gfortran.texi
@@ -3866,8 +3866,8 @@ initialization using @code{_gfortran_set_args}.
 Default: enabled.
 @item @var{option}[6] @tab Enables run-time checking.  Possible values
 are (bitwise or-ed): GFC_RTCHECK_BOUNDS (1), GFC_RTCHECK_ARRAY_TEMPS (2),
-GFC_RTCHECK_RECURSION (4), GFC_RTCHECK_DO (16), GFC_RTCHECK_POINTER (32),
-GFC_RTCHECK_BITS (64).
+GFC_RTCHECK_RECURSION (4), GFC_RTCHECK_DO (8), GFC_RTCHECK_POINTER (16),
+GFC_RTCHECK_MEM (32), GFC_RTCHECK_BITS (64).
 Default: disabled.
 @item @var{option}[7] @tab Unused.
 @item @var{option}[8] @tab Show a warning when invoking @code{STOP} and