test: update regression-tests/test-results

JohelEGP · JohelEGP · commit 95b158dfebd5 · 2023-08-14T11:27:28.000-04:00
diff --git a/regression-tests/test-results/mixed-captures-in-expressions-and-postconditions.cpp b/regression-tests/test-results/mixed-captures-in-expressions-and-postconditions.cpp
@@ -48,6 +48,6 @@ auto insert_at(cpp2::in<int> where, cpp2::in<int> val) -> void
     cpp2::Default.expects(cpp2::cmp_less_eq(0,where) && cpp2::cmp_less_eq(where,CPP2_UFCS(&,,(ssize),(vec),())), "");
     auto post_21_5 = cpp2::finally_success([_0 = CPP2_UFCS(&,,(ssize),(vec),())]{cpp2::Default.expects(CPP2_UFCS(&,,(ssize),(vec),())==_0 + 1, "");} );
 #line 23 "mixed-captures-in-expressions-and-postconditions.cpp2"
-    static_cast<void>(CPP2_UFCS(&,,(insert),(vec),(,), CPP2_UFCS(&,,(begin),(vec),()) + where, val));
+    static_cast<void>(CPP2_UFCS(&,,(insert),(vec),(), CPP2_UFCS(&,,(begin),(vec),()) + where, val));
 }
 
