From: bothner Date: Tue, 1 Mar 2005 16:37:45 +0000 (+0000) Subject: * diagnostic.c (diagnostic_build_prefix): If USE_MAPPED_LOCATION X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cf564176fe9bdab8cdb6a591f5d64ac1af4cd2a;p=thirdparty%2Fgcc.git * diagnostic.c (diagnostic_build_prefix): If USE_MAPPED_LOCATION and we have a non-zero column-number, add it to the message. Also factor out the diagnostic_kind_text. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95746 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 120114c173eb..a28f1bf7c404 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-03-01 Per Bothner + + * diagnostic.c (diagnostic_build_prefix): If USE_MAPPED_LOCATION + and we have a non-zero column-number, add it to the message. + Also factor out the diagnostic_kind_text. + 2005-03-01 Zdenek Dvorak * cfgloop.c (flow_loop_entry_edges_find, flow_loop_exit_edges_find, diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c index b047167bc492..39b46fc7aefe 100644 --- a/gcc/diagnostic.c +++ b/gcc/diagnostic.c @@ -133,15 +133,18 @@ diagnostic_build_prefix (diagnostic_info *diagnostic) #undef DEFINE_DIAGNOSTIC_KIND "must-not-happen" }; + const char *text = _(diagnostic_kind_text[diagnostic->kind]); expanded_location s = expand_location (diagnostic->location); gcc_assert (diagnostic->kind < DK_LAST_DIAGNOSTIC_KIND); - return s.file - ? build_message_string ("%s:%d: %s", - s.file, s.line, - _(diagnostic_kind_text[diagnostic->kind])) - : build_message_string ("%s: %s", progname, - _(diagnostic_kind_text[diagnostic->kind])); + return + (s.file == NULL + ? build_message_string ("%s: %s", progname, text) +#ifdef USE_MAPPED_LOCATION + : s.column != 0 + ? build_message_string ("%s:%d:%d: %s", s.file, s.line, s.column, text) +#endif + : build_message_string ("%s:%d: %s", s.file, s.line, text)); } /* Count a diagnostic. Return true if the message should be printed. */