1 files changed, 37 insertions, 13 deletions

diff --git a/src/macros_and_utils.h b/src/macros_and_utils.h
index 31027d6..e8d5ab5 100644
--- a/src/macros_and_utils.h
+++ b/src/macros_and_utils.h
@@ -11,20 +11,25 @@ extern "C" {
 #endif // __cplusplus
 
 #include <cassert>
+#include <chrono>
 #include <tuple>
 #include <type_traits>
 
+using namespace std::chrono_literals;
+
 #define USE_DEBUG_SPEW() 0
 #if USE_DEBUG_SPEW()
 extern char const* debugspew_indent;
 #define INDENT_BEGIN "%.*s "
-#define INDENT_END , (U ? U->debugspew_indent_depth : 0), debugspew_indent
+#define INDENT_END , (U ? U->debugspew_indent_depth.load(std::memory_order_relaxed) : 0), debugspew_indent
 #define DEBUGSPEW_CODE(_code) _code
-#define DEBUGSPEW_PARAM_COMMA( param_) param_,
+#define DEBUGSPEW_OR_NOT(a_, b_) a_
+#define DEBUGSPEW_PARAM_COMMA(param_) param_,
 #define DEBUGSPEW_COMMA_PARAM( param_) , param_
 #else // USE_DEBUG_SPEW()
 #define DEBUGSPEW_CODE(_code)
-#define DEBUGSPEW_PARAM_COMMA( param_)
+#define DEBUGSPEW_OR_NOT(a_, b_) b_
+#define DEBUGSPEW_PARAM_COMMA(param_)
 #define DEBUGSPEW_COMMA_PARAM( param_)
 #endif // USE_DEBUG_SPEW()
 
@@ -41,8 +46,8 @@ extern char const* debugspew_indent;
 
 #else // NDEBUG
 
-#define _ASSERT_L( L, cond_) if( (cond_) == 0) { (void) luaL_error( L, "ASSERT failed: %s:%d '%s'", __FILE__, __LINE__, #cond_);}
-#define STACK_DUMP( L)    luaG_dump( L)
+#define _ASSERT_L(L, cond_) if( (cond_) == 0) { (void) luaL_error(L, "ASSERT failed: %s:%d '%s'", __FILE__, __LINE__, #cond_);}
+#define STACK_DUMP(L)    luaG_dump(L)
 
 class StackChecker
 {
@@ -72,7 +77,7 @@ class StackChecker
         if ((offset_ < 0) || (m_oldtop < 0))
         {
             assert(false);
-            std::ignore = luaL_error(m_L, "STACK INIT ASSERT failed (%d not %d): %s:%d", lua_gettop(m_L), offset_, file_, line_);
+            luaL_error(m_L, "STACK INIT ASSERT failed (%d not %d): %s:%d", lua_gettop(m_L), offset_, file_, line_); // doesn't return
         }
     }
 
@@ -83,7 +88,7 @@ class StackChecker
         if (lua_gettop(m_L) != pos_)
         {
             assert(false);
-            std::ignore = luaL_error(m_L, "STACK INIT ASSERT failed (%d not %d): %s:%d", lua_gettop(m_L), pos_, file_, line_);
+            luaL_error(m_L, "STACK INIT ASSERT failed (%d not %d): %s:%d", lua_gettop(m_L), pos_, file_, line_); // doesn't return
         }
     }
 
@@ -103,7 +108,7 @@ class StackChecker
             if (actual != expected_)
             {
                 assert(false);
-                std::ignore = luaL_error(m_L, "STACK ASSERT failed (%d not %d): %s:%d", actual, expected_, file_, line_);
+                luaL_error(m_L, "STACK ASSERT failed (%d not %d): %s:%d", actual, expected_, file_, line_); // doesn't return
             }
         }
     }
@@ -123,24 +128,24 @@ inline void STACK_GROW(lua_State* L, int n_)
 {
     if (!lua_checkstack(L, n_))
     {
-        std::ignore = luaL_error(L, "Cannot grow stack!");
+        luaL_error(L, "Cannot grow stack!"); // doesn't return
     }
 }
 
-#define LUAG_FUNC( func_name) int LG_##func_name( lua_State* L)
+#define LUAG_FUNC(func_name) [[nodiscard]] int LG_##func_name(lua_State* L)
 
 // #################################################################################################
 
 // a small helper to extract a full userdata pointer from the stack in a safe way
 template<typename T>
-T* lua_tofulluserdata(lua_State* L, int index_)
+[[nodiscard]] T* lua_tofulluserdata(lua_State* L, int index_)
 {
     ASSERT_L(lua_isnil(L, index_) || lua_type(L, index_) == LUA_TUSERDATA);
     return static_cast<T*>(lua_touserdata(L, index_));
 }
 
 template<typename T>
-auto lua_tolightuserdata(lua_State* L, int index_)
+[[nodiscard]] auto lua_tolightuserdata(lua_State* L, int index_)
 {
     ASSERT_L(lua_isnil(L, index_) || lua_islightuserdata(L, index_));
     if constexpr (std::is_pointer_v<T>)
@@ -154,7 +159,7 @@ auto lua_tolightuserdata(lua_State* L, int index_)
 }
 
 template <typename T>
-T* lua_newuserdatauv(lua_State* L, int nuvalue_)
+[[nodiscard]] T* lua_newuserdatauv(lua_State* L, int nuvalue_)
 {
     return static_cast<T*>(lua_newuserdatauv(L, sizeof(T), nuvalue_));
 }
@@ -167,3 +172,22 @@ T* lua_newuserdatauv(lua_State* L, int nuvalue_)
     std::ignore = lua_error(L); // doesn't return
     assert(false); // we should never get here, but i'm paranoid
 }
+
+using lua_Duration = std::chrono::template duration<lua_Number>;
+
+// #################################################################################################
+
+// A unique type generator
+template <typename T, auto = []{}>
+struct Unique
+{
+    T m_val;
+    constexpr Unique() = default;
+    constexpr operator T() const { return m_val; }
+    constexpr explicit Unique(T b_) : m_val{ b_ } {}
+};
+
+// #################################################################################################
+
+using Source = Unique<lua_State*>;
+using Dest = Unique<lua_State*>;
\ No newline at end of file