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

Fixes for examples. Wrapped keywords into guardian in keyword_rename test

Browse source
This commit is contained in:
Artem Serebriyskiy 2013-11-11 21:58:07 +04:00
commit ce2760f77e
6 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/lua/dual/dual.cpp
View file

@ -36,6 +36,10 @@ extern "C" int luaopen_example2(lua_State*L);
#define DEBUG2(X,Y) {printf(X,Y);fflush(stdout);} #define DEBUG2(X,Y) {printf(X,Y);fflush(stdout);}
#define DEBUG3(X,Y,Z) {printf(X,Y,Z);fflush(stdout);} #define DEBUG3(X,Y,Z) {printf(X,Y,Z);fflush(stdout);}
#if LUA_VERSION_NUM > 501
#define lua_open luaL_newstate
#endif
void testModule(lua_State *L) void testModule(lua_State *L)
{ {
swig_type_info *pTypeInfo=0,*pTypeInfo2=0; swig_type_info *pTypeInfo=0,*pTypeInfo2=0;

3
Examples/lua/embed/Makefile
View file

@ -4,6 +4,7 @@ TARGET = embed
SRCS = example.c SRCS = example.c
INTERFACE = example.i INTERFACE = example.i
LUA_INTERP = embed.c LUA_INTERP = embed.c
LIBS = -lm
# this is a little different to normal as we have our own special interpreter # this is a little different to normal as we have our own special interpreter
# which we want to static link # which we want to static link
@ -12,7 +13,7 @@ check: build
build: build:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' LIBS='$(LIBS)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static
clean: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean

4
Examples/lua/embed/embed.c
View file

@ -18,6 +18,10 @@ We will be using the luaL_dostring()/lua_dostring() function to call into lua
#include <lauxlib.h> #include <lauxlib.h>
#include <lualib.h> #include <lualib.h>
#if LUA_VERSION_NUM > 501
#define lua_open luaL_newstate
#endif
/* the SWIG wrappered library */ /* the SWIG wrappered library */
extern int luaopen_example(lua_State*L); extern int luaopen_example(lua_State*L);

3
Examples/lua/embed2/Makefile
View file

@ -4,6 +4,7 @@ TARGET = embed2
SRCS = example.c SRCS = example.c
INTERFACE = example.i INTERFACE = example.i
LUA_INTERP = embed2.c LUA_INTERP = embed2.c
LIBS = -lm
# this is a little different to normal as we have our own special interpreter # this is a little different to normal as we have our own special interpreter
# which we want to static link # which we want to static link
@ -12,7 +13,7 @@ check: build
build: build:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' LIBS='$(LIBS)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static
clean: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean

2
Examples/test-suite/keyword_rename.i
View file

@ -32,8 +32,10 @@ KW(go, defer)
KW(chan, fallthrough) KW(chan, fallthrough)
/* Lua keywords */ /* Lua keywords */
#ifdef SWIGLUA
KW(end, function) KW(end, function)
KW(nil,local) KW(nil,local)
#endif
%} %}

5
Lib/lua/luarun.swg
View file

@ -357,6 +357,9 @@ SWIGINTERN int SWIG_Lua_namespace_set(lua_State *L)
lua_pop(L,1); /* remove the value */ lua_pop(L,1); /* remove the value */
} }
lua_pop(L,1); /* remove the value .set table */ lua_pop(L,1); /* remove the value .set table */
lua_pop(L,1); /* remote metatable */
assert(lua_gettop(L) == 3); // TODO: REMOVE
lua_rawset(L,-3);
return 0; return 0;
} }
@ -505,7 +508,7 @@ SWIGINTERN void SWIG_Lua_get_class_metatable(lua_State *L,const char *cname);
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 *const ret) SWIGINTERN 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