cppexp.c: Don't worry about pfile->skipping.

        * cppexp.c: Don't worry about pfile->skipping.
        * cpplib.c (struct if_stack): Make was_skipping unsigned char.
        (cpp_handle_directive): Save pfile->skipping in struct cpp_buffer
        for handled directives.
        (skip_rest_of_line): Use _cpp_lex_token after popping contexts
        and releasing lookaheads.
        (do_ifdef, do_ifndef, do_if): Use buffer->was_skipping.
        (do_else, do_elif, push_conditional): Update logic.
        (do_endif): Set buffer->was_skipping rather than pfile->skipping.
        (unwind_if_stack): Inline into cpp_pop_buffer.
        (cpp_push_buffer): Clear ifs->was_skipping for cpp_handle_directive.
        * cpplex.c (_cpp_lex_token): Clear skipping on EOF.  Handle
        multiple-include optimisation.
        * cpplib.h (struct cpp_buffer): New member was_skipping.
        * cppmacro.c (_cpp_get_token): Loop whilst pfile->skipping.  This
        works because skipping == 0 in directives.
        (_cpp_release_lookahead): Renamed from release_lookahead.
        (cpp_get_token): No need to check skipping as _cpp_get_token does
        this for us.  No need to handle MI optimisation.

From-SVN: r37404

1 files changed, 0 insertions, 5 deletions

diff --git a/gcc/cppexp.c b/gcc/cppexp.c
index 4814868..82f8aab 100644
--- a/gcc/cppexp.c
+++ b/gcc/cppexp.c
@@ -752,10 +752,6 @@ _cpp_parse_expr (pfile)
   int skip_evaluation = 0;
   int result;
 
-  /* Save parser state and set it to something sane.  */
-  int save_skipping = pfile->skipping;
-  pfile->skipping = 0;
-
   /* Set up detection of #if ! defined().  */
   pfile->mi_lexed = 0;
   pfile->mi_if_not_defined = MI_IND_NONE;
@@ -1039,7 +1035,6 @@ _cpp_parse_expr (pfile)
   /* Free dynamic stack if we allocated one.  */
   if (stack != init_stack)
     free (stack);
-  pfile->skipping = save_skipping;
   return result;
 }