diff options
| author | Matthias Kretz <m.kretz@gsi.de> | 2019-11-06 16:06:08 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2019-11-06 11:06:08 -0500 |
| commit | 6394a341d6c4a69d61b29618bf8837002eca580f (patch) | |
| tree | 9a691b9f60b25f72e388c699df5e8084d40e64d4 /gcc | |
| parent | 4b205bf82d06c4d9d0ae7b78e54c712d79d5b021 (diff) | |
| download | gcc-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')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/operator9.C | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.jason/operator.C | 2 |
4 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d0b47f7..e60a45b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2019-11-06 Matthias Kretz <m.kretz@gsi.de> + + * parser.c (cp_parser_operator): Parse operator?: as an + attempt to overload the conditional operator. + 2019-11-05 Jason Merrill <jason@redhat.com> Implement C++20 operator<=>. 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 `('. */ diff --git a/gcc/testsuite/g++.dg/parse/operator9.C b/gcc/testsuite/g++.dg/parse/operator9.C new file mode 100644 index 0000000..d66355a --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/operator9.C @@ -0,0 +1,5 @@ +// { dg-do compile } + +struct A {}; +struct B {}; +int operator?:(bool, A, B); // { dg-error "prohibits overloading" } diff --git a/gcc/testsuite/g++.old-deja/g++.jason/operator.C b/gcc/testsuite/g++.old-deja/g++.jason/operator.C index c2fc212..69a41cf 100644 --- a/gcc/testsuite/g++.old-deja/g++.jason/operator.C +++ b/gcc/testsuite/g++.old-deja/g++.jason/operator.C @@ -5,7 +5,7 @@ typedef __SIZE_TYPE__ size_t; struct A { - int operator?:(int a, int b); // { dg-error "expected type-specifier" } + int operator?:(int a, int b); // { dg-error "prohibits overloading" } static int operator()(int a); // { dg-error "14:.static int A::operator\\(\\)\\(int\\). must be a nonstatic member function" } static int operator+(A,A); // { dg-error "14:.static int A::operator\\+\\(A, A\\). must be either a non-static member function or a non-member function" } int operator+(int a, int b = 1); // { dg-error "7:.int A::operator\\+\\(int, int\\). must have either zero or one argument" } |