diff options
author | Neil Booth <neilb@earthling.net> | 2000-11-11 13:19:01 +0000 |
---|---|---|
committer | Neil Booth <neil@gcc.gnu.org> | 2000-11-11 13:19:01 +0000 |
commit | 4c2b647d427e98f8b5e283e4011aa286d2d4a956 (patch) | |
tree | 7323fe5e1674d601cd12b49ff890f231326528ee /gcc/cpplib.c | |
parent | 1e8ba2a38cd259556340a4143716e7ee96b3f56c (diff) | |
download | gcc-4c2b647d427e98f8b5e283e4011aa286d2d4a956.zip gcc-4c2b647d427e98f8b5e283e4011aa286d2d4a956.tar.gz gcc-4c2b647d427e98f8b5e283e4011aa286d2d4a956.tar.bz2 |
Remove CPP_PLACEMARKERs
* cppexp.c (lex): Don't handle CPP_PLACEMARKER.
* cpplex.c (_cpp_lex_token): Rename skip_newlines to next_bol
* cpplib.c (skip_rest_of_line, check_eol, cpp_push_buffer):
Similarly.
* cpplib.h: Remove CPP_PLACEMARKER.
(struct lexer_state): Rename skip_newlines to next_bol.
* cppmacro.c (stringify_arg): Don't handle CPP_PLACEMARKER.
Simplify prev_white handling as a result.
(paste_all_tokens): Don't worry about CPP_PLACEMARKERs.
(parse_arg): Empty arguments are now empty, not CPP_PLACEMARKERs.
(parse_args): Similarly. Update argument count tests.
(enter_macro_context): Return 2 to indicate an empty macro.
(replace_args): Don't bother pre-expanding an empty argument.
Handle placemarkers and ## extension during pre-expansion.
(cpp_get_token): Handle empty macro expansions. Don't worry
about CPP_PLACEMARKERs.
(_cpp_create_definition): Empty macros are now empty.
(cpp_macro_defintion): Don't special case empty macros.
* scan-decls.c: Don't bother with CPP_PLACEMARKERs.
* c-lex.c: Similarly.
From-SVN: r37385
Diffstat (limited to 'gcc/cpplib.c')
-rw-r--r-- | gcc/cpplib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cpplib.c b/gcc/cpplib.c index fb34680..d70e6ec 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -194,7 +194,7 @@ skip_rest_of_line (pfile) because they may be saving tokens prior to this directive for an external client. So we use _cpp_get_token, with macros disabled. */ pfile->state.prevent_expansion++; - while (!pfile->state.skip_newlines) + while (!pfile->state.next_bol) _cpp_get_token (pfile, &token); pfile->state.prevent_expansion--; } @@ -204,7 +204,7 @@ static void check_eol (pfile) cpp_reader *pfile; { - if (!pfile->state.skip_newlines) + if (!pfile->state.next_bol) { cpp_token token; @@ -1728,7 +1728,7 @@ cpp_push_buffer (pfile, buffer, length) /* No read ahead or extra char initially. */ new->read_ahead = EOF; new->extra_char = EOF; - pfile->state.skip_newlines = 1; + pfile->state.next_bol = 1; CPP_BUFFER (pfile) = new; return new; |