Skip to content

fix(parse)!: accept short constexpr function with requires #922

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.

Sign up for GitHub

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 1 commit into from
Jan 9, 2024
Merged

fix(parse)!: accept short constexpr function with requires #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion regression-tests/pure2-requires-clauses.cpp2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@ f: <T: type, U: type>
return a * b;
}

f: (x) -> int requires true == x;

v: <T> const T requires std::same_as<T, i32> = 0;

main: () = {
_: X<int,int> = ();
std::cout << f<int,int>(2,5);
std::cout << f<int,int>(2,5)
<< f(0);
}
2 changes: 1 addition & 1 deletion regression-tests/test-results/gcc-13/pure2-requires-clauses.cpp.execution
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
100
17 changes: 13 additions & 4 deletions regression-tests/test-results/pure2-requires-clauses.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,14 @@ CPP2_REQUIRES (std::is_same_v<T,int> && std::is_same_v<U,int> && std::is_same_v<
;

#line 18 "pure2-requires-clauses.cpp2"
[[nodiscard]] constexpr auto f(auto const& x) -> int
CPP2_REQUIRES (true) ;

#line 20 "pure2-requires-clauses.cpp2"
template<typename T>
CPP2_REQUIRES_ (std::same_as<T,cpp2::i32>) extern T const v;

#line 20 "pure2-requires-clauses.cpp2"
#line 22 "pure2-requires-clauses.cpp2"
auto main() -> int;

//=== Cpp2 function definitions =================================================
Expand All @@ -61,12 +65,17 @@ requires (std::is_same_v<T,int> && std::is_same_v<U,int> && std::is_same_v<CPP2_
return CPP2_FORWARD(a) * CPP2_FORWARD(b);
}

[[nodiscard]] constexpr auto f(auto const& x) -> int
requires (true) { return x; }

#line 20 "pure2-requires-clauses.cpp2"
template<typename T>
requires (std::same_as<T,cpp2::i32>) T const v {0};

#line 20 "pure2-requires-clauses.cpp2"
#line 22 "pure2-requires-clauses.cpp2"
auto main() -> int{
X<int,int> auto_21_5 {};
std::cout << f<int,int>(2, 5);
X<int,int> auto_23_5 {};
std::cout << f<int,int>(2, 5)
<< f(0);
}

4 changes: 2 additions & 2 deletions source/parse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4962,7 +4962,7 @@ auto pretty_print_visualize(declaration_node const& n, int indent, bool include_

auto metafunctions = std::string{};
{
auto as_comment =
auto as_comment =
!n.metafunctions.empty()
&& !include_metafunctions_list;
if (as_comment) {
Expand Down Expand Up @@ -8315,7 +8315,7 @@ class parser

n->requires_pos = curr().position();
next();
auto e = logical_or_expression();
auto e = logical_or_expression(true, false);
if (!e) {
error("'requires' must be followed by an expression");
return {};
Expand Down