summaryrefslogtreecommitdiffstats
path: root/src/Bindings
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2016-05-31 01:01:55 +0200
committerworktycho <work.tycho@gmail.com>2016-05-31 01:01:55 +0200
commit5618e453e60219c10ac4d811dc44926ecee7c370 (patch)
tree3d618336ec689295e950a4177b32d8e8cba8445e /src/Bindings
parentMerge pull request #3078 from cuberite/AddTerrainGenDocs (diff)
downloadcuberite-5618e453e60219c10ac4d811dc44926ecee7c370.tar
cuberite-5618e453e60219c10ac4d811dc44926ecee7c370.tar.gz
cuberite-5618e453e60219c10ac4d811dc44926ecee7c370.tar.bz2
cuberite-5618e453e60219c10ac4d811dc44926ecee7c370.tar.lz
cuberite-5618e453e60219c10ac4d811dc44926ecee7c370.tar.xz
cuberite-5618e453e60219c10ac4d811dc44926ecee7c370.tar.zst
cuberite-5618e453e60219c10ac4d811dc44926ecee7c370.zip
Diffstat (limited to '')
-rw-r--r--src/Bindings/LuaState.cpp178
-rw-r--r--src/Bindings/LuaState.h16
2 files changed, 140 insertions, 54 deletions
diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp
index 200878cf7..e0551c550 100644
--- a/src/Bindings/LuaState.cpp
+++ b/src/Bindings/LuaState.cpp
@@ -1470,7 +1470,7 @@ int cLuaState::CallFunctionWithForeignParams(
-int cLuaState::CopyStackFrom(cLuaState & a_SrcLuaState, int a_SrcStart, int a_SrcEnd)
+int cLuaState::CopyStackFrom(cLuaState & a_SrcLuaState, int a_SrcStart, int a_SrcEnd, int a_NumAllowedNestingLevels)
{
/*
// DEBUG:
@@ -1480,64 +1480,138 @@ int cLuaState::CopyStackFrom(cLuaState & a_SrcLuaState, int a_SrcStart, int a_Sr
*/
for (int i = a_SrcStart; i <= a_SrcEnd; ++i)
{
- int t = lua_type(a_SrcLuaState, i);
- switch (t)
+ if (!CopySingleValueFrom(a_SrcLuaState, i, a_NumAllowedNestingLevels))
{
- case LUA_TNIL:
- {
- lua_pushnil(m_LuaState);
- break;
- }
- case LUA_TSTRING:
- {
- AString s;
- a_SrcLuaState.ToString(i, s);
- Push(s);
- break;
- }
- case LUA_TBOOLEAN:
- {
- bool b = (tolua_toboolean(a_SrcLuaState, i, false) != 0);
- Push(b);
- break;
- }
- case LUA_TNUMBER:
- {
- lua_Number d = tolua_tonumber(a_SrcLuaState, i, 0);
- Push(d);
- break;
- }
- case LUA_TUSERDATA:
+ lua_pop(m_LuaState, i - a_SrcStart);
+ return -1;
+ }
+ }
+ return a_SrcEnd - a_SrcStart + 1;
+}
+
+
+
+
+
+bool cLuaState::CopyTableFrom(cLuaState & a_SrcLuaState, int a_SrcStackIdx, int a_NumAllowedNestingLevels)
+{
+ // Create the dest table:
+ #ifdef _DEBUG
+ auto srcTop = lua_gettop(a_SrcLuaState);
+ auto dstTop = lua_gettop(m_LuaState);
+ #endif
+ lua_createtable(m_LuaState, 0, 0); // DST: <table>
+ lua_pushvalue(a_SrcLuaState, a_SrcStackIdx); // SRC: <table>
+ lua_pushnil(a_SrcLuaState); // SRC: <table> <key>
+ while (lua_next(a_SrcLuaState, -2) != 0) // SRC: <table> <key> <value>
+ {
+ assert(lua_gettop(a_SrcLuaState) == srcTop + 3);
+ assert(lua_gettop(m_LuaState) == dstTop + 1);
+
+ // Copy the key:
+ if (!CopySingleValueFrom(a_SrcLuaState, -2, a_NumAllowedNestingLevels)) // DST: <table> <key>
+ {
+ lua_pop(m_LuaState, 1);
+ lua_pop(a_SrcLuaState, 3);
+ assert(lua_gettop(a_SrcLuaState) == srcTop);
+ assert(lua_gettop(m_LuaState) == dstTop);
+ return false;
+ }
+ assert(lua_gettop(a_SrcLuaState) == srcTop + 3);
+ assert(lua_gettop(m_LuaState) == dstTop + 2);
+
+ // Copy the value:
+ if (!CopySingleValueFrom(a_SrcLuaState, -1, a_NumAllowedNestingLevels - 1)) // DST: <table> <key> <value>
+ {
+ lua_pop(m_LuaState, 2); // DST: empty
+ lua_pop(a_SrcLuaState, 3); // SRC: empty
+ assert(lua_gettop(a_SrcLuaState) == srcTop);
+ assert(lua_gettop(m_LuaState) == dstTop);
+ return false;
+ }
+ assert(lua_gettop(a_SrcLuaState) == srcTop + 3);
+ assert(lua_gettop(m_LuaState) == dstTop + 3);
+
+ // Set the value and fix up stacks:
+ lua_rawset(m_LuaState, -3); // DST: <table>
+ lua_pop(a_SrcLuaState, 1); // SRC: <table> <key>
+ assert(lua_gettop(a_SrcLuaState) == srcTop + 2);
+ assert(lua_gettop(m_LuaState) == dstTop + 1);
+ }
+ lua_pop(a_SrcLuaState, 1); // SRC: empty
+ assert(lua_gettop(a_SrcLuaState) == srcTop);
+ assert(lua_gettop(m_LuaState) == dstTop + 1);
+ return true;
+}
+
+
+
+
+
+bool cLuaState::CopySingleValueFrom(cLuaState & a_SrcLuaState, int a_StackIdx, int a_NumAllowedNestingLevels)
+{
+ int t = lua_type(a_SrcLuaState, a_StackIdx);
+ switch (t)
+ {
+ case LUA_TNIL:
+ {
+ lua_pushnil(m_LuaState);
+ return true;
+ }
+ case LUA_TSTRING:
+ {
+ AString s;
+ a_SrcLuaState.ToString(a_StackIdx, s);
+ Push(s);
+ return true;
+ }
+ case LUA_TBOOLEAN:
+ {
+ bool b = (tolua_toboolean(a_SrcLuaState, a_StackIdx, false) != 0);
+ Push(b);
+ return true;
+ }
+ case LUA_TNUMBER:
+ {
+ lua_Number d = tolua_tonumber(a_SrcLuaState, a_StackIdx, 0);
+ Push(d);
+ return true;
+ }
+ case LUA_TUSERDATA:
+ {
+ // Get the class name:
+ const char * type = nullptr;
+ if (lua_getmetatable(a_SrcLuaState, a_StackIdx) == 0)
{
- // Get the class name:
- const char * type = nullptr;
- if (lua_getmetatable(a_SrcLuaState, i) == 0)
- {
- LOGWARNING("%s: Unknown class in pos %d, cannot copy.", __FUNCTION__, i);
- lua_pop(m_LuaState, i - a_SrcStart);
- return -1;
- }
- lua_rawget(a_SrcLuaState, LUA_REGISTRYINDEX); // Stack +1
- type = lua_tostring(a_SrcLuaState, -1);
- lua_pop(a_SrcLuaState, 1); // Stack -1
-
- // Copy the value:
- void * ud = tolua_touserdata(a_SrcLuaState, i, nullptr);
- tolua_pushusertype(m_LuaState, ud, type);
- break;
+ LOGWARNING("%s: Unknown class in pos %d, cannot copy.", __FUNCTION__, a_StackIdx);
+ return false;
}
- default:
+ lua_rawget(a_SrcLuaState, LUA_REGISTRYINDEX); // Stack +1
+ type = lua_tostring(a_SrcLuaState, -1);
+ lua_pop(a_SrcLuaState, 1); // Stack -1
+
+ // Copy the value:
+ void * ud = tolua_touserdata(a_SrcLuaState, a_StackIdx, nullptr);
+ tolua_pushusertype(m_LuaState, ud, type);
+ return true;
+ }
+ case LUA_TTABLE:
+ {
+ if (!CopyTableFrom(a_SrcLuaState, a_StackIdx, a_NumAllowedNestingLevels - 1))
{
- LOGWARNING("%s: Unsupported value: '%s' at stack position %d. Can only copy numbers, strings, bools and classes!",
- __FUNCTION__, lua_typename(a_SrcLuaState, t), i
- );
- a_SrcLuaState.LogStack("Stack where copying failed:");
- lua_pop(m_LuaState, i - a_SrcStart);
- return -1;
+ LOGWARNING("%s: Failed to copy table in pos %d.", __FUNCTION__, a_StackIdx);
+ return false;
}
+ return true;
+ }
+ default:
+ {
+ LOGWARNING("%s: Unsupported value: '%s' at stack position %d. Can only copy numbers, strings, bools, classes and simple tables!",
+ __FUNCTION__, lua_typename(a_SrcLuaState, t), a_StackIdx
+ );
+ return false;
}
}
- return a_SrcEnd - a_SrcStart + 1;
}
diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
index 215980033..b795a80d4 100644
--- a/src/Bindings/LuaState.h
+++ b/src/Bindings/LuaState.h
@@ -419,10 +419,22 @@ public:
);
/** Copies objects on the stack from the specified state.
- Only numbers, bools, strings and userdatas are copied.
+ Only numbers, bools, strings, API classes and simple tables containing these (recursively) are copied.
+ a_NumAllowedNestingLevels specifies how many table nesting levels are allowed, copying fails if there's a deeper table.
If successful, returns the number of objects copied.
If failed, returns a negative number and rewinds the stack position. */
- int CopyStackFrom(cLuaState & a_SrcLuaState, int a_SrcStart, int a_SrcEnd);
+ int CopyStackFrom(cLuaState & a_SrcLuaState, int a_SrcStart, int a_SrcEnd, int a_NumAllowedNestingLevels = 16);
+
+ /** Copies a table at the specified stack index of the source Lua state to the top of this Lua state's stack.
+ a_NumAllowedNestingLevels specifies how many table nesting levels are allowed, copying fails if there's a deeper table.
+ Returns true if successful, false on failure.
+ Can copy only simple values - numbers, bools, strings and recursively simple tables. */
+ bool CopyTableFrom(cLuaState & a_SrcLuaState, int a_TableIdx, int a_NumAllowedNestingLevels);
+
+ /** Copies a single value from the specified stack index of the source Lua state to the top of this Lua state's stack.
+ a_NumAllowedNestingLevels specifies how many table nesting levels are allowed, copying fails if there's a deeper table.
+ Returns true if the value was copied, false on failure. */
+ bool CopySingleValueFrom(cLuaState & a_SrcLuaState, int a_StackIdx, int a_NumAllowedNestingLevels);
/** Reads the value at the specified stack position as a string and sets it to a_String. */
void ToString(int a_StackPos, AString & a_String);