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.c | |
| 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.c')
| -rw-r--r-- | gcc/cpplib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cpplib.c b/gcc/cpplib.c index 05d3d87..9e93e4d 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -476,7 +476,7 @@ read_line_number (pfile, num) } else { - if (type != CPP_VSPACE && type != CPP_EOF) + if (type != CPP_EOF) cpp_error (pfile, "invalid format #line"); return 0; } @@ -545,7 +545,7 @@ do_line (pfile) str = tok->val.name.text; len = tok->val.name.len; - if (type == CPP_VSPACE || type == CPP_EOF) + if (type == CPP_EOF) goto done; else if (type != CPP_STRING) { |