public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jason Merrill <jason@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4380] c++: simple-requirement starting with 'typename' [PR101733] Date: Mon, 28 Nov 2022 20:52:52 +0000 (GMT) [thread overview] Message-ID: <20221128205252.42557385516A@sourceware.org> (raw) https://gcc.gnu.org/g:2b0ae7fb91f64fb005abf7d7903fd4c0764bb45c commit r13-4380-g2b0ae7fb91f64fb005abf7d7903fd4c0764bb45c Author: Jason Merrill <jason@redhat.com> Date: Sat Nov 26 11:13:55 2022 -0500 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. Diff: --- gcc/cp/parser.cc | 15 ++++++++++++++- gcc/testsuite/g++.dg/cpp2a/concepts-requires32.C | 11 +++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 82459b7683a..a13fbe41309 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 00000000000..117b8920787 --- /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) { }
reply other threads:[~2022-11-28 20:52 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221128205252.42557385516A@sourceware.org \ --to=jason@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).