fixed mistake reported by William, caused by updating the lua.cxx
but not the lua.swg file git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8534 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
773018d61c
commit
c413035b7c
3 changed files with 40 additions and 49 deletions
|
|
@ -31,15 +31,26 @@
|
|||
%typemap(in,checkfn="lua_isnumber") int,short,long,
|
||||
unsigned int,unsigned short,unsigned long,
|
||||
signed char,unsigned char,
|
||||
float,double,enum SWIGTYPE
|
||||
float,double
|
||||
%{$1 = ($type)lua_tonumber(L, $input);%}
|
||||
|
||||
%typemap(out) int,short,long,
|
||||
unsigned int,unsigned short,unsigned long,
|
||||
signed char,unsigned char,
|
||||
float,double,enum SWIGTYPE
|
||||
float,double
|
||||
%{ lua_pushnumber(L, (double) $1); SWIG_arg++;%}
|
||||
|
||||
/* enums have to be handled slightly differently
|
||||
VC++ .net will not allow a cast from double to enum directly
|
||||
therefore cast to an int first.
|
||||
Thanks to Jason Rego <JasonR@rainbowstudios.com> for finding this.
|
||||
*/
|
||||
%typemap(in,checkfn="lua_isnumber") enum SWIGTYPE
|
||||
%{$1 = ($type)(int)lua_tonumber(L, $input);%}
|
||||
|
||||
%typemap(out) enum SWIGTYPE
|
||||
%{ lua_pushnumber(L, (double)(int)($1)); SWIG_arg++;%}
|
||||
|
||||
// boolean (which is a special type in lua)
|
||||
// note: 1 & 0 are not booleans in lua, only true & false
|
||||
%typemap(in,checkfn="lua_isboolean") bool
|
||||
|
|
@ -429,8 +440,11 @@ SWIGEXPORT int SWIG_init(lua_State* L)
|
|||
SWIG_Lua_module_begin(L,SWIG_name);
|
||||
/* add commands/functions */
|
||||
for (i = 0; swig_commands[i].name; i++){
|
||||
SWIG_Lua_module_add_function(L,swig_commands[i].name,swig_commands[i].wrapper);
|
||||
SWIG_Lua_module_add_function(L,swig_commands[i].name,swig_commands[i].func);
|
||||
}
|
||||
/*luaL_openlib(L,NULL,swig_commands,0);*/
|
||||
/* all in one */
|
||||
/*luaL_openlib(L,SWIG_name,swig_commands,0);*/
|
||||
/* add variables */
|
||||
for (i = 0; swig_variables[i].name; i++){
|
||||
SWIG_Lua_module_add_variable(L,swig_variables[i].name,swig_variables[i].get,swig_variables[i].set);
|
||||
|
|
@ -447,8 +461,8 @@ SWIGEXPORT int SWIG_init(lua_State* L)
|
|||
SWIG_Lua_InstallConstants(L,swig_constants);
|
||||
|
||||
/* end module */
|
||||
SWIG_Lua_module_end(L);
|
||||
|
||||
/*SWIG_Lua_module_end(L);*/
|
||||
lua_pop(L,1); /* tidy stack (remove module table)*/
|
||||
lua_pop(L,1); /* tidy stack (remove global table)*/
|
||||
|
||||
return 1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue