update languages to use swig2.0 and reswig

This commit is contained in:
Brian West
2015-06-16 12:44:37 -05:00
parent 54762dd197
commit 4e88d9eea1
7 changed files with 133 additions and 45 deletions
+17 -35
View File
@@ -1,65 +1,47 @@
--- mod_lua_wrap.cpp.orig 2014-09-06 19:25:05.000000000 +0800
+++ mod_lua_wrap.cpp 2014-09-06 19:27:17.000000000 +0800
@@ -2799,7 +2799,7 @@
--- mod_lua_wrap.cpp.old 2015-06-16 12:27:19.024000000 -0500
+++ mod_lua_wrap.cpp 2015-06-16 12:34:51.540000000 -0500
@@ -3065,7 +3065,7 @@
}
result = (char *)(arg1)->read(arg2);
SWIG_arg=0;
- lua_pushstring(L,(const char*)result); SWIG_arg++;
- lua_pushstring(L,(const char *)result); SWIG_arg++;
+ lua_pushlstring(L,(const char*)result, (*arg2)); SWIG_arg++;
lua_pushnumber(L, (lua_Number) *arg2); SWIG_arg++;
return SWIG_arg;
@@ -6750,7 +6750,7 @@
SWIG_check_num_args("LUA::Session",0,0)
@@ -6855,7 +6855,7 @@
SWIG_check_num_args("LUA::Session::Session",0,0)
result = (LUA::Session *)new LUA::Session();
SWIG_arg=0;
- SWIG_NewPointerObj(L,result,SWIGTYPE_p_LUA__Session,1); SWIG_arg++;
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_LUA__Session,1); SWIG_arg++; result->setLUA(L);
return SWIG_arg;
if(0) SWIG_fail;
@@ -6778,7 +6778,7 @@
@@ -6882,7 +6882,7 @@
}
result = (LUA::Session *)new LUA::Session(arg1,arg2);
SWIG_arg=0;
- SWIG_NewPointerObj(L,result,SWIGTYPE_p_LUA__Session,1); SWIG_arg++;
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_LUA__Session,1); SWIG_arg++; result->setLUA(L);
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_LUA__Session,1); SWIG_arg++; result->setLUA(L);
return SWIG_arg;
if(0) SWIG_fail;
@@ -6799,7 +6799,7 @@
@@ -6902,7 +6902,7 @@
if(!SWIG_lua_isnilstring(L,1)) SWIG_fail_arg("LUA::Session::Session",1,"char *");
arg1 = (char *)lua_tostring(L, 1);
result = (LUA::Session *)new LUA::Session(arg1);
SWIG_arg=0;
- SWIG_NewPointerObj(L,result,SWIGTYPE_p_LUA__Session,1); SWIG_arg++;
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_LUA__Session,1); SWIG_arg++; result->setLUA(L);
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_LUA__Session,1); SWIG_arg++; result->setLUA(L);
return SWIG_arg;
if(0) SWIG_fail;
@@ -6824,7 +6824,7 @@
@@ -6926,7 +6926,7 @@
}
result = (LUA::Session *)new LUA::Session(arg1);
SWIG_arg=0;
- SWIG_NewPointerObj(L,result,SWIGTYPE_p_LUA__Session,1); SWIG_arg++;
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_LUA__Session,1); SWIG_arg++; result->setLUA(L);
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_LUA__Session,1); SWIG_arg++; result->setLUA(L);
return SWIG_arg;
if(0) SWIG_fail;
@@ -8236,7 +8236,7 @@
}
#endif
-static const struct luaL_reg swig_commands[] = {
+static const struct luaL_Reg swig_commands[] = {
{ "setGlobalVariable", _wrap_setGlobalVariable},
{ "getGlobalVariable", _wrap_getGlobalVariable},
{ "consoleLog", _wrap_consoleLog},
@@ -8654,7 +8654,7 @@
{
int i;
/* start with global table */
- lua_pushvalue(L,LUA_GLOBALSINDEX);
+ lua_pushglobaltable(L);
/* SWIG's internal initalisation */
SWIG_InitializeModule((void*)L);
SWIG_PropagateClientData();