diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/error.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gfortran-dg.exp | 12 |
4 files changed, 16 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index f07fcc9..800ba51 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2006-11-02 Brooks Moses <brooks.moses@codesourcery.com> + + * error.c (show_locus): Remove "In file" from error messages. + 2006-10-31 Geoffrey Keating <geoffk@apple.com> * trans-decl.c (gfc_generate_constructors): Update for removal diff --git a/gcc/fortran/error.c b/gcc/fortran/error.c index f63e416..c4ef9d6 100644 --- a/gcc/fortran/error.c +++ b/gcc/fortran/error.c @@ -134,7 +134,7 @@ show_locus (int offset, locus * loc) 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 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bfff167..51bceea 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-11-02 Brooks Moses <brooks.moses@codesourcery.com> + + * lib/gfortran-dg.exp (gfortran-dg-test): Remove expected "In file" + from error messages. + 2006-11-02 Mike Stump <mrs@apple.com> * obj-c++.dg/const-str-9.mm: Don't run on 64-bit. diff --git a/gcc/testsuite/lib/gfortran-dg.exp b/gcc/testsuite/lib/gfortran-dg.exp index 6ceb7fc..421e4a4 100644 --- a/gcc/testsuite/lib/gfortran-dg.exp +++ b/gcc/testsuite/lib/gfortran-dg.exp @@ -26,23 +26,23 @@ proc gfortran-dg-test { prog do_what extra_tool_flags } { 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 @@ proc gfortran-dg-test { prog do_what extra_tool_flags } { # 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" |