diff options
| author | Brooks Moses <brooks.moses@codesourcery.com> | 2006-11-05 00:28:08 +0000 |
|---|---|---|
| committer | Brooks Moses <brooks@gcc.gnu.org> | 2006-11-04 16:28:08 -0800 |
| commit | cb60c134e23d6c8c013ad89a4c1cb6e28cac94b6 (patch) | |
| tree | 1f1e4086161fd949b74b1ce6d0ee23f9e1a5b41b | |
| parent | 487288827473946bc53390c4a64ef61ab558577c (diff) | |
| download | gcc-cb60c134e23d6c8c013ad89a4c1cb6e28cac94b6.zip gcc-cb60c134e23d6c8c013ad89a4c1cb6e28cac94b6.tar.gz gcc-cb60c134e23d6c8c013ad89a4c1cb6e28cac94b6.tar.bz2 | |
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
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/error.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gfortran-dg.exp | 10 |
4 files changed, 18 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 64d3baf..6cc6b20 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -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 diff --git a/gcc/fortran/error.c b/gcc/fortran/error.c index c4ef9d6..e532830 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 ("%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; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 925f5b3..7bce686 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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 diff --git a/gcc/testsuite/lib/gfortran-dg.exp b/gcc/testsuite/lib/gfortran-dg.exp index 421e4a4..1c50ef7 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: - # [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" |