diff options
| author | Zack Weinberg <zack@wolery.cumb.org> | 2000-07-08 02:33:00 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-07-08 02:33:00 +0000 |
| commit | cf00a885103d939b2175adc8918908a3b6f211d2 (patch) | |
| tree | 063609848f321cdd31d0d1155b156f5af32e889c /gcc/cpplib.h | |
| parent | 563dd08adfa12573fdecf9669fdf685fef5fd360 (diff) | |
| download | gcc-cf00a885103d939b2175adc8918908a3b6f211d2.zip gcc-cf00a885103d939b2175adc8918908a3b6f211d2.tar.gz gcc-cf00a885103d939b2175adc8918908a3b6f211d2.tar.bz2 | |
cppexp.c: Update all code for new lexer interface.
* cppexp.c: Update all code for new lexer interface.
(op_t, operator codes, struct token, tokentab2, op_to_str): Remove.
(struct suffix, vsuf_1, vsuf_2, vsuf_3, op_to_prio): New.
* cpplex.c (token_names): Trim leading CPP_ from names; make
the strings unsigned.
(_cpp_spell_operator): New.
(is_macro_disabled): Disable all macros if rescanning
preprocessed text.
(_cpp_get_directive_token): Remove.
* cppinit.c: Don't set no_macro_expand.
* cpplib.c (read_line_number, do_line): Check only for EOF,
not VSPACE.
* cpphash.h: Update prototypes.
* cpplib.h (CPP_VSPACE): Remove.
(struct cpp_reader): Remove no_macro_expand.
testsuite:
* gcc.dg/cpp/19951227-1.c, gcc.dg/cpp/assert2.c,
gcc.dg/cpp/if-1.c, gcc.dg/cpp/if-4.c: Tweak error regexps.
From-SVN: r34920
Diffstat (limited to 'gcc/cpplib.h')
| -rw-r--r-- | gcc/cpplib.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gcc/cpplib.h b/gcc/cpplib.h index e9bb24f..5f49f91 100644 --- a/gcc/cpplib.h +++ b/gcc/cpplib.h @@ -123,10 +123,7 @@ typedef struct cpp_hashnode cpp_hashnode; I(CPP_COMMENT, 0) /* Only if output comments. */ \ N(CPP_MACRO_ARG, 0) /* Macro argument. */ \ N(CPP_EOF, 0) /* End of file. */ \ - I(CPP_HEADER_NAME, 0) /* <stdio.h> in #include */ \ -\ - /* Obsolete - will be removed when no code uses them still. */ \ - T(CPP_VSPACE, "\n") /* End of line. */ + I(CPP_HEADER_NAME, 0) /* <stdio.h> in #include */ #define T(e, s) e, #define I(e, s) e, @@ -542,9 +539,6 @@ struct cpp_reader containing files that matches the current status. */ unsigned char input_stack_listing_current; - /* If non-zero, macros are not expanded. */ - unsigned char no_macro_expand; - /* We're printed a warning recommending against using #import. */ unsigned char import_warning; @@ -555,7 +549,8 @@ struct cpp_reader /* True if we are skipping a failed conditional group. */ unsigned char skipping; - /* Do we need to save paramter spellings. */ + /* True if we need to save parameter spellings - only if -pedantic, + or we might need to write out definitions. */ unsigned char save_parameter_spellings; /* If we're in lex_line. */ |