1 files changed, 81 insertions, 57 deletions

diff --git a/src/compat.hpp b/src/compat.hpp
index 9a8dedf..4dc7433 100644
--- a/src/compat.hpp
+++ b/src/compat.hpp
@@ -5,7 +5,6 @@
 
 // try to detect if we are building against LuaJIT or MoonJIT
 #if defined(LUA_JITLIBNAME)
-#include "luajit.h"
 #if (defined(__x86_64__) || defined(_M_X64) || defined(__LP64__))
 #define LUAJIT_FLAVOR() 64
 #else // 64 bits
@@ -21,7 +20,7 @@
 #endif // LUA_OK
 
 #ifndef LUA_ERRGCMM
-#define LUA_ERRGCMM 666 // doesn't exist in Lua 5.1 and Lua 5.4, we don't care about the actual value
+#define LUA_ERRGCMM 666 // doesn't exist in Lua 5.1 and Lua 5.4/5.5, we don't care about the actual value
 #endif // LUA_ERRGCMM
 
 
@@ -29,7 +28,7 @@
 #define LUA_LOADED_TABLE "_LOADED" // doesn't exist before Lua 5.3
 #endif // LUA_LOADED_TABLE
 
-// code is now preferring Lua 5.4 API
+// code is now preferring Lua 5.5 API
 
 // #################################################################################################
 
@@ -76,18 +75,6 @@ int luaL_getsubtable(lua_State* L_, StackIndex idx_, char const* fname_);
 
 // #################################################################################################
 
-// wrap Lua 5.3 calls under Lua 5.1 API when it is simpler that way
-#if LUA_VERSION_NUM == 503
-
-inline int luaL_optint(lua_State* L_, int n_, lua_Integer d_)
-{
-    return static_cast<int>(luaL_optinteger(L_, n_, d_));
-}
-
-#endif // LUA_VERSION_NUM == 503
-
-// #################################################################################################
-
 #if LUA_VERSION_NUM < 504
 
 void* lua_newuserdatauv(lua_State* L_, size_t sz_, UserValueCount nuvalue_);
@@ -100,15 +87,11 @@ int lua_setiuservalue(lua_State* L_, StackIndex idx_, UserValueIndex n_);
 
 // #################################################################################################
 
-// wrap Lua 5.4 calls under Lua 5.1 API when it is simpler that way
-#if LUA_VERSION_NUM == 504
+#if LUA_VERSION_NUM < 505
 
-inline int luaL_optint(lua_State* L_, StackIndex n_, lua_Integer d_)
-{
-    return static_cast<int>(luaL_optinteger(L_, n_, d_));
-}
+unsigned int luaL_makeseed(lua_State*);
 
-#endif // LUA_VERSION_NUM == 504
+#endif // LUA_VERSION_NUM < 505
 
 // #################################################################################################
 
@@ -136,14 +119,14 @@ inline constexpr LuaError ToLuaError(int const rc_)
 
 // break lexical order for that one because it's needed below
 [[nodiscard]]
-inline LuaType luaG_type(lua_State* const L_, StackIndex const idx_)
+inline LuaType luaW_type(lua_State* const L_, StackIndex const idx_)
 {
     return static_cast<LuaType>(lua_type(L_, idx_));
 }
 
 // #################################################################################################
 // #################################################################################################
-// All the compatibility wrappers we expose start with luaG_
+// All the compatibility wrappers we expose start with luaW_
 // #################################################################################################
 // #################################################################################################
 
@@ -152,7 +135,7 @@ inline LuaType luaG_type(lua_State* const L_, StackIndex const idx_)
 
 // a replacement of lua_tolstring
 [[nodiscard]]
