1 files changed, 13 insertions, 12 deletions

diff --git a/src/universe.h b/src/universe.h
index 4be6a9a..7624fed 100644
--- a/src/universe.h
+++ b/src/universe.h
@@ -108,8 +108,6 @@ class ProtectedAllocator
 
 // #################################################################################################
 
-// xxh64 of string "kUniverseFullRegKey" generated at https://www.pelock.com/products/hash-calculator
-static constexpr RegistryUniqueKey kUniverseFullRegKey{ 0x1C2D76870DD9DD9Full };
 // xxh64 of string "kUniverseLightRegKey" generated at https://www.pelock.com/products/hash-calculator
 static constexpr RegistryUniqueKey kUniverseLightRegKey{ 0x48BBE9CEAB0BA04Full };
 
@@ -172,6 +170,11 @@ class Universe
     // The terminal desinit sequence should wait for all such processing to terminate before force-killing threads
     std::atomic<int> selfdestructingCount{ 0 };
 
+    public:
+    [[nodiscard]] static void* operator new([[maybe_unused]] size_t size_, lua_State* L_) noexcept { return lua_newuserdatauv<Universe>(L_, 0); };
+    // can't actually delete the operator because the compiler generates stack unwinding code that could call it in case of exception
+    static void operator delete([[maybe_unused]] void* p_, [[maybe_unused]] lua_State* L_) {} // nothing to do, as nothing is allocated independently
+
     Universe();
     ~Universe() = default;
     // non-copyable, non-movable
@@ -181,21 +184,18 @@ class Universe
     Universe& operator=(Universe&&) = delete;
 
     void closeKeepers();
+    [[nodiscard]] static Universe* Create(lua_State* L_);
+    [[nodiscard]] static inline Universe* Get(lua_State* L_);
     void initializeAllocatorFunction(lua_State* L_);
     static int InitializeFinalizer(lua_State* L_);
     void initializeKeepers(lua_State* L_);
+    static inline void Store(lua_State* L_, Universe* U_);
     void terminateFreeRunningLanes(lua_State* L_, lua_Duration shutdownTimeout_, CancelOp op_);
 };
 
 // #################################################################################################
 
-[[nodiscard]] Universe* universe_get(lua_State* L_);
-[[nodiscard]] Universe* universe_create(lua_State* L_);
-void universe_store(lua_State* L_, Universe* U_);
-
-// #################################################################################################
-
-[[nodiscard]] inline Universe* universe_get(lua_State* L_)
+inline Universe* Universe::Get(lua_State* L_)
 {
     STACK_CHECK_START_REL(L_, 0);
     Universe* const _universe{ kUniverseLightRegKey.readLightUserDataValue<Universe>(L_) };
@@ -205,9 +205,10 @@ void universe_store(lua_State* L_, Universe* U_);
 
 // #################################################################################################
 
-inline void universe_store(lua_State* L_, Universe* U_)
+inline void Universe::Store(lua_State* L_, Universe* U_)
 {
-    LUA_ASSERT(L_, !U_ || universe_get(L_) == nullptr);
+    // TODO: check if we actually ever call Store with a null universe
+    LUA_ASSERT(L_, !U_ || Universe::Get(L_) == nullptr);
     STACK_CHECK_START_REL(L_, 0);
     kUniverseLightRegKey.setValue(L_, [U = U_](lua_State* L_) { U ? lua_pushlightuserdata(L_, U) : lua_pushnil(L_); });
     STACK_CHECK(L_, 0);
@@ -215,4 +216,4 @@ inline void universe_store(lua_State* L_, Universe* U_)
 
 // #################################################################################################
 
-int universe_gc(lua_State* L_);
+LUAG_FUNC(universe_gc);