diff options
| author | Neil Booth <neil@daikokuya.demon.co.uk> | 2002-02-27 07:24:53 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2002-02-27 07:24:53 +0000 |
| commit | e808ec9c71e52aa64bdb4579ad2ef75802b7bcb5 (patch) | |
| tree | 7ffd19f1f5d3104b1545c9af4c64c746cda65cbc /gcc/cpplex.c | |
| parent | f585a35687df424814b57fd201253c11a19795f5 (diff) | |
| download | gcc-e808ec9c71e52aa64bdb4579ad2ef75802b7bcb5.zip gcc-e808ec9c71e52aa64bdb4579ad2ef75802b7bcb5.tar.gz gcc-e808ec9c71e52aa64bdb4579ad2ef75802b7bcb5.tar.bz2 | |
cpplex.c (_cpp_lex_token): Handle directives in macro arguments.
* cpplex.c (_cpp_lex_token): Handle directives in macro
arguments.
* cpplib.c (_cpp_handle_directive): Save and restore state
if parsing macro args when entering a directive.
* cppmacro.c (collect_args): No need to handle directives
in macro arguments.
(enter_macro_context, replace_args): Use the original macro
definition in case it was redefined whilst collecting arguments.
doc:
* cpp.texi: Update.
testsuite:
* gcc.dg/cpp/undef1.c: Remove.
* gcc.dg/cpp/directiv.c: Update.
* gcc.dg/cpp/mac-dir-1.c, mac-dir-2.c: New tests.
From-SVN: r50091
Diffstat (limited to 'gcc/cpplex.c')
| -rw-r--r-- | gcc/cpplex.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cpplex.c b/gcc/cpplex.c index eea6a9e..a5a20db 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -828,7 +828,10 @@ _cpp_lex_token (pfile) /* Is this a directive. If _cpp_handle_directive returns false, it is an assembler #. */ if (result->type == CPP_HASH - && !pfile->state.parsing_args + /* 6.10.3 p 11: Directives in a list of macro arguments + gives undefined behavior. This implementation + handles the directive as normal. */ + && pfile->state.parsing_args != 1 && _cpp_handle_directive (pfile, result->flags & PREV_WHITE)) continue; if (pfile->cb.line_change && !pfile->state.skipping) |