diff options
| author | Neil Booth <neilb@earthling.net> | 2000-12-09 12:06:37 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2000-12-09 12:06:37 +0000 |
| commit | 28e0f040343cefbd1de6c067394ea1415fab83f8 (patch) | |
| tree | 03c1db8498e9dbaa46fcb7c0ed5437d1bbb36e07 /gcc/cpplex.c | |
| parent | 1b32f732bf637e9783bf840d04cf4039944b3339 (diff) | |
| download | gcc-28e0f040343cefbd1de6c067394ea1415fab83f8.zip gcc-28e0f040343cefbd1de6c067394ea1415fab83f8.tar.gz gcc-28e0f040343cefbd1de6c067394ea1415fab83f8.tar.bz2 | |
cppfiles.c (NEVER_REREAD, [...]): Move from cpphash.h.
* cppfiles.c (NEVER_REREAD, DO_NOT_REREAD): Move from cpphash.h.
* cpphash.h (NEVER_REREAD, DO_NOT_REREAD, ABSOLUTE_PATH): Delete.
* cpplex.c (parse_identifier): Improve diagnostic.
(_cpp_lex_token): Return unconditionally at the end of a directive.
* cpplib.c (read_flag): Verify legality of each flag.
(end_directive): Resotre pfile->skipping before skip_rest_of_line.
(do_line): Use the new read_flag.
* cppmacro.c (struct cpp_macro, parse_arg, replace_args,
check_macro_redefinition, parse_params): Rename var_args to
variadic.
From-SVN: r38150
Diffstat (limited to 'gcc/cpplex.c')
| -rw-r--r-- | gcc/cpplex.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/cpplex.c b/gcc/cpplex.c index 17a89b9..2b5b852 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -521,10 +521,10 @@ parse_identifier (pfile, c) cpp_error (pfile, "attempt to use poisoned \"%s\"", result->name); /* Constraint 6.10.3.5: __VA_ARGS__ should only appear in the - replacement list of a variable-arguments macro. */ + replacement list of a variadic macro. */ if (result == pfile->spec_nodes.n__VA_ARGS__ && !pfile->state.va_args_ok) - cpp_pedwarn (pfile, "__VA_ARGS__ can only appear in the expansion of a C99 variable-argument macro"); + cpp_pedwarn (pfile, "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro"); } return result; @@ -907,7 +907,8 @@ _cpp_lex_token (pfile, result) buffer->read_ahead = c; pfile->state.next_bol = 1; result->type = CPP_EOF; - break; + /* Don't break; pfile->skipping might be true. */ + return; case '?': case '\\': |