jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bugfixes

Browse source
This commit is contained in:
Artem Serebriyskiy 2013-11-11 15:23:50 +04:00
commit f1fb2cc295
3 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Examples/test-suite/lua/template_default_arg_runme.lua
View file

@ -3,6 +3,7 @@ import("template_default_arg") -- import code
--for k,v in pairs(template_default_arg) do _G[k]=v end -- move to global --for k,v in pairs(template_default_arg) do _G[k]=v end -- move to global
helloInt = template_default_arg.Hello_int() helloInt = template_default_arg.Hello_int()
assert(template_default_arg.Hello_int_hi ~= nil)
helloInt:foo(template_default_arg.Hello_int_hi) helloInt:foo(template_default_arg.Hello_int_hi)
x = template_default_arg.X_int() x = template_default_arg.X_int()

46
Lib/lua/luarun.swg
View file

@ -477,10 +477,10 @@ SWIGINTERN void SWIG_Lua_get_class_metatable(lua_State* L,const char* cname);
lua_rawgeti(L,bases_table,i+1);\ lua_rawgeti(L,bases_table,i+1);\
base_swig_type = 0;\ base_swig_type = 0;\
if(lua_isnil(L,-1)) {\ if(lua_isnil(L,-1)) {\
valid = false;\ valid = 0;\
lua_pop(L,1);\ lua_pop(L,1);\
} else\ } else\
valid = true; valid = 1;
#else // en elua .bases table doesn't exist. Use table from swig_lua_class #else // en elua .bases table doesn't exist. Use table from swig_lua_class
@ -494,18 +494,18 @@ SWIGINTERN void SWIG_Lua_get_class_metatable(lua_State* L,const char* cname);
#define SWIG_LUA_GET_BASE_METATABLE(i,base_swig_type, valid)\ #define SWIG_LUA_GET_BASE_METATABLE(i,base_swig_type, valid)\
swig_lua_class *base_class = bases[i];\ swig_lua_class *base_class = bases[i];\
if(!base_class)\ if(!base_class)\
valid = false;\ valid = 0;\
else {\ else {\
valid = true;\ valid = 1;\
SWIG_Lua_get_class_metatable(L,base_class->fqname);\ SWIG_Lua_get_class_metatable(L,base_class->fqname);\
base_swig_type = SWIG_TypeQueryModule(module,module,base_class->fqname);\ base_swig_type = SWIG_TypeQueryModule(module,module,base_class->fqname);\
} }
#endif #endif
typedef int (*swig_lua_base_iterator_func)(lua_State*,swig_type_info*, int, int& ret); typedef int (*swig_lua_base_iterator_func)(lua_State*,swig_type_info*, int, int *ret);
int SWIG_Lua_iterate_bases(lua_State *L, swig_type_info* swig_type, int first_arg, swig_lua_base_iterator_func func, int& ret) int SWIG_Lua_iterate_bases(lua_State *L, swig_type_info* swig_type, int first_arg, swig_lua_base_iterator_func func, int * const ret)
{ {
// first_arg - position of the object in stack. Everything that is above are arguments // first_arg - position of the object in stack. Everything that is above are arguments
// and is passed to every evocation of the func // and is passed to every evocation of the func
@ -515,13 +515,13 @@ int SWIG_Lua_iterate_bases(lua_State *L, swig_type_info* swig_type, int first_ar
int bases_count; int bases_count;
SWIG_LUA_INIT_BASE_SEARCH(bases_count); SWIG_LUA_INIT_BASE_SEARCH(bases_count);
int result = SWIG_ERROR; int result = SWIG_ERROR;
ret = 0; if(ret) *ret = 0;
if(bases_count>0) if(bases_count>0)
{ {
int i; int i;
int j; int j;
int subcall_first_arg = lua_gettop(L) + 1;// Here a copy of first_arg and arguments begin int subcall_first_arg = lua_gettop(L) + 1;// Here a copy of first_arg and arguments begin
bool valid = true; int valid = 1;
for(j=first_arg;j<=last_arg;j++) for(j=first_arg;j<=last_arg;j++)
lua_pushvalue(L,j); lua_pushvalue(L,j);
int subcall_last_arg = lua_gettop(L); int subcall_last_arg = lua_gettop(L);
@ -538,7 +538,7 @@ int SWIG_Lua_iterate_bases(lua_State *L, swig_type_info* swig_type, int first_ar
lua_setmetatable(L,subcall_first_arg); // Set new metatable lua_setmetatable(L,subcall_first_arg); // Set new metatable
assert(lua_gettop(L) == subcall_last_arg); assert(lua_gettop(L) == subcall_last_arg);
result = func(L, base_swig_type,subcall_first_arg, ret); // Forward call result = func(L, base_swig_type,subcall_first_arg, ret); // Forward call
assert(lua_gettop(L) == subcall_last_arg + ret); // TODO: REMOVE if(ret) assert(lua_gettop(L) == subcall_last_arg + *ret); // TODO: REMOVE
if(result != SWIG_ERROR) { if(result != SWIG_ERROR) {
break; break;
} }
@ -550,12 +550,12 @@ int SWIG_Lua_iterate_bases(lua_State *L, swig_type_info* swig_type, int first_ar
const int to_remove = subcall_last_arg - last_arg; const int to_remove = subcall_last_arg - last_arg;
for(j=0;j<to_remove;j++) for(j=0;j<to_remove;j++)
lua_remove(L,last_arg+1); lua_remove(L,last_arg+1);
assert(lua_gettop(L) == last_arg + ret); // TODO: REMOVE if(ret) assert(lua_gettop(L) == last_arg + *ret); // TODO: REMOVE
} else { } else {
// Remove everything after last_arg // Remove everything after last_arg
lua_pop(L, lua_gettop(L) - last_arg); lua_pop(L, lua_gettop(L) - last_arg);
} }
assert(lua_gettop(L) == last_arg + ret); if(ret) assert(lua_gettop(L) == last_arg + *ret);
return result; return result;
} }
@ -563,7 +563,7 @@ int SWIG_Lua_iterate_bases(lua_State *L, swig_type_info* swig_type, int first_ar
* It returns error code. Number of function return values is passed inside 'ret' * It returns error code. Number of function return values is passed inside 'ret'
* first_arg is not used in this function because function always has 2 arguments. * first_arg is not used in this function because function always has 2 arguments.
*/ */
SWIGINTERN int SWIG_Lua_class_do_get(lua_State *L, swig_type_info *type, int first_arg, int &ret) SWIGINTERN int SWIG_Lua_class_do_get(lua_State *L, swig_type_info *type, int first_arg, int *ret)
{ {
/* there should be 2 params passed in /* there should be 2 params passed in
(1) userdata (not the meta table) (1) userdata (not the meta table)
@ -591,7 +591,7 @@ SWIGINTERN int SWIG_Lua_class_do_get(lua_State *L, swig_type_info *type, int fi
lua_pushvalue(L,substack_start+1); /* the userdata */ lua_pushvalue(L,substack_start+1); /* the userdata */
lua_call(L,1,1); /* 1 value in (userdata),1 out (result) */ lua_call(L,1,1); /* 1 value in (userdata),1 out (result) */
lua_remove(L,-2); /* stack tidy, remove metatable */ lua_remove(L,-2); /* stack tidy, remove metatable */
ret = 1; if(ret) *ret = 1;
return SWIG_OK; return SWIG_OK;
} }
lua_pop(L,1); /* remove whatever was there */ lua_pop(L,1); /* remove whatever was there */
@ -604,7 +604,7 @@ SWIGINTERN int SWIG_Lua_class_do_get(lua_State *L, swig_type_info *type, int fi
if (lua_isfunction(L,-1)) /* note: if its a C function or lua function */ if (lua_isfunction(L,-1)) /* note: if its a C function or lua function */
{ /* found it so return the fn & let lua call it */ { /* found it so return the fn & let lua call it */
lua_remove(L,-2); /* stack tidy, remove metatable */ lua_remove(L,-2); /* stack tidy, remove metatable */
ret = 1; if(ret) *ret = 1;
return SWIG_OK; return SWIG_OK;
} }
lua_pop(L,1); /* remove whatever was there */ lua_pop(L,1); /* remove whatever was there */
@ -617,7 +617,7 @@ SWIGINTERN int SWIG_Lua_class_do_get(lua_State *L, swig_type_info *type, int fi
lua_pushvalue(L,substack_start+2); /* the parameter */ lua_pushvalue(L,substack_start+2); /* the parameter */
lua_call(L,2,1); /* 2 value in (userdata),1 out (result) */ lua_call(L,2,1); /* 2 value in (userdata),1 out (result) */
lua_remove(L,-2); /* stack tidy, remove metatable */ lua_remove(L,-2); /* stack tidy, remove metatable */
ret = 1; if(ret) *ret = 1;
return SWIG_OK; return SWIG_OK;
} }
lua_pop(L,1); lua_pop(L,1);
@ -625,12 +625,12 @@ SWIGINTERN int SWIG_Lua_class_do_get(lua_State *L, swig_type_info *type, int fi
lua_pop(L,1); lua_pop(L,1);
// Search in base classes // Search in base classes
assert(lua_gettop(L) == substack_start + 2); // TODO: REMOVE assert(lua_gettop(L) == substack_start + 2); // TODO: REMOVE
printf("failed, searching bases\n"); // TODO: REMOVE //printf("failed, searching bases\n"); // TODO: REMOVE
int bases_search_result = SWIG_Lua_iterate_bases(L,type,substack_start+1,SWIG_Lua_class_do_get,ret); int bases_search_result = SWIG_Lua_iterate_bases(L,type,substack_start+1,SWIG_Lua_class_do_get,ret);
assert(lua_gettop(L) == substack_start + 2 + ret); // TODO: REMOVE if(ret) assert(lua_gettop(L) == substack_start + 2 + *ret); // TODO: REMOVE
// TODO: REMOVE // TODO: REMOVE
if(bases_search_result != SWIG_OK) { if(bases_search_result != SWIG_OK) {
printf("failed.\n"); //printf("failed.\n");
} }
// END OF REMOVE // END OF REMOVE
return bases_search_result; /* sorry not known */ return bases_search_result; /* sorry not known */
@ -648,7 +648,7 @@ SWIGINTERN int SWIG_Lua_class_get(lua_State* L)
swig_lua_userdata *usr=(swig_lua_userdata*)lua_touserdata(L,1); /* get data */ swig_lua_userdata *usr=(swig_lua_userdata*)lua_touserdata(L,1); /* get data */
swig_type_info *type = usr->type; swig_type_info *type = usr->type;
int ret = 0; int ret = 0;
int result = SWIG_Lua_class_do_get(L,type,1,ret); int result = SWIG_Lua_class_do_get(L,type,1,&ret);
if(result == SWIG_OK) if(result == SWIG_OK)
return ret; return ret;
@ -658,7 +658,7 @@ SWIGINTERN int SWIG_Lua_class_get(lua_State* L)
/* helper for the class.set method, performs the lookup of class attributes /* helper for the class.set method, performs the lookup of class attributes
* It returns error code. Number of function return values is passed inside 'ret' * It returns error code. Number of function return values is passed inside 'ret'
*/ */
SWIGINTERN int SWIG_Lua_class_do_set(lua_State* L, swig_type_info *type, int first_arg, int& ret) SWIGINTERN int SWIG_Lua_class_do_set(lua_State* L, swig_type_info *type, int first_arg, int *ret)
{ {
/* there should be 3 params passed in /* there should be 3 params passed in
(1) table (not the meta table) (1) table (not the meta table)
@ -671,7 +671,7 @@ SWIGINTERN int SWIG_Lua_class_do_set(lua_State* L, swig_type_info *type, int fi
assert(lua_isuserdata(L,substack_start+1)); /* just in case */ assert(lua_isuserdata(L,substack_start+1)); /* just in case */
lua_getmetatable(L,substack_start+1); /* get the meta table */ lua_getmetatable(L,substack_start+1); /* get the meta table */
assert(lua_istable(L,-1)); /* just in case */ assert(lua_istable(L,-1)); /* just in case */
ret = 0; // it is setter - number of return values is always 0 if(ret) *ret = 0; // it is setter - number of return values is always 0
SWIG_Lua_get_table(L,".set"); /* find the .set table */ SWIG_Lua_get_table(L,".set"); /* find the .set table */
if (lua_istable(L,-1)) if (lua_istable(L,-1))
@ -712,7 +712,7 @@ SWIGINTERN int SWIG_Lua_class_do_set(lua_State* L, swig_type_info *type, int fi
// Search among bases // Search among bases
assert(lua_gettop(L) == first_arg+2); // TODO: REMOVE assert(lua_gettop(L) == first_arg+2); // TODO: REMOVE
int bases_search_result = SWIG_Lua_iterate_bases(L,type,first_arg,SWIG_Lua_class_do_set,ret); int bases_search_result = SWIG_Lua_iterate_bases(L,type,first_arg,SWIG_Lua_class_do_set,ret);
assert(ret == 0); if(ret) assert(*ret == 0);
assert(lua_gettop(L) == substack_start + 3); assert(lua_gettop(L) == substack_start + 3);
return bases_search_result; return bases_search_result;
} }
@ -731,7 +731,7 @@ SWIGINTERN int SWIG_Lua_class_set(lua_State* L)
swig_lua_userdata *usr=(swig_lua_userdata*)lua_touserdata(L,1); /* get data */ swig_lua_userdata *usr=(swig_lua_userdata*)lua_touserdata(L,1); /* get data */
swig_type_info *type = usr->type; swig_type_info *type = usr->type;
int ret = 0; int ret = 0;
int result = SWIG_Lua_class_do_set(L,type,1,ret); int result = SWIG_Lua_class_do_set(L,type,1,&ret);
if(result != SWIG_OK) { if(result != SWIG_OK) {
SWIG_Lua_pushferrstring(L,"Assignment not possible. No setter/member with this name. For custom assignments implement __setitem method"); SWIG_Lua_pushferrstring(L,"Assignment not possible. No setter/member with this name. For custom assignments implement __setitem method");
lua_error(L); lua_error(L);

2
Source/Modules/lua.cxx
View file

@ -1129,7 +1129,7 @@ public:
Replaceall(tm_v2, "$target", target_name_v2); Replaceall(tm_v2, "$target", target_name_v2);
Replaceall(tm_v2, "$value", value); Replaceall(tm_v2, "$value", value);
Replaceall(tm_v2, "$nsname", nsname); Replaceall(tm_v2, "$nsname", nsname);
registerConstant( class_parent_nspace, tm); registerConstant( class_parent_nspace, tm_v2.ptr());
} else { } else {
tm_v2 = Swig_typemap_lookup("constcode", n_v2, name, 0); tm_v2 = Swig_typemap_lookup("constcode", n_v2, name, 0);
if( !tm_v2) { if( !tm_v2) {