Add the member's name as a String literal parameter to store_as_base, closes #334

hsutter · hsutter · commit fe132076edd6 · 2023-04-08T13:52:43.000-07:00
Disambiguates two such members having the same type

Move the existing `String` wrapper into `cpp2util.h` where it can be used outside the compiler too, in this case by `store_as_base`
diff --git a/include/cpp2util.h b/include/cpp2util.h
@@ -269,6 +269,27 @@ using __schar   = signed char;      // normally use i8 instead
 using __uchar   = unsigned char;    // normally use u8 instead
 
 
+//-----------------------------------------------------------------------
+//
+//  String: A helper workaround for passing a string literal as a
+//  template argument
+//
+//-----------------------------------------------------------------------
+//
+template<size_t N>
+struct String
+{
+    constexpr String(const char (&str)[N])
+    {
+        std::copy_n(str, N, value);
+    }
+
+    auto operator<=>(String const&) const = default;
+
+    char value[N] = {};
+};
+
+
 //-----------------------------------------------------------------------
 //
 //  contract_group
@@ -619,7 +640,7 @@ class out {
 };
 
 
-template<typename T>
+template<String Name, typename T>
 struct store_as_base : private T
 {
     store_as_base( T const& t    ) : T{t}                  { }
diff --git a/regression-tests/pure2-types-inheritance.cpp2 b/regression-tests/pure2-types-inheritance.cpp2
@@ -12,9 +12,10 @@ N: namespace = {
 }
 
 Cyborg: type = {
-    name: std::string;
-    this: Human = ();
-    this: N::Machine;
+    name:    std::string;
+    this:    Human = ();
+    address: std::string = "123 Main St.";
+    this:    N::Machine;
 
     operator=: (out this, n: std::string) = {
         name = n;
@@ -28,6 +29,9 @@ Cyborg: type = {
     work: (override this) =
         std::cout << "(name)$ carries some half-tonne crates of Fe2O3 to cold storage\n";
 
+    print: (this) =
+        std::cout << "printing: (name)$ lives at (address)$\n";
+
     operator=: (move this) =
         std::cout << "Tired but satisfied after another successful day, (name)$ checks out and goes home to their family\n";
 }
@@ -44,6 +48,7 @@ do_work: ( m: N::Machine ) = {
 
 main: () = {
     c: Cyborg = "Parsnip";
+    c.print();
     c.make_speak();
     c.do_work();
 }
diff --git a/regression-tests/test-results/clang-12/pure2-types-inheritance.cpp.execution b/regression-tests/test-results/clang-12/pure2-types-inheritance.cpp.execution
@@ -1,4 +1,5 @@
 Parsnip checks in for the day's shift
+printing: Parsnip lives at 123 Main St.
 -> [vcall: make_speak] Parsnip cracks a few jokes with a coworker
 -> [vcall: do_work] Parsnip carries some half-tonne crates of Fe2O3 to cold storage
 Tired but satisfied after another successful day, Parsnip checks out and goes home to their family
diff --git a/regression-tests/test-results/gcc-10/pure2-types-inheritance.cpp.execution b/regression-tests/test-results/gcc-10/pure2-types-inheritance.cpp.execution
@@ -1,4 +1,5 @@
 Parsnip checks in for the day's shift
+printing: Parsnip lives at 123 Main St.
 -> [vcall: make_speak] Parsnip cracks a few jokes with a coworker
 -> [vcall: do_work] Parsnip carries some half-tonne crates of Fe2O3 to cold storage
 Tired but satisfied after another successful day, Parsnip checks out and goes home to their family
diff --git a/regression-tests/test-results/msvc-2022/pure2-types-inheritance.cpp.execution b/regression-tests/test-results/msvc-2022/pure2-types-inheritance.cpp.execution
@@ -1,4 +1,5 @@
 Parsnip checks in for the day's shift
+printing: Parsnip lives at 123 Main St.
 -> [vcall: make_speak] Parsnip cracks a few jokes with a coworker
 -> [vcall: do_work] Parsnip carries some half-tonne crates of Fe2O3 to cold storage
 Tired but satisfied after another successful day, Parsnip checks out and goes home to their family
diff --git a/regression-tests/test-results/pure2-types-inheritance.cpp b/regression-tests/test-results/pure2-types-inheritance.cpp
@@ -35,28 +35,31 @@ namespace N {
     };
 }
 
-class Cyborg: private cpp2::store_as_base<std::string>, public Human, public N::Machine {
+class Cyborg: private cpp2::store_as_base<"name",std::string>, public Human, private cpp2::store_as_base<"address",std::string>, public N::Machine {
 
-#line 19 "pure2-types-inheritance.cpp2"
+#line 20 "pure2-types-inheritance.cpp2"
     public: explicit Cyborg(cpp2::in<std::string> n);
 
-#line 25 "pure2-types-inheritance.cpp2"
+#line 26 "pure2-types-inheritance.cpp2"
     public: auto speak() const -> void override;
 
-#line 28 "pure2-types-inheritance.cpp2"
+#line 29 "pure2-types-inheritance.cpp2"
     public: auto work() const -> void override;
 
-#line 31 "pure2-types-inheritance.cpp2"
+#line 32 "pure2-types-inheritance.cpp2"
+    public: auto print() const -> void;
+
+#line 35 "pure2-types-inheritance.cpp2"
     public: ~Cyborg();
 
 };
 
 auto make_speak(cpp2::in<Human> h) -> void;
 
-#line 40 "pure2-types-inheritance.cpp2"
+#line 44 "pure2-types-inheritance.cpp2"
 auto do_work(cpp2::in<N::Machine> m) -> void;
 
-#line 45 "pure2-types-inheritance.cpp2"
+#line 49 "pure2-types-inheritance.cpp2"
 auto main() -> int;
 
 //=== Cpp2 function definitions =================================================
@@ -74,28 +77,32 @@ namespace N {
 
 }
 
-#line 19 "pure2-types-inheritance.cpp2"
+#line 20 "pure2-types-inheritance.cpp2"
     Cyborg::Cyborg(cpp2::in<std::string> n)
-        : cpp2::store_as_base<std::string>{ n }
+        : cpp2::store_as_base<"name",std::string>{ n }
         , Human{  }
+        , cpp2::store_as_base<"address",std::string>{ "123 Main St." }
         , N::Machine{ "Acme Corp. engineer tech" }
-#line 19 "pure2-types-inheritance.cpp2"
+#line 20 "pure2-types-inheritance.cpp2"
     {
 
-#line 22 "pure2-types-inheritance.cpp2"
-        std::cout << cpp2::to_string(cpp2::store_as_base<std::string>::value__()) + " checks in for the day's shift\n";
+#line 23 "pure2-types-inheritance.cpp2"
+        std::cout << cpp2::to_string(cpp2::store_as_base<"name",std::string>::value__()) + " checks in for the day's shift\n";
     }
 
     auto Cyborg::speak() const -> void { 
-        std::cout << cpp2::to_string(cpp2::store_as_base<std::string>::value__()) + " cracks a few jokes with a coworker\n";  }
+        std::cout << cpp2::to_string(cpp2::store_as_base<"name",std::string>::value__()) + " cracks a few jokes with a coworker\n";  }
 
     auto Cyborg::work() const -> void { 
-        std::cout << cpp2::to_string(cpp2::store_as_base<std::string>::value__()) + " carries some half-tonne crates of Fe2O3 to cold storage\n";  }
+        std::cout << cpp2::to_string(cpp2::store_as_base<"name",std::string>::value__()) + " carries some half-tonne crates of Fe2O3 to cold storage\n";  }
+
+    auto Cyborg::print() const -> void { 
+        std::cout << "printing: " + cpp2::to_string(cpp2::store_as_base<"name",std::string>::value__()) + " lives at " + cpp2::to_string(cpp2::store_as_base<"address",std::string>::value__()) + "\n";  }
 
     Cyborg::~Cyborg() { 
-        std::cout << "Tired but satisfied after another successful day, " + cpp2::to_string(cpp2::store_as_base<std::string>::value__()) + " checks out and goes home to their family\n";  }
+        std::cout << "Tired but satisfied after another successful day, " + cpp2::to_string(cpp2::store_as_base<"name",std::string>::value__()) + " checks out and goes home to their family\n";  }
 
-#line 35 "pure2-types-inheritance.cpp2"
+#line 39 "pure2-types-inheritance.cpp2"
 auto make_speak(cpp2::in<Human> h) -> void{
     std::cout << "-> [vcall: make_speak] ";
     CPP2_UFCS_0(speak, h);
@@ -108,6 +115,7 @@ auto do_work(cpp2::in<N::Machine> m) -> void{
 
 auto main() -> int{
     Cyborg c {"Parsnip"}; 
+    CPP2_UFCS_0(print, c);
     CPP2_UFCS_0(make_speak, c);
     CPP2_UFCS_0(do_work, std::move(c));
 }
diff --git a/source/common.h b/source/common.h
@@ -380,6 +380,7 @@ auto starts_with_identifier(std::string_view s)
     return 0;
 };
 
+
 //  Helper to allow one of the above or a digit separator
 //  Example:    is_separator_or( is_binary_digit (c) )
 //
@@ -393,27 +394,6 @@ auto is_separator_or(auto pred, char c)
 }
 
 
-//-----------------------------------------------------------------------
-//
-//  String: A helper workaround for passing a string literal as a
-//  template argument
-//
-//-----------------------------------------------------------------------
-//
-template<size_t N>
-struct String
-{
-    constexpr String(const char (&str)[N])
-    {
-        std::copy_n(str, N, value);
-    }
-
-    auto operator<=>(String const&) const = default;
-
-    char value[N] = {};
-};
-
-
 //  Bool to string
 //
 template<typename T>
@@ -426,6 +406,7 @@ auto __as(bool b)
 
 
 //  Explicit cast
+//
 template<typename T>
 auto __as(auto x)
     -> T
diff --git a/source/cppfront.cpp b/source/cppfront.cpp
@@ -1461,7 +1461,8 @@ class cppfront
             assert(decl && decl->is_object());
             auto type = decl->get_object_type();
             assert(type);
-            printer.print_cpp2("cpp2::store_as_base<", pos);
+            assert(decl->name());
+            printer.print_cpp2("cpp2::store_as_base<\"" + decl->name()->to_string(true) + "\",", pos);
             emit(*type);
             printer.print_cpp2(">::value__()", pos);
         }
