Don't emit Cpp1 ref-qualifiers on virtual functions, closes #694

Author: hsutter

regression-tests/test-results/pure2-print.cpp

@@ -28,7 +28,7 @@ CPP2_REQUIRES_ (true)
      {
         protected: [[nodiscard]] static auto f() -> int;
 
-        public: [[nodiscard]] virtual auto g(cpp2::in<int> i) const& -> int;
+        public: [[nodiscard]] virtual auto g(cpp2::in<int> i) const -> int;
 
 
 #line 29 "pure2-print.cpp2"
@@ -96,7 +96,7 @@ requires (true)
 #line 10 "pure2-print.cpp2"
         [[nodiscard]] auto outer::mytype::f() -> int { return 42;  }
 
-        [[nodiscard]] auto outer::mytype::g(cpp2::in<int> i) const& -> int{
+        [[nodiscard]] auto outer::mytype::g(cpp2::in<int> i) const -> int{
             auto s {"string literal"}; 
             int ret {i}; 
             int const* const p {&ret}; 

regression-tests/test-results/pure2-types-down-upcast.cpp

@@ -18,7 +18,7 @@ class B;
 class A {
   public: int i {0}; 
 
- public: virtual auto const_foo() const& -> void;
+ public: virtual auto const_foo() const -> void;
  public: auto mut_foo() & -> void;
 
   public: A() = default;
@@ -65,7 +65,7 @@ auto test_down() -> void;
 
 
 #line 4 "pure2-types-down-upcast.cpp2"
- auto A::const_foo() const& -> void{std::cout << "const foo \n"; }
+ auto A::const_foo() const -> void{std::cout << "const foo \n"; }
  auto A::mut_foo() & -> void{std::cout << "foo \n"; }
 
 #line 13 "pure2-types-down-upcast.cpp2"

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,10 +61,10 @@ 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;
@@ -117,10 +117,10 @@ 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 { 

regression-tests/test-results/pure2-union.cpp

@@ -46,7 +46,7 @@ template<typename T> class name_or_other
 
 #line 12 "pure2-union.cpp2"
     public: [[nodiscard]] auto to_string() const& -> std::string;
-        
+
         private: std::aligned_storage_t<cpp2::max(sizeof(std::string), sizeof(T))> _storage {}; private: cpp2::i8 _discriminator {-1}; public: [[nodiscard]] auto is_name() const& -> bool;
 public: [[nodiscard]] auto name() const& -> std::string const&;
 public: [[nodiscard]] auto name() & -> std::string&;
@@ -63,15 +63,13 @@ public: ~name_or_other() noexcept;
     public: name_or_other() = default;
     public: name_or_other(name_or_other const&) = delete; /* No 'that' constructor, suppress copy */
     public: auto operator=(name_or_other const&) -> void = delete;
-
-
-#line 16 "pure2-union.cpp2"
+#line 17 "pure2-union.cpp2"
 };
 
 auto print_name(cpp2::in<name_or_number> non) -> void;
 
 
-#line 27 "pure2-union.cpp2"
+#line 28 "pure2-union.cpp2"
 auto main() -> int;
 
 
@@ -102,8 +100,9 @@ auto name_or_number::destroy() & -> void{
     name_or_number::~name_or_number() noexcept{destroy();}
 #line 12 "pure2-union.cpp2"
     template <typename T> [[nodiscard]] auto name_or_other<T>::to_string() const& -> std::string{
-        if (is_name()) {return name(); }
-        else         { return cpp2::as_<std::string>(other()); }
+        if (is_name())       { return name(); }
+        else {if (is_other()) {return cpp2::as_<std::string>(other()); }
+        else               { return "invalid value"; }}
     }
 
 
@@ -130,7 +129,7 @@ template <typename T> auto name_or_other<T>::destroy() & -> void{
 
     template <typename T> name_or_other<T>::~name_or_other() noexcept{destroy();}
 
-#line 18 "pure2-union.cpp2"
+#line 19 "pure2-union.cpp2"
 auto print_name(cpp2::in<name_or_number> non) -> void{
     if (CPP2_UFCS_0(is_name, non)) {
         std::cout << CPP2_UFCS_0(name, non) << "\n";

regression-tests/test-results/version

@@ -1,5 +1,5 @@
 
-cppfront compiler v0.2.1   Build 8927:1553
+cppfront compiler v0.2.1   Build 8928:1030
 Copyright(c) Herb Sutter   All rights reserved
 
 SPDX-License-Identifier: CC-BY-NC-ND-4.0

source/build.info

@@ -1 +1 @@
-"8927:1553"
+"8928:1030"

source/cppfront.cpp

@@ -5608,9 +5608,16 @@ class cppfront
 
                     switch (this_->pass) {
                     break;case passing_style::in:
-                        suffix1 += " const&";
+                        suffix1 += " const";
+                        //  Cpp1 ref-qualifiers don't belong on virtual functions
+                        if (!this_->is_polymorphic()) {
+                            suffix1 += "&";
+                        }
                     break;case passing_style::inout:
-                        suffix1 += " &";
+                        //  Cpp1 ref-qualifiers don't belong on virtual functions
+                        if (!this_->is_polymorphic()) {
+                            suffix1 += " &";
+                        }
                     break;case passing_style::out:
                         ; // constructor is handled below
                     break;case passing_style::move:

source/reflect.h

@@ -109,7 +109,7 @@ class compiler_services
     ) & -> std::unique_ptr<statement_node>;
 
 #line 118 "reflect.h2"
-    public: [[nodiscard]] virtual auto position() const& -> source_position;
+    public: [[nodiscard]] virtual auto position() const -> source_position;
 
 
 #line 124 "reflect.h2"
@@ -188,7 +188,7 @@ class declaration_base
     );
 
 #line 208 "reflect.h2"
-    public: [[nodiscard]] auto position() const& -> source_position override;
+    public: [[nodiscard]] auto position() const -> source_position override;
 
     public: [[nodiscard]] auto print() const& -> std::string;
 
@@ -838,7 +838,7 @@ auto newline_pos = CPP2_UFCS(find, source, '\n');
         ); 
     }
 
-    [[nodiscard]] auto compiler_services::position() const& -> source_position
+    [[nodiscard]] auto compiler_services::position() const -> source_position
 
     {
         return {  }; 
@@ -889,7 +889,7 @@ compiler_services::compiler_services(compiler_services const& that)
         cpp2::Default.expects(n, "a meta::declaration must point to a valid declaration_node, not null");
     }
 
-    [[nodiscard]] auto declaration_base::position() const& -> source_position { return CPP2_UFCS_0(position, (*cpp2::assert_not_null(n)));  }
+    [[nodiscard]] auto declaration_base::position() const -> source_position { return CPP2_UFCS_0(position, (*cpp2::assert_not_null(n)));  }
 
     [[nodiscard]] auto declaration_base::print() const& -> std::string { return CPP2_UFCS(pretty_print_visualize, (*cpp2::assert_not_null(n)), 0);  }