karm-base: Renamed Var<Ts...> to Union<Ts...>

skift-org · Mar 21, 2024 · 45e167b · 45e167b
1 parent c113d15
commit 45e167b
Show file tree

Hide file tree

Showing 28 changed files with 52 additions and 52 deletions.
diff --git a/src/apps/hideo-calculator/model.h b/src/apps/hideo-calculator/model.h
@@ -95,7 +95,7 @@ struct MemStoreAction {};
 
 struct EnterDecimalAction {};
 
-using Action = Var<
+using Action = Union<
     Operator, Number, BackspaceAction, EqualAction, ClearAction, ClearAllAction,
     MemClearAction, MemRecallAction, MemAddAction, MemSubAction, MemStoreAction,
     EnterDecimalAction>;

diff --git a/src/apps/hideo-clock/model.h b/src/apps/hideo-clock/model.h
@@ -35,7 +35,7 @@ struct State {
 
 struct TimeTick {};
 
-using Action = Var<Page, TimeTick>;
+using Action = Union<Page, TimeTick>;
 
 void reduce(State &, Action);
 

diff --git a/src/apps/hideo-colors/model.h b/src/apps/hideo-colors/model.h
@@ -22,7 +22,7 @@ struct UpdateHsv {
     Gfx::Hsv hsv;
 };
 
-using Action = Var<UpdatePage, UpdateHsv>;
+using Action = Union<UpdatePage, UpdateHsv>;
 
 inline void reduce(State &s, Action action) {
     action.visit(Visitor{

diff --git a/src/apps/hideo-counter/model.h b/src/apps/hideo-counter/model.h
@@ -15,7 +15,7 @@ struct IncrementAction {};
 
 struct DecrementAction {};
 
-using Action = Var<ResetAction, IncrementAction, DecrementAction>;
+using Action = Union<ResetAction, IncrementAction, DecrementAction>;
 
 void reduce(State &, Action);
 

diff --git a/src/apps/hideo-demos/main.cpp b/src/apps/hideo-demos/main.cpp
@@ -42,7 +42,7 @@ struct SwitchAction {
     usize index;
 };
 
-using Action = Var<SwitchAction>;
+using Action = Union<SwitchAction>;
 
 void reduce(State &s, Action action) {
     action.visit(

diff --git a/src/apps/hideo-files/model.h b/src/apps/hideo-files/model.h
@@ -54,7 +54,7 @@ struct Refresh {
 
 struct AddBookmark {};
 
-using Action = Var<GoRoot, GoBack, GoForward, GoParent, Navigate, GoTo, Refresh, AddBookmark>;
+using Action = Union<GoRoot, GoBack, GoForward, GoParent, Navigate, GoTo, Refresh, AddBookmark>;
 
 void reduce(State &, Action);
 

diff --git a/src/apps/hideo-images/app.h b/src/apps/hideo-images/app.h
@@ -26,7 +26,7 @@ struct ApplyFilter {};
 
 struct SaveImage {};
 
-using Action = Var<
+using Action = Union<
     Refresh,
     ToggleEditor,
     SetFilter,

diff --git a/src/apps/hideo-keyboard/model.h b/src/apps/hideo-keyboard/model.h
@@ -11,7 +11,7 @@ struct State {
 struct ToggleShift {
 };
 
-using Action = Var<ToggleShift>;
+using Action = Union<ToggleShift>;
 
 void reduce(State &, Action);
 

diff --git a/src/apps/hideo-settings/app.h b/src/apps/hideo-settings/app.h
@@ -43,7 +43,7 @@ struct GoBack {};
 
 struct GoForward {};
 
-using Action = Var<GoTo, GoBack, GoForward>;
+using Action = Union<GoTo, GoBack, GoForward>;
 
 void reduce(State &, Action);
 

diff --git a/src/apps/hideo-shell/model.h b/src/apps/hideo-shell/model.h
@@ -88,7 +88,7 @@ struct Activate {
     Panel panel;
 };
 
-using Action = Var<
+using Action = Union<
     ToggleTablet,
     Lock,
     Unlock,

diff --git a/src/apps/hideo-spreadsheet/app.h b/src/apps/hideo-spreadsheet/app.h
@@ -3,7 +3,7 @@
 #include <karm-base/checked.h>
 #include <karm-base/map.h>
 #include <karm-base/string.h>
-#include <karm-base/var.h>
+#include <karm-base/union.h>
 #include <karm-base/vec.h>
 #include <karm-gfx/colors.h>
 #include <karm-math/vec.h>
@@ -14,7 +14,7 @@ namespace Hideo::Spreadsheet {
 
 /* --- Reducer -------------------------------------------------------------- */
 
-using Value = Var<None, String, f64, bool>;
+using Value = Union<None, String, f64, bool>;
 
 struct Pos {
     usize row;
@@ -247,7 +247,7 @@ struct SwitchSheet {
 
 struct ToggleProperties {};
 
-using Action = Var<
+using Action = Union<
     UpdateSelection,
 
     UpdateValue,

diff --git a/src/kernel/hjert-api/types.h b/src/kernel/hjert-api/types.h
@@ -320,7 +320,7 @@ struct ListenerProps {
     static constexpr Type TYPE = Type::LISTENER;
 };
 
-using _Props = Var<
+using _Props = Union<
     DomainProps,
     TaskProps,
     SpaceProps,

diff --git a/src/kernel/hjert-core/channel.h b/src/kernel/hjert-core/channel.h
@@ -9,7 +9,7 @@ namespace Hjert::Core {
 struct Domain;
 
 struct Parcel {
-    using Slot = Var<None, Hj::Arg, Strong<Object>>;
+    using Slot = Union<None, Hj::Arg, Strong<Object>>;
 
     Hj::Arg _label;
     Hj::Arg _flags;

diff --git a/src/kernel/hjert-core/cpu.h b/src/kernel/hjert-core/cpu.h
@@ -7,7 +7,7 @@
 #include <karm-base/lock.h>
 #include <karm-base/rc.h>
 #include <karm-base/ring.h>
-#include <karm-base/var.h>
+#include <karm-base/union.h>
 #include <karm-base/vec.h>
 
 #include "arch.h"

diff --git a/src/kernel/hjert-core/vmo.h b/src/kernel/hjert-core/vmo.h
@@ -7,7 +7,7 @@
 namespace Hjert::Core {
 
 struct Vmo : public BaseObject<Vmo, Hj::Type::VMO> {
-    using _Mem = Var<Hal::PmmMem, Hal::DmaRange>;
+    using _Mem = Union<Hal::PmmMem, Hal::DmaRange>;
     _Mem _mem;
 
     static Res<Strong<Vmo>> alloc(usize size, Hj::VmoFlags);

diff --git a/src/kernel/loader/loader.h b/src/kernel/loader/loader.h
@@ -32,7 +32,7 @@ struct Blob {
 };
 
 struct Entry {
-    Var<None, Mdi::Icon, Media::Image> icon = NONE;
+    Union<None, Mdi::Icon, Media::Image> icon = NONE;
     String name;
     Blob kernel;
     Vec<Blob> blobs;

diff --git a/src/kernel/loader/menu.cpp b/src/kernel/loader/menu.cpp
@@ -22,7 +22,7 @@ struct MoveSelectionAction {
 
 struct SelectAction {};
 
-using Action = Var<MoveSelectionAction, SelectAction>;
+using Action = Union<MoveSelectionAction, SelectAction>;
 
 void reduce(State &s, Action a) {
     a.visit(Visitor{

diff --git a/src/libs/karm-base/res.h b/src/libs/karm-base/res.h
@@ -2,7 +2,7 @@
 
 #include "error.h"
 #include "std.h"
-#include "var.h"
+#include "union.h"
 
 namespace Karm {
 
@@ -30,7 +30,7 @@ Ok(Args &&...) -> Ok<Meta::RemoveConstVolatileRef<Args>...>;
 
 template <typename V = None, typename E = Error>
 struct [[nodiscard]] Res {
-    using Inner = Var<Ok<V>, E>;
+    using Inner = Union<Ok<V>, E>;
 
     Inner _inner;
 

diff --git a/src/libs/karm-base/var.h → src/libs/karm-base/union.h b/src/libs/karm-base/var.h → src/libs/karm-base/union.h
@@ -9,27 +9,27 @@
 namespace Karm {
 
 template <typename... Ts>
-struct Var {
-    static_assert(sizeof...(Ts) <= 255, "Var can only hold up to 255 types");
+struct Union {
+    static_assert(sizeof...(Ts) <= 255, "Union can only hold up to 255 types");
 
     alignas(max(alignof(Ts)...)) char _buf[max(sizeof(Ts)...)];
     u8 _index;
 
-    always_inline Var() = delete;
+    always_inline Union() = delete;
 
     template <Meta::Contains<Ts...> T>
-    always_inline Var(T const &value)
+    always_inline Union(T const &value)
         : _index(Meta::indexOf<T, Ts...>()) {
         new (_buf) T(value);
     }
 
     template <Meta::Contains<Ts...> T>
-    always_inline Var(T &&value)
+    always_inline Union(T &&value)
         : _index(Meta::indexOf<T, Ts...>()) {
         new (_buf) T(std::move(value));
     }
 
-    always_inline Var(Var const &other)
+    always_inline Union(Union const &other)
         : _index(other._index) {
         Meta::indexCast<Ts...>(
             _index, other._buf,
@@ -38,27 +38,27 @@ struct Var {
             });
     }
 
-    always_inline Var(Var &&other)
+    always_inline Union(Union &&other)
         : _index(other._index) {
         Meta::indexCast<Ts...>(_index, other._buf, [this]<typename T>(T &ptr) {
             new (_buf) T(std::move(ptr));
         });
     }
 
-    always_inline ~Var() {
+    always_inline ~Union() {
         Meta::indexCast<Ts...>(_index, _buf, []<typename T>(T &ptr) {
             ptr.~T();
         });
     }
 
     template <Meta::Contains<Ts...> T>
-    always_inline Var &operator=(T const &value) {
-        *this = Var(value);
+    always_inline Union &operator=(T const &value) {
+        *this = Union(value);
         return *this;
     }
 
     template <Meta::Contains<Ts...> T>
-    always_inline Var &operator=(T &&value) {
+    always_inline Union &operator=(T &&value) {
         Meta::indexCast<Ts...>(_index, _buf, []<typename U>(U &ptr) {
             ptr.~U();
         });
@@ -69,12 +69,12 @@ struct Var {
         return *this;
     }
 
-    always_inline Var &operator=(Var const &other) {
-        *this = Var(other);
+    always_inline Union &operator=(Union const &other) {
+        *this = Union(other);
         return *this;
     }
 
-    always_inline Var &operator=(Var &&other) {
+    always_inline Union &operator=(Union &&other) {
         Meta::indexCast<Ts...>(_index, _buf, []<typename T>(T &ptr) {
             ptr.~T();
         });
@@ -177,7 +177,7 @@ struct Var {
         return false;
     }
 
-    std::partial_ordering operator<=>(Var const &other) const {
+    std::partial_ordering operator<=>(Union const &other) const {
         if (_index == other._index)
             return visit([&]<typename T>(T const &ptr) {
                 if constexpr (Meta::Comparable<T>) {
@@ -189,7 +189,7 @@ struct Var {
         return std::partial_ordering::unordered;
     }
 
-    bool operator==(Var const &other) const {
+    bool operator==(Union const &other) const {
         if (_index == other._index)
             return visit([&]<typename T>(T const &ptr) {
                 if constexpr (Meta::Equatable<T>) {

diff --git a/src/libs/karm-crypto/hash.h b/src/libs/karm-crypto/hash.h
@@ -27,7 +27,7 @@ using enum HashType;
 struct AnyDigest {
     HashType _type;
 
-    Var<
+    Union<
 #define ITER(NAME, TYPE) HashDigest<TYPE>,
         FOR_EACH_HASH(ITER)
 #undef ITER
@@ -61,13 +61,13 @@ struct AnyHash {
     using Digest = AnyDigest;
 
     // clang-format off
-    Var<
+    Union<
 #define ITER(NAME, TYPE) TYPE,
         FOR_EACH_HASH(ITER)
 #undef ITER
     None> _h = NONE;
 
-    using Sum = Var<
+    using Sum = Union<
 #define ITER(NAME, TYPE) HashSum<TYPE>,
         FOR_EACH_HASH(ITER)
 #undef ITER

diff --git a/src/libs/karm-gfx/buffer.h b/src/libs/karm-gfx/buffer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <karm-base/rc.h>
-#include <karm-base/var.h>
+#include <karm-base/union.h>
 #include <karm-math/rect.h>
 
 #include "color.h"
@@ -50,7 +50,7 @@ struct Bgra8888 {
 
 [[gnu::used]] inline Bgra8888 BGRA8888;
 
-using _Fmts = Var<Rgba8888, Bgra8888>;
+using _Fmts = Union<Rgba8888, Bgra8888>;
 
 struct Fmt : public _Fmts {
     using _Fmts::_Fmts;

diff --git a/src/libs/karm-gfx/filters.h b/src/libs/karm-gfx/filters.h
@@ -99,7 +99,7 @@ struct FilterChain {
     void apply(MutPixels) const;
 };
 
-using _Filters = Var<
+using _Filters = Union<
     Unfiltered,
     BlurFilter,
     SaturationFilter,

diff --git a/src/libs/karm-gfx/paint.h b/src/libs/karm-gfx/paint.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <karm-base/var.h>
+#include <karm-base/union.h>
 #include <karm-base/vec.h>
 #include <karm-math/trans.h>
 #include <karm-media/image.h>
@@ -134,7 +134,7 @@ struct Gradient {
     }
 };
 
-using _Paints = Var<
+using _Paints = Union<
     Color,
     Gradient,
     Media::Image>;

diff --git a/src/libs/karm-sys/addr.h b/src/libs/karm-sys/addr.h
@@ -127,8 +127,8 @@ union Ip6 {
     }
 };
 
-struct Ip : public Var<Ip4, Ip6> {
-    using Var<Ip4, Ip6>::Var;
+struct Ip : public Union<Ip4, Ip6> {
+    using Union<Ip4, Ip6>::Union;
 
     static Res<Ip> parse(Io::SScan &s) {
         auto saved = s;

diff --git a/src/libs/karm-ui/scafold.h b/src/libs/karm-ui/scafold.h
@@ -54,7 +54,7 @@ struct Scafold : public Meta::NoCopy {
 
     struct ToggleSidebar {};
 
-    using Action = Var<ToggleSidebar>;
+    using Action = Union<ToggleSidebar>;
 
     static void reduce(State &s, Action a) {
         a.visit(::Visitor{

diff --git a/src/specs/json/json.h b/src/specs/json/json.h
@@ -2,7 +2,7 @@
 
 #include <karm-base/map.h>
 #include <karm-base/string.h>
-#include <karm-base/var.h>
+#include <karm-base/union.h>
 #include <karm-base/vec.h>
 #include <karm-io/emit.h>
 #include <karm-io/expr.h>
@@ -23,7 +23,7 @@ using Number = isize;
 using Number = f64;
 #endif
 
-using Store = Var<None, Array, Object, String, Number, bool>;
+using Store = Union<None, Array, Object, String, Number, bool>;
 
 struct Value {
     Store _store;