Add support for CLuaArguments return type (#1675)

StrixG · web-flow · commit 7709c2d17091 · 2020-09-25T12:49:53.000+02:00
diff --git a/Client/mods/deathmatch/logic/lua/CLuaArguments.cpp b/Client/mods/deathmatch/logic/lua/CLuaArguments.cpp
@@ -143,7 +143,7 @@ void CLuaArguments::PushArguments(lua_State* luaVM) const
     }
 }
 
-void CLuaArguments::PushAsTable(lua_State* luaVM, CFastHashMap<CLuaArguments*, int>* pKnownTables)
+void CLuaArguments::PushAsTable(lua_State* luaVM, CFastHashMap<CLuaArguments*, int>* pKnownTables) const
 {
     // Ensure there is enough space on the Lua stack
     LUA_CHECKSTACK(luaVM, 4);
diff --git a/Client/mods/deathmatch/logic/lua/CLuaArguments.h b/Client/mods/deathmatch/logic/lua/CLuaArguments.h
@@ -50,7 +50,7 @@ class CLuaArguments
     bool CallGlobal(class CLuaMain* pLuaMain, const char* szFunction, CLuaArguments* returnValues = NULL) const;
 
     void ReadTable(lua_State* luaVM, int iIndexBegin, CFastHashMap<const void*, CLuaArguments*>* pKnownTables = NULL);
-    void PushAsTable(lua_State* luaVM, CFastHashMap<CLuaArguments*, int>* pKnownTables = NULL);
+    void PushAsTable(lua_State* luaVM, CFastHashMap<CLuaArguments*, int>* pKnownTables = nullptr) const;
 
     CLuaArgument* PushNil();
     CLuaArgument* PushBoolean(bool bBool);
diff --git a/Server/mods/deathmatch/logic/lua/CLuaArguments.cpp b/Server/mods/deathmatch/logic/lua/CLuaArguments.cpp
@@ -139,7 +139,7 @@ void CLuaArguments::PushArguments(lua_State* luaVM) const
     }
 }
 
-void CLuaArguments::PushAsTable(lua_State* luaVM, CFastHashMap<CLuaArguments*, int>* pKnownTables)
+void CLuaArguments::PushAsTable(lua_State* luaVM, CFastHashMap<CLuaArguments*, int>* pKnownTables) const
 {
     // Ensure there is enough space on the Lua stack
     LUA_CHECKSTACK(luaVM, 4);
diff --git a/Server/mods/deathmatch/logic/lua/CLuaArguments.h b/Server/mods/deathmatch/logic/lua/CLuaArguments.h
@@ -62,7 +62,7 @@ class CLuaArguments
     bool CallGlobal(class CLuaMain* pLuaMain, const char* szFunction, CLuaArguments* returnValues = NULL) const;
 
     void ReadTable(lua_State* luaVM, int iIndexBegin, CFastHashMap<const void*, CLuaArguments*>* pKnownTables = NULL);
-    void PushAsTable(lua_State* luaVM, CFastHashMap<CLuaArguments*, int>* pKnownTables = NULL);
+    void PushAsTable(lua_State* luaVM, CFastHashMap<CLuaArguments*, int>* pKnownTables = nullptr) const;
 
     CLuaArgument* PushNil();
     CLuaArgument* PushBoolean(bool bBool);
diff --git a/Shared/mods/deathmatch/logic/lua/LuaBasic.h b/Shared/mods/deathmatch/logic/lua/LuaBasic.h
@@ -80,6 +80,12 @@ namespace lua
         return 1;
     }
 
+    inline int Push(lua_State* L, const CLuaArguments& args)
+    {
+        args.PushAsTable(L);
+        return 1;
+    }
+
     template <typename... Ts>
     int Push(lua_State* L, const std::variant<Ts...>&& val)
     {

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ void CLuaArguments::PushArguments(lua_State* luaVM) const`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`
`146`		`-void CLuaArguments::PushAsTable(lua_State* luaVM, CFastHashMap<CLuaArguments, int> pKnownTables)`
	`146`	`+void CLuaArguments::PushAsTable(lua_State* luaVM, CFastHashMap<CLuaArguments, int> pKnownTables) const`
`147`	`147`	`{`
`148`	`148`	`// Ensure there is enough space on the Lua stack`
`149`	`149`	`LUA_CHECKSTACK(luaVM, 4);`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ void CLuaArguments::PushArguments(lua_State* luaVM) const`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`
`142`		`-void CLuaArguments::PushAsTable(lua_State* luaVM, CFastHashMap<CLuaArguments, int> pKnownTables)`
	`142`	`+void CLuaArguments::PushAsTable(lua_State* luaVM, CFastHashMap<CLuaArguments, int> pKnownTables) const`
`143`	`143`	`{`
`144`	`144`	`// Ensure there is enough space on the Lua stack`
`145`	`145`	`LUA_CHECKSTACK(luaVM, 4);`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,12 @@ namespace lua`
`80`	`80`	`return 1;`
`81`	`81`	`}`
`82`	`82`
	`83`	`+ inline int Push(lua_State* L, const CLuaArguments& args)`
	`84`	`+ {`
	`85`	`+ args.PushAsTable(L);`
	`86`	`+ return 1;`
	`87`	`+ }`
	`88`	`+`
`83`	`89`	`template <typename... Ts>`
`84`	`90`	`int Push(lua_State* L, const std::variant<Ts...>&& val)`
`85`	`91`	`{`