Give @union accessor function the nice name

hsutter · hsutter · commit f4a2ddbf85b3 · 2023-09-25T15:15:34.000-07:00
And fix `@union` alignment
diff --git a/include/cpp2util.h b/include/cpp2util.h
@@ -569,7 +569,7 @@ using in =
 //
 template<typename T>
 class deferred_init {
-    alignas(T) std::byte data[sizeof(T)]; // or: std::aligned_storage_t<sizeof(T), alignof(T)> data
+    alignas(T) std::byte data[sizeof(T)];
     bool init = false;
 
     auto t() -> T& { return *std::launder(reinterpret_cast<T*>(&data)); }
diff --git a/regression-tests/pure2-enum.cpp2 b/regression-tests/pure2-enum.cpp2
@@ -8,18 +8,13 @@ skat_game: @enum type = {
     null     := 23;
 }
 
-duality: @enum type = {
-    first;
-    second;
-
-    flip: (inout this, val: duality) = {
-        if val == first {
-            value__ = second.value__;
-        }
-        else {
-            [[assert: value__ == second.value__]]
-            value__ = first.value__;
-        }
+janus: @enum type = {
+    past;
+    future;
+
+    flip: (inout this) = {
+        if this == past { this = future; }
+        else { this = past; }
     }
 }
 
@@ -31,10 +26,9 @@ file_attributes: @flag_enum<u8> type = {
 }
 
 main: () = {
-    janus := duality::second;
-    std::cout << "janus is initially (janus.to_string())$\n";
-    janus.flip( janus );
-    std::cout << "janus is flipped to (janus.to_string())$\n";
+    j := janus::past;
+    j.flip();
+    _ = j;
 
     // x : skat_game = 9;               // error, can't construct skat_game from integer
 
diff --git a/regression-tests/pure2-union.cpp2 b/regression-tests/pure2-union.cpp2
@@ -6,7 +6,7 @@ name_or_number: @union type = {
 
 print_name: (non: name_or_number) = {
     if non.is_name() {
-        std::cout << non.get_name() << "\n";
+        std::cout << non.name() << "\n";
     }
     else {
         std::cout << "(not a name)\n";
diff --git a/regression-tests/test-results/clang-12/pure2-enum.cpp.execution b/regression-tests/test-results/clang-12/pure2-enum.cpp.execution
@@ -1,5 +1,3 @@
-janus is initially second
-janus is flipped to first
 x.to_string() is clubs
 x2.to_string() is clubs
 using << prints clubs
diff --git a/regression-tests/test-results/clang-12/pure2-union.cpp.execution b/regression-tests/test-results/clang-12/pure2-union.cpp.execution
@@ -1,3 +1,3 @@
-sizeof(x) is 33
+sizeof(x) is 48
 (not a name)
 xyz
diff --git a/regression-tests/test-results/gcc-10/pure2-enum.cpp.execution b/regression-tests/test-results/gcc-10/pure2-enum.cpp.execution
@@ -1,5 +1,3 @@
-janus is initially second
-janus is flipped to first
 x.to_string() is clubs
 x2.to_string() is clubs
 using << prints clubs
diff --git a/regression-tests/test-results/gcc-10/pure2-union.cpp.execution b/regression-tests/test-results/gcc-10/pure2-union.cpp.execution
@@ -1,3 +1,3 @@
-sizeof(x) is 33
+sizeof(x) is 48
 (not a name)
 xyz
diff --git a/regression-tests/test-results/gcc-13/pure2-enum.cpp.execution b/regression-tests/test-results/gcc-13/pure2-enum.cpp.execution
@@ -1,5 +1,3 @@
-janus is initially second
-janus is flipped to first
 x.to_string() is clubs
 x2.to_string() is clubs
 using << prints clubs
diff --git a/regression-tests/test-results/gcc-13/pure2-union.cpp.execution b/regression-tests/test-results/gcc-13/pure2-union.cpp.execution
@@ -1,3 +1,3 @@
-sizeof(x) is 33
+sizeof(x) is 48
 (not a name)
 xyz
diff --git a/regression-tests/test-results/msvc-2022/pure2-enum.cpp.execution b/regression-tests/test-results/msvc-2022/pure2-enum.cpp.execution
@@ -1,5 +1,3 @@
-janus is initially second
-janus is flipped to first
 x.to_string() is clubs
 x2.to_string() is clubs
 using << prints clubs
diff --git a/regression-tests/test-results/msvc-2022/pure2-union.cpp.execution b/regression-tests/test-results/msvc-2022/pure2-union.cpp.execution
@@ -1,3 +1,3 @@
-sizeof(x) is 25
+sizeof(x) is 32
 (not a name)
 xyz
diff --git a/regression-tests/test-results/pure2-enum.cpp b/regression-tests/test-results/pure2-enum.cpp
@@ -12,10 +12,10 @@ class skat_game;
     
 
 #line 11 "pure2-enum.cpp2"
-class duality;
+class janus;
     
 
-#line 26 "pure2-enum.cpp2"
+#line 21 "pure2-enum.cpp2"
 class file_attributes;
     
 
@@ -24,7 +24,7 @@ class file_attributes;
 
 #line 2 "pure2-enum.cpp2"
 class skat_game {
-private: cpp2::i8 value__; private: constexpr skat_game(auto const& val);
+private: cpp2::i8 _value; private: constexpr skat_game(auto const& val);
 
 private: constexpr auto operator=(auto const& val) -> skat_game& ;
 public: [[nodiscard]] constexpr auto get_raw_value() const& -> cpp2::i8;
@@ -50,30 +50,30 @@ public: friend auto operator<<(std::ostream& o, cpp2::in<skat_game> val) -> std:
 #line 9 "pure2-enum.cpp2"
 };
 
-class duality {
+class janus {
 
 #line 15 "pure2-enum.cpp2"
-    public: auto flip(cpp2::in<duality> val) & -> void;
+    public: auto flip() & -> void;
         
-        private: cpp2::i8 value__; private: constexpr duality(auto const& val);
+        private: cpp2::i8 _value; private: constexpr janus(auto const& val);
 
-private: constexpr auto operator=(auto const& val) -> duality& ;
+private: constexpr auto operator=(auto const& val) -> janus& ;
 public: [[nodiscard]] constexpr auto get_raw_value() const& -> cpp2::i8;
-public: constexpr duality(duality const& that);
-public: constexpr auto operator=(duality const& that) -> duality& ;
-public: constexpr duality(duality&& that) noexcept;
-public: constexpr auto operator=(duality&& that) noexcept -> duality& ;
-public: [[nodiscard]] auto operator<=>(duality const& that) const& -> std::strong_ordering = default;
-public: static const duality first;
-public: static const duality second;
+public: constexpr janus(janus const& that);
+public: constexpr auto operator=(janus const& that) -> janus& ;
+public: constexpr janus(janus&& that) noexcept;
+public: constexpr auto operator=(janus&& that) noexcept -> janus& ;
+public: [[nodiscard]] auto operator<=>(janus const& that) const& -> std::strong_ordering = default;
+public: static const janus past;
+public: static const janus future;
 public: [[nodiscard]] auto to_string() const& -> std::string;
-public: friend auto operator<<(std::ostream& o, cpp2::in<duality> val) -> std::ostream&;
+public: friend auto operator<<(std::ostream& o, cpp2::in<janus> val) -> std::ostream&;
 
-#line 24 "pure2-enum.cpp2"
+#line 19 "pure2-enum.cpp2"
 };
 
 class file_attributes {
-private: cpp2::u8 value__; private: constexpr file_attributes(auto const& val);
+private: cpp2::u8 _value; private: constexpr file_attributes(auto const& val);
 
 private: constexpr auto operator=(auto const& val) -> file_attributes& ;
 public: [[nodiscard]] constexpr auto get_raw_value() const& -> cpp2::u8;
@@ -99,12 +99,12 @@ public: static const file_attributes none;
 public: [[nodiscard]] auto to_string() const& -> std::string;
 public: friend auto operator<<(std::ostream& o, cpp2::in<file_attributes> val) -> std::ostream&;
 
-#line 27 "pure2-enum.cpp2"
+#line 22 "pure2-enum.cpp2"
                 // 1
                 // 2
                 // 4
 
-#line 31 "pure2-enum.cpp2"
+#line 26 "pure2-enum.cpp2"
 };
 
 auto main() -> int;
@@ -115,20 +115,20 @@ auto main() -> int;
 
 
     constexpr skat_game::skat_game(auto const& val)
-                                                    : value__{ cpp2::unsafe_narrow<cpp2::i8>(val) } {  }
+                                                    : _value{ cpp2::unsafe_narrow<cpp2::i8>(val) } {  }
 constexpr auto skat_game::operator=(auto const& val) -> skat_game&  { 
-                                                    value__ = cpp2::unsafe_narrow<cpp2::i8>(val);
+                                                    _value = cpp2::unsafe_narrow<cpp2::i8>(val);
                                                     return *this; }
-[[nodiscard]] constexpr auto skat_game::get_raw_value() const& -> cpp2::i8 { return value__; }
+[[nodiscard]] constexpr auto skat_game::get_raw_value() const& -> cpp2::i8 { return _value; }
 constexpr skat_game::skat_game(skat_game const& that)
-                                              : value__{ that.value__ }{}
+                                              : _value{ that._value }{}
 constexpr auto skat_game::operator=(skat_game const& that) -> skat_game& {
-                                              value__ = that.value__;
+                                              _value = that._value;
                                               return *this;}
 constexpr skat_game::skat_game(skat_game&& that) noexcept
-                                              : value__{ std::move(that).value__ }{}
+                                              : _value{ std::move(that)._value }{}
 constexpr auto skat_game::operator=(skat_game&& that) noexcept -> skat_game& {
-                                              value__ = std::move(that).value__;
+                                              _value = std::move(that)._value;
                                               return *this;}
 inline constexpr skat_game skat_game::diamonds = 9;
 
@@ -154,70 +154,65 @@ inline constexpr skat_game skat_game::null = 23;
 
     auto operator<<(std::ostream& o, cpp2::in<skat_game> val) -> std::ostream&{o << CPP2_UFCS_0(to_string, val);return o; }
 #line 15 "pure2-enum.cpp2"
-    auto duality::flip(cpp2::in<duality> val) & -> void{
-        if (val == first) {
-            value__ = second.value__;
-        }
-        else {
-            cpp2::Default.expects(value__ == second.value__, "");
-            value__ = first.value__;
-        }
+    auto janus::flip() & -> void{
+        if ((*this) == past) {(*this) = future; }
+        else {(*this) = past; }
     }
 
 
-    constexpr duality::duality(auto const& val)
-                                                    : value__{ cpp2::unsafe_narrow<cpp2::i8>(val) } {  }
+    constexpr janus::janus(auto const& val)
+                                                    : _value{ cpp2::unsafe_narrow<cpp2::i8>(val) } {  }
 
-constexpr auto duality::operator=(auto const& val) -> duality&  { 
-                                                    value__ = cpp2::unsafe_narrow<cpp2::i8>(val);
+constexpr auto janus::operator=(auto const& val) -> janus&  { 
+                                                    _value = cpp2::unsafe_narrow<cpp2::i8>(val);
                                                     return *this; }
-[[nodiscard]] constexpr auto duality::get_raw_value() const& -> cpp2::i8 { return value__; }
-constexpr duality::duality(duality const& that)
-                                              : value__{ that.value__ }{}
-constexpr auto duality::operator=(duality const& that) -> duality& {
-                                              value__ = that.value__;
+[[nodiscard]] constexpr auto janus::get_raw_value() const& -> cpp2::i8 { return _value; }
+constexpr janus::janus(janus const& that)
+                                              : _value{ that._value }{}
+constexpr auto janus::operator=(janus const& that) -> janus& {
+                                              _value = that._value;
                                               return *this;}
-constexpr duality::duality(duality&& that) noexcept
-                                              : value__{ std::move(that).value__ }{}
-constexpr auto duality::operator=(duality&& that) noexcept -> duality& {
-                                              value__ = std::move(that).value__;
+constexpr janus::janus(janus&& that) noexcept
+                                              : _value{ std::move(that)._value }{}
+constexpr auto janus::operator=(janus&& that) noexcept -> janus& {
+                                              _value = std::move(that)._value;
                                               return *this;}
-inline constexpr duality duality::first = 0;
+inline constexpr janus janus::past = 0;
 
-inline constexpr duality duality::second = 1;
+inline constexpr janus janus::future = 1;
 
-[[nodiscard]] auto duality::to_string() const& -> std::string{
-    if ((*this) == first) {return "first"; }
-    if ((*this) == second) {return "second"; }
-    return "invalid duality value"; 
+[[nodiscard]] auto janus::to_string() const& -> std::string{
+    if ((*this) == past) {return "past"; }
+    if ((*this) == future) {return "future"; }
+    return "invalid janus value"; 
     }
 
-    auto operator<<(std::ostream& o, cpp2::in<duality> val) -> std::ostream&{o << CPP2_UFCS_0(to_string, val);return o; }
+    auto operator<<(std::ostream& o, cpp2::in<janus> val) -> std::ostream&{o << CPP2_UFCS_0(to_string, val);return o; }
 constexpr file_attributes::file_attributes(auto const& val)
-                                                    : value__{ cpp2::unsafe_narrow<cpp2::u8>(val) } {  }
+                                                    : _value{ cpp2::unsafe_narrow<cpp2::u8>(val) } {  }
 constexpr auto file_attributes::operator=(auto const& val) -> file_attributes&  { 
-                                                    value__ = cpp2::unsafe_narrow<cpp2::u8>(val);
+                                                    _value = cpp2::unsafe_narrow<cpp2::u8>(val);
                                                     return *this; }
-[[nodiscard]] constexpr auto file_attributes::get_raw_value() const& -> cpp2::u8 { return value__; }
+[[nodiscard]] constexpr auto file_attributes::get_raw_value() const& -> cpp2::u8 { return _value; }
 constexpr file_attributes::file_attributes(file_attributes const& that)
-                                              : value__{ that.value__ }{}
+                                              : _value{ that._value }{}
 constexpr auto file_attributes::operator=(file_attributes const& that) -> file_attributes& {
-                                              value__ = that.value__;
+                                              _value = that._value;
                                               return *this;}
 constexpr file_attributes::file_attributes(file_attributes&& that) noexcept
-                                              : value__{ std::move(that).value__ }{}
+                                              : _value{ std::move(that)._value }{}
 constexpr auto file_attributes::operator=(file_attributes&& that) noexcept -> file_attributes& {
-                                              value__ = std::move(that).value__;
+                                              _value = std::move(that)._value;
                                               return *this;}
-constexpr auto file_attributes::operator|=(file_attributes const& that) & -> void { value__ |= that.value__; }
-constexpr auto file_attributes::operator&=(file_attributes const& that) & -> void { value__ &= that.value__; }
-constexpr auto file_attributes::operator^=(file_attributes const& that) & -> void { value__ ^= that.value__; }
-[[nodiscard]] constexpr auto file_attributes::operator|(file_attributes const& that) const& -> file_attributes { return value__ | that.value__; }
-[[nodiscard]] constexpr auto file_attributes::operator&(file_attributes const& that) const& -> file_attributes { return value__ & that.value__; }
-[[nodiscard]] constexpr auto file_attributes::operator^(file_attributes const& that) const& -> file_attributes { return value__ ^ that.value__; }
-[[nodiscard]] constexpr auto file_attributes::has(file_attributes const& that) & -> bool { return value__ & that.value__; }
-constexpr auto file_attributes::set(file_attributes const& that) & -> void { value__ |= that.value__; }
-constexpr auto file_attributes::clear(file_attributes const& that) & -> void { value__ &= ~that.value__; }
+constexpr auto file_attributes::operator|=(file_attributes const& that) & -> void { _value |= that._value; }
+constexpr auto file_attributes::operator&=(file_attributes const& that) & -> void { _value &= that._value; }
+constexpr auto file_attributes::operator^=(file_attributes const& that) & -> void { _value ^= that._value; }
+[[nodiscard]] constexpr auto file_attributes::operator|(file_attributes const& that) const& -> file_attributes { return _value | that._value; }
+[[nodiscard]] constexpr auto file_attributes::operator&(file_attributes const& that) const& -> file_attributes { return _value & that._value; }
+[[nodiscard]] constexpr auto file_attributes::operator^(file_attributes const& that) const& -> file_attributes { return _value ^ that._value; }
+[[nodiscard]] constexpr auto file_attributes::has(file_attributes const& that) & -> bool { return _value & that._value; }
+constexpr auto file_attributes::set(file_attributes const& that) & -> void { _value |= that._value; }
+constexpr auto file_attributes::clear(file_attributes const& that) & -> void { _value &= ~that._value; }
 inline constexpr file_attributes file_attributes::cached = 1;
 
 inline constexpr file_attributes file_attributes::current = 2;
@@ -242,12 +237,11 @@ inline constexpr file_attributes file_attributes::none = 0;
     }
 
     auto operator<<(std::ostream& o, cpp2::in<file_attributes> val) -> std::ostream&{o << CPP2_UFCS_0(to_string, val);return o; }
-#line 33 "pure2-enum.cpp2"
+#line 28 "pure2-enum.cpp2"
 auto main() -> int{
-    auto janus {duality::second}; 
-    std::cout << "janus is initially " + cpp2::to_string(CPP2_UFCS_0(to_string, janus)) + "\n";
-    CPP2_UFCS(flip, janus, janus);
-    std::cout << "janus is flipped to " + cpp2::to_string(CPP2_UFCS_0(to_string, std::move(janus))) + "\n";
+    auto j {janus::past}; 
+    CPP2_UFCS_0(flip, j);
+    static_cast<void>(std::move(j));
 
     // x : skat_game = 9;               // error, can't construct skat_game from integer
 
diff --git a/regression-tests/test-results/pure2-union.cpp b/regression-tests/test-results/pure2-union.cpp
diff --git a/regression-tests/test-results/version b/regression-tests/test-results/version
diff --git a/source/build.info b/source/build.info
diff --git a/source/reflect.h b/source/reflect.h
diff --git a/source/reflect.h2 b/source/reflect.h2

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ name_or_number: @union type = {`
`6`	`6`
`7`	`7`	`print_name: (non: name_or_number) = {`
`8`	`8`	`if non.is_name() {`
`9`		`- std::cout << non.get_name() << "\n";`
	`9`	`+ std::cout << non.name() << "\n";`
`10`	`10`	`}`
`11`	`11`	`else {`
`12`	`12`	`std::cout << "(not a name)\n";`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-janus is initially second`
`2`		`-janus is flipped to first`
`3`	`1`	`x.to_string() is clubs`
`4`	`2`	`x2.to_string() is clubs`
`5`	`3`	`using << prints clubs`