OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

error.c (show_locus): Add trailing colon in error messages. 

* fortran/error.c (show_locus): Add trailing colon in error messages.
(error_print): Avoid leading space in error lines.
* testsuite/lib/gfortran-dg.exp (gfortran-dg-test): Adjust pattern
for matching error messages.

From-SVN: r118491
This commit is contained in:
Brooks Moses 2006-11-05 00:28:08 +00:00 committed by Brooks Moses
parent 4872888274
commit cb60c134e2
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/fortran/ChangeLog
View File

@ -1,3 +1,8 @@
2006-11-04 Brooks Moses <brooks.moses@codesourcery.com>
* error.c (show_locus): Add trailing colon in error messages.
(error_print): Avoid leading space in error lines.
2006-11-04 Francois-Xavier Coudert <coudert@clipper.ens.fr>
PR fortran/29713

5
gcc/fortran/error.c
View File

@ -134,7 +134,7 @@ show_locus (int offset, locus * loc)
lb = loc->lb;
f = lb->file;
error_printf ("%s:%d\n", f->filename,
error_printf ("%s:%d:\n", f->filename,
#ifdef USE_MAPPED_LOCATION
LOCATION_LINE (lb->location)
#else
@ -380,7 +380,8 @@ error_print (const char *type, const char *format0, va_list argp)
if (have_l1)
show_loci (l1, l2);
error_string (type);
error_char (' ');
if (*type)
error_char (' ');
have_l1 = 0;
format = format0;

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2006-11-04 Brooks Moses <brooks.moses@codesourcery.com>
* lib/gfortran-dg.exp (gfortran-dg-test): Adjust pattern
for matching error messages.
2006-11-04 Uros Bizjak <ubizjak@gmail.com>
PR target/26915

10
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:
# [name]:[line]
# [name]:[line]:
#
# some code
# 1
# Error: Some error at (1)
# or
# [name]:[line]
# [name]:[line]:
#
# some code
# 1
# [name]:[line2]
# [name]:[line2]:
#
# some other code
# 2
# Error: Some error at (1) and (2)
# or
# [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 " (\[^\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"