matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better luacon_geterror

Browse Source
This commit is contained in:
mniip 2013-05-03 01:09:13 +04:00
parent 29496cb6d3
commit d8023d21cd
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/cat/LegacyLuaAPI.cpp
View File

@ -664,12 +664,32 @@ void luacon_hook(lua_State * l, lua_Debug * ar)
} }
} }
char *luacon_geterror(){ static int luaL_tostring (lua_State *L, int n) {
char *error = (char*)lua_tostring(luacon_ci->l, -1); luaL_checkany(L, n);
if(error==NULL || !error[0]){ switch (lua_type(L, n)) {
error = "failed to execute"; case LUA_TNUMBER:
lua_pushstring(L, lua_tostring(L, n));
break;
case LUA_TSTRING:
lua_pushvalue(L, n);
break;
case LUA_TBOOLEAN:
lua_pushstring(L, (lua_toboolean(L, n) ? "true" : "false"));
break;
case LUA_TNIL:
lua_pushliteral(L, "nil");
break;
default:
lua_pushfstring(L, "%s: %p", luaL_typename(L, n), lua_topointer(L, n));
break;
} }
return error; return 1;
}
char *luacon_geterror(){
luaL_tostring(luacon_ci->l, -1);
char* err = (char*)luaL_optstring(luacon_ci->l, -1, "failed to execute");
lua_pop(luacon_ci->l, 1);
return err;
} }
/*void luacon_close(){ /*void luacon_close(){
lua_close(l); lua_close(l);
@ -923,27 +943,6 @@ int luatpt_setconsole(lua_State* l)
luacon_controller->HideConsole(); luacon_controller->HideConsole();
return 0; return 0;
} }
static int luaL_tostring (lua_State *L, int n) {
luaL_checkany(L, n);
switch (lua_type(L, n)) {
case LUA_TNUMBER:
lua_pushstring(L, lua_tostring(L, n));
break;
case LUA_TSTRING:
lua_pushvalue(L, n);
break;
case LUA_TBOOLEAN:
lua_pushstring(L, (lua_toboolean(L, n) ? "true" : "false"));
break;
case LUA_TNIL:
lua_pushliteral(L, "nil");
break;
default:
lua_pushfstring(L, "%s: %p", luaL_typename(L, n), lua_topointer(L, n));
break;
}
return 1;
}
int luatpt_log(lua_State* l) int luatpt_log(lua_State* l)
{ {
int args = lua_gettop(l); int args = lua_gettop(l);