Skip to content

Commit 0eb8cb8

Browse files
committed
feat: recognize requires expressions
1 parent 05ce45a commit 0eb8cb8

29 files changed

+838
-17
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// https://youtu.be/CXn02MPkn8Y?t=2337
2+
negatable: <T> concept = requires(t: T)
3+
{
4+
_ = -t is T; // Hopefully obviously wrong. Should be `{ -t } is T;`.
5+
};
6+
7+
main: () = static_assert(negatable<char>);
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// https://youtu.be/CXn02MPkn8Y?t=2418
2+
int_sized: <T> concept = requires(t: T)
3+
{
4+
_ = sizeof(T) == 4; // Hopefully obviously wrong. Should be `requires (sizeof(T) == 4);`.
5+
};
6+
// Could also be `int_sized: <T> concept = sizeof(T) == 4;`.
7+
8+
main: () = static_assert(int_sized<char>);
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// https://youtu.be/CXn02MPkn8Y?t=2455
2+
nothrow_incrementable: <T> concept = requires(inout t: T)
3+
{
4+
_ = noexcept(t++); // Hopefully obviously wrong. Should be `requires noexcept(t++);` or `{ t++ } !throws;`.
5+
};
6+
7+
main: () = { static_assert(nothrow_incrementable<char>); }
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// https://quuxplusone.github.io/blog/2021/06/09/another-concepts-chest-mimic/
2+
has_a_but_not_b: <T> concept = requires(t: T)
3+
{
4+
_ = a(t);
5+
!requires _ = b(t); // In Cpp2, this works and does the correct thing.
6+
};
7+
8+
s1: @struct type = { }
9+
s2: @struct type = { }
10+
a: (_: s2) = { }
11+
s3: @struct type = { }
12+
b: (_: s3) = { }
13+
s4: @struct type = { }
14+
a: (_: s4) = { }
15+
b: (_: s4) = { }
16+
17+
main: () = {
18+
static_assert(!has_a_but_not_b<s1>); // as expected
19+
static_assert(has_a_but_not_b<s2>); // as expected
20+
static_assert(!has_a_but_not_b<s3>); // as expected
21+
static_assert(!has_a_but_not_b<s4>); // pit of success!
22+
}
Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
arithmetic: <T> concept = std::integral<T> || std::floating_point<T>;
2-
main: () = {
3-
assert<Testing>( arithmetic<i32> );
4-
assert<Testing>( arithmetic<float> );
2+
number_difference_t: <T> type == std::type_identity_t<decltype(T() - T())>;
3+
number: <T> concept = std::regular<T> && requires(c: T)
4+
{
5+
!requires std::iter_reference_t<T>; // Negative requirement.
6+
{c + c} is std::common_with<T>; // Compound requirement.
7+
number_difference_t<T>; // Type requirement.
8+
_ = c - c; // Expression requirement.
9+
requires std::common_with<number_difference_t<T>, T>; // Nested requirement.
10+
};
11+
test_nonthrowing_requirements: <T> concept = requires
12+
{ // clang-format off
13+
{ T() } !throws;
14+
{ -T() } !throws, is std::same_as<T>;
15+
}; // clang-format on
16+
main: () = {
17+
static_assert(arithmetic<i32>);
18+
static_assert(arithmetic<float>);
19+
static_assert(number<i32>);
20+
static_assert(number<float>);
21+
static_assert(number<std::chrono::seconds>);
22+
static_assert(!number<* i32>);
23+
static_assert(!number<std::reverse_iterator<* i32>>);
24+
static_assert(test_nonthrowing_requirements<i32>);
25+
static_assert(!test_nonthrowing_requirements<std::chrono::seconds>);
526
}

regression-tests/pure2-print.cpp2

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,19 @@ outer: @print type = {
8484
is 43 = "forty-and-three";
8585
is _ = "default case";
8686
} << "\n";
87+
88+
_ =
89+
requires { std::vector<int>; }
90+
+ requires { _ = 0; }
91+
+ requires {
92+
requires true;
93+
!requires std::vector<int>;
94+
!requires _ = 0;
95+
{ 0 };
96+
{ 0 } !throws;
97+
{ 0 } is std::regular;
98+
{ 0 } !throws, is std::regular;
99+
};
87100
}
88101

89102
x: <Ts...: type> type = {

regression-tests/pure2-requires-clauses.cpp2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ f: <T: type, U: type>
1717

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

20+
g: <T> () requires true = { }
21+
g: () (requires { _ = 0; });
22+
2023
main: () = {
2124
_: X<int,int> = ();
2225
std::cout << f<int,int>(2,5);

regression-tests/test-results/gcc-13/pure2-concept-definition-no-pitfall-1.cpp.execution

Whitespace-only changes.

regression-tests/test-results/gcc-13/pure2-concept-definition-no-pitfall-1.cpp.output

Whitespace-only changes.

regression-tests/test-results/gcc-13/pure2-concept-definition-no-pitfall-2.cpp.execution

Whitespace-only changes.

0 commit comments

Comments
 (0)