diff options
| author | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2009-04-22 15:32:18 +0000 |
|---|---|---|
| committer | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2009-04-22 15:32:18 +0000 |
| commit | cfc935327585254eabd5c18f298b1b4bc28a2b02 (patch) | |
| tree | 51e37b610f5f0eae957aa2a3cee06eec9ab65abb /libcpp/internal.h | |
| parent | 8632d02a43457ecbcef85175e7575e5da6784646 (diff) | |
| download | gcc-cfc935327585254eabd5c18f298b1b4bc28a2b02.zip gcc-cfc935327585254eabd5c18f298b1b4bc28a2b02.tar.gz gcc-cfc935327585254eabd5c18f298b1b4bc28a2b02.tar.bz2 | |
re PR c++/14875 (When using 'or' keyword, the error message speaks of a '||' token)
2009-04-22 Manuel Lopez-Ibanez <manu@gcc.gnu.org>
PR c++/14875
* c-common.c (c_parse_error): Take a token_flags parameter.
Use token_type for the token type instead.
Pass token_flags to cpp_type2name.
* c-common.h (c_parse_error): Update declaration.
* c-parser.c (c_parser_error): Pass 0 as token flags.
libcpp/
* lex.c (cpp_type2name): Take a flags parameter. Call
cpp_named_operator2name for named operators and cpp_digraph2name
for digraphs.
(cpp_digraph2name): New.
(cpp_spell_token): Use it.
(cpp_output_token): Likewise.
* include/cpplib.h (cpp_type2name): Update declaration.
* init.c (cpp_named_operator2name): New.
* internal.h (cpp_named_operator2name): Declare.
cp/
* parser.c (cp_parser_error): Pass token->flags to c_parse_error.
testsuite/
* g++.dg/parse/parser-pr14875.C: New.
* g++.dg/parse/parser-pr14875-2.C: New.
* g++.dg/parse/error6.C: Update match string.
From-SVN: r146589
Diffstat (limited to 'libcpp/internal.h')
| -rw-r--r-- | libcpp/internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libcpp/internal.h b/libcpp/internal.h index 4368ebb..22e6d23 100644 --- a/libcpp/internal.h +++ b/libcpp/internal.h @@ -570,6 +570,7 @@ extern void _cpp_init_tokenrun (tokenrun *, unsigned int); /* In init.c. */ extern void _cpp_maybe_push_include_file (cpp_reader *); +extern const char *cpp_named_operator2name (enum cpp_ttype type); /* In directives.c */ extern int _cpp_test_assertion (cpp_reader *, unsigned int *); |