diff options
| author | Neil Booth <neilb@earthling.net> | 2000-09-23 21:41:41 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2000-09-23 21:41:41 +0000 |
| commit | cbcff6df5c57b1f2862916680673611398ef1bda (patch) | |
| tree | ed10891b3898c3d5117b135bd865e1653390160c /gcc/cpplib.c | |
| parent | 19e223db83b86b7262db77c9ea67e7d6d32a0d73 (diff) | |
| download | gcc-cbcff6df5c57b1f2862916680673611398ef1bda.zip gcc-cbcff6df5c57b1f2862916680673611398ef1bda.tar.gz gcc-cbcff6df5c57b1f2862916680673611398ef1bda.tar.bz2 | |
cpphash.h (CPP_RESERVE, [...]): Delete.
* cpphash.h (CPP_RESERVE, CPP_PUTS_Q, CPP_PUTS, CPP_PUTC_Q,
CPP_PUTC, DUMMY_TOKEN, NO_DUMMY_TOKEN): Delete.
* cpplex.c (_cpp_expand_token_space, _cpp_init_toklist,
_cpp_free_toklist): No need to worry about extra dummy token
at the start of token lists any more.
(trigraph_ok): Only warn outside comments.
(skip_block_comment): Set and clear lexing_comment.
(skip_line_comment): Take a cpp_reader not cpp_buffer.
Set and clear lexing_comment.
(parse_number): Handle leading '.' indicated by pfile->seen_dot.
(check_long_token): Delete.
(lex_percent, lex_dot): New subroutines of lex_token to
handle lexing of '.' and '%' without lookback.
(lex_token): Use lex_dot and lex_percent.
(lex_line): Don't check for LIST_OFFSET.
(_cpp_init_input_buffer): Update for new _cpp_init_toklist.
* cpplib.c (_cpp_parse_assertion): Similarly.
(cpp_push_buffer): Initialize extra_char.
* cpplib.h (LIST_OFFSET): Delete.
(struct cpp_buffer): New member extra_char.
(struct lexer_state): New members lexing_comment and seen_dot.
From-SVN: r36582
Diffstat (limited to 'gcc/cpplib.c')
| -rw-r--r-- | gcc/cpplib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc/cpplib.c b/gcc/cpplib.c index 3106486..8c61ab0 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -1247,7 +1247,7 @@ _cpp_parse_assertion (pfile, answerp) /* Allocate a struct answer, and copy the answer to it. */ answer = (struct answer *) xmalloc (sizeof (struct answer)); list = &answer->list; - _cpp_init_toklist (list, NO_DUMMY_TOKEN); + _cpp_init_toklist (list, 1); /* Empty. */ for (;;) { @@ -1516,7 +1516,9 @@ cpp_push_buffer (pfile, buffer, length) new->rlimit = buffer + length; new->prev = buf; new->pfile = pfile; + /* No read ahead or extra char initially. */ new->read_ahead = EOF; + new->extra_char = EOF; CPP_BUFFER (pfile) = new; return new; |