[Bug preprocessor/42014] Inconsistent column number display for "In file incuded from"

[Bug preprocessor/42014] Inconsistent column number display for "In file incuded from"

[skannan at redhat dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42014

Shakthi Kannan <skannan at redhat dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |skannan at redhat dot com

--- Comment #3 from Shakthi Kannan <skannan at redhat dot com> ---
Created attachment 30079
  --> http://gcc.gnu.org/bugzilla/attachment.cgi?id=30079&action=edit
Added LAST_SOURCE_COLUMN in while loop

Attached patch adds LAST_SOURCE_COLUMN to pp_verbatim function in the while
loop present in diagnostic_report_current_module() to make the output
consistent.

[Bug preprocessor/42014] Inconsistent column number display for "In file incuded from"

[vreeland.justin at gmail dot com]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=42014

Justin Vreeland <vreeland.justin at gmail dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |vreeland.justin at gmail dot com

--- Comment #4 from Justin Vreeland <vreeland.justin at gmail dot com> ---
Created attachment 33832
  --> https://gcc.gnu.org/bugzilla/attachment.cgi?id=33832&action=edit
adds column to output

The currently attached patch doesn't apply cleanly I'm uploading another that
does, it's essentially the same patch.

Without patch:

In file included from /usr/include/c++/4.9.1/iostream:39:0,
                 from test.cxx:1:

With patch:

In file included from
/extra/gcc/bug42014/patched/gcc/pkg/gcc/usr/include/c++/4.9.1/iostream:39:0,
                 from test.cxx:1,0:

Which matches the error location.

[Bug preprocessor/42014] Inconsistent column number display for "In file incuded from"

[pinskia at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=42014

--- Comment #7 from Andrew Pinski <pinskia at gcc dot gnu.org> ---
Since r11-2092 we don't print the columns at all if the column was 0.
So mostly we get:

In file included from /usr/include/c++/4.9.1/iostream:39,
                 from test.cxx:1:


The code looks like:
              const char *line_col = maybe_line_and_column (s.line, col);
              static const char *const msgs[] =
                {
                 NULL,
                 N_("                 from"),
                 N_("In file included from"),   /* 2 */
                 N_("        included from"),
                 N_("In module"),               /* 4 */
                 N_("of module"),
                 N_("In module imported at"),   /* 6 */
                 N_("imported at"),
                };

              unsigned index = (was_module ? 6 : is_module ? 4
                                : need_inc ? 2 : 0) + !first;

              pp_verbatim (context->printer, "%s%s %r%s%s%R",
                           first ? "" : was_module ? ", " : ",\n",
                           _(msgs[index]),
                           "locus", s.file, line_col);



Where maybe_line_and_column does:
static const char *
maybe_line_and_column (int line, int col)
{
  static char result[32];

  if (line)
    {
      size_t l
        = snprintf (result, sizeof (result),
                    col >= 0 ? ":%d:%d" : ":%d", line, col);
      gcc_checking_assert (l < sizeof (result));
    }
  else
    result[0] = 0;
  return result;
}