-inline std::string_view luaG_tostring(lua_State* const L_, StackIndex const idx_)
+inline std::string_view luaW_tostring(lua_State* const L_, StackIndex const idx_)
 {
     size_t _len{ 0 };
     char const* _str{ lua_tolstring(L_, idx_, &_len) };
@@ -160,7 +143,7 @@ inline std::string_view luaG_tostring(lua_State* const L_, StackIndex const idx_
 }
 
 [[nodiscard]]
-inline std::string_view luaG_checkstring(lua_State* const L_, StackIndex const idx_)
+inline std::string_view luaW_checkstring(lua_State* const L_, StackIndex const idx_)
 {
     size_t _len{ 0 };
     char const* _str{ luaL_checklstring(L_, idx_, &_len) };
@@ -168,7 +151,7 @@ inline std::string_view luaG_checkstring(lua_State* const L_, StackIndex const i
 }
 
 [[nodiscard]]
-inline std::string_view luaG_optstring(lua_State* const L_, StackIndex const idx_, std::string_view const& default_)
+inline std::string_view luaW_optstring(lua_State* const L_, StackIndex const idx_, std::string_view const& default_)
 {
     if (lua_isnoneornil(L_, idx_)) {
         return default_;
@@ -179,13 +162,13 @@ inline std::string_view luaG_optstring(lua_State* const L_, StackIndex const idx
 }
 
 template <typename... EXTRA>
-inline std::string_view luaG_pushstring(lua_State* const L_, std::string_view const& str_, EXTRA&&... extra_)
+inline std::string_view luaW_pushstring(lua_State* const L_, std::string_view const& str_, EXTRA&&... extra_)
 {
     if constexpr (sizeof...(EXTRA) == 0) {
         if constexpr (LUA_VERSION_NUM == 501) {
             // lua_pushlstring doesn't return a value in Lua 5.1
             lua_pushlstring(L_, str_.data(), str_.size());
-            return luaG_tostring(L_, kIdxTop);
+            return luaW_tostring(L_, kIdxTop);
         } else {
             return std::string_view{ lua_pushlstring(L_, str_.data(), str_.size()), str_.size() };
         }
@@ -198,7 +181,7 @@ inline std::string_view luaG_pushstring(lua_State* const L_, std::string_view co
 // #################################################################################################
 
 // use this in place of lua_absindex to save a function call
-inline StackIndex luaG_absindex(lua_State* const L_, StackIndex const idx_)
+inline StackIndex luaW_absindex(lua_State* const L_, StackIndex const idx_)
 {
     return StackIndex{ (idx_ >= 0 || idx_ <= kIdxRegistry) ? idx_ : StackIndex{ lua_gettop(L_) + idx_ + 1 } };
 }
@@ -227,14 +210,14 @@ static inline int WrapLuaDump(LUA_DUMP f_, lua_State* const L_, lua_Writer const
 
 // -------------------------------------------------------------------------------------------------
 
-static inline int luaG_dump(lua_State* const L_, lua_Writer const writer_, void* const data_, int const strip_)
+static inline int luaW_dump(lua_State* const L_, lua_Writer const writer_, void* const data_, int const strip_)
 {
     return WrapLuaDump(lua_dump, L_, writer_, data_, strip_);
 }
 
 // #################################################################################################
 
-UserValueCount luaG_getalluservalues(lua_State* L_, StackIndex idx_);
+UserValueCount luaW_getalluservalues(lua_State* L_, StackIndex idx_);
 
 // #################################################################################################
 
@@ -272,7 +255,7 @@ static inline int WrapLuaGetField(LUA_GETFIELD f_, lua_State* const L_, StackInd
 // -------------------------------------------------------------------------------------------------
 
 [[nodiscard]]
-static inline LuaType luaG_getfield(lua_State* const L_, StackIndex const idx_, std::string_view const& name_)
+static inline LuaType luaW_getfield(lua_State* const L_, StackIndex const idx_, std::string_view const& name_)
 {
     return static_cast<LuaType>(WrapLuaGetField(lua_getfield, L_, idx_, name_));
 }
@@ -280,21 +263,62 @@ static inline LuaType luaG_getfield(lua_State* const L_, StackIndex const idx_,
 // #################################################################################################
 
 [[nodiscard]]
-LuaType luaG_getmodule(lua_State* L_, std::string_view const& name_);
+LuaType luaW_getmodule(lua_State* L_, std::string_view const& name_);
+
+// #################################################################################################
+
+template <typename LUA_NEWSTATE>
+concept RequiresOldLuaNewState = requires(LUA_NEWSTATE f_)
+{
+    {
+        f_(nullptr, 0)
+    } -> std::same_as<lua_State*>;
+};
+
+template <RequiresOldLuaNewState LUA_NEWSTATE>
+static inline lua_State* WrapLuaNewState(LUA_NEWSTATE const lua_newstate_, lua_Alloc const allocf_, void* const ud_, [[maybe_unused]] unsigned int const seed_)
+{
+    // until Lua 5.5, lua_newstate has only 2 parameters
+    return lua_newstate_(allocf_, ud_);
+}
+
+// -------------------------------------------------------------------------------------------------
+
+template <typename LUA_NEWSTATE>
+concept RequiresNewLuaNewState = requires(LUA_NEWSTATE f_)
+{
+    {
+        f_(nullptr, nullptr, 0)
+    } -> std::same_as<lua_State*>;
+};
+
+template <RequiresNewLuaNewState LUA_NEWSTATE>
+static inline lua_State* WrapLuaNewState(LUA_NEWSTATE const lua_newstate_, lua_Alloc const allocf_, void* const ud_, unsigned int const seed_)
+{
+    // starting with Lua 5.5, lua_newstate has 3 parameters
+    return lua_newstate_(allocf_, ud_, seed_);
+}
+
+// -------------------------------------------------------------------------------------------------
+
+static inline lua_State* luaW_newstate(lua_Alloc const allocf_, void* const ud_, unsigned int const seed_)
+{
+    return WrapLuaNewState(lua_newstate, allocf_, ud_, seed_);
+}
 
 // #################################################################################################
 
 template<typename ENUM>
 requires std::is_enum_v<ENUM>
 [[nodiscard]]
-ENUM luaG_optenum(lua_State* const L_, StackIndex const idx_, ENUM const def_)
+ENUM luaW_optenum(lua_State* const L_, StackIndex const idx_, ENUM const def_)
 {
     return static_cast<ENUM>(luaL_optinteger(L_, idx_, static_cast<std::underlying_type_t<ENUM>>(def_)));
 }
 
 // #################################################################################################
 
-inline void luaG_registerlibfuncs(lua_State* const L_, luaL_Reg const* funcs_)
+inline void luaW_registerlibfuncs(lua_State* const L_, luaL_Reg const* funcs_)
 {
     // fake externs to make clang happy...
     extern void luaL_register(lua_State*, char const*, luaL_Reg const*); // Lua 5.1
@@ -353,7 +377,7 @@ static inline int WrapLuaResume(LUA_RESUME const lua_resume_, lua_State* const L
 // -------------------------------------------------------------------------------------------------
 
 [[nodiscard]]
-static inline LuaError luaG_resume(lua_State* const L_, lua_State* const from_, int const nargs_, int* const nresults_)
+static inline LuaError luaW_resume(lua_State* const L_, lua_State* const from_, int const nargs_, int* const nresults_)
 {
     return ToLuaError(WrapLuaResume(lua_resume, L_, from_, nargs_, nresults_));
 }
@@ -364,11 +388,11 @@ template <typename LUA_RAWGET>
 concept RequiresOldLuaRawget = requires(LUA_RAWGET f_) { { f_(nullptr, 0) } -> std::same_as<void>; };
 
 template <RequiresOldLuaRawget LUA_RAWGET>
-static inline LuaType WrapLuaRawget(LUA_RAWGET lua_rawget_, lua_State* const L_, StackIndex const idx_)
+static inline LuaType WrapLuaRawget(LUA_RAWGET const lua_rawget_, lua_State* const L_, StackIndex const idx_)
 {
     // until Lua 5.3, lua_rawget -> void
     lua_rawget_(L_, idx_);
-    return luaG_type(L_, kIdxTop);
+    return luaW_type(L_, kIdxTop);
 }
 
 // -------------------------------------------------------------------------------------------------
@@ -377,7 +401,7 @@ template <typename LUA_RAWGET>
 concept RequiresNewLuaRawget = requires(LUA_RAWGET f_) { { f_(nullptr, 0) } -> std::same_as<int>; };
 
 template <RequiresNewLuaRawget LUA_RAWGET>
-static inline LuaType WrapLuaRawget(LUA_RAWGET lua_rawget_, lua_State* const L_, StackIndex const idx_)
+static inline LuaType WrapLuaRawget(LUA_RAWGET const lua_rawget_, lua_State* const L_, StackIndex const idx_)
 {
     // starting with Lua 5.3, lua_rawget -> int (the type of the extracted value)
     return static_cast<LuaType>(lua_rawget_(L_, idx_));
@@ -385,42 +409,42 @@ static inline LuaType WrapLuaRawget(LUA_RAWGET lua_rawget_, lua_State* const L_,
 
 // -------------------------------------------------------------------------------------------------
 
-static inline LuaType luaG_rawget(lua_State* const L_, StackIndex const idx_)
+static inline LuaType luaW_rawget(lua_State* const L_, StackIndex const idx_)
 {
     return WrapLuaRawget(lua_rawget, L_, idx_);
 }
 
 // #################################################################################################
 
-static inline LuaType luaG_rawgetfield(lua_State* const L_, StackIndex const idx_, std::string_view const& name_)
+static inline LuaType luaW_rawgetfield(lua_State* const L_, StackIndex const idx_, std::string_view const& name_)
 {
-    auto const _absIdx{ luaG_absindex(L_, idx_) };
-    luaG_pushstring(L_, name_);                                                                    // L_: ... t ... name_
+    auto const _absIdx{ luaW_absindex(L_, idx_) };
+    luaW_pushstring(L_, name_);                                                                    // L_: ... t ... name_
     lua_rawget(L_, _absIdx);                                                                       // L_: ... t ... <field>
-    return luaG_type(L_, kIdxTop);
+    return luaW_type(L_, kIdxTop);
 }
 
 // #################################################################################################
 
 template <size_t N>
-static inline void luaG_newlib(lua_State* const L_, luaL_Reg const (&funcs_)[N])
+static inline void luaW_newlib(lua_State* const L_, luaL_Reg const (&funcs_)[N])
 {
     lua_createtable(L_, 0, N - 1);
-    luaG_registerlibfuncs(L_, funcs_);
+    luaW_registerlibfuncs(L_, funcs_);
 }
 
 // #################################################################################################
 
 template <typename T>
 [[nodiscard]]
-T* luaG_newuserdatauv(lua_State* const L_, UserValueCount const nuvalue_)
+T* luaW_newuserdatauv(lua_State* const L_, UserValueCount const nuvalue_)
 {
     return static_cast<T*>(lua_newuserdatauv(L_, sizeof(T), nuvalue_));
 }
 
 // #################################################################################################
 
-inline void luaG_pushglobaltable(lua_State* const L_)
+inline void luaW_pushglobaltable(lua_State* const L_)
 {
 #ifdef LUA_GLOBALSINDEX // All flavors of Lua 5.1
     ::lua_pushvalue(L_, LUA_GLOBALSINDEX);
@@ -431,15 +455,15 @@ inline void luaG_pushglobaltable(lua_State* const L_)
 
 // #################################################################################################
 
-inline void luaG_setfield(lua_State* const L_, StackIndex const idx_, char const* const k_) = delete;
-inline void luaG_setfield(lua_State* const L_, StackIndex const idx_, std::string_view const& k_)
+inline void luaW_setfield(lua_State* const L_, StackIndex const idx_, char const* const k_) = delete;
+inline void luaW_setfield(lua_State* const L_, StackIndex const idx_, std::string_view const& k_)
 {
     lua_setfield(L_, idx_, k_.data());
 }
 
 // #################################################################################################
 
-inline void luaG_setmetatable(lua_State* const L_, std::string_view const& tname_)
+inline void luaW_setmetatable(lua_State* const L_, std::string_view const& tname_)
 {
     // fake externs to make clang happy...
     if constexpr (LUA_VERSION_NUM > 501) {
@@ -456,7 +480,7 @@ inline void luaG_setmetatable(lua_State* const L_, std::string_view const& tname
 // a small helper to extract a full userdata pointer from the stack in a safe way
 template <typename T>
 [[nodiscard]]
-T* luaG_tofulluserdata(lua_State* const L_, StackIndex const index_)
+T* luaW_tofulluserdata(lua_State* const L_, StackIndex const index_)
 {
     LUA_ASSERT(L_, lua_isnil(L_, index_) || lua_type(L_, index_) == LUA_TUSERDATA);
     return static_cast<T*>(lua_touserdata(L_, index_));
@@ -466,7 +490,7 @@ T* luaG_tofulluserdata(lua_State* const L_, StackIndex const index_)
 
 template <typename T>
 [[nodiscard]]
-auto luaG_tolightuserdata(lua_State* const L_, StackIndex const index_)
+auto luaW_tolightuserdata(lua_State* const L_, StackIndex const index_)
 {
     LUA_ASSERT(L_, lua_isnil(L_, index_) || lua_islightuserdata(L_, index_));
     if constexpr (std::is_pointer_v<T>) {
@@ -479,7 +503,7 @@ auto luaG_tolightuserdata(lua_State* const L_, StackIndex const index_)
 // -------------------------------------------------------------------------------------------------
 
 [[nodiscard]]
-inline std::string_view luaG_typename(lua_State* const L_, LuaType const t_)
+inline std::string_view luaW_typename(lua_State* const L_, LuaType const t_)
 {
     return lua_typename(L_, static_cast<int>(t_));
 }
@@ -487,7 +511,7 @@ inline std::string_view luaG_typename(lua_State* const L_, LuaType const t_)
 // -------------------------------------------------------------------------------------------------
 
 [[nodiscard]]
-inline std::string_view luaG_typename(lua_State* const L_, StackIndex const idx_)
+inline std::string_view luaW_typename(lua_State* const L_, StackIndex const idx_)
 {
-    return luaG_typename(L_, luaG_type(L_, idx_));
+    return luaW_typename(L_, luaW_type(L_, idx_));
 }