mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-27 23:34:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

cpperror.c (cpp_file_line_for_message): If 'line' is zero, just print "<command line>".

Browse Source 
* cpperror.c (cpp_file_line_for_message): If 'line' is zero,
	just print "<command line>".  If 'filename' is null or an
	empty string, print "<stdin>" for the filename.
	* cpplib.c (do_define): Don't print the 'location of the
	previous definition' message if we're still parsing the
	command line.
	(cpp_pedwarn_with_file_and_line): Always call
	cpp_file_line_for_message.

From-SVN: r31697
This commit is contained in:
Zack Weinberg 2000-01-30 03:31:59 +00:00 committed by Zack Weinberg
parent 607ace9b9b
commit 59495f3843
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ChangeLog
View File

@ -1,3 +1,14 @@
2000-01-29 Zack Weinberg <zack@wolery.cumb.org>
* cpperror.c (cpp_file_line_for_message): If 'line' is zero,
just print "<command line>". If 'filename' is null or an
empty string, print "<stdin>" for the filename.
* cpplib.c (do_define): Don't print the 'location of the
previous definition' message if we're still parsing the
command line.
(cpp_pedwarn_with_file_and_line): Always call
cpp_file_line_for_message.
2000-01-29 Mark Mitchell <mark@codesourcery.com>
* flow.c (mark_regs_live_at_end): Fix typo.

6
gcc/cpperror.c
View File

@ -84,7 +84,11 @@ cpp_file_line_for_message (pfile, filename, line, column)
const char *filename;
int line, column;
{
if (column > 0)
if (filename == 0 || *filename == '\0')
filename = "<stdin>";
if (line == 0)
fputs (_("<command line>: "), stderr);
else if (column > 0)
fprintf (stderr, "%s:%d:%d: ", filename, line, column);
else
fprintf (stderr, "%s:%d: ", filename, line);

5
gcc/cpplib.c
View File

@ -685,7 +685,7 @@ do_define (pfile, keyword)
mdef.symlen, mdef.symnam);
else
cpp_pedwarn (pfile, "`%.*s' redefined", mdef.symlen, mdef.symnam);
if (hp->type == T_MACRO)
if (hp->type == T_MACRO && CPP_OPTIONS (pfile)->done_initializing)
cpp_pedwarn_with_file_and_line (pfile, hp->value.defn->file,
hp->value.defn->line,
"this is the location of the previous definition");
@ -3474,8 +3474,7 @@ cpp_pedwarn_with_file_and_line VPARAMS ((cpp_reader *pfile, const char *file,
if (!CPP_OPTIONS (pfile)->pedantic_errors
&& CPP_OPTIONS (pfile)->inhibit_warnings)
return;
if (file != NULL)
cpp_file_line_for_message (pfile, file, line, -1);
cpp_file_line_for_message (pfile, file, line, -1);
v_cpp_message (pfile, CPP_OPTIONS (pfile)->pedantic_errors, msgid, ap);
va_end(ap);
}