Skip to content

Commit 95b158d

Browse files
JohelEGPJohelEGP
committed
test: update regression-tests/test-results 
1 parent 730f714 commit 95b158d

20 files changed

+87
-87
lines changed

‎regression-tests/test-results/mixed-captures-in-expressions-and-postconditions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ auto insert_at(cpp2::in<int> where, cpp2::in<int> val) -> void
4848
cpp2::Default.expects(cpp2::cmp_less_eq(0,where) && cpp2::cmp_less_eq(where,CPP2_UFCS(&,,(ssize),(vec),())), "");
4949
auto post_21_5 = cpp2::finally_success([_0 = CPP2_UFCS(&,,(ssize),(vec),())]{cpp2::Default.expects(CPP2_UFCS(&,,(ssize),(vec),())==_0 + 1, "");} );
5050
#line 23 "mixed-captures-in-expressions-and-postconditions.cpp2"
51-
static_cast<void>(CPP2_UFCS(&,,(insert),(vec),(,), CPP2_UFCS(&,,(begin),(vec),()) + where, val));
51+
static_cast<void>(CPP2_UFCS(&,,(insert),(vec),(), CPP2_UFCS(&,,(begin),(vec),()) + where, val));
5252
}
5353

‎regression-tests/test-results/mixed-initialization-safety-3-contract-violation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ auto fill(
6161
{
6262
cpp2::Default.expects(cpp2::cmp_greater_eq(CPP2_UFCS(&,,(ssize),(value),()),count), "fill: value must contain at least count elements");
6363
#line 25 "mixed-initialization-safety-3-contract-violation.cpp2"
64-
x.construct(CPP2_UFCS(&,,(substr),(value),(,), 0, count));
64+
x.construct(CPP2_UFCS(&,,(substr),(value),(), 0, count));
6565
}
6666

6767
auto print_decorated(auto const& x) -> void { std::cout << ">> [" << x << "]\n"; }

‎regression-tests/test-results/mixed-initialization-safety-3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ auto fill(
5656
{
5757
cpp2::Default.expects(cpp2::cmp_greater_eq(CPP2_UFCS(&,,(ssize),(value),()),count), "fill: value must contain at least count elements");
5858
#line 23 "mixed-initialization-safety-3.cpp2"
59-
x.construct(CPP2_UFCS(&,,(substr),(value),(,), 0, count));
59+
x.construct(CPP2_UFCS(&,,(substr),(value),(), 0, count));
6060
}
6161

6262
auto print_decorated(auto const& x) -> void { std::cout << ">> [" << x << "]\n"; }

‎regression-tests/test-results/mixed-lifetime-safety-and-null-contracts.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ auto call_my_framework(char const* msg) -> void;
3434

3535
#line 6 "mixed-lifetime-safety-and-null-contracts.cpp2"
3636
[[nodiscard]] auto main() -> int{
37-
CPP2_UFCS(&,,(set_handler),(cpp2::Null),(,), &call_my_framework);
37+
CPP2_UFCS(&,,(set_handler),(cpp2::Null),(), &call_my_framework);
3838
try_pointer_stuff();
3939
std::cout << "done\n";
4040
}

‎regression-tests/test-results/mixed-postexpression-with-capture.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ auto insert_at(cpp2::in<int> where, cpp2::in<int> val) -> void
4343
cpp2::Default.expects(cpp2::cmp_less_eq(0,where) && cpp2::cmp_less_eq(where,CPP2_UFCS(&,,(ssize),(vec),())), "");
4444
auto post_16_5 = cpp2::finally_success([_0 = CPP2_UFCS(&,,(size),(vec),())]{cpp2::Default.expects(CPP2_UFCS(&,,(size),(vec),())==_0 + 1, "");} );
4545
#line 18 "mixed-postexpression-with-capture.cpp2"
46-
CPP2_UFCS(&,,(push_back),(vec),(,), val);
46+
CPP2_UFCS(&,,(push_back),(vec),(), val);
4747
}
4848

‎regression-tests/test-results/mixed-postfix-expression-custom-formatting.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ auto call([[maybe_unused]] auto const& param1, [[maybe_unused]] auto const& para
2828

2929
[[nodiscard]] auto test(auto const& a) -> std::string{
3030
return call(a,
31-
++*cpp2::assert_not_null(CPP2_UFCS(&,,(b),(a),(,), a.c)), "hello", /* polite
31+
++*cpp2::assert_not_null(CPP2_UFCS(&,,(b),(a),(), a.c)), "hello", /* polite
3232
greeting
3333
goes here */" there",
34-
CPP2_UFCS(&,,(e),(a.d),(,), ++CPP2_UFCS(&,,(g),(*cpp2::assert_not_null(a.f)),()), // because f is foobar
34+
CPP2_UFCS(&,,(e),(a.d),(), ++CPP2_UFCS(&,,(g),(*cpp2::assert_not_null(a.f)),()), // because f is foobar
3535
CPP2_UFCS(&,,(i),(a.h),()),
36-
CPP2_UFCS(&,,(j),(a),(,), a.k, a.l))
36+
CPP2_UFCS(&,,(j),(a),(), a.k, a.l))
3737
);
3838
}
3939

‎regression-tests/test-results/pure2-bugfix-for-ufcs-arguments.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,29 +76,29 @@ t m {};
7676
t const n {};
7777

7878
cpp2::i32 auto_21_1 {CPP2_UFCS(,,(f),(m),())};
79-
cpp2::i32 auto_22_1 {CPP2_UFCS(,,(f),(m),(,), 0)};
79+
cpp2::i32 auto_22_1 {CPP2_UFCS(,,(f),(m),(), 0)};
8080
cpp2::i32 auto_23_1 {CPP2_UFCS(,template,(f<t>),(m),())};
81-
cpp2::i32 auto_24_1 {CPP2_UFCS(,template,(f<t>),(m),(,), 0)};
82-
cpp2::i32 auto_25_1 {CPP2_UFCS(,template,(f<t,t>),(m),(,), 0, 0)};
81+
cpp2::i32 auto_24_1 {CPP2_UFCS(,template,(f<t>),(m),(), 0)};
82+
cpp2::i32 auto_25_1 {CPP2_UFCS(,template,(f<t,t>),(m),(), 0, 0)};
8383
cpp2::i32 auto_26_1 {CPP2_UFCS(,,(f),(n),())};
84-
cpp2::i32 auto_27_1 {CPP2_UFCS(,,(f),(n),(,), 0)};
84+
cpp2::i32 auto_27_1 {CPP2_UFCS(,,(f),(n),(), 0)};
8585
cpp2::i32 auto_28_1 {CPP2_UFCS(,template,(f<t>),(n),())};
86-
cpp2::i32 auto_29_1 {CPP2_UFCS(,template,(f<t>),(n),(,), 0)};
87-
cpp2::i32 auto_30_1 {CPP2_UFCS(,template,(f<t,t>),(n),(,), 0, 0)};
88-
cpp2::i32 auto_31_1 {CPP2_UFCS(,template,(f<t,t>),(a<t,t>),(,), 0, 0)};
86+
cpp2::i32 auto_29_1 {CPP2_UFCS(,template,(f<t>),(n),(), 0)};
87+
cpp2::i32 auto_30_1 {CPP2_UFCS(,template,(f<t,t>),(n),(), 0, 0)};
88+
cpp2::i32 auto_31_1 {CPP2_UFCS(,template,(f<t,t>),(a<t,t>),(), 0, 0)};
8989
auto main() -> int{
9090
cpp2::i32 auto_33_3 {CPP2_UFCS(&,,(f),(m),())};
91-
cpp2::i32 auto_34_3 {CPP2_UFCS(&,,(f),(m),(,), 0)};
91+
cpp2::i32 auto_34_3 {CPP2_UFCS(&,,(f),(m),(), 0)};
9292
cpp2::i32 auto_35_3 {CPP2_UFCS(&,template,(f<t>),(m),())};
93-
cpp2::i32 auto_36_3 {CPP2_UFCS(&,template,(f<t>),(m),(,), 0)};
94-
cpp2::i32 auto_37_3 {CPP2_UFCS(&,template,(f<t,t>),(m),(,), 0, 0)};
93+
cpp2::i32 auto_36_3 {CPP2_UFCS(&,template,(f<t>),(m),(), 0)};
94+
cpp2::i32 auto_37_3 {CPP2_UFCS(&,template,(f<t,t>),(m),(), 0, 0)};
9595
cpp2::i32 auto_38_3 {CPP2_UFCS(&,,(f),(n),())};
96-
cpp2::i32 auto_39_3 {CPP2_UFCS(&,,(f),(n),(,), 0)};
96+
cpp2::i32 auto_39_3 {CPP2_UFCS(&,,(f),(n),(), 0)};
9797
cpp2::i32 auto_40_3 {CPP2_UFCS(&,template,(f<t>),(n),())};
98-
cpp2::i32 auto_41_3 {CPP2_UFCS(&,template,(f<t>),(n),(,), 0)};
99-
cpp2::i32 auto_42_3 {CPP2_UFCS(&,template,(f<t,t>),(n),(,), 0, 0)};
100-
cpp2::i32 auto_43_3 {CPP2_UFCS(&,template,(f<t,t>),(a<t,t>),(,), 0, 0)};
98+
cpp2::i32 auto_41_3 {CPP2_UFCS(&,template,(f<t>),(n),(), 0)};
99+
cpp2::i32 auto_42_3 {CPP2_UFCS(&,template,(f<t,t>),(n),(), 0, 0)};
100+
cpp2::i32 auto_43_3 {CPP2_UFCS(&,template,(f<t,t>),(a<t,t>),(), 0, 0)};
101101

102-
(void) [](auto const& a, auto const& f) -> void{(void) CPP2_UFCS(&,,(f),(CPP2_UFCS(&,,(f),(a),(,), a)),()); };
102+
static_cast<void>([](auto const& a, auto const& f) -> void{static_cast<void>(CPP2_UFCS(&,,(f),(CPP2_UFCS(&,,(f),(a),(), a)),())); });
103103
}
104104

‎regression-tests/test-results/pure2-bugfix-for-ufcs-noexcept.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class t;
1414

1515
#line 1 "pure2-bugfix-for-ufcs-noexcept.cpp2"
1616
class t {
17-
public: auto swap(t const& that) noexcept -> void;
17+
public: auto swap([[maybe_unused]] t const& that) noexcept -> void;
1818

1919
public: t() = default;
2020
public: t(t const&) = delete; /* No 'that' constructor, suppress copy */
@@ -28,7 +28,7 @@ auto main() -> int;
2828

2929

3030
#line 2 "pure2-bugfix-for-ufcs-noexcept.cpp2"
31-
auto t::swap(t const& that) noexcept -> void{}
31+
auto t::swap([[maybe_unused]] t const& that) noexcept -> void{}
3232

33-
auto main() -> int{static_assert(noexcept(CPP2_UFCS(&,,(swap),(t()),(,), t()))); }
33+
auto main() -> int{static_assert(noexcept(CPP2_UFCS(&,,(swap),(t()),(), t()))); }
3434

‎regression-tests/test-results/pure2-inspect-expression-in-generic-function-multiple-types.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ auto test_generic(auto const& x, auto const& msg) -> void;
3131
test_generic(a, "any");
3232
test_generic(o, "optional<int>");
3333

34-
static_cast<void>(CPP2_UFCS(&,template,(emplace<0>),(v),(,), 1));
34+
static_cast<void>(CPP2_UFCS(&,template,(emplace<0>),(v),(), 1));
3535
a = 2;
3636
o = 3;
3737
test_generic(42, "int");

‎regression-tests/test-results/pure2-stdio-with-raii.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
[[nodiscard]] auto main() -> int{
2525
std::string s {"Freddy"};
2626
auto myfile {cpp2::fopen("xyzzy", "w")};
27-
static_cast<void>(CPP2_UFCS(&,,(fprintf),(std::move(myfile)),(,), "Hello %s with UFCS!", CPP2_UFCS(&,,(c_str),(std::move(s)),())));
27+
static_cast<void>(CPP2_UFCS(&,,(fprintf),(std::move(myfile)),(), "Hello %s with UFCS!", CPP2_UFCS(&,,(c_str),(std::move(s)),())));
2828
}
2929

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
[[nodiscard]] auto main() -> int{
2828
std::string s {"Fred"};
2929
auto myfile {fopen("xyzzy", "w")};
30-
static_cast<void>(CPP2_UFCS(&,,(fprintf),(myfile),(,), "Hello %s with UFCS!", CPP2_UFCS(&,,(c_str),(std::move(s)),())));
30+
static_cast<void>(CPP2_UFCS(&,,(fprintf),(myfile),(), "Hello %s with UFCS!", CPP2_UFCS(&,,(c_str),(std::move(s)),())));
3131
static_cast<void>(CPP2_UFCS(&,,(fclose),(std::move(myfile)),()));
3232
}
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ auto print(cpp2::in<std::string> msg, cpp2::in<bool> b) -> void;
4242

4343
std::cout << "\n";
4444

45-
static_cast<void>(CPP2_UFCS(&,template,(emplace<1>),(v),(,), 1));
45+
static_cast<void>(CPP2_UFCS(&,template,(emplace<1>),(v),(), 1));
4646
a = 2;
4747
o = 3;
4848
test_generic(42, "int");

‎regression-tests/test-results/pure2-type-safety-2-with-inspect-expression.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ auto test_generic(auto const& x, auto const& msg) -> void;
3131
test_generic(a, "any");
3232
test_generic(o, "optional<int>");
3333

34-
static_cast<void>(CPP2_UFCS(&,template,(emplace<2>),(v),(,), 1));
34+
static_cast<void>(CPP2_UFCS(&,template,(emplace<2>),(v),(), 1));
3535
a = 2;
3636
o = 3;
3737
test_generic(42, "int");

‎regression-tests/test-results/pure2-types-basics.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@ namespace N {
183183

184184
auto main() -> int{
185185
N::myclass x {1};
186-
CPP2_UFCS(&,,(f),(x),(,), 53);
186+
CPP2_UFCS(&,,(f),(x),(), 53);
187187
N::myclass::nested::g();
188-
std::cout << "f1: " + cpp2::to_string(CPP2_UFCS(&,,(f1),(x),(,), 1, 1)) + "\n";
189-
std::cout << "f2: " + cpp2::to_string(CPP2_UFCS(&,,(f2),(x),(,), 2, 2)) + "\n";
188+
std::cout << "f1: " + cpp2::to_string(CPP2_UFCS(&,,(f1),(x),(), 1, 1)) + "\n";
189+
std::cout << "f2: " + cpp2::to_string(CPP2_UFCS(&,,(f2),(x),(), 2, 2)) + "\n";
190190
std::cout << "f3: " + cpp2::to_string(CPP2_UFCS(&,template,(f3<3,3>),(x),())) + "\n";
191191
std::cout << "f4: " + cpp2::to_string(CPP2_UFCS(&,template,(f4<4,4>),(x),())) + "\n";
192192
N::myclass x2 {"abracadabra"};

‎regression-tests/test-results/pure2-types-order-independence-and-nesting.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ namespace N {
155155
// Exercise '_' anonymous objects too while we're at it
156156
cpp2::finally auto_37_9 {[&]() -> void { std::cout << "leaving call to 'why(" + cpp2::to_string(count) + ")'\n"; }};
157157
if (cpp2::cmp_less(count,5)) {
158-
CPP2_UFCS(&,,(why),((*cpp2::assert_not_null(py))),(,), count + 1);// use Y object from X
158+
CPP2_UFCS(&,,(why),((*cpp2::assert_not_null(py))),(), count + 1);// use Y object from X
159159
}
160160
}
161161

@@ -172,7 +172,7 @@ namespace N {
172172
}
173173

174174
auto Y::why(cpp2::in<int> count) const -> void {
175-
CPP2_UFCS(&,,(exx),((*cpp2::assert_not_null(px))),(,), count + 1); }// use X object from Y
175+
CPP2_UFCS(&,,(exx),((*cpp2::assert_not_null(px))),(), count + 1); }// use X object from Y
176176

177177
#line 55 "pure2-types-order-independence-and-nesting.cpp2"
178178
namespace M {
@@ -192,7 +192,7 @@ auto main() -> int
192192
N::X x {cpp2::out(&y)}; // construct y and x, and point them at each other
193193

194194
// now have the two objects call each other back and forth a few times
195-
CPP2_UFCS(&,,(exx),(std::move(x)),(,), 1);
195+
CPP2_UFCS(&,,(exx),(std::move(x)),(), 1);
196196

197197
// and test a nested template out-of-line definition
198198
N::M::A<int,int>::B<42>::f<int,43>("welt");

‎regression-tests/test-results/pure2-types-smf-and-that-1-provide-everything.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,24 +127,24 @@ auto main() -> int{
127127
std::cout << "---------------------- ------------ ------------------------------------------------------\n";
128128

129129
myclass x {"Henry"};
130-
CPP2_UFCS(&,,(print),(x),(,), " construct ", "\n");
130+
CPP2_UFCS(&,,(print),(x),(), " construct ", "\n");
131131
x = "Clara";
132-
CPP2_UFCS(&,,(print),(x),(,), " assign ", "\n");
132+
CPP2_UFCS(&,,(print),(x),(), " assign ", "\n");
133133

134134
auto y {x};
135-
CPP2_UFCS(&,,(print),(y),(,), " cp-construct ", " <- ");
136-
CPP2_UFCS(&,,(print),(x),(,), "", "\n");
135+
CPP2_UFCS(&,,(print),(y),(), " cp-construct ", " <- ");
136+
CPP2_UFCS(&,,(print),(x),(), "", "\n");
137137

138138
auto z {std::move(x)};
139-
CPP2_UFCS(&,,(print),(z),(,), " mv-construct ", " <- ");
140-
CPP2_UFCS(&,,(print),(std::move(x)),(,), "", "\n");
139+
CPP2_UFCS(&,,(print),(z),(), " mv-construct ", " <- ");
140+
CPP2_UFCS(&,,(print),(std::move(x)),(), "", "\n");
141141

142142
z = y;
143-
CPP2_UFCS(&,,(print),(z),(,), " cp-assign ", " <- ");
144-
CPP2_UFCS(&,,(print),(y),(,), "", "\n");
143+
CPP2_UFCS(&,,(print),(z),(), " cp-assign ", " <- ");
144+
CPP2_UFCS(&,,(print),(y),(), "", "\n");
145145

146146
z = { std::move(y) };
147-
CPP2_UFCS(&,,(print),(std::move(z)),(,), " mv-assign ", " <- ");
148-
CPP2_UFCS(&,,(print),(std::move(y)),(,), "", "\n");
147+
CPP2_UFCS(&,,(print),(std::move(z)),(), " mv-assign ", " <- ");
148+
CPP2_UFCS(&,,(print),(std::move(y)),(), "", "\n");
149149
}
150150

‎regression-tests/test-results/pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,24 +132,24 @@ auto main() -> int{
132132
std::cout << "---------------------- ------------ ------------------------------------------------------\n";
133133

134134
myclass x {"Henry"};
135-
CPP2_UFCS(&,,(print),(x),(,), " construct ", "\n");
135+
CPP2_UFCS(&,,(print),(x),(), " construct ", "\n");
136136
x = "Clara";
137-
CPP2_UFCS(&,,(print),(x),(,), " assign ", "\n");
137+
CPP2_UFCS(&,,(print),(x),(), " assign ", "\n");
138138

139139
auto y {x};
140-
CPP2_UFCS(&,,(print),(y),(,), " cp-construct ", " <- ");
141-
CPP2_UFCS(&,,(print),(x),(,), "", "\n");
140+
CPP2_UFCS(&,,(print),(y),(), " cp-construct ", " <- ");
141+
CPP2_UFCS(&,,(print),(x),(), "", "\n");
142142

143143
auto z {std::move(x)};
144-
CPP2_UFCS(&,,(print),(z),(,), " mv-construct ", " <- ");
145-
CPP2_UFCS(&,,(print),(std::move(x)),(,), "", "\n");
144+
CPP2_UFCS(&,,(print),(z),(), " mv-construct ", " <- ");
145+
CPP2_UFCS(&,,(print),(std::move(x)),(), "", "\n");
146146

147147
z = y;
148-
CPP2_UFCS(&,,(print),(z),(,), " cp-assign ", " <- ");
149-
CPP2_UFCS(&,,(print),(y),(,), "", "\n");
148+
CPP2_UFCS(&,,(print),(z),(), " cp-assign ", " <- ");
149+
CPP2_UFCS(&,,(print),(y),(), "", "\n");
150150

151151
z = { std::move(y) };
152-
CPP2_UFCS(&,,(print),(std::move(z)),(,), " mv-assign ", " <- ");
153-
CPP2_UFCS(&,,(print),(std::move(y)),(,), "", "\n");
152+
CPP2_UFCS(&,,(print),(std::move(z)),(), " mv-assign ", " <- ");
153+
CPP2_UFCS(&,,(print),(std::move(y)),(), "", "\n");
154154
}
155155

‎regression-tests/test-results/pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,24 +131,24 @@ auto main() -> int{
131131
std::cout << "---------------------- ------------ ------------------------------------------------------\n";
132132

133133
myclass x {"Henry"};
134-
CPP2_UFCS(&,,(print),(x),(,), " construct ", "\n");
134+
CPP2_UFCS(&,,(print),(x),(), " construct ", "\n");
135135
x = "Clara";
136-
CPP2_UFCS(&,,(print),(x),(,), " assign ", "\n");
136+
CPP2_UFCS(&,,(print),(x),(), " assign ", "\n");
137137

138138
auto y {x};
139-
CPP2_UFCS(&,,(print),(y),(,), " cp-construct ", " <- ");
140-
CPP2_UFCS(&,,(print),(x),(,), "", "\n");
139+
CPP2_UFCS(&,,(print),(y),(), " cp-construct ", " <- ");
140+
CPP2_UFCS(&,,(print),(x),(), "", "\n");
141141

142142
auto z {std::move(x)};
143-
CPP2_UFCS(&,,(print),(z),(,), " mv-construct ", " <- ");
144-
CPP2_UFCS(&,,(print),(std::move(x)),(,), "", "\n");
143+
CPP2_UFCS(&,,(print),(z),(), " mv-construct ", " <- ");
144+
CPP2_UFCS(&,,(print),(std::move(x)),(), "", "\n");
145145

146146
z = y;
147-
CPP2_UFCS(&,,(print),(z),(,), " cp-assign ", " <- ");
148-
CPP2_UFCS(&,,(print),(y),(,), "", "\n");
147+
CPP2_UFCS(&,,(print),(z),(), " cp-assign ", " <- ");
148+
CPP2_UFCS(&,,(print),(y),(), "", "\n");
149149

150150
z = { std::move(y) };
151-
CPP2_UFCS(&,,(print),(std::move(z)),(,), " mv-assign ", " <- ");
152-
CPP2_UFCS(&,,(print),(std::move(y)),(,), "", "\n");
151+
CPP2_UFCS(&,,(print),(std::move(z)),(), " mv-assign ", " <- ");
152+
CPP2_UFCS(&,,(print),(std::move(y)),(), "", "\n");
153153
}
154154

‎regression-tests/test-results/pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,24 +131,24 @@ auto main() -> int{
131131
std::cout << "---------------------- ------------ ------------------------------------------------------\n";
132132

133133
myclass x {"Henry"};
134-
CPP2_UFCS(&,,(print),(x),(,), " construct ", "\n");
134+
CPP2_UFCS(&,,(print),(x),(), " construct ", "\n");
135135
x = "Clara";
136-
CPP2_UFCS(&,,(print),(x),(,), " assign ", "\n");
136+
CPP2_UFCS(&,,(print),(x),(), " assign ", "\n");
137137

138138
auto y {x};
139-
CPP2_UFCS(&,,(print),(y),(,), " cp-construct ", " <- ");
140-
CPP2_UFCS(&,,(print),(x),(,), "", "\n");
139+
CPP2_UFCS(&,,(print),(y),(), " cp-construct ", " <- ");
140+
CPP2_UFCS(&,,(print),(x),(), "", "\n");
141141

142142
auto z {std::move(x)};
143-
CPP2_UFCS(&,,(print),(z),(,), " mv-construct ", " <- ");
144-
CPP2_UFCS(&,,(print),(std::move(x)),(,), "", "\n");
143+
CPP2_UFCS(&,,(print),(z),(), " mv-construct ", " <- ");
144+
CPP2_UFCS(&,,(print),(std::move(x)),(), "", "\n");
145145

146146
z = y;
147-
CPP2_UFCS(&,,(print),(z),(,), " cp-assign ", " <- ");
148-
CPP2_UFCS(&,,(print),(y),(,), "", "\n");
147+
CPP2_UFCS(&,,(print),(z),(), " cp-assign ", " <- ");
148+
CPP2_UFCS(&,,(print),(y),(), "", "\n");
149149

150150
z = { std::move(y) };
151-
CPP2_UFCS(&,,(print),(std::move(z)),(,), " mv-assign ", " <- ");
152-
CPP2_UFCS(&,,(print),(std::move(y)),(,), "", "\n");
151+
CPP2_UFCS(&,,(print),(std::move(z)),(), " mv-assign ", " <- ");
152+
CPP2_UFCS(&,,(print),(std::move(y)),(), "", "\n");
153153
}
154154

‎regression-tests/test-results/pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,24 +137,24 @@ auto main() -> int{
137137
std::cout << "---------------------- ------------ ------------------------------------------------------\n";
138138

139139
myclass x {"Henry"};
140-
CPP2_UFCS(&,,(print),(x),(,), " construct ", "\n");
140+
CPP2_UFCS(&,,(print),(x),(), " construct ", "\n");
141141
x = "Clara";
142-
CPP2_UFCS(&,,(print),(x),(,), " assign ", "\n");
142+
CPP2_UFCS(&,,(print),(x),(), " assign ", "\n");
143143

144144
auto y {x};
145-
CPP2_UFCS(&,,(print),(y),(,), " cp-construct ", " <- ");
146-
CPP2_UFCS(&,,(print),(x),(,), "", "\n");
145+
CPP2_UFCS(&,,(print),(y),(), " cp-construct ", " <- ");
146+
CPP2_UFCS(&,,(print),(x),(), "", "\n");
147147

148148
auto z {std::move(x)};
149-
CPP2_UFCS(&,,(print),(z),(,), " mv-construct ", " <- ");
150-
CPP2_UFCS(&,,(print),(std::move(x)),(,), "", "\n");
149+
CPP2_UFCS(&,,(print),(z),(), " mv-construct ", " <- ");
150+
CPP2_UFCS(&,,(print),(std::move(x)),(), "", "\n");
151151

152152
z = y;
153-
CPP2_UFCS(&,,(print),(z),(,), " cp-assign ", " <- ");
154-
CPP2_UFCS(&,,(print),(y),(,), "", "\n");
153+
CPP2_UFCS(&,,(print),(z),(), " cp-assign ", " <- ");
154+
CPP2_UFCS(&,,(print),(y),(), "", "\n");
155155

156156
z = { std::move(y) };
157-
CPP2_UFCS(&,,(print),(std::move(z)),(,), " mv-assign ", " <- ");
158-
CPP2_UFCS(&,,(print),(std::move(y)),(,), "", "\n");
157+
CPP2_UFCS(&,,(print),(std::move(z)),(), " mv-assign ", " <- ");
158+
CPP2_UFCS(&,,(print),(std::move(y)),(), "", "\n");
159159
}
160160

0 commit comments

Comments
 (0)