Changed out x argument to pass out(&x) for better deduction, see #369 comment thread

Author: hsutter

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

@@ -45,7 +45,7 @@ bool flip_a_coin() {
     if (flip_a_coin()) {
         x.construct("xyzzy");
     }else {
-        fill(&x, "plugh", 40);      // note: constructs x!
+        fill(cpp2::out(&x), "plugh", 40);// note: constructs x!
     }
     print_decorated(std::move(x.value()));
 }

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

@@ -42,7 +42,7 @@ auto print_decorated(auto const& x) -> void;
     if (flip_a_coin()) {
         x.construct("xyzzy");
     }else {
-        fill(&x, "plugh", 40);      // note: constructs x!
+        fill(cpp2::out(&x), "plugh", 40);// note: constructs x!
     }
     print_decorated(std::move(x.value()));
 }

regression-tests/test-results/mixed-out-destruction.cpp

@@ -54,13 +54,13 @@ int main() {
 
 
 #line 22 "mixed-out-destruction.cpp2"
-auto f00() -> void     {   C c {"f00"}; cpp2::deferred_init<X> x; f01(&x);}
+auto f00() -> void     {   C c {"f00"}; cpp2::deferred_init<X> x; f01(cpp2::out(&x));}
 auto f01(cpp2::out<X> x) -> void{C c {"f01"}; x.construct();throw_1();}
 
 #line 27 "mixed-out-destruction.cpp2"
-auto f10() -> void     {   C c {"f10"}; cpp2::deferred_init<X> x; f11(&x);}
-auto f11(cpp2::out<X> x) -> void{C c {"f11"}; f12(&x);}
-auto f12(cpp2::out<X> x) -> void{C c {"f12"}; f13(&x);throw_1();}
-auto f13(cpp2::out<X> x) -> void{C c {"f13"}; f14(&x);}
+auto f10() -> void     {   C c {"f10"}; cpp2::deferred_init<X> x; f11(cpp2::out(&x));}
+auto f11(cpp2::out<X> x) -> void{C c {"f11"}; f12(cpp2::out(&x));}
+auto f12(cpp2::out<X> x) -> void{C c {"f12"}; f13(cpp2::out(&x));throw_1();}
+auto f13(cpp2::out<X> x) -> void{C c {"f13"}; f14(cpp2::out(&x));}
 auto f14(cpp2::out<X> x) -> void{C c {"f14"}; x.construct();}
 

regression-tests/test-results/mixed-parameter-passing-generic-out.cpp

@@ -20,7 +20,7 @@ auto operator<<(std::ostream& o, X const&) -> std::ostream& {
 }
 
 #line 11 "mixed-parameter-passing-generic-out.cpp2"
-auto f(auto* x_) -> void;
+auto f(auto x_) -> void;
 
 
 #line 15 "mixed-parameter-passing-generic-out.cpp2"
@@ -31,19 +31,19 @@ auto f(auto* x_) -> void;
 
 
 #line 11 "mixed-parameter-passing-generic-out.cpp2"
-auto f(auto* x_) -> void{
+auto f(auto x_) -> void{
     auto x = cpp2::out(x_); 
 #line 12 "mixed-parameter-passing-generic-out.cpp2"
     x.construct(42);
 }
 
 [[nodiscard]] auto main() -> int{
     cpp2::deferred_init<int> a; 
-    f(&a);
+    f(cpp2::out(&a));
     std::cout << std::move(a.value()) << "\n";
 
     cpp2::deferred_init<X> b; 
-    f(&b);
+    f(cpp2::out(&b));
     std::cout << std::move(b.value()) << "\n";
 }
 

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

@@ -189,7 +189,7 @@ namespace M {
 auto main() -> int
 {
     cpp2::deferred_init<N::Y> y; // declare an uninitialized Y object
-    N::X x {&y};        // construct y and x, and point them at each other
+    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);

regression-tests/test-results/version

@@ -1,5 +1,5 @@
 
-cppfront compiler v0.2.1   Build 8520:1425
+cppfront compiler v0.2.1   Build 8521:0840
 Copyright(c) Herb Sutter   All rights reserved
 
 SPDX-License-Identifier: CC-BY-NC-ND-4.0

source/build.info

@@ -1 +1 @@
-"8520:1425"
+"8521:0840"

source/cppfront.cpp

@@ -3551,7 +3551,7 @@ class cppfront
                 );
                 if (x.pass == passing_style::out) {
                     is_out = true;
-                    printer.print_cpp2("&", n.position());
+                    printer.print_cpp2("cpp2::out(&", n.position());
                 }
                 else if (x.pass == passing_style::move) {
                     printer.print_cpp2("std::move(", n.position());
@@ -3571,7 +3571,11 @@ class cppfront
                 in_non_rvalue_context.pop_back();
             }
 
-            if (x.pass == passing_style::move) {
+            if (
+                x.pass == passing_style::move
+                || x.pass == passing_style::out
+                )
+            {
                 printer.print_cpp2(")", n.position());
             }
         }
@@ -3914,7 +3918,7 @@ class cppfront
 
             //  For generic out parameters, we take a pointer to anything with paramater named "identifier_"
             //  and then generate the out<> as a stack local with the expected name "identifier"
-            break;case passing_style::out    : printer.print_cpp2( name+"*",       n.position() );
+            break;case passing_style::out    : printer.print_cpp2( name,           n.position() );
                                                current_functions.back().prolog.statements.push_back(
                                                    "auto " + identifier + " = cpp2::out(" + identifier + "_); "
                                                );