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.h | |
| 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.h')
| -rw-r--r-- | gcc/cpplib.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/cpplib.h b/gcc/cpplib.h index 742e1a9..d677396 100644 --- a/gcc/cpplib.h +++ b/gcc/cpplib.h @@ -140,7 +140,6 @@ struct htab; \ TK(CPP_COMMENT, SPELL_STRING) /* Only if output comments. */ \ TK(CPP_MACRO_ARG, SPELL_NONE) /* Macro argument. */ \ - TK(CPP_PLACEMARKER, SPELL_NONE) /* Placemarker token. */ \ OP(CPP_EOF, "EOL") /* End of line or file. */ #define OP(e, s) e, @@ -488,8 +487,8 @@ struct lexer_state all directives apart from #define. */ unsigned char save_comments; - /* If nonzero the lexer skips newlines. Internal to the lexer. */ - unsigned char skip_newlines; + /* If nonzero the next token is at the beginning of the line. */ + unsigned char next_bol; /* Nonzero if we're mid-comment. */ unsigned char lexing_comment; |