Skip to content

fix(parse): permit unbraced initializer after requires #477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
f: <T> () requires std::regular<T> = g(T());
main: () = { }
5 changes: 5 additions & 0 deletions regression-tests/test-results/gcc-13/gcc-version.output
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
c++ (GCC) 13.1.1 20230429
Copyright (C) 2023 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

#define CPP2_USE_MODULES Yes

//=== Cpp2 type declarations ====================================================


#include "cpp2util.h"



//=== Cpp2 type definitions and function declarations ===========================

#line 1 "pure2-bugfix-for-requires-clause-unbraced-function-initializer.cpp2"
template<typename T> auto f() -> void;
auto main() -> int;


//=== Cpp2 function definitions =================================================

#line 1 "pure2-bugfix-for-requires-clause-unbraced-function-initializer.cpp2"
template<typename T> auto f() -> void
requires (std::regular<T>)
#line 1 "pure2-bugfix-for-requires-clause-unbraced-function-initializer.cpp2"
{ g(T()); }
auto main() -> int {}

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pure2-bugfix-for-requires-clause-unbraced-function-initializer.cpp2... ok (all Cpp2, passes safety checks)

6 changes: 3 additions & 3 deletions source/parse.h
Original file line number Diff line number Diff line change
Expand Up @@ -1988,7 +1988,7 @@ struct declaration_node
std::vector<std::unique_ptr<id_expression_node>> meta_functions;
std::unique_ptr<parameter_declaration_list_node> template_parameters;
source_position requires_pos = {};
std::unique_ptr<expression_node> requires_clause_expression;
std::unique_ptr<logical_or_expression_node> requires_clause_expression;

source_position equal_sign = {};
std::unique_ptr<statement_node> initializer;
Expand Down Expand Up @@ -5865,7 +5865,7 @@ class parser
//G meta-functions-list '@' id-expression
//G
//G requires-clause:
//G 'requires' expression
//G 'requires' logical-or-expression
//G
//G template-parameter-declaration-list
//G '<' parameter-declaration-seq '>'
Expand Down Expand Up @@ -6112,7 +6112,7 @@ class parser
if (curr() == "requires") {
n->requires_pos = curr().position();
next();
auto e = expression();
auto e = logical_or_expression();
if (!e) {
error("'requires' must be followed by an expression");
return {};
Expand Down