@@ -4355,9 +4356,12 @@ class cppfront
                 //  (a) ... if this is assignment, emit it in all cases
                 if (is_assignment)
                 {
+                    assert ((*object)->name());
                     if (is_object_before_base) {
                         object_name =
-                            "cpp2::store_as_base<"
+                            "cpp2::store_as_base<\""
+                            + (*object)->name()->to_string(true)
+                            + "\","
                             + print_to_string(*(*object)->get_object_type())
                             + ">::value__()";
                     }
@@ -4403,7 +4407,9 @@ class cppfront
                 {
                     if (is_object_before_base) {
                         object_name =
-                            "cpp2::store_as_base<"
+                            "cpp2::store_as_base<\""
+                            + (*object)->name()->to_string(true)
+                            + "\","
                             + print_to_string(*(*object)->get_object_type())
                             + ">";
                     }
@@ -4469,7 +4475,9 @@ class cppfront
 
                     if (is_object_before_base) {
                         object_name =
-                            "cpp2::store_as_base<"
+                            "cpp2::store_as_base<\""
+                            + (*object)->name()->to_string(true)
+                            + "\","
                             + print_to_string(*(*object)->get_object_type())
                             + ">::value__()";
                     }
@@ -4485,7 +4493,9 @@ class cppfront
                         if (is_object_before_base)
                         {
                             object_name =
-                                "cpp2::store_as_base<"
+                                "cpp2::store_as_base<\""
+                                + (*object)->name()->to_string(true)
+                                + "\","
                                 + print_to_string(*(*object)->get_object_type())
                                 + ">::value__()";
                         }
@@ -4501,7 +4511,9 @@ class cppfront
                     else if (is_object_before_base)
                     {
                         object_name =
-                            "cpp2::store_as_base<"
+                            "cpp2::store_as_base<\""
+                            + (*object)->name()->to_string(true)
+                            + "\","
                             + print_to_string(*(*object)->get_object_type())
                             + ">";
 
@@ -4858,7 +4870,9 @@ class cppfront
                     else {
                         if (printer.get_phase() == printer.phase1_type_defs_func_decls) {
                             printer.print_cpp2(
-                                separator + " private cpp2::store_as_base<"
+                                separator + " private cpp2::store_as_base<\""
+                                    + decl->name()->to_string(true)
+                                    + "\","
                                     + print_to_string(*decl->get_object_type()) + ">",
                                 compound_stmt->position()
                             );
