diff options
author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-27 07:24:53 +0000 |
---|---|---|
committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-02-27 07:24:53 +0000 |
commit | d6af03689afcb6d54e5ce66a399f68753a2aea3e (patch) | |
tree | 7ffd19f1f5d3104b1545c9af4c64c746cda65cbc /gcc/testsuite/gcc.dg/cpp/directiv.c | |
parent | fc54b737e45b3feef050092c62be54cf1b81c5a7 (diff) | |
download | gcc-d6af03689afcb6d54e5ce66a399f68753a2aea3e.tar.gz |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50091 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/testsuite/gcc.dg/cpp/directiv.c')
-rw-r--r-- | gcc/testsuite/gcc.dg/cpp/directiv.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gcc/testsuite/gcc.dg/cpp/directiv.c b/gcc/testsuite/gcc.dg/cpp/directiv.c index cbf4ac6501c..aafe2ec109d 100644 --- a/gcc/testsuite/gcc.dg/cpp/directiv.c +++ b/gcc/testsuite/gcc.dg/cpp/directiv.c @@ -25,16 +25,11 @@ EMPTY #define bar /* Our friend the null directive OK? */ # -/* Check that directives always start a line, even if in middle of - macro expansion. */ -#define func(x) x -func (2 /* { dg-error "unterminated" "" } */ -#define foobar /* { dg-error "directives may not" } */ - /* Check newlines end directives, even in function-like macro invocations. 6.10 paragraph 1. Note that the #if is still treated as a conditional, so there should be no errors about #endif without #if. */ +#define func(x) x #if func ( /* { dg-error "unterminated argument" } */ #endif |