diff options
author | Jason Merrill <jason@redhat.com> | 2022-11-26 11:13:55 -0500 |
---|---|---|
committer | Jason Merrill <jason@redhat.com> | 2022-11-28 15:51:53 -0500 |
commit | 2b0ae7fb91f64fb005abf7d7903fd4c0764bb45c (patch) | |
tree | 6de19e3c1a6fc3c61e2069b3940d9c1c919319f2 | |
parent | 297bbe2d0dea083344e66e3e72fa791b5855a3de (diff) | |
download | gcc-2b0ae7fb91f64fb005abf7d7903fd4c0764bb45c.zip gcc-2b0ae7fb91f64fb005abf7d7903fd4c0764bb45c.tar.gz gcc-2b0ae7fb91f64fb005abf7d7903fd4c0764bb45c.tar.bz2 |
c++: simple-requirement starting with 'typename' [PR101733]
Usually a requirement starting with 'typename' is a type-requirement, but it
might be a simple-requirement such as a functional cast to a typename-type.
PR c++/101733
gcc/cp/ChangeLog:
* parser.cc (cp_parser_requirement): Parse tentatively for the
'typename' case.
gcc/testsuite/ChangeLog:
* g++.dg/cpp2a/concepts-requires32.C: New test.
-rw-r--r-- | gcc/cp/parser.cc | 15 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/concepts-requires32.C | 11 |
2 files changed, 25 insertions, 1 deletions
diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 82459b7..a13fbe4 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -30737,7 +30737,20 @@ cp_parser_requirement (cp_parser *parser) if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE)) return cp_parser_compound_requirement (parser); else if (cp_lexer_next_token_is_keyword (parser->lexer, RID_TYPENAME)) - return cp_parser_type_requirement (parser); + { + /* It's probably a type-requirement. */ + cp_parser_parse_tentatively (parser); + tree req = cp_parser_type_requirement (parser); + if (cp_parser_parse_definitely (parser)) + return req; + /* No, maybe it's something like typename T::type(); */ + cp_parser_parse_tentatively (parser); + req = cp_parser_simple_requirement (parser); + if (cp_parser_parse_definitely (parser)) + return req; + /* Non-tentative for the error. */ + return cp_parser_type_requirement (parser); + } else if (cp_lexer_next_token_is_keyword (parser->lexer, RID_REQUIRES)) return cp_parser_nested_requirement (parser); else diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires32.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires32.C new file mode 100644 index 0000000..117b892 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires32.C @@ -0,0 +1,11 @@ +// PR c++/101733 +// { dg-do compile { target c++20 } } + +template<class T> +requires requires { + typename T::type; + (typename T::type()); // (1) + T::type(); // (2) + typename T::type(); // (3) +} +void f(T) { } |