Skip to content

Commit 8e38516

Browse files
filipsajdakfilipsajdak
committed
Fix test mixed-type-safety-1.cpp.output
1 parent 994708f commit 8e38516

13 files changed

+27
-32
lines changed

‎regression-tests/test-results/gcc-10-c++20/mixed-type-safety-1.cpp.output

-5
This file was deleted.

‎regression-tests/test-results/mixed-forwarding.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ auto use([[maybe_unused]] auto const& unnamed_param_1) -> void{}
4949

5050
#line 16 "mixed-forwarding.cpp2"
5151
auto apply_implicit_forward(auto&& t) -> void
52-
requires (std::is_same_v<std::pair<X,X>, CPP2_TYPEOF(t)>) {
52+
CPP2_REQUIRES (std::is_same_v<std::pair<X,X>, CPP2_TYPEOF(t)>) {
5353
#line 17 "mixed-forwarding.cpp2"
5454
copy_from(t.first); // copies
5555
copy_from(CPP2_FORWARD(t).second);// moves
5656
}
5757
#line 20 "mixed-forwarding.cpp2"
5858
auto apply_explicit_forward(auto&& t) -> void
59-
requires (std::is_same_v<std::pair<X,X>, CPP2_TYPEOF(t)>) {
59+
CPP2_REQUIRES (std::is_same_v<std::pair<X,X>, CPP2_TYPEOF(t)>) {
6060
#line 21 "mixed-forwarding.cpp2"
6161
copy_from(CPP2_FORWARD(t).first);// moves
6262
copy_from(CPP2_FORWARD(t).second);// moves

‎regression-tests/test-results/mixed-increment-decrement.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ auto operator--(number_line_pre_decrement<1>& x,int) -> number_line_pre_decremen
132132

133133
#line 4 "mixed-increment-decrement.cpp2"
134134
template <typename T> auto iterator<T>::operator++() & -> iterator<T>&
135-
requires (true) {++x; return (*this); }
135+
CPP2_REQUIRES (true) {++x; return (*this); }
136136
#line 4 "mixed-increment-decrement.cpp2"
137137
template <typename T> auto iterator<T>::operator++(int) & -> iterator<T>
138-
requires (true) { auto ret = *this; ++*this; return ret; }
138+
CPP2_REQUIRES (true) { auto ret = *this; ++*this; return ret; }
139139

140140

141141
template <typename T> iterator<T>::iterator(iterator const& that)
@@ -163,26 +163,26 @@ template <typename T> auto iterator2<T>::operator=(iterator2&& that) noexcept ->
163163
template <typename T> iterator2<T>::iterator2(){}
164164
#line 10 "mixed-increment-decrement.cpp2"
165165
template<typename T> auto operator++(iterator2<T>& it) -> iterator2<T>&
166-
requires (true) {++it.x; return it; }
166+
CPP2_REQUIRES (true) {++it.x; return it; }
167167
#line 10 "mixed-increment-decrement.cpp2"
168168
template<typename T> auto operator++(iterator2<T>& it,int) -> iterator2<T>
169-
requires (true) { auto ret = it; ++it; return ret; }
169+
CPP2_REQUIRES (true) { auto ret = it; ++it; return ret; }
170170

171171
#line 36 "mixed-increment-decrement.cpp2"
172172
[[nodiscard]] auto number::operator-([[maybe_unused]] auto const& unnamed_param_2) const& -> int { return 0; }
173173

174174
#line 48 "mixed-increment-decrement.cpp2"
175175
template<cpp2::i8 Op, cpp2::i32 Id> auto operator++(number_line<Op,Id>& x) -> number_line<Op,Id>&
176-
requires (bool(Op & 1)) { return x; }
176+
CPP2_REQUIRES (bool(Op & 1)) { return x; }
177177
#line 48 "mixed-increment-decrement.cpp2"
178178
template<cpp2::i8 Op, cpp2::i32 Id> auto operator++(number_line<Op,Id>& x,int) -> number_line<Op,Id>
179-
requires (bool(Op & 1)) { auto ret = x; ++x; return ret; }
179+
CPP2_REQUIRES (bool(Op & 1)) { auto ret = x; ++x; return ret; }
180180
#line 49 "mixed-increment-decrement.cpp2"
181181
template<cpp2::i8 Op, cpp2::i32 Id> auto operator--(number_line<Op,Id>& x) -> number_line<Op,Id>&
182-
requires (bool(Op & 2)) { return x; }
182+
CPP2_REQUIRES (bool(Op & 2)) { return x; }
183183
#line 49 "mixed-increment-decrement.cpp2"
184184
template<cpp2::i8 Op, cpp2::i32 Id> auto operator--(number_line<Op,Id>& x,int) -> number_line<Op,Id>
185-
requires (bool(Op & 2)) { auto ret = x; ++x; return ret; }
185+
CPP2_REQUIRES (bool(Op & 2)) { auto ret = x; ++x; return ret; }
186186

187187
#line 51 "mixed-increment-decrement.cpp2"
188188
auto operator++(number_line_pre_increment<0>& x) -> number_line_pre_increment<0>& { return x; }

‎regression-tests/test-results/mixed-parameter-passing-with-forward.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ auto parameter_styles(
4848
std::string&& d,
4949
auto&& e
5050
) -> void
51-
requires (std::is_same_v<std::string, CPP2_TYPEOF(e)>)
51+
CPP2_REQUIRES (std::is_same_v<std::string, CPP2_TYPEOF(e)>)
5252
#line 15 "mixed-parameter-passing-with-forward.cpp2"
5353
{
5454
int z {12};

‎regression-tests/test-results/mixed-type-safety-1.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ auto print(cpp2::impl::in<std::string> msg, cpp2::impl::in<bool> b) -> void;
4141

4242
#line 13 "mixed-type-safety-1.cpp2"
4343
template<typename T> auto print(cpp2::impl::in<std::string> msg, T const& x) -> void
44-
requires (!(std::convertible_to<T,bool>)) {
44+
CPP2_REQUIRES (!(std::convertible_to<T,bool>)) {
4545

4646
#line 15 "mixed-type-safety-1.cpp2"
4747
std::cout << msg << x << "\n"; }

‎regression-tests/test-results/pure2-bugfix-for-requires-clause-in-forward-declaration.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ auto main() -> int;
3535

3636
#line 3 "pure2-bugfix-for-requires-clause-in-forward-declaration.cpp2"
3737
element::element(auto&& n)
38-
requires (std::is_same_v<std::string, CPP2_TYPEOF(n)>)
38+
CPP2_REQUIRES (std::is_same_v<std::string, CPP2_TYPEOF(n)>)
3939
: name{ CPP2_FORWARD(n) }{}
4040
#line 3 "pure2-bugfix-for-requires-clause-in-forward-declaration.cpp2"
4141
auto element::operator=(auto&& n) -> element&
42-
requires (std::is_same_v<std::string, CPP2_TYPEOF(n)>) {
42+
CPP2_REQUIRES (std::is_same_v<std::string, CPP2_TYPEOF(n)>) {
4343
name = CPP2_FORWARD(n);
4444
return *this; }
4545

‎regression-tests/test-results/pure2-bugfix-for-requires-clause-unbraced-function-initializer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ auto main() -> int;
2121

2222
#line 1 "pure2-bugfix-for-requires-clause-unbraced-function-initializer.cpp2"
2323
template<typename T> auto f() -> void
24-
requires (std::regular<T>) { g(T()); }
24+
CPP2_REQUIRES (std::regular<T>) { g(T()); }
2525
#line 2 "pure2-bugfix-for-requires-clause-unbraced-function-initializer.cpp2"
2626
auto main() -> int {}
2727

‎regression-tests/test-results/pure2-function-multiple-forward-arguments.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ auto main() -> int;
2222

2323
#line 1 "pure2-function-multiple-forward-arguments.cpp2"
2424
auto fun(auto&& s1, auto&& s2, auto&& s3) -> void
25-
requires (std::is_same_v<std::string, CPP2_TYPEOF(s1)> && std::is_same_v<std::string, CPP2_TYPEOF(s2)> && std::is_same_v<std::string, CPP2_TYPEOF(s3)>) {
25+
CPP2_REQUIRES (std::is_same_v<std::string, CPP2_TYPEOF(s1)> && std::is_same_v<std::string, CPP2_TYPEOF(s2)> && std::is_same_v<std::string, CPP2_TYPEOF(s3)>) {
2626
#line 2 "pure2-function-multiple-forward-arguments.cpp2"
2727
std::cout << CPP2_FORWARD(s1) << CPP2_FORWARD(s2) << CPP2_FORWARD(s3) << std::endl;
2828
}

‎regression-tests/test-results/pure2-last-use.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -558,13 +558,13 @@ auto f_copy([[maybe_unused]] auto ...unnamed_param_1) -> void{}
558558
[[nodiscard]] auto pred_copy([[maybe_unused]] auto ...unnamed_param_1) -> auto { return true; }
559559
#line 5 "pure2-last-use.cpp2"
560560
template<typename T> [[nodiscard]] constexpr auto identity(T&& x) -> auto&&
561-
requires (std::is_reference_v<T>) {return CPP2_FORWARD(x); }
561+
CPP2_REQUIRES (std::is_reference_v<T>) {return CPP2_FORWARD(x); }
562562
#line 6 "pure2-last-use.cpp2"
563563
[[nodiscard]] auto identity_copy(auto x) -> auto
564-
requires (std::copyable<decltype(x)>) { return cpp2::move(x); }
564+
CPP2_REQUIRES (std::copyable<decltype(x)>) { return cpp2::move(x); }
565565
#line 7 "pure2-last-use.cpp2"
566566
[[nodiscard]] auto identity_copy(auto&& x) -> auto
567-
requires (!(std::copyable<decltype(x)>)) { return std::move(cpp2::move(x)); }
567+
CPP2_REQUIRES (!(std::copyable<decltype(x)>)) { return std::move(cpp2::move(x)); }
568568

569569
#line 9 "pure2-last-use.cpp2"
570570
auto issue_313() -> void{

‎regression-tests/test-results/pure2-print.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ bool testing_enabled {false};
8989

9090
#line 8 "pure2-print.cpp2"
9191
template<typename T>
92-
requires (true) inline CPP2_CONSTEXPR T outer::object_alias{ 42 };
92+
CPP2_REQUIRES (true) inline CPP2_CONSTEXPR T outer::object_alias{ 42 };
9393
#line 9 "pure2-print.cpp2"
9494

9595
#line 12 "pure2-print.cpp2"
@@ -163,7 +163,7 @@ requires (true) inline CPP2_CONSTEXPR T outer::object_alias{ 42 };
163163

164164
#line 67 "pure2-print.cpp2"
165165
auto outer::mytype::variadic(auto const& ...x) -> void
166-
requires ((std::is_convertible_v<CPP2_TYPEOF(x), int> && ...)) {(std::cout << ... << x); }
166+
CPP2_REQUIRES ((std::is_convertible_v<CPP2_TYPEOF(x), int> && ...)) {(std::cout << ... << x); }
167167

168168
#line 70 "pure2-print.cpp2"
169169
auto outer::test() -> void{
@@ -190,7 +190,7 @@ requires ((std::is_convertible_v<CPP2_TYPEOF(x), int> && ...)) {(std::cout << ..
190190

191191
#line 96 "pure2-print.cpp2"
192192
template<typename ...Args> auto outer::print(std::ostream& out, Args const& ...args) -> void
193-
requires (cpp2::impl::cmp_greater_eq(sizeof...(Args),0u)) {
193+
CPP2_REQUIRES (cpp2::impl::cmp_greater_eq(sizeof...(Args),0u)) {
194194
#line 97 "pure2-print.cpp2"
195195
(out << ... << args);
196196
}

‎regression-tests/test-results/pure2-requires-clauses.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ X<T,U>::X(){}
5959
#line 10 "pure2-requires-clauses.cpp2"
6060
template<typename T, typename U> [[nodiscard]] auto f
6161
(auto&& a, auto&& b) -> int
62-
requires (std::is_same_v<T,int> && std::is_same_v<U,int> && std::is_same_v<int, CPP2_TYPEOF(a)> && std::is_same_v<int, CPP2_TYPEOF(b)>)
62+
CPP2_REQUIRES (std::is_same_v<T,int> && std::is_same_v<U,int> && std::is_same_v<int, CPP2_TYPEOF(a)> && std::is_same_v<int, CPP2_TYPEOF(b)>)
6363

6464
#line 14 "pure2-requires-clauses.cpp2"
6565
{
@@ -68,11 +68,11 @@ requires (std::is_same_v<T,int> && std::is_same_v<U,int> && std::is_same_v<int,
6868

6969
#line 18 "pure2-requires-clauses.cpp2"
7070
[[nodiscard]] constexpr auto f(auto const& x) -> int
71-
requires (true) { return x; }
71+
CPP2_REQUIRES (true) { return x; }
7272

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

7777
#line 22 "pure2-requires-clauses.cpp2"
7878
auto main() -> int{

‎regression-tests/test-results/pure2-type-constraints.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ auto main() -> int;
3939

4040
#line 2 "pure2-type-constraints.cpp2"
4141
auto print(auto const& r) -> void
42-
requires (std::regular<CPP2_TYPEOF(r)>) {
42+
CPP2_REQUIRES (std::regular<CPP2_TYPEOF(r)>) {
4343
#line 3 "pure2-type-constraints.cpp2"
4444
std::cout << "satisfies std::regular\n";
4545
}

‎source/to_cpp1.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5612,7 +5612,7 @@ class cppfront
56125612
}
56135613
}
56145614
else {
5615-
printer.print_extra("requires (");
5615+
printer.print_extra("CPP2_REQUIRES (");
56165616
}
56175617

56185618
if (n.requires_clause_expression) {

0 commit comments

Comments
 (0)