diff --git a/regression-tests/test-results/mixed-initialization-safety-3-contract-violation.cpp b/regression-tests/test-results/mixed-initialization-safety-3-contract-violation.cpp
@@ -61,7 +61,7 @@ auto fill(
 {
     cpp2::Default.expects(cpp2::cmp_greater_eq(CPP2_UFCS(&,,(ssize),(value),()),count), "fill: value must contain at least count elements");
 #line 25 "mixed-initialization-safety-3-contract-violation.cpp2"
-    x.construct(CPP2_UFCS(&,,(substr),(value),(,), 0, count));
+    x.construct(CPP2_UFCS(&,,(substr),(value),(), 0, count));
 }
 
 auto print_decorated(auto const& x) -> void { std::cout << ">> [" << x << "]\n";  }
diff --git a/regression-tests/test-results/mixed-initialization-safety-3.cpp b/regression-tests/test-results/mixed-initialization-safety-3.cpp
@@ -56,7 +56,7 @@ auto fill(
 {
     cpp2::Default.expects(cpp2::cmp_greater_eq(CPP2_UFCS(&,,(ssize),(value),()),count), "fill: value must contain at least count elements");
 #line 23 "mixed-initialization-safety-3.cpp2"
-    x.construct(CPP2_UFCS(&,,(substr),(value),(,), 0, count));
+    x.construct(CPP2_UFCS(&,,(substr),(value),(), 0, count));
 }
 
 auto print_decorated(auto const& x) -> void { std::cout << ">> [" << x << "]\n";  }
diff --git a/regression-tests/test-results/mixed-lifetime-safety-and-null-contracts.cpp b/regression-tests/test-results/mixed-lifetime-safety-and-null-contracts.cpp
@@ -34,7 +34,7 @@ auto call_my_framework(char const* msg) -> void;
 
 #line 6 "mixed-lifetime-safety-and-null-contracts.cpp2"
 [[nodiscard]] auto main() -> int{
-    CPP2_UFCS(&,,(set_handler),(cpp2::Null),(,), &call_my_framework);
+    CPP2_UFCS(&,,(set_handler),(cpp2::Null),(), &call_my_framework);
     try_pointer_stuff();
     std::cout << "done\n";
 }
diff --git a/regression-tests/test-results/mixed-postexpression-with-capture.cpp b/regression-tests/test-results/mixed-postexpression-with-capture.cpp
@@ -43,6 +43,6 @@ auto insert_at(cpp2::in<int> where, cpp2::in<int> val) -> void
     cpp2::Default.expects(cpp2::cmp_less_eq(0,where) && cpp2::cmp_less_eq(where,CPP2_UFCS(&,,(ssize),(vec),())), "");
     auto post_16_5 = cpp2::finally_success([_0 = CPP2_UFCS(&,,(size),(vec),())]{cpp2::Default.expects(CPP2_UFCS(&,,(size),(vec),())==_0 + 1, "");} );
 #line 18 "mixed-postexpression-with-capture.cpp2"
-    CPP2_UFCS(&,,(push_back),(vec),(,), val);
+    CPP2_UFCS(&,,(push_back),(vec),(), val);
 }
 
diff --git a/regression-tests/test-results/mixed-postfix-expression-custom-formatting.cpp b/regression-tests/test-results/mixed-postfix-expression-custom-formatting.cpp
@@ -28,12 +28,12 @@ auto call([[maybe_unused]] auto const& param1, [[maybe_unused]] auto const& para
 
 [[nodiscard]] auto test(auto const& a) -> std::string{
     return call(a, 
-        ++*cpp2::assert_not_null(CPP2_UFCS(&,,(b),(a),(,), a.c)), "hello", /* polite
+        ++*cpp2::assert_not_null(CPP2_UFCS(&,,(b),(a),(), a.c)), "hello", /* polite
                           greeting
                           goes here */" there", 
-        CPP2_UFCS(&,,(e),(a.d),(,), ++CPP2_UFCS(&,,(g),(*cpp2::assert_not_null(a.f)),()), // because f is foobar
+        CPP2_UFCS(&,,(e),(a.d),(), ++CPP2_UFCS(&,,(g),(*cpp2::assert_not_null(a.f)),()), // because f is foobar
               CPP2_UFCS(&,,(i),(a.h),()), 
-              CPP2_UFCS(&,,(j),(a),(,), a.k, a.l))
+              CPP2_UFCS(&,,(j),(a),(), a.k, a.l))
         ); 
 }
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-ufcs-arguments.cpp b/regression-tests/test-results/pure2-bugfix-for-ufcs-arguments.cpp
@@ -76,29 +76,29 @@ t m {};
 t const n {}; 
 
 cpp2::i32 auto_21_1 {CPP2_UFCS(,,(f),(m),())}; 
-cpp2::i32 auto_22_1 {CPP2_UFCS(,,(f),(m),(,), 0)}; 
+cpp2::i32 auto_22_1 {CPP2_UFCS(,,(f),(m),(), 0)}; 
 cpp2::i32 auto_23_1 {CPP2_UFCS(,template,(f<t>),(m),())}; 
-cpp2::i32 auto_24_1 {CPP2_UFCS(,template,(f<t>),(m),(,), 0)}; 
-cpp2::i32 auto_25_1 {CPP2_UFCS(,template,(f<t,t>),(m),(,), 0, 0)}; 
+cpp2::i32 auto_24_1 {CPP2_UFCS(,template,(f<t>),(m),(), 0)}; 
+cpp2::i32 auto_25_1 {CPP2_UFCS(,template,(f<t,t>),(m),(), 0, 0)}; 
 cpp2::i32 auto_26_1 {CPP2_UFCS(,,(f),(n),())}; 
-cpp2::i32 auto_27_1 {CPP2_UFCS(,,(f),(n),(,), 0)}; 
+cpp2::i32 auto_27_1 {CPP2_UFCS(,,(f),(n),(), 0)}; 
 cpp2::i32 auto_28_1 {CPP2_UFCS(,template,(f<t>),(n),())}; 
-cpp2::i32 auto_29_1 {CPP2_UFCS(,template,(f<t>),(n),(,), 0)}; 
-cpp2::i32 auto_30_1 {CPP2_UFCS(,template,(f<t,t>),(n),(,), 0, 0)}; 
-cpp2::i32 auto_31_1 {CPP2_UFCS(,template,(f<t,t>),(a<t,t>),(,), 0, 0)}; 
+cpp2::i32 auto_29_1 {CPP2_UFCS(,template,(f<t>),(n),(), 0)}; 
+cpp2::i32 auto_30_1 {CPP2_UFCS(,template,(f<t,t>),(n),(), 0, 0)}; 
+cpp2::i32 auto_31_1 {CPP2_UFCS(,template,(f<t,t>),(a<t,t>),(), 0, 0)}; 
 auto main() -> int{
   cpp2::i32 auto_33_3 {CPP2_UFCS(&,,(f),(m),())}; 
-  cpp2::i32 auto_34_3 {CPP2_UFCS(&,,(f),(m),(,), 0)}; 
+  cpp2::i32 auto_34_3 {CPP2_UFCS(&,,(f),(m),(), 0)}; 
   cpp2::i32 auto_35_3 {CPP2_UFCS(&,template,(f<t>),(m),())}; 
-  cpp2::i32 auto_36_3 {CPP2_UFCS(&,template,(f<t>),(m),(,), 0)}; 
-  cpp2::i32 auto_37_3 {CPP2_UFCS(&,template,(f<t,t>),(m),(,), 0, 0)}; 
+  cpp2::i32 auto_36_3 {CPP2_UFCS(&,template,(f<t>),(m),(), 0)}; 
+  cpp2::i32 auto_37_3 {CPP2_UFCS(&,template,(f<t,t>),(m),(), 0, 0)}; 
   cpp2::i32 auto_38_3 {CPP2_UFCS(&,,(f),(n),())}; 
-  cpp2::i32 auto_39_3 {CPP2_UFCS(&,,(f),(n),(,), 0)}; 
+  cpp2::i32 auto_39_3 {CPP2_UFCS(&,,(f),(n),(), 0)}; 
   cpp2::i32 auto_40_3 {CPP2_UFCS(&,template,(f<t>),(n),())}; 
-  cpp2::i32 auto_41_3 {CPP2_UFCS(&,template,(f<t>),(n),(,), 0)}; 
-  cpp2::i32 auto_42_3 {CPP2_UFCS(&,template,(f<t,t>),(n),(,), 0, 0)}; 
-  cpp2::i32 auto_43_3 {CPP2_UFCS(&,template,(f<t,t>),(a<t,t>),(,), 0, 0)}; 
+  cpp2::i32 auto_41_3 {CPP2_UFCS(&,template,(f<t>),(n),(), 0)}; 
+  cpp2::i32 auto_42_3 {CPP2_UFCS(&,template,(f<t,t>),(n),(), 0, 0)}; 
+  cpp2::i32 auto_43_3 {CPP2_UFCS(&,template,(f<t,t>),(a<t,t>),(), 0, 0)}; 
 
-  (void) [](auto const& a, auto const& f) -> void{(void) CPP2_UFCS(&,,(f),(CPP2_UFCS(&,,(f),(a),(,), a)),()); };
+  static_cast<void>([](auto const& a, auto const& f) -> void{static_cast<void>(CPP2_UFCS(&,,(f),(CPP2_UFCS(&,,(f),(a),(), a)),())); });
 }
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-ufcs-noexcept.cpp b/regression-tests/test-results/pure2-bugfix-for-ufcs-noexcept.cpp
@@ -14,7 +14,7 @@ class t;
 
 #line 1 "pure2-bugfix-for-ufcs-noexcept.cpp2"
 class t {
-  public: auto swap(t const& that) noexcept -> void;
+  public: auto swap([[maybe_unused]] t const& that) noexcept -> void;
 
   public: t() = default;
   public: t(t const&) = delete; /* No 'that' constructor, suppress copy */
@@ -28,7 +28,7 @@ auto main() -> int;
 
 
 #line 2 "pure2-bugfix-for-ufcs-noexcept.cpp2"
-  auto t::swap(t const& that) noexcept -> void{}
+  auto t::swap([[maybe_unused]] t const& that) noexcept -> void{}
 
-auto main() -> int{static_assert(noexcept(CPP2_UFCS(&,,(swap),(t()),(,), t()))); }
+auto main() -> int{static_assert(noexcept(CPP2_UFCS(&,,(swap),(t()),(), t()))); }
 
diff --git a/regression-tests/test-results/pure2-inspect-expression-in-generic-function-multiple-types.cpp b/regression-tests/test-results/pure2-inspect-expression-in-generic-function-multiple-types.cpp
@@ -31,7 +31,7 @@ auto test_generic(auto const& x, auto const& msg) -> void;
     test_generic(a,    "any");
     test_generic(o,    "optional<int>");
 
-    static_cast<void>(CPP2_UFCS(&,template,(emplace<0>),(v),(,), 1));
+    static_cast<void>(CPP2_UFCS(&,template,(emplace<0>),(v),(), 1));
     a = 2;
     o = 3;
     test_generic(42,   "int");
diff --git a/regression-tests/test-results/pure2-stdio-with-raii.cpp b/regression-tests/test-results/pure2-stdio-with-raii.cpp
@@ -24,6 +24,6 @@
 [[nodiscard]] auto main() -> int{
     std::string s {"Freddy"}; 
     auto myfile {cpp2::fopen("xyzzy", "w")}; 
-    static_cast<void>(CPP2_UFCS(&,,(fprintf),(std::move(myfile)),(,), "Hello %s with UFCS!", CPP2_UFCS(&,,(c_str),(std::move(s)),())));
+    static_cast<void>(CPP2_UFCS(&,,(fprintf),(std::move(myfile)),(), "Hello %s with UFCS!", CPP2_UFCS(&,,(c_str),(std::move(s)),())));
 }
 
diff --git a/regression-tests/test-results/pure2-stdio.cpp b/regression-tests/test-results/pure2-stdio.cpp
@@ -27,7 +27,7 @@
 [[nodiscard]] auto main() -> int{
     std::string s {"Fred"}; 
     auto myfile {fopen("xyzzy", "w")}; 
-    static_cast<void>(CPP2_UFCS(&,,(fprintf),(myfile),(,), "Hello %s with UFCS!", CPP2_UFCS(&,,(c_str),(std::move(s)),())));
+    static_cast<void>(CPP2_UFCS(&,,(fprintf),(myfile),(), "Hello %s with UFCS!", CPP2_UFCS(&,,(c_str),(std::move(s)),())));
     static_cast<void>(CPP2_UFCS(&,,(fclose),(std::move(myfile)),()));
 }
 
diff --git a/regression-tests/test-results/pure2-type-safety-1.cpp b/regression-tests/test-results/pure2-type-safety-1.cpp
@@ -42,7 +42,7 @@ auto print(cpp2::in<std::string> msg, cpp2::in<bool> b) -> void;
 
     std::cout << "\n";
 
-    static_cast<void>(CPP2_UFCS(&,template,(emplace<1>),(v),(,), 1));
+    static_cast<void>(CPP2_UFCS(&,template,(emplace<1>),(v),(), 1));
     a = 2;
     o = 3;
     test_generic(42,   "int");
diff --git a/regression-tests/test-results/pure2-type-safety-2-with-inspect-expression.cpp b/regression-tests/test-results/pure2-type-safety-2-with-inspect-expression.cpp
@@ -31,7 +31,7 @@ auto test_generic(auto const& x, auto const& msg) -> void;
     test_generic(a,    "any");
     test_generic(o,    "optional<int>");
 
-    static_cast<void>(CPP2_UFCS(&,template,(emplace<2>),(v),(,), 1));
+    static_cast<void>(CPP2_UFCS(&,template,(emplace<2>),(v),(), 1));
     a = 2;
     o = 3;
     test_generic(42,   "int");
diff --git a/regression-tests/test-results/pure2-types-basics.cpp b/regression-tests/test-results/pure2-types-basics.cpp
@@ -183,10 +183,10 @@ namespace N {
 
 auto main() -> int{
     N::myclass x {1}; 
-    CPP2_UFCS(&,,(f),(x),(,), 53);
+    CPP2_UFCS(&,,(f),(x),(), 53);
     N::myclass::nested::g();
-    std::cout << "f1: " + cpp2::to_string(CPP2_UFCS(&,,(f1),(x),(,), 1, 1)) + "\n";
-    std::cout << "f2: " + cpp2::to_string(CPP2_UFCS(&,,(f2),(x),(,), 2, 2)) + "\n";
+    std::cout << "f1: " + cpp2::to_string(CPP2_UFCS(&,,(f1),(x),(), 1, 1)) + "\n";
+    std::cout << "f2: " + cpp2::to_string(CPP2_UFCS(&,,(f2),(x),(), 2, 2)) + "\n";
     std::cout << "f3: " + cpp2::to_string(CPP2_UFCS(&,template,(f3<3,3>),(x),())) + "\n";
     std::cout << "f4: " + cpp2::to_string(CPP2_UFCS(&,template,(f4<4,4>),(x),())) + "\n";
     N::myclass x2 {"abracadabra"}; 
diff --git a/regression-tests/test-results/pure2-types-order-independence-and-nesting.cpp b/regression-tests/test-results/pure2-types-order-independence-and-nesting.cpp
@@ -155,7 +155,7 @@ namespace N {
         //  Exercise '_' anonymous objects too while we're at it
         cpp2::finally auto_37_9 {[&]() -> void { std::cout << "leaving call to 'why(" + cpp2::to_string(count) + ")'\n";  }}; 
         if (cpp2::cmp_less(count,5)) {
-            CPP2_UFCS(&,,(why),((*cpp2::assert_not_null(py))),(,), count + 1);// use Y object from X
+            CPP2_UFCS(&,,(why),((*cpp2::assert_not_null(py))),(), count + 1);// use Y object from X
         }
     }
 
@@ -172,7 +172,7 @@ namespace N {
      }
 
     auto Y::why(cpp2::in<int> count) const -> void { 
-        CPP2_UFCS(&,,(exx),((*cpp2::assert_not_null(px))),(,), count + 1);  }// use X object from Y
+        CPP2_UFCS(&,,(exx),((*cpp2::assert_not_null(px))),(), count + 1);  }// use X object from Y
 
 #line 55 "pure2-types-order-independence-and-nesting.cpp2"
 namespace M {
@@ -192,7 +192,7 @@ auto main() -> int
     N::X x {cpp2::out(&y)}; // construct y and x, and point them at each other
 
     // now have the two objects call each other back and forth a few times
-    CPP2_UFCS(&,,(exx),(std::move(x)),(,), 1);
+    CPP2_UFCS(&,,(exx),(std::move(x)),(), 1);
 
     // and test a nested template out-of-line definition
     N::M::A<int,int>::B<42>::f<int,43>("welt");
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-1-provide-everything.cpp b/regression-tests/test-results/pure2-types-smf-and-that-1-provide-everything.cpp
@@ -127,24 +127,24 @@ auto main() -> int{
     std::cout << "----------------------  ------------  ------------------------------------------------------\n";
 
     myclass x {"Henry"}; 
-    CPP2_UFCS(&,,(print),(x),(,), "   construct     ", "\n");
+    CPP2_UFCS(&,,(print),(x),(), "   construct     ", "\n");
     x = "Clara";
-    CPP2_UFCS(&,,(print),(x),(,), "   assign        ", "\n");
+    CPP2_UFCS(&,,(print),(x),(), "   assign        ", "\n");
 
     auto y {x}; 
-    CPP2_UFCS(&,,(print),(y),(,), "   cp-construct  ", " <- ");
-    CPP2_UFCS(&,,(print),(x),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(y),(), "   cp-construct  ", " <- ");
+    CPP2_UFCS(&,,(print),(x),(), "", "\n");
 
     auto z {std::move(x)}; 
-    CPP2_UFCS(&,,(print),(z),(,), "   mv-construct  ", " <- ");
-    CPP2_UFCS(&,,(print),(std::move(x)),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(z),(), "   mv-construct  ", " <- ");
+    CPP2_UFCS(&,,(print),(std::move(x)),(), "", "\n");
 
     z = y;
-    CPP2_UFCS(&,,(print),(z),(,), "   cp-assign     ", " <- ");
-    CPP2_UFCS(&,,(print),(y),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(z),(), "   cp-assign     ", " <- ");
+    CPP2_UFCS(&,,(print),(y),(), "", "\n");
 
     z = { std::move(y) };
-    CPP2_UFCS(&,,(print),(std::move(z)),(,), "   mv-assign     ", " <- ");
-    CPP2_UFCS(&,,(print),(std::move(y)),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(std::move(z)),(), "   mv-assign     ", " <- ");
+    CPP2_UFCS(&,,(print),(std::move(y)),(), "", "\n");
 }
 
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp b/regression-tests/test-results/pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp
@@ -132,24 +132,24 @@ auto main() -> int{
     std::cout << "----------------------  ------------  ------------------------------------------------------\n";
 
     myclass x {"Henry"}; 
-    CPP2_UFCS(&,,(print),(x),(,), "   construct     ", "\n");
+    CPP2_UFCS(&,,(print),(x),(), "   construct     ", "\n");
     x = "Clara";
-    CPP2_UFCS(&,,(print),(x),(,), "   assign        ", "\n");
+    CPP2_UFCS(&,,(print),(x),(), "   assign        ", "\n");
 
     auto y {x}; 
-    CPP2_UFCS(&,,(print),(y),(,), "   cp-construct  ", " <- ");
-    CPP2_UFCS(&,,(print),(x),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(y),(), "   cp-construct  ", " <- ");
+    CPP2_UFCS(&,,(print),(x),(), "", "\n");
 
     auto z {std::move(x)}; 
-    CPP2_UFCS(&,,(print),(z),(,), "   mv-construct  ", " <- ");
-    CPP2_UFCS(&,,(print),(std::move(x)),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(z),(), "   mv-construct  ", " <- ");
+    CPP2_UFCS(&,,(print),(std::move(x)),(), "", "\n");
 
     z = y;
-    CPP2_UFCS(&,,(print),(z),(,), "   cp-assign     ", " <- ");
-    CPP2_UFCS(&,,(print),(y),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(z),(), "   cp-assign     ", " <- ");
+    CPP2_UFCS(&,,(print),(y),(), "", "\n");
 
     z = { std::move(y) };
-    CPP2_UFCS(&,,(print),(std::move(z)),(,), "   mv-assign     ", " <- ");
-    CPP2_UFCS(&,,(print),(std::move(y)),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(std::move(z)),(), "   mv-assign     ", " <- ");
+    CPP2_UFCS(&,,(print),(std::move(y)),(), "", "\n");
 }
 
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp b/regression-tests/test-results/pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp
@@ -131,24 +131,24 @@ auto main() -> int{
     std::cout << "----------------------  ------------  ------------------------------------------------------\n";
 
     myclass x {"Henry"}; 
-    CPP2_UFCS(&,,(print),(x),(,), "   construct     ", "\n");
+    CPP2_UFCS(&,,(print),(x),(), "   construct     ", "\n");
     x = "Clara";
-    CPP2_UFCS(&,,(print),(x),(,), "   assign        ", "\n");
+    CPP2_UFCS(&,,(print),(x),(), "   assign        ", "\n");
 
     auto y {x}; 
-    CPP2_UFCS(&,,(print),(y),(,), "   cp-construct  ", " <- ");
-    CPP2_UFCS(&,,(print),(x),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(y),(), "   cp-construct  ", " <- ");
+    CPP2_UFCS(&,,(print),(x),(), "", "\n");
 
     auto z {std::move(x)}; 
-    CPP2_UFCS(&,,(print),(z),(,), "   mv-construct  ", " <- ");
-    CPP2_UFCS(&,,(print),(std::move(x)),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(z),(), "   mv-construct  ", " <- ");
+    CPP2_UFCS(&,,(print),(std::move(x)),(), "", "\n");
 
     z = y;
-    CPP2_UFCS(&,,(print),(z),(,), "   cp-assign     ", " <- ");
-    CPP2_UFCS(&,,(print),(y),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(z),(), "   cp-assign     ", " <- ");
+    CPP2_UFCS(&,,(print),(y),(), "", "\n");
 
     z = { std::move(y) };
-    CPP2_UFCS(&,,(print),(std::move(z)),(,), "   mv-assign     ", " <- ");
-    CPP2_UFCS(&,,(print),(std::move(y)),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(std::move(z)),(), "   mv-assign     ", " <- ");
+    CPP2_UFCS(&,,(print),(std::move(y)),(), "", "\n");
 }
 
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp b/regression-tests/test-results/pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp
@@ -131,24 +131,24 @@ auto main() -> int{
     std::cout << "----------------------  ------------  ------------------------------------------------------\n";
 
     myclass x {"Henry"}; 
-    CPP2_UFCS(&,,(print),(x),(,), "   construct     ", "\n");
+    CPP2_UFCS(&,,(print),(x),(), "   construct     ", "\n");
     x = "Clara";
-    CPP2_UFCS(&,,(print),(x),(,), "   assign        ", "\n");
+    CPP2_UFCS(&,,(print),(x),(), "   assign        ", "\n");
 
     auto y {x}; 
-    CPP2_UFCS(&,,(print),(y),(,), "   cp-construct  ", " <- ");
-    CPP2_UFCS(&,,(print),(x),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(y),(), "   cp-construct  ", " <- ");
+    CPP2_UFCS(&,,(print),(x),(), "", "\n");
 
     auto z {std::move(x)}; 
-    CPP2_UFCS(&,,(print),(z),(,), "   mv-construct  ", " <- ");
-    CPP2_UFCS(&,,(print),(std::move(x)),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(z),(), "   mv-construct  ", " <- ");
+    CPP2_UFCS(&,,(print),(std::move(x)),(), "", "\n");
 
     z = y;
-    CPP2_UFCS(&,,(print),(z),(,), "   cp-assign     ", " <- ");
-    CPP2_UFCS(&,,(print),(y),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(z),(), "   cp-assign     ", " <- ");
+    CPP2_UFCS(&,,(print),(y),(), "", "\n");
 
     z = { std::move(y) };
-    CPP2_UFCS(&,,(print),(std::move(z)),(,), "   mv-assign     ", " <- ");
-    CPP2_UFCS(&,,(print),(std::move(y)),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(std::move(z)),(), "   mv-assign     ", " <- ");
+    CPP2_UFCS(&,,(print),(std::move(y)),(), "", "\n");
 }
 
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp b/regression-tests/test-results/pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp
@@ -137,24 +137,24 @@ auto main() -> int{
     std::cout << "----------------------  ------------  ------------------------------------------------------\n";
 
     myclass x {"Henry"}; 
-    CPP2_UFCS(&,,(print),(x),(,), "   construct     ", "\n");
+    CPP2_UFCS(&,,(print),(x),(), "   construct     ", "\n");
     x = "Clara";
-    CPP2_UFCS(&,,(print),(x),(,), "   assign        ", "\n");
+    CPP2_UFCS(&,,(print),(x),(), "   assign        ", "\n");
 
     auto y {x}; 
-    CPP2_UFCS(&,,(print),(y),(,), "   cp-construct  ", " <- ");
-    CPP2_UFCS(&,,(print),(x),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(y),(), "   cp-construct  ", " <- ");
+    CPP2_UFCS(&,,(print),(x),(), "", "\n");
 
     auto z {std::move(x)}; 
-    CPP2_UFCS(&,,(print),(z),(,), "   mv-construct  ", " <- ");
-    CPP2_UFCS(&,,(print),(std::move(x)),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(z),(), "   mv-construct  ", " <- ");
+    CPP2_UFCS(&,,(print),(std::move(x)),(), "", "\n");
 
     z = y;
-    CPP2_UFCS(&,,(print),(z),(,), "   cp-assign     ", " <- ");
-    CPP2_UFCS(&,,(print),(y),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(z),(), "   cp-assign     ", " <- ");
+    CPP2_UFCS(&,,(print),(y),(), "", "\n");
 
     z = { std::move(y) };
-    CPP2_UFCS(&,,(print),(std::move(z)),(,), "   mv-assign     ", " <- ");
-    CPP2_UFCS(&,,(print),(std::move(y)),(,), "", "\n");
+    CPP2_UFCS(&,,(print),(std::move(z)),(), "   mv-assign     ", " <- ");
+    CPP2_UFCS(&,,(print),(std::move(y)),(), "", "\n");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,6 @@ auto insert_at(cpp2::in<int> where, cpp2::in<int> val) -> void`
`48`	`48`	`cpp2::Default.expects(cpp2::cmp_less_eq(0,where) && cpp2::cmp_less_eq(where,CPP2_UFCS(&,,(ssize),(vec),())), "");`
`49`	`49`	`auto post_21_5 = cpp2::finally_success([_0 = CPP2_UFCS(&,,(ssize),(vec),())]{cpp2::Default.expects(CPP2_UFCS(&,,(ssize),(vec),())==_0 + 1, "");} );`
`50`	`50`	`#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));`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ auto fill(`
`61`	`61`	`{`
`62`	`62`	`cpp2::Default.expects(cpp2::cmp_greater_eq(CPP2_UFCS(&,,(ssize),(value),()),count), "fill: value must contain at least count elements");`
`63`	`63`	`#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));`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`auto print_decorated(auto const& x) -> void { std::cout << ">> [" << x << "]\n"; }`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ auto fill(`
`56`	`56`	`{`
`57`	`57`	`cpp2::Default.expects(cpp2::cmp_greater_eq(CPP2_UFCS(&,,(ssize),(value),()),count), "fill: value must contain at least count elements");`
`58`	`58`	`#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));`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`auto print_decorated(auto const& x) -> void { std::cout << ">> [" << x << "]\n"; }`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ auto call_my_framework(char const* msg) -> void;`
`34`	`34`
`35`	`35`	`#line 6 "mixed-lifetime-safety-and-null-contracts.cpp2"`
`36`	`36`	`[[nodiscard]] auto main() -> int{`
`37`		`- CPP2_UFCS(&,,(set_handler),(cpp2::Null),(,), &call_my_framework);`
	`37`	`+ CPP2_UFCS(&,,(set_handler),(cpp2::Null),(), &call_my_framework);`
`38`	`38`	`try_pointer_stuff();`
`39`	`39`	`std::cout << "done\n";`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,6 @@ auto insert_at(cpp2::in<int> where, cpp2::in<int> val) -> void`
`43`	`43`	`cpp2::Default.expects(cpp2::cmp_less_eq(0,where) && cpp2::cmp_less_eq(where,CPP2_UFCS(&,,(ssize),(vec),())), "");`
`44`	`44`	`auto post_16_5 = cpp2::finally_success([_0 = CPP2_UFCS(&,,(size),(vec),())]{cpp2::Default.expects(CPP2_UFCS(&,,(size),(vec),())==_0 + 1, "");} );`
`45`	`45`	`#line 18 "mixed-postexpression-with-capture.cpp2"`
`46`		`- CPP2_UFCS(&,,(push_back),(vec),(,), val);`
	`46`	`+ CPP2_UFCS(&,,(push_back),(vec),(), val);`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@`
`24`	`24`	`[[nodiscard]] auto main() -> int{`
`25`	`25`	`std::string s {"Freddy"};`
`26`	`26`	`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)),())));`
`28`	`28`	`}`
`29`	`29`