aboutsummaryrefslogtreecommitdiff
path: root/gcc/cppmacro.c
diff options
context:
space:
mode:
authorNeil Booth <neil@daikokuya.demon.co.uk>2001-10-21 14:04:42 +0000
committerNeil Booth <neil@gcc.gnu.org>2001-10-21 14:04:42 +0000
commit480709cc6c3deed4fd90c02e86920d8a3e98ceb6 (patch)
tree89ea5c85908fbe5e7d5dbc18983341f4a856a863 /gcc/cppmacro.c
parent28d8dc3a10515f24498449589849dee132b75cd1 (diff)
downloadgcc-480709cc6c3deed4fd90c02e86920d8a3e98ceb6.zip
gcc-480709cc6c3deed4fd90c02e86920d8a3e98ceb6.tar.gz
gcc-480709cc6c3deed4fd90c02e86920d8a3e98ceb6.tar.bz2
cpphash.h (struct cpp_buffer): Delete read_ahead and extra_char.
* cpphash.h (struct cpp_buffer): Delete read_ahead and extra_char. * cpplex.c (lex_percent, lex_dot): Remove. (get_effective_char, skip_block_comment, skip_line_comment, parse_identifier_slow, parse_number, parse_string, save_comment, _cpp_lex_direct): Update to do lookback freely. (IF_NEXT_IS, BACKUP): New macros. * cpplib.c (cpp_push_buffer): Don't set read_ahead and extra_char. * cppmacro.c (paste_tokens): Update. From-SVN: r46392
Diffstat (limited to 'gcc/cppmacro.c')
-rw-r--r--gcc/cppmacro.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index 5e094c2..9390cbc 100644
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -392,8 +392,7 @@ paste_tokens (pfile, plhs, rhs)
/* Set pfile->cur_token as required by _cpp_lex_direct. */
pfile->cur_token = _cpp_temp_token (pfile);
*plhs = _cpp_lex_direct (pfile);
- valid = (pfile->buffer->cur == pfile->buffer->rlimit
- && pfile->buffer->read_ahead == EOF);
+ valid = pfile->buffer->cur == pfile->buffer->rlimit;
_cpp_pop_buffer (pfile);
return valid;