Emit this functions with ref-qualifiers per #653, closes #651, closes #653

Author: hsutter

regression-tests/pure2-types-basics.cpp2

@@ -35,6 +35,10 @@ myclass : type = {
         std::cout << "    data: (data)$, more: (more)$\n";
     }
 
+    print: (move this) = {
+        std::cout << "    (move print) data: (data)$, more: (more)$\n";
+    }
+
     operator=: (move this) = {
         std::cout << "myclass: destructor\n";
     }

regression-tests/test-results/pure2-bugfix-for-discard-precedence.cpp

@@ -19,7 +19,7 @@ class quantity {
 
 #line 3 "pure2-bugfix-for-discard-precedence.cpp2"
   public: auto operator=(cpp2::in<cpp2::i32> x) -> quantity& ;
-  public: [[nodiscard]] auto operator+(quantity const& that) -> quantity;
+  public: [[nodiscard]] auto operator+(quantity const& that) & -> quantity;
 
   public: quantity(quantity const&) = delete; /* No 'that' constructor, suppress copy */
   public: auto operator=(quantity const&) -> void = delete;
@@ -43,7 +43,7 @@ auto main(int const argc_, char** argv_) -> int;
                                   return *this;
 #line 3 "pure2-bugfix-for-discard-precedence.cpp2"
                                  }
-  [[nodiscard]] auto quantity::operator+(quantity const& that) -> quantity { return quantity(number + that.number);  }
+  [[nodiscard]] auto quantity::operator+(quantity const& that) & -> quantity { return quantity(number + that.number);  }
 
 #line 7 "pure2-bugfix-for-discard-precedence.cpp2"
 auto main(int const argc_, char** argv_) -> int{

regression-tests/test-results/pure2-defaulted-comparisons-and-final-types.cpp

@@ -23,9 +23,9 @@ class widget final
 #line 6 "pure2-defaulted-comparisons-and-final-types.cpp2"
     public: auto operator=(cpp2::in<int> value) -> widget& ;
 
-    public: [[nodiscard]] auto operator==(widget const& that) const -> bool = default;
+    public: [[nodiscard]] auto operator==(widget const& that) const& -> bool = default;
 
-    public: [[nodiscard]] auto operator<=>(widget const& that) const -> std::strong_ordering = default;
+    public: [[nodiscard]] auto operator<=>(widget const& that) const& -> std::strong_ordering = default;
 
     public: widget(widget const&) = delete; /* No 'that' constructor, suppress copy */
     public: auto operator=(widget const&) -> void = delete;

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

@@ -12,7 +12,7 @@ namespace N {
 
 class myclass;
 
-#line 60 "pure2-types-basics.cpp2"
+#line 64 "pure2-types-basics.cpp2"
 }
 
 
@@ -46,18 +46,22 @@ class myclass {
 
 
 #line 34 "pure2-types-basics.cpp2"
-    public: auto print() const -> void;
+    public: auto print() const& -> void;
 
 
 #line 38 "pure2-types-basics.cpp2"
-    public: ~myclass() noexcept;
+    public: auto print() && -> void;
 
 
 #line 42 "pure2-types-basics.cpp2"
-    public: auto f(cpp2::in<int> x) const -> void;
+    public: ~myclass() noexcept;
 
 
 #line 46 "pure2-types-basics.cpp2"
+    public: auto f(cpp2::in<int> x) const& -> void;
+        
+
+#line 50 "pure2-types-basics.cpp2"
     private: int data {42 * 12}; 
     private: std::string more {std::to_string(42 * 12)}; 
 
@@ -68,7 +72,7 @@ class myclass {
         public: nested(nested const&) = delete; /* No 'that' constructor, suppress copy */
         public: auto operator=(nested const&) -> void = delete;
 
-#line 51 "pure2-types-basics.cpp2"
+#line 55 "pure2-types-basics.cpp2"
     };
 
     public: template<typename T, typename U> [[nodiscard]] static auto f1(T const& t, U const& u) -> auto;
@@ -78,7 +82,7 @@ class myclass {
 
     public: myclass(myclass const&) = delete; /* No 'that' constructor, suppress copy */
     public: auto operator=(myclass const&) -> void = delete;
-#line 58 "pure2-types-basics.cpp2"
+#line 62 "pure2-types-basics.cpp2"
 };
 
 }
@@ -157,28 +161,32 @@ namespace N {
         print();
     }
 
-    auto myclass::print() const -> void{
+    auto myclass::print() const& -> void{
         std::cout << "    data: " + cpp2::to_string(data) + ", more: " + cpp2::to_string(more) + "\n";
     }
 
+    auto myclass::print() && -> void{
+        std::cout << "    (move print) data: " + cpp2::to_string(data) + ", more: " + cpp2::to_string(more) + "\n";
+    }
+
     myclass::~myclass() noexcept{
         std::cout << "myclass: destructor\n";
     }
 
-    auto myclass::f(cpp2::in<int> x) const -> void{
+    auto myclass::f(cpp2::in<int> x) const& -> void{
         std::cout << "N::myclass::f with " + cpp2::to_string(x) + "\n";
     }
 
-#line 50 "pure2-types-basics.cpp2"
+#line 54 "pure2-types-basics.cpp2"
         auto myclass::nested::g() -> void { std::cout << "N::myclass::nested::g\n";  }
 
-#line 53 "pure2-types-basics.cpp2"
+#line 57 "pure2-types-basics.cpp2"
     template<typename T, typename U> [[nodiscard]] auto myclass::f1(T const& t, U const& u) -> auto { return t + u; }
     template<typename T, typename U> [[nodiscard]] auto myclass::f2(T const& t, U const& u) -> auto { return t + u;  }
     template<auto T, auto U> [[nodiscard]] auto myclass::f3() -> auto { return T + U; }
     template<cpp2::i8 T, cpp2::i16 U> [[nodiscard]] auto myclass::f4() -> auto { return T + U; }
 
-#line 60 "pure2-types-basics.cpp2"
+#line 64 "pure2-types-basics.cpp2"
 }
 
 auto main() -> int{

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

@@ -27,7 +27,7 @@ class Cyborg;
 
 #line 2 "pure2-types-inheritance.cpp2"
 class Human {
-    public: virtual auto speak() const -> void = 0;
+    public: virtual auto speak() const& -> void = 0;
 
 public: virtual ~Human() noexcept;
 
@@ -40,7 +40,7 @@ public: virtual ~Human() noexcept;
 namespace N {
     template<int I> class Machine {
         public: explicit Machine([[maybe_unused]] cpp2::in<std::string> param2);
-        public: virtual auto work() const -> void = 0;
+        public: virtual auto work() const& -> void = 0;
 
     public: virtual ~Machine() noexcept;
 
@@ -61,13 +61,13 @@ class Cyborg: public Cyborg_name_as_base, public Human, public Cyborg_address_as
 
 
 #line 25 "pure2-types-inheritance.cpp2"
-    public: auto speak() const -> void override;
+    public: auto speak() const& -> void override;
 
 
-    public: auto work() const -> void override;
+    public: auto work() const& -> void override;
 
 
-    public: auto print() const -> void;
+    public: auto print() const& -> void;
 
 
     public: ~Cyborg() noexcept;
@@ -117,13 +117,13 @@ namespace N {
         std::cout << cpp2::to_string(name) + " checks in for the day's shift\n";
     }
 
-    auto Cyborg::speak() const -> void { 
+    auto Cyborg::speak() const& -> void { 
         std::cout << cpp2::to_string(name) + " cracks a few jokes with a coworker\n";  }
 
-    auto Cyborg::work() const -> void { 
+    auto Cyborg::work() const& -> void { 
         std::cout << cpp2::to_string(name) + " carries some half-tonne crates of Fe2O3 to cold storage\n";  }
 
-    auto Cyborg::print() const -> void { 
+    auto Cyborg::print() const& -> void { 
         std::cout << "printing: " + cpp2::to_string(name) + " lives at " + cpp2::to_string(address) + "\n";  }
 
     Cyborg::~Cyborg() noexcept { 

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

@@ -51,7 +51,7 @@ class X {
 
 #line 34 "pure2-types-order-independence-and-nesting.cpp2"
     //  X::exx member function description here
-    public: auto exx(cpp2::in<int> count) const -> void;
+    public: auto exx(cpp2::in<int> count) const& -> void;
 
     public: X(X const&) = delete; /* No 'that' constructor, suppress copy */
     public: auto operator=(X const&) -> void = delete;
@@ -69,7 +69,7 @@ class Y {
 #line 49 "pure2-types-order-independence-and-nesting.cpp2"
     public: auto operator=(X* x) -> Y& ;
 
-    public: auto why(cpp2::in<int> count) const -> void;
+    public: auto why(cpp2::in<int> count) const& -> void;
 
     public: Y(Y const&) = delete; /* No 'that' constructor, suppress copy */
     public: auto operator=(Y const&) -> void = delete;
@@ -151,7 +151,7 @@ namespace N {
     }
 
 #line 35 "pure2-types-order-independence-and-nesting.cpp2"
-    auto X::exx(cpp2::in<int> count) const -> void{
+    auto X::exx(cpp2::in<int> count) const& -> void{
         //  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)) {
@@ -171,7 +171,7 @@ namespace N {
 #line 49 "pure2-types-order-independence-and-nesting.cpp2"
      }
 
-    auto Y::why(cpp2::in<int> count) const -> void { 
+    auto Y::why(cpp2::in<int> count) const& -> void { 
         CPP2_UFCS(exx, (*cpp2::assert_not_null(px)), count + 1);  }// use X object from Y
 
 #line 55 "pure2-types-order-independence-and-nesting.cpp2"

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

@@ -33,7 +33,7 @@ class my_integer {
 #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: [[nodiscard]] auto operator<=>(my_integer const& that) const& -> std::strong_ordering = default;
 
     public: my_integer(my_integer const&) = delete; /* No 'that' constructor, suppress copy */
     public: auto operator=(my_integer const&) -> void = delete;
@@ -46,7 +46,7 @@ class case_insensitive_string {
 #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: [[nodiscard]] auto operator<=>(case_insensitive_string const& that) const& -> std::weak_ordering = default;
 
     public: case_insensitive_string(case_insensitive_string const&) = delete; /* No 'that' constructor, suppress copy */
     public: auto operator=(case_insensitive_string const&) -> void = delete;
@@ -59,7 +59,7 @@ class person_in_family_tree {
 #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: [[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; /* No 'that' constructor, suppress copy */
     public: auto operator=(person_in_family_tree const&) -> void = delete;

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

@@ -47,7 +47,7 @@ class myclass {
 
         cpp2::in<std::string_view> prefix, 
         cpp2::in<std::string_view> suffix
-        ) const -> void;
+        ) const& -> void;
 
 #line 37 "pure2-types-smf-and-that-1-provide-everything.cpp2"
 };
@@ -118,7 +118,7 @@ auto main() -> int;
 
         cpp2::in<std::string_view> prefix, 
         cpp2::in<std::string_view> suffix
-        ) const -> void { 
+        ) const& -> void { 
     std::cout << prefix << "[ " + cpp2::to_string(name) + " | " + cpp2::to_string(addr) + " ]" << suffix;  }
 
 #line 39 "pure2-types-smf-and-that-1-provide-everything.cpp2"

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

@@ -50,7 +50,7 @@ class myclass {
 
         cpp2::in<std::string_view> prefix, 
         cpp2::in<std::string_view> suffix
-        ) const -> void;
+        ) const& -> void;
 
 #line 37 "pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp2"
 };
@@ -123,7 +123,7 @@ auto main() -> int;
 
         cpp2::in<std::string_view> prefix, 
         cpp2::in<std::string_view> suffix
-        ) const -> void { 
+        ) const& -> void { 
     std::cout << prefix << "[ " + cpp2::to_string(name) + " | " + cpp2::to_string(addr) + " ]" << suffix;  }
 
 #line 39 "pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp2"

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

@@ -51,7 +51,7 @@ class myclass {
 
         cpp2::in<std::string_view> prefix, 
         cpp2::in<std::string_view> suffix
-        ) const -> void;
+        ) const& -> void;
 
 #line 37 "pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp2"
 };
@@ -122,7 +122,7 @@ auto main() -> int;
 
         cpp2::in<std::string_view> prefix, 
         cpp2::in<std::string_view> suffix
-        ) const -> void { 
+        ) const& -> void { 
     std::cout << prefix << "[ " + cpp2::to_string(name) + " | " + cpp2::to_string(addr) + " ]" << suffix;  }
 
 #line 39 "pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp2"