cpphash.h (struct_lexer_state): Delete was_skipping.
authorNeil Booth <neil@cat.daikokuya.demon.co.uk>
Thu, 26 Jul 2001 06:02:47 +0000 (06:02 +0000)
committerNeil Booth <neil@gcc.gnu.org>
Thu, 26 Jul 2001 06:02:47 +0000 (06:02 +0000)
commitcef0d199d24feb707b86db0ad2991823b276cd1a
treecaee9edc9501482aa583e1040604f6f2a4d52aba
parent2e824adbe44a946c91c1ff94815963fd2bec93be
cpphash.h (struct_lexer_state): Delete was_skipping.

* cpphash.h (struct_lexer_state): Delete was_skipping.
Move skipping here from struct cpp_reader.
* cpplex.c (parse_identifier): Update.
(_cpp_lex_token): Don't skip tokens in a directive.
* cpplib.c (struct if_stack): Update.
(start_directive, end_directive): Don't change skipping state.
(_cpp_handle_directive): Update.
(do_ifdef, do_ifndef, do_if, do_elif): Similarly.
(do_else, do_endif): Update; only check for excess tokens if not
in a skipped conditional block.
(push_conditional): Update for new struct if_stack.

* gcc.dg/cpp/extratokens.c: Fix.
* gcc.dg/cpp/skipping2.c: New tests.

From-SVN: r44380
gcc/ChangeLog
gcc/cpphash.h
gcc/cpplex.c
gcc/cpplib.c
gcc/testsuite/ChangeLog
gcc/testsuite/gcc.dg/cpp/extratokens.c
gcc/testsuite/gcc.dg/cpp/skipping2.c [new file with mode: 0644]