diff options
| author | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2014-12-04 23:59:35 +0000 |
|---|---|---|
| committer | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2014-12-04 23:59:35 +0000 |
| commit | 99abe958d87a7cf653ea2ea9c467f7ebe0ba956d (patch) | |
| tree | 5367afa1553141e677c4411189df8b007d01bd1c /gcc/fortran | |
| parent | 1be71446897bf65257d37183f28355a3b5f9fe8e (diff) | |
| download | gcc-99abe958d87a7cf653ea2ea9c467f7ebe0ba956d.zip gcc-99abe958d87a7cf653ea2ea9c467f7ebe0ba956d.tar.gz gcc-99abe958d87a7cf653ea2ea9c467f7ebe0ba956d.tar.bz2 | |
error.c (gfc_diagnostic_build_locus_prefix): Use diagnostic_expand_location.
gcc/fortran/ChangeLog:
2014-12-05 Manuel López-Ibáñez <manu@gcc.gnu.org>
* error.c (gfc_diagnostic_build_locus_prefix): Use
diagnostic_expand_location.
gcc/ChangeLog:
2014-12-05 Manuel López-Ibáñez <manu@gcc.gnu.org>
* diagnostic.h (diagnostic_expand_location): New inline function.
* diagnostic.c (diagnostic_build_prefix): Use it.
(diagnostic_show_locus): Likewise.
From-SVN: r218409
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/error.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 95605b7..b34084d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,10 @@ 2014-12-05 Manuel López-Ibáñez <manu@gcc.gnu.org> + * error.c (gfc_diagnostic_build_locus_prefix): Use + diagnostic_expand_location. + +2014-12-05 Manuel López-Ibáñez <manu@gcc.gnu.org> + * scanner.c (gfc_next_char_literal): Use gfc_warning_now. (load_file): Use the line length as the column hint for linemap_line_start. Reserve a location for the highest column of diff --git a/gcc/fortran/error.c b/gcc/fortran/error.c index d6475f3..333ad00 100644 --- a/gcc/fortran/error.c +++ b/gcc/fortran/error.c @@ -1143,10 +1143,7 @@ gfc_diagnostic_build_locus_prefix (diagnostic_context *context, pretty_printer *pp = context->printer; const char *locus_cs = colorize_start (pp_show_color (pp), "locus"); const char *locus_ce = colorize_stop (pp_show_color (pp)); - expanded_location s = expand_location_to_spelling_point (diagnostic->location); - if (diagnostic->override_column) - s.column = diagnostic->override_column; - + expanded_location s = diagnostic_expand_location (diagnostic); return (s.file == NULL ? build_message_string ("%s%s:%s", locus_cs, progname, locus_ce ) : !strcmp (s.file, N_("<built-in>")) |