aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/parser.c
diff options
context:
space:
mode:
authorMatthias Kretz <m.kretz@gsi.de>2019-11-06 16:06:08 +0000
committerJason Merrill <jason@gcc.gnu.org>2019-11-06 11:06:08 -0500
commit6394a341d6c4a69d61b29618bf8837002eca580f (patch)
tree9a691b9f60b25f72e388c699df5e8084d40e64d4 /gcc/cp/parser.c
parent4b205bf82d06c4d9d0ae7b78e54c712d79d5b021 (diff)
downloadgcc-6394a341d6c4a69d61b29618bf8837002eca580f.zip
gcc-6394a341d6c4a69d61b29618bf8837002eca580f.tar.gz
gcc-6394a341d6c4a69d61b29618bf8837002eca580f.tar.bz2
Fix parser to recognize operator?:
This change lets grok_op_properties print its useful "ISO C++ prohibits overloading operator ?:" message instead of the cryptic error message about a missing type-specifier before '?' token. 2019-11-06 Matthias Kretz <m.kretz@gsi.de> * parser.c (cp_parser_operator): Parse operator?: as an attempt to overload the conditional operator. From-SVN: r277887
Diffstat (limited to 'gcc/cp/parser.c')
-rw-r--r--gcc/cp/parser.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index cbbf946..b17e033 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -15542,6 +15542,15 @@ cp_parser_operator (cp_parser* parser, location_t start_loc)
op = COMPONENT_REF;
break;
+ case CPP_QUERY:
+ op = COND_EXPR;
+ /* Consume the `?'. */
+ cp_lexer_consume_token (parser->lexer);
+ /* Look for the matching `:'. */
+ cp_parser_require (parser, CPP_COLON, RT_COLON);
+ consumed = true;
+ break;
+
case CPP_OPEN_PAREN:
{
/* Consume the `('. */