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

tree.c (warn_deprecated_use): Print file:line using locus color. 

* tree.c (warn_deprecated_use): Print file:line using locus color.
	* diagnostic.c (diagnostic_report_current_module): Print file:line
	and file:line:column using locus color.

From-SVN: r198900
This commit is contained in:
Jakub Jelinek 2013-05-14 21:41:13 +02:00 committed by Jakub Jelinek
parent 0bfdb81e69
commit 2e55d06281
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2013-05-14 Jakub Jelinek <jakub@redhat.com>
* tree.c (warn_deprecated_use): Print file:line using locus color.
* diagnostic.c (diagnostic_report_current_module): Print file:line
and file:line:column using locus color.
2013-05-14 Mike Stump <mikestump@comcast.net>
* gdbinit.in: Add __null.

6
gcc/diagnostic.c
View File

@ -517,18 +517,18 @@ diagnostic_report_current_module (diagnostic_context *context, location_t where)
map = INCLUDED_FROM (line_table, map);
if (context->show_column)
pp_verbatim (context->printer,
"In file included from %s:%d:%d",
"In file included from %r%s:%d:%d%R", "locus",
LINEMAP_FILE (map),
LAST_SOURCE_LINE (map), LAST_SOURCE_COLUMN (map));
else
pp_verbatim (context->printer,
"In file included from %s:%d",
"In file included from %r%s:%d%R", "locus",
LINEMAP_FILE (map), LAST_SOURCE_LINE (map));
while (! MAIN_FILE_P (map))
{
map = INCLUDED_FROM (line_table, map);
pp_verbatim (context->printer,
",\n from %s:%d",
",\n from %r%s:%d%R", "locus",
LINEMAP_FILE (map), LAST_SOURCE_LINE (map));
}
pp_verbatim (context->printer, ":");

24
gcc/tree.c
View File

@ -11715,12 +11715,12 @@ warn_deprecated_use (tree node, tree attr)
expanded_location xloc = expand_location (DECL_SOURCE_LOCATION (node));
if (msg)
warning (OPT_Wdeprecated_declarations,
"%qD is deprecated (declared at %s:%d): %s",
node, xloc.file, xloc.line, msg);
"%qD is deprecated (declared at %r%s:%d%R): %s",
node, "locus", xloc.file, xloc.line, msg);
else
warning (OPT_Wdeprecated_declarations,
"%qD is deprecated (declared at %s:%d)",
node, xloc.file, xloc.line);
"%qD is deprecated (declared at %r%s:%d%R)",
node, "locus", xloc.file, xloc.line);
}
else if (TYPE_P (node))
{
@ -11744,23 +11744,23 @@ warn_deprecated_use (tree node, tree attr)
{
if (msg)
warning (OPT_Wdeprecated_declarations,
"%qE is deprecated (declared at %s:%d): %s",
what, xloc.file, xloc.line, msg);
"%qE is deprecated (declared at %r%s:%d%R): %s",
what, "locus", xloc.file, xloc.line, msg);
else
warning (OPT_Wdeprecated_declarations,
"%qE is deprecated (declared at %s:%d)", what,
xloc.file, xloc.line);
"%qE is deprecated (declared at %r%s:%d%R)",
what, "locus", xloc.file, xloc.line);
}
else
{
if (msg)
warning (OPT_Wdeprecated_declarations,
"type is deprecated (declared at %s:%d): %s",
xloc.file, xloc.line, msg);
"type is deprecated (declared at %r%s:%d%R): %s",
"locus", xloc.file, xloc.line, msg);
else
warning (OPT_Wdeprecated_declarations,
"type is deprecated (declared at %s:%d)",
xloc.file, xloc.line);
"type is deprecated (declared at %r%s:%d%R)",
"locus", xloc.file, xloc.line);
}
}
else