diff options
| author | Neil Booth <neilb@earthling.net> | 2000-11-14 18:32:06 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2000-11-14 18:32:06 +0000 |
| commit | 7f2f1a6633e44161efbfc2edbf2aaec9574f274d (patch) | |
| tree | 5e118199d108d9149834d978b08d106ac77d7ea8 /gcc/cppexp.c | |
| parent | f36d6244de2d705437102b9e3ebf34589c92edea (diff) | |
| download | gcc-7f2f1a6633e44161efbfc2edbf2aaec9574f274d.zip gcc-7f2f1a6633e44161efbfc2edbf2aaec9574f274d.tar.gz gcc-7f2f1a6633e44161efbfc2edbf2aaec9574f274d.tar.bz2 | |
cppexp.c (parse_defined): Call cpp_get_token not _cpp_get_token.
* cppexp.c (parse_defined): Call cpp_get_token not
_cpp_get_token.
(lex): Similarly.
* cpplex.c (cpp_output_line): Similarly.
* cpplib.c (glue_header_name, do_line, do_ident,
parse_answer, parse_assertion): Similarly.
(_cpp_handle_diretive): Don't save to lookaheads
when processing directives.
* cppmacro.c (parse_arg, expand_arg): Call cpp_get_token not
_cpp_get_token.
(funlike_invocation_p): Don't save to lookaheads
when pre-expanding arguments.
(_cpp_get_token): Delete.
(cpp_get_token): Merge contents of _cpp_get_token.
From-SVN: r37462
Diffstat (limited to 'gcc/cppexp.c')
| -rw-r--r-- | gcc/cppexp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gcc/cppexp.c b/gcc/cppexp.c index 82f8aab..98bd94e 100644 --- a/gcc/cppexp.c +++ b/gcc/cppexp.c @@ -321,11 +321,11 @@ parse_defined (pfile) /* Don't expand macros. */ pfile->state.prevent_expansion++; - _cpp_get_token (pfile, &token); + cpp_get_token (pfile, &token); if (token.type == CPP_OPEN_PAREN) { paren = 1; - _cpp_get_token (pfile, &token); + cpp_get_token (pfile, &token); } if (token.type == CPP_NAME) @@ -333,7 +333,7 @@ parse_defined (pfile) node = token.val.node; if (paren) { - _cpp_get_token (pfile, &token); + cpp_get_token (pfile, &token); if (token.type != CPP_CLOSE_PAREN) { cpp_error (pfile, "missing ')' after \"defined\""); @@ -378,13 +378,14 @@ lex (pfile, skip_evaluation, token) { struct op op; - _cpp_get_token (pfile, token); + cpp_get_token (pfile, token); switch (token->type) { case CPP_INT: case CPP_NUMBER: return parse_number (pfile, token); + case CPP_CHAR: case CPP_WCHAR: return parse_charconst (pfile, token); |