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/include | |
| 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/include')
| -rw-r--r-- | libcpp/include/cpplib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index 3aeb035..b38d9f4 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -841,7 +841,7 @@ extern void cpp_output_line (cpp_reader *, FILE *); extern unsigned char *cpp_output_line_to_string (cpp_reader *, const unsigned char *); extern void cpp_output_token (const cpp_token *, FILE *); -extern const char *cpp_type2name (enum cpp_ttype); +extern const char *cpp_type2name (enum cpp_ttype, unsigned char flags); /* Returns the value of an escape sequence, truncated to the correct target precision. PSTR points to the input pointer, which is just after the backslash. LIMIT is how much text we have. WIDE is true |