Add *value meta functions, and don't mark copy/move ctors explicit, closes #375

Generated code now doesn't get tacked together as a very long emitted line - which is legal code, but isn't visually pleasing or readable. This matters more in this commit now that we have meta functions that generate multiple functions in the same type.

Author: hsutter

regression-tests/pure2-types-value-types-via-meta-functions.cpp2

@@ -0,0 +1,35 @@
+
+widget: @value type = {
+    val: int = 0;
+    operator=: (out this, i: int) = { val = i; }
+}
+
+w_widget: @weakly_ordered_value type = {
+    val: int = 0;
+    operator=: (out this, i: int) = { val = i; }
+}
+
+p_widget: @partially_ordered_value type = {
+    val: int = 0;
+    operator=: (out this, i: int) = { val = i; }
+}
+
+main: () = {
+    test<widget>();
+    test<w_widget>();
+    test<p_widget>();
+}
+
+test: <T> () = {
+    //  should be default constructible
+    a: T = ();
+
+    //  widget should be comparable
+    b: T = 2;
+    if (a<b) {
+        std::cout << "less ";
+    }
+    else {
+        std::cout << "more ";
+    }
+}

regression-tests/test-results/clang-12/pure2-types-value-types-via-meta-functions.cpp.execution

@@ -0,0 +1 @@
+less less less 

regression-tests/test-results/clang-12/pure2-types-value-types-via-meta-functions.cpp.output

@@ -0,0 +1 @@
+less less less 

regression-tests/test-results/gcc-10/pure2-types-value-types-via-meta-functions.cpp.execution

@@ -0,0 +1 @@
+less less less 

regression-tests/test-results/gcc-10/pure2-types-value-types-via-meta-functions.cpp.output

@@ -0,0 +1 @@
+pure2-types-value-types-via-meta-functions.cpp

regression-tests/test-results/msvc-2022/pure2-types-value-types-via-meta-functions.cpp.execution

@@ -28,19 +28,22 @@ class Cyborg;
 #line 2 "pure2-types-inheritance.cpp2"
 class Human {
     public: virtual auto speak() const -> void = 0;
+
 public: virtual ~Human();
+
     public: Human() = default;
     public: Human(Human const&) = delete;
     public: auto operator=(Human const&) -> void = delete;
-
 #line 4 "pure2-types-inheritance.cpp2"
 };
 
 namespace N {
     template<int I> class Machine {
         public: explicit Machine(cpp2::in<std::string> id);
         public: virtual auto work() const -> void = 0;
+    
     public: virtual ~Machine();
+
         public: Machine(Machine const&) = delete;
         public: auto operator=(Machine const&) -> void = delete;
 
@@ -88,13 +91,15 @@ auto main() -> int;
 
 //=== Cpp2 function definitions =================================================
 
-#line 0 "pure2-types-inheritance.cpp2"
-Human::~Human(){}
 
+    
+    Human::~Human(){}
 #line 6 "pure2-types-inheritance.cpp2"
 namespace N {
 
-        template <int I> Machine<I>::Machine(cpp2::in<std::string> id){}template <int I> Machine<I>::~Machine(){}
+        template <int I> Machine<I>::Machine(cpp2::in<std::string> id){}
+        template <int I> 
+        Machine<I>::~Machine(){}
 
 #line 11 "pure2-types-inheritance.cpp2"
 }

regression-tests/test-results/msvc-2022/pure2-types-value-types-via-meta-functions.cpp.output

@@ -28,10 +28,11 @@ class my_integer {
     public: explicit my_integer(cpp2::in<int> val);
 #line 4 "pure2-types-ordering-via-meta-functions.cpp2"
     public: auto operator=(cpp2::in<int> val) -> my_integer& ;
+
 public: [[nodiscard]] auto operator<=>(my_integer const& that) const -> std::strong_ordering = default;
+
     public: my_integer(my_integer const&) = delete;
     public: auto operator=(my_integer const&) -> void = delete;
-
 #line 5 "pure2-types-ordering-via-meta-functions.cpp2"
 };
 
@@ -40,10 +41,11 @@ class case_insensitive_string {
     public: explicit case_insensitive_string(cpp2::in<std::string> val);
 #line 9 "pure2-types-ordering-via-meta-functions.cpp2"
     public: auto operator=(cpp2::in<std::string> val) -> case_insensitive_string& ;
+
 public: [[nodiscard]] auto operator<=>(case_insensitive_string const& that) const -> std::weak_ordering = default;
+
     public: case_insensitive_string(case_insensitive_string const&) = delete;
     public: auto operator=(case_insensitive_string const&) -> void = delete;
-
 #line 10 "pure2-types-ordering-via-meta-functions.cpp2"
 };
 
@@ -52,10 +54,11 @@ class person_in_family_tree {
     public: explicit person_in_family_tree(cpp2::in<int> parents);
 #line 14 "pure2-types-ordering-via-meta-functions.cpp2"
     public: auto operator=(cpp2::in<int> parents) -> person_in_family_tree& ;
+
 public: [[nodiscard]] auto operator<=>(person_in_family_tree const& that) const -> std::partial_ordering = default;
+
     public: person_in_family_tree(person_in_family_tree const&) = delete;
     public: auto operator=(person_in_family_tree const&) -> void = delete;
-
 #line 15 "pure2-types-ordering-via-meta-functions.cpp2"
 };
 

regression-tests/test-results/pure2-types-inheritance.cpp

@@ -17,11 +17,11 @@ class myclass;
 #line 2 "pure2-types-smf-and-that-1-provide-everything.cpp2"
 class myclass {
 
-    public: explicit myclass(myclass const& that);
+    public: myclass(myclass const& that);
 
 
 #line 8 "pure2-types-smf-and-that-1-provide-everything.cpp2"
-    public: explicit myclass(myclass&& that);
+    public: myclass(myclass&& that);
 
 
 #line 13 "pure2-types-smf-and-that-1-provide-everything.cpp2"

regression-tests/test-results/pure2-types-ordering-via-meta-functions.cpp

@@ -17,11 +17,11 @@ class myclass;
 #line 2 "pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp2"
 class myclass {
 
-    public: explicit myclass(myclass const& that);
+    public: myclass(myclass const& that);
 
 
 #line 8 "pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp2"
-    public: explicit myclass(myclass&& that);
+    public: myclass(myclass&& that);
 
 
 #line 13 "pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp2"

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

@@ -17,14 +17,14 @@ class myclass;
 #line 2 "pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp2"
 class myclass {
 
-    public: explicit myclass(myclass const& that);
+    public: myclass(myclass const& that);
 
 #line 4 "pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp2"
     public: auto operator=(myclass const& that) -> myclass& ;
 
 
 #line 8 "pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp2"
-    public: explicit myclass(myclass&& that);
+    public: myclass(myclass&& that);
 
 
 #line 13 "pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp2"

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

@@ -17,10 +17,10 @@ class myclass;
 #line 2 "pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp2"
 class myclass {
 
-    public: explicit myclass(myclass const& that);
+    public: myclass(myclass const& that);
 
 #line 4 "pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp2"
-    public: explicit myclass(myclass&& that);
+    public: myclass(myclass&& that);
 
 
 #line 8 "pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp2"

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

@@ -17,13 +17,13 @@ class myclass;
 #line 2 "pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp2"
 class myclass {
 
-    public: explicit myclass(myclass const& that);
+    public: myclass(myclass const& that);
 
 #line 4 "pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp2"
     public: auto operator=(myclass const& that) -> myclass& ;
 
 #line 4 "pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp2"
-    public: explicit myclass(myclass&& that);
+    public: myclass(myclass&& that);
 
 #line 4 "pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp2"
     public: auto operator=(myclass&& that) -> myclass& ;

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

@@ -19,14 +19,14 @@ class myclass {
 
     public: myclass();
 
-    public: explicit myclass(myclass const& that);
+    public: myclass(myclass const& that);
 
 #line 6 "pure2-types-that-parameters.cpp2"
     public: auto operator=(myclass const& that) -> myclass& ;
 
 
 #line 11 "pure2-types-that-parameters.cpp2"
-    public: explicit myclass(myclass&& that);
+    public: myclass(myclass&& that);
 
 #line 11 "pure2-types-that-parameters.cpp2"
     public: auto operator=(myclass&& that) -> myclass& ;

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

@@ -0,0 +1,179 @@
+
+#define CPP2_USE_MODULES         Yes
+
+//=== Cpp2 type declarations ====================================================
+
+
+#include "cpp2util.h"
+
+
+#line 2 "pure2-types-value-types-via-meta-functions.cpp2"
+class widget;
+    
+
+#line 7 "pure2-types-value-types-via-meta-functions.cpp2"
+class w_widget;
+    
+
+#line 12 "pure2-types-value-types-via-meta-functions.cpp2"
+class p_widget;
+    
+
+//=== Cpp2 type definitions and function declarations ===========================
+
+
+#line 2 "pure2-types-value-types-via-meta-functions.cpp2"
+class widget {
+    private: int val {0}; 
+    public: explicit widget(cpp2::in<int> i);
+#line 4 "pure2-types-value-types-via-meta-functions.cpp2"
+    public: auto operator=(cpp2::in<int> i) -> widget& ;
+
+public: [[nodiscard]] auto operator<=>(widget const& that) const -> std::strong_ordering = default;
+public: widget(widget const& that);
+public: auto operator=(widget const& that) -> widget& ;
+public: widget(widget&& that);
+public: auto operator=(widget&& that) -> widget& ;
+public: widget();
+
+#line 5 "pure2-types-value-types-via-meta-functions.cpp2"
+};
+
+class w_widget {
+    private: int val {0}; 
+    public: explicit w_widget(cpp2::in<int> i);
+#line 9 "pure2-types-value-types-via-meta-functions.cpp2"
+    public: auto operator=(cpp2::in<int> i) -> w_widget& ;
+
+public: [[nodiscard]] auto operator<=>(w_widget const& that) const -> std::weak_ordering = default;
+public: w_widget(w_widget const& that);
+public: auto operator=(w_widget const& that) -> w_widget& ;
+public: w_widget(w_widget&& that);
+public: auto operator=(w_widget&& that) -> w_widget& ;
+public: w_widget();
+
+#line 10 "pure2-types-value-types-via-meta-functions.cpp2"
+};
+
+class p_widget {
+    private: int val {0}; 
+    public: explicit p_widget(cpp2::in<int> i);
+#line 14 "pure2-types-value-types-via-meta-functions.cpp2"
+    public: auto operator=(cpp2::in<int> i) -> p_widget& ;
+
+public: [[nodiscard]] auto operator<=>(p_widget const& that) const -> std::partial_ordering = default;
+public: p_widget(p_widget const& that);
+public: auto operator=(p_widget const& that) -> p_widget& ;
+public: p_widget(p_widget&& that);
+public: auto operator=(p_widget&& that) -> p_widget& ;
+public: p_widget();
+
+#line 15 "pure2-types-value-types-via-meta-functions.cpp2"
+};
+
+auto main() -> int;
+    
+
+#line 23 "pure2-types-value-types-via-meta-functions.cpp2"
+template<typename T> auto test() -> void;
+    
+
+//=== Cpp2 function definitions =================================================
+
+
+#line 4 "pure2-types-value-types-via-meta-functions.cpp2"
+    widget::widget(cpp2::in<int> i)
+                                      : val{ i }
+#line 4 "pure2-types-value-types-via-meta-functions.cpp2"
+    {}
+#line 4 "pure2-types-value-types-via-meta-functions.cpp2"
+    auto widget::operator=(cpp2::in<int> i) -> widget& {
+                                      val = i;
+                                      return *this;
+#line 4 "pure2-types-value-types-via-meta-functions.cpp2"
+    }
+    
+    
+    widget::widget(widget const& that){}
+
+    auto widget::operator=(widget const& that) -> widget& {
+                                val = 0;
+                                return *this;}
+    
+    widget::widget(widget&& that){}
+    auto widget::operator=(widget&& that) -> widget& {
+                                val = 0;
+                                return *this;}
+    
+    widget::widget(){}
+#line 9 "pure2-types-value-types-via-meta-functions.cpp2"
+    w_widget::w_widget(cpp2::in<int> i)
+                                      : val{ i }
+#line 9 "pure2-types-value-types-via-meta-functions.cpp2"
+    {}
+#line 9 "pure2-types-value-types-via-meta-functions.cpp2"
+    auto w_widget::operator=(cpp2::in<int> i) -> w_widget& {
+                                      val = i;
+                                      return *this;
+#line 9 "pure2-types-value-types-via-meta-functions.cpp2"
+    }
+    
+    
+    w_widget::w_widget(w_widget const& that){}
+
+    auto w_widget::operator=(w_widget const& that) -> w_widget& {
+                                val = 0;
+                                return *this;}
+    
+    w_widget::w_widget(w_widget&& that){}
+    auto w_widget::operator=(w_widget&& that) -> w_widget& {
+                                val = 0;
+                                return *this;}
+    
+    w_widget::w_widget(){}
+#line 14 "pure2-types-value-types-via-meta-functions.cpp2"
+    p_widget::p_widget(cpp2::in<int> i)
+                                      : val{ i }
+#line 14 "pure2-types-value-types-via-meta-functions.cpp2"
+    {}
+#line 14 "pure2-types-value-types-via-meta-functions.cpp2"
+    auto p_widget::operator=(cpp2::in<int> i) -> p_widget& {
+                                      val = i;
+                                      return *this;
+#line 14 "pure2-types-value-types-via-meta-functions.cpp2"
+    }
+    
+    
+    p_widget::p_widget(p_widget const& that){}
+
+    auto p_widget::operator=(p_widget const& that) -> p_widget& {
+                                val = 0;
+                                return *this;}
+    
+    p_widget::p_widget(p_widget&& that){}
+    auto p_widget::operator=(p_widget&& that) -> p_widget& {
+                                val = 0;
+                                return *this;}
+    
+    p_widget::p_widget(){}
+#line 17 "pure2-types-value-types-via-meta-functions.cpp2"
+auto main() -> int{
+    test<widget>();
+    test<w_widget>();
+    test<p_widget>();
+}
+
+template<typename T> auto test() -> void{
+    //  should be default constructible
+    T a {}; 
+
+    //  widget should be comparable
+    T b {2}; 
+    if ((cpp2::cmp_less(std::move(a),std::move(b)))) {
+        std::cout << "less ";
+    }
+    else {
+        std::cout << "more ";
+    }
+}
+