git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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

From-SVN: r118450
This commit is contained in:
Brooks Moses 2006-11-03 05:07:59 +00:00 committed by Brooks Moses
parent 502e2a2d24
commit 5d7de335d7
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/fortran/ChangeLog
View File

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

2
gcc/fortran/error.c
View File

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

5
gcc/testsuite/ChangeLog
View File

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

12
gcc/testsuite/lib/gfortran-dg.exp
View File

@ -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"