mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-10 15:00:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

cpplex.c (_cpp_lex_token): Don't warn about directives in macro arguments when looking for the '('.

Browse Source 
* cpplex.c (_cpp_lex_token): Don't warn about directives in
	macro arguments when looking for the '('.
	* cppmacro.c (funlike_invocation_p): Set parsing_args to
	2 when really parsing arguments; 1 when looking for '('.
	Always restore the lexer position.
	* gcc.dg/cpp/cppmacro7.c: New test.

From-SVN: r40223
This commit is contained in:
Neil Booth 2001-03-03 22:14:08 +00:00 committed by Neil Booth
parent 20f9202d81
commit e8408f251a
5 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2001-03-03 Neil Booth <neil@daikokuya.demon.co.uk>
* cpplex.c (_cpp_lex_token): Don't warn about directives in
macro arguments when looking for the '('.
* cppmacro.c (funlike_invocation_p): Set parsing_args to
2 when really parsing arguments; 1 when looking for '('.
Always restore the lexer position.
2001-03-03 Neil Booth <neil@daikokuya.demon.co.uk>
* longlong.h (umul_ppmm): Don't use a multiline string.

56
gcc/cpplex.c
View File

@ -1171,38 +1171,36 @@ _cpp_lex_token (pfile, result)
result->type = CPP_HASH;
do_hash:
if (bol)
if (!bol)
break;
/* 6.10.3 paragraph 11: If there are sequences of preprocessing
tokens within the list of arguments that would otherwise act
as preprocessing directives, the behavior is undefined.
This implementation will report a hard error, terminate the
macro invocation, and proceed to process the directive. */
if (pfile->state.parsing_args)
{
if (pfile->state.parsing_args)
{
/* 6.10.3 paragraph 11: If there are sequences of
preprocessing tokens within the list of arguments that
would otherwise act as preprocessing directives, the
behavior is undefined.
if (pfile->state.parsing_args == 2)
cpp_error (pfile,
"directives may not be used inside a macro argument");
This implementation will report a hard error, terminate
the macro invocation, and proceed to process the
directive. */
cpp_error (pfile,
"directives may not be used inside a macro argument");
/* Put a '#' in lookahead, return CPP_EOF for parse_arg. */
buffer->extra_char = buffer->read_ahead;
buffer->read_ahead = '#';
pfile->state.next_bol = 1;
result->type = CPP_EOF;
/* Put a '#' in lookahead, return CPP_EOF for parse_arg. */
buffer->extra_char = buffer->read_ahead;
buffer->read_ahead = '#';
pfile->state.next_bol = 1;
result->type = CPP_EOF;
/* Get whitespace right - newline_in_args sets it. */
if (pfile->lexer_pos.col == 1)
result->flags &= ~(PREV_WHITE | AVOID_LPASTE);
}
else
{
/* This is the hash introducing a directive. */
if (_cpp_handle_directive (pfile, result->flags & PREV_WHITE))
goto done_directive; /* bol still 1. */
/* This is in fact an assembler #. */
}
/* Get whitespace right - newline_in_args sets it. */
if (pfile->lexer_pos.col == 1)
result->flags &= ~(PREV_WHITE | AVOID_LPASTE);
}
else
{
/* This is the hash introducing a directive. */
if (_cpp_handle_directive (pfile, result->flags & PREV_WHITE))
goto done_directive; /* bol still 1. */
/* This is in fact an assembler #. */
}
break;

8
gcc/cppmacro.c
View File

@ -602,6 +602,7 @@ funlike_invocation_p (pfile, node, list)
cpp_start_lookahead (pfile);
cpp_get_token (pfile, &maybe_paren);
cpp_stop_lookahead (pfile, maybe_paren.type == CPP_OPEN_PAREN);
pfile->state.parsing_args = 2;
if (maybe_paren.type == CPP_OPEN_PAREN)
args = parse_args (pfile, node);
@ -615,11 +616,12 @@ funlike_invocation_p (pfile, node, list)
pfile->state.prevent_expansion--;
pfile->state.parsing_args = 0;
/* Reset the position in case of failure. If success, the macro's
expansion appears where the name would have. */
pfile->lexer_pos = macro_pos;
if (args)
{
/* The macro's expansion appears where the name would have. */
pfile->lexer_pos = macro_pos;
if (node->value.macro->paramc > 0)
{
/* Don't save tokens during pre-expansion. */

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2001-03-03 Neil Booth <neil@daikokuya.demon.co.uk>
* gcc.dg/cpp/macro7.c: New test.
2001-03-03 Neil Booth <neil@daikokuya.demon.co.uk>
* gcc.dg/cpp/multiline.c: Update.

10
gcc/testsuite/gcc.dg/cpp/macro7.c Normal file
View File

@ -0,0 +1,10 @@
/* { dg-do preprocess } */
/* Test we don't complain about directives in macro expansions when
looking for the '(' of a function-like macro.
Submitter: Neil Booth. 3 Mar 2000. */
#define f(x) x
f
#define g