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

applied neomantra's patches & fixed C89 bug #1356574

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8316 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Mark Gossage 2006-01-09 07:59:11 +00:00
commit ab9338a15e
3 changed files with 279 additions and 279 deletions
Download patch file Download diff file Expand all files Collapse all files

58
SWIG/Lib/lua/lua.swg
View file

@ -394,69 +394,81 @@ SWIG_fail; %}
/* ------------------------------------------------------------ /* ------------------------------------------------------------
* SWIG_init * SWIG_init
* ------------------------------------------------------------ */ * ------------------------------------------------------------ */
%insert(init) "swiginit.swg" %insert(initbeforefunc) "swiginit.swg"
// this is the initialization function
// added at the very end of the code
// the function is always called SWIG_init, but an eariler #define will rename it
%init %{
%insert(initbeforefunc) %{
/* Forward declaration of where the user's %init{} gets inserted */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C" {
#endif #endif
void SWIG_init_user(lua_State* L );
/* this is the initialization function
added at the very end of the code
the function is always called SWIG_init, but an eariler #define will rename it
*/
SWIGEXPORT int SWIG_init(lua_State* L) SWIGEXPORT int SWIG_init(lua_State* L)
{ {
int i; int i;
// start with global table /* start with global table */
lua_pushvalue(L,LUA_GLOBALSINDEX); lua_pushvalue(L,LUA_GLOBALSINDEX);
SWIG_InitializeModule((void*)L); SWIG_InitializeModule((void*)L);
SWIG_PropagateClientData(); SWIG_PropagateClientData();
// add a global fn /* invoke user-specific initialization */
SWIG_init_user(L);
/* add a global fn */
SWIG_Lua_add_function(L,"swig_type",SWIG_Lua_type); SWIG_Lua_add_function(L,"swig_type",SWIG_Lua_type);
SWIG_Lua_add_function(L,"swig_equals",SWIG_Lua_equal); SWIG_Lua_add_function(L,"swig_equals",SWIG_Lua_equal);
// begin the module (its a table with the same name as the module) /* begin the module (its a table with the same name as the module) */
SWIG_Lua_module_begin(L,SWIG_name); SWIG_Lua_module_begin(L,SWIG_name);
// add commands/functions /* add commands/functions */
for (i = 0; swig_commands[i].name; i++){ 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].wrapper);
} }
// add variables /* add variables */
for (i = 0; swig_variables[i].name; i++){ 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); SWIG_Lua_module_add_variable(L,swig_variables[i].name,swig_variables[i].get,swig_variables[i].set);
} }
// additional registration structs & classes in lua: /* additional registration structs & classes in lua: */
for (i = 0; swig_types[i]; i++){ for (i = 0; swig_types[i]; i++){
if (swig_types[i]->clientdata){ if (swig_types[i]->clientdata){
SWIG_Lua_class_register(L,(swig_lua_class*)(swig_types[i]->clientdata)); SWIG_Lua_class_register(L,(swig_lua_class*)(swig_types[i]->clientdata));
} }
} }
// constants /* constants */
SWIG_Lua_InstallConstants(L,swig_constants); SWIG_Lua_InstallConstants(L,swig_constants);
// end module /* end module */
SWIG_Lua_module_end(L); SWIG_Lua_module_end(L);
lua_pop(L,1); // tidy stack (remove global table) lua_pop(L,1); /* tidy stack (remove global table)*/
return 1; return 1;
} }
// Lua 5.1 has a different name for importing libraries /* Lua 5.1 has a different name for importing libraries
// luaopen_XXX, where XXX is the name of the module (not capitalised) luaopen_XXX, where XXX is the name of the module (not capitalised)
// this function will allow Lua 5.1 to import correctly this function will allow Lua 5.1 to import correctly.
#ifdef __cplusplus There is a #define in the wrapper to rename 'SWIG_import' to the correct name
extern "C" */
#endif
SWIGEXPORT int SWIG_import(lua_State* L) SWIGEXPORT int SWIG_import(lua_State* L)
{ {
return SWIG_init(L); return SWIG_init(L);
} }
#ifdef __cplusplus
};
#endif
%} %}
/* Note: the initialization function is closed after all code is generated */ /* Note: the initialization function is closed after all code is generated */

486
SWIG/Lib/lua/luarun.swg
View file

@ -13,8 +13,9 @@ extern "C" {
#endif #endif
#include "lua.h" #include "lua.h"
#include "stdio.h" // debug printing #include "lauxlib.h"
#include <assert.h> // for a few sanity tests /*#include "stdio.h" debug printing */
#include <assert.h> /* for a few sanity tests */
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* global swig types * global swig types
@ -76,7 +77,7 @@ typedef struct swig_lua_class {
typedef struct { typedef struct {
void *ptr; void *ptr;
swig_type_info *type; swig_type_info *type;
int own; // 1 if owned & must be destroyed int own; /* 1 if owned & must be destroyed */
} swig_lua_userdata; } swig_lua_userdata;
@ -99,7 +100,7 @@ typedef struct {
// helper #defines /* helper #defines */
#define SWIG_fail {goto fail;} #define SWIG_fail {goto fail;}
#define SWIG_fail_arg(I) {lua_pushfstring(L,"argument %d incorrect/missing",I);goto fail;} #define SWIG_fail_arg(I) {lua_pushfstring(L,"argument %d incorrect/missing",I);goto fail;}
@ -112,8 +113,7 @@ typedef struct {
lua_rawset(L,-3)) lua_rawset(L,-3))
/* debug routine*/
// debug routine
#if 0 #if 0
#define DEBUG_PRINT(X) {printf(X);fflush(stdout);} #define DEBUG_PRINT(X) {printf(X);fflush(stdout);}
#define DEBUG_STACK(X) {swig_print_stack(L);} #define DEBUG_STACK(X) {swig_print_stack(L);}
@ -135,126 +135,121 @@ void swig_print_stack(lua_State* L)
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* global variable support code: modules * global variable support code: modules
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
// the module.get method used for getting linked data
/* the module.get method used for getting linked data */
SWIGINTERN int SWIG_Lua_module_get(lua_State* L) SWIGINTERN int SWIG_Lua_module_get(lua_State* L)
{ {
// there should be 2 params passed in /* there should be 2 params passed in
// (1) table (not the meta table) (1) table (not the meta table)
// (2) string name of the attribute (2) string name of the attribute
// printf("SWIG_Lua_module_get %p(%s) '%s'\n", printf("SWIG_Lua_module_get %p(%s) '%s'\n",
// lua_topointer(L,1),lua_typename(L,lua_type(L,1)), lua_topointer(L,1),lua_typename(L,lua_type(L,1)),
// lua_tostring(L,2)); lua_tostring(L,2));
*/
// get the metatable /* get the metatable */
assert(lua_istable(L,1)); // just in case assert(lua_istable(L,1)); /* just in case */
lua_getmetatable(L,1); // get the metatable lua_getmetatable(L,1); /* get the metatable */
assert(lua_istable(L,-1)); // just in case assert(lua_istable(L,-1)); /* just in case */
SWIG_Lua_get_table(L,".get"); // get the .get table SWIG_Lua_get_table(L,".get"); /* get the .get table */
lua_remove(L,3); // remove metatable lua_remove(L,3); /* remove metatable */
// printf(" found %p(%s)\n",lua_topointer(L,-1),lua_typename(L,lua_type(L,-1)));
if (lua_istable(L,-1)) if (lua_istable(L,-1))
{ {
// look for the key in the .get table /* look for the key in the .get table */
lua_pushvalue(L,2); // key lua_pushvalue(L,2); /* key */
lua_rawget(L,-2); lua_rawget(L,-2);
lua_remove(L,3); // remove .get lua_remove(L,3); /* remove .get */
if (lua_iscfunction(L,-1)) if (lua_iscfunction(L,-1))
{ // found it so call the fn & return its value { /* found it so call the fn & return its value */
// printf("calling fn\n");
lua_call(L,0,1); lua_call(L,0,1);
return 1; return 1;
} }
lua_pop(L,1); // remove the top lua_pop(L,1); /* remove the top */
} }
lua_pop(L,1); // remove the .get lua_pop(L,1); /* remove the .get */
lua_pushnil(L); // return a nil lua_pushnil(L); /* return a nil */
return 1; return 1;
} }
// the module.set method used for setting linked data /* the module.set method used for setting linked data */
SWIGINTERN int SWIG_Lua_module_set(lua_State* L) SWIGINTERN int SWIG_Lua_module_set(lua_State* L)
{ {
// 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)
// (2) string name of the attribute (2) string name of the attribute
// (3) any for the new value (3) any for the new value
// printf("SWIG_Lua_module_set %p(%s) '%s' %p(%s)\n", */
// lua_topointer(L,1),lua_typename(L,lua_type(L,1)), /* get the metatable */
// lua_tostring(L,2), assert(lua_istable(L,1)); /* just in case */
// lua_topointer(L,3),lua_typename(L,lua_type(L,3))); lua_getmetatable(L,1); /* get the metatable */
assert(lua_istable(L,-1)); /* just in case */
// get the metatable SWIG_Lua_get_table(L,".set"); /* get the .set table */
assert(lua_istable(L,1)); // just in case lua_remove(L,4); /* remove metatable */
lua_getmetatable(L,1); // get the metatable
assert(lua_istable(L,-1)); // just in case
SWIG_Lua_get_table(L,".set"); // get the .set table
lua_remove(L,4); // remove metatable
if (lua_istable(L,-1)) if (lua_istable(L,-1))
{ {
// look for the key in the .set table /* look for the key in the .set table */
lua_pushvalue(L,2); // key lua_pushvalue(L,2); /* key */
lua_rawget(L,-2); lua_rawget(L,-2);
lua_remove(L,4); // remove .set lua_remove(L,4); /* remove .set */
if (lua_iscfunction(L,-1)) if (lua_iscfunction(L,-1))
{ // found it so call the fn & return its value { /* found it so call the fn & return its value */
lua_pushvalue(L,3); // value lua_pushvalue(L,3); /* value */
lua_call(L,1,0); lua_call(L,1,0);
return 0; return 0;
} }
lua_pop(L,1); // remove the top lua_pop(L,1); /* remove the top */
} }
lua_pop(L,1); // remove the .set lua_pop(L,1); /* remove the .set */
return 0; return 0;
} }
// registering a module in lua /* registering a module in lua */
SWIGINTERN void SWIG_Lua_module_begin(lua_State* L,const char* name) SWIGINTERN void SWIG_Lua_module_begin(lua_State* L,const char* name)
{ {
assert(lua_istable(L,-1)); // just in case assert(lua_istable(L,-1)); /* just in case */
lua_pushstring(L,name); lua_pushstring(L,name);
lua_newtable(L); // the table lua_newtable(L); /* the table */
// add meta table /* add meta table */
lua_newtable(L); // the meta table lua_newtable(L); /* the meta table */
SWIG_Lua_add_function(L,"__index",SWIG_Lua_module_get); SWIG_Lua_add_function(L,"__index",SWIG_Lua_module_get);
SWIG_Lua_add_function(L,"__newindex",SWIG_Lua_module_set); SWIG_Lua_add_function(L,"__newindex",SWIG_Lua_module_set);
lua_pushstring(L,".get"); lua_pushstring(L,".get");
lua_newtable(L); // the .get table lua_newtable(L); /* the .get table */
lua_rawset(L,-3); // add .get into metatable lua_rawset(L,-3); /* add .get into metatable */
lua_pushstring(L,".set"); lua_pushstring(L,".set");
lua_newtable(L); // the .set table lua_newtable(L); /* the .set table */
lua_rawset(L,-3); // add .set into metatable lua_rawset(L,-3); /* add .set into metatable */
lua_setmetatable(L,-2); // sets meta table in module lua_setmetatable(L,-2); /* sets meta table in module */
lua_rawset(L,-3); // add module into parent lua_rawset(L,-3); /* add module into parent */
SWIG_Lua_get_table(L,name); // get the table back out SWIG_Lua_get_table(L,name); /* get the table back out */
} }
// ending the register /* ending the register */
SWIGINTERN void SWIG_Lua_module_end(lua_State* L) SWIGINTERN void SWIG_Lua_module_end(lua_State* L)
{ {
lua_pop(L,1); // tidy stack (remove module) lua_pop(L,1); /* tidy stack (remove module) */
} }
// adding a linked variable to the module /* adding a linked variable to the module */
SWIGINTERN void SWIG_Lua_module_add_variable(lua_State* L,const char* name,swig_lua_wrapper_func getFn,swig_lua_wrapper_func setFn) SWIGINTERN void SWIG_Lua_module_add_variable(lua_State* L,const char* name,swig_lua_wrapper_func getFn,swig_lua_wrapper_func setFn)
{ {
assert(lua_istable(L,-1)); // just in case assert(lua_istable(L,-1)); /* just in case */
lua_getmetatable(L,-1); // get the metatable lua_getmetatable(L,-1); /* get the metatable */
assert(lua_istable(L,-1)); // just in case assert(lua_istable(L,-1)); /* just in case */
SWIG_Lua_get_table(L,".get"); // find the .get table SWIG_Lua_get_table(L,".get"); /* find the .get table */
assert(lua_istable(L,-1)); // should be a table: assert(lua_istable(L,-1)); /* should be a table: */
SWIG_Lua_add_function(L,name,getFn); SWIG_Lua_add_function(L,name,getFn);
lua_pop(L,1); // tidy stack (remove table) lua_pop(L,1); /* tidy stack (remove table) */
if (setFn) // if there is a set fn if (setFn) /* if there is a set fn */
{ {
SWIG_Lua_get_table(L,".set"); // find the .set table SWIG_Lua_get_table(L,".set"); /* find the .set table */
assert(lua_istable(L,-1)); // should be a table: assert(lua_istable(L,-1)); /* should be a table: */
SWIG_Lua_add_function(L,name,setFn); SWIG_Lua_add_function(L,name,setFn);
lua_pop(L,1); // tidy stack (remove table) lua_pop(L,1); /* tidy stack (remove table) */
} }
lua_pop(L,1); // tidy stack (remove meta) lua_pop(L,1); /* tidy stack (remove meta) */
} }
// adding a function module /* adding a function module */
SWIGINTERN void SWIG_Lua_module_add_function(lua_State* L,const char* name,swig_lua_wrapper_func fn) SWIGINTERN void SWIG_Lua_module_add_function(lua_State* L,const char* name,swig_lua_wrapper_func fn)
{ {
SWIG_Lua_add_function(L,name,fn); SWIG_Lua_add_function(L,name,fn);
@ -263,211 +258,200 @@ SWIGINTERN void SWIG_Lua_module_add_function(lua_State* L,const char* name,swig
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* global variable support code: classes * global variable support code: classes
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
// the class.get method, performs the lookup of class attributes
/* the class.get method, performs the lookup of class attributes */
SWIGINTERN int SWIG_Lua_class_get(lua_State* L) SWIGINTERN int SWIG_Lua_class_get(lua_State* L)
{ {
// 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)
// (2) string name of the attribute (2) string name of the attribute
// printf("SWIG_Lua_class_get %p(%s) '%s'\n", */
// lua_topointer(L,1),lua_typename(L,lua_type(L,1)), assert(lua_isuserdata(L,-2)); /* just in case */
// lua_tostring(L,2)); lua_getmetatable(L,-2); /* get the meta table */
// DEBUG_STACK(L); assert(lua_istable(L,-1)); /* just in case */
assert(lua_isuserdata(L,-2)); // just in case SWIG_Lua_get_table(L,".get"); /* find the .get table */
lua_getmetatable(L,-2); // get the meta table assert(lua_istable(L,-1)); /* just in case */
assert(lua_istable(L,-1)); // just in case /* look for the key in the .get table */
SWIG_Lua_get_table(L,".get"); // find the .get table lua_pushvalue(L,2); /* key */
assert(lua_istable(L,-1)); // just in case
// look for the key in the .get table
lua_pushvalue(L,2); // key
lua_rawget(L,-2); lua_rawget(L,-2);
lua_remove(L,-2); // stack tidy, remove .get table lua_remove(L,-2); /* stack tidy, remove .get table */
DEBUG_PRINT("check .get\n");
DEBUG_STACK(L);
if (lua_iscfunction(L,-1)) if (lua_iscfunction(L,-1))
{ // found it so call the fn & return its value { /* found it so call the fn & return its value */
lua_pushvalue(L,1); // the userdata lua_pushvalue(L,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 */
return 1; return 1;
} }
lua_pop(L,1); // remove whatever was there lua_pop(L,1); /* remove whatever was there */
// ok, so try the .fn table /* ok, so try the .fn table */
SWIG_Lua_get_table(L,".fn"); // find the .get table SWIG_Lua_get_table(L,".fn"); /* find the .get table */
assert(lua_istable(L,-1)); // just in case assert(lua_istable(L,-1)); /* just in case */
lua_pushvalue(L,2); // key lua_pushvalue(L,2); /* key */
lua_rawget(L,-2); // look for the fn lua_rawget(L,-2); /* look for the fn */
lua_remove(L,-2); // stack tidy, remove .fn table lua_remove(L,-2); /* stack tidy, remove .fn table */
DEBUG_PRINT("check .fn\n"); DEBUG_PRINT("check .fn\n");
DEBUG_STACK(L); DEBUG_STACK(L);
if (lua_iscfunction(L,-1)) if (lua_iscfunction(L,-1))
{ // 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 */
return 1; return 1;
} }
lua_pop(L,1); // remove whatever was there lua_pop(L,1); /* remove whatever was there */
// NEW: looks for the __getitem() fn /* NEW: looks for the __getitem() fn
// this is a user provided get fn this is a user provided get fn */
SWIG_Lua_get_table(L,"__getitem"); // find the __getitem fn SWIG_Lua_get_table(L,"__getitem"); /* find the __getitem fn */
DEBUG_PRINT("check __getitem\n"); DEBUG_PRINT("check __getitem\n");
DEBUG_STACK(L); DEBUG_STACK(L);
if (lua_iscfunction(L,-1)) // if its there if (lua_iscfunction(L,-1)) /* if its there */
{ // found it so call the fn & return its value { /* found it so call the fn & return its value */
lua_pushvalue(L,1); // the userdata lua_pushvalue(L,1); /* the userdata */
lua_pushvalue(L,2); // the parameter lua_pushvalue(L,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 */
//DEBUG_STACK(L); /*DEBUG_STACK(L); */
return 1; return 1;
} }
return 0; /* sorry not known */
return 0; // sorry not known
} }
// the class.set method, performs the lookup of class attributes /* the class.set method, performs the lookup of class attributes */
SWIGINTERN int SWIG_Lua_class_set(lua_State* L) SWIGINTERN int SWIG_Lua_class_set(lua_State* L)
{ {
// 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)
// (2) string name of the attribute (2) string name of the attribute
// (3) any for the new value (3) any for the new value
// printf("SWIG_Lua_class_set %p(%s) '%s' %p(%s)\n", printf("SWIG_Lua_class_set %p(%s) '%s' %p(%s)\n",
// lua_topointer(L,1),lua_typename(L,lua_type(L,1)), lua_topointer(L,1),lua_typename(L,lua_type(L,1)),
// lua_tostring(L,2), lua_tostring(L,2),
// lua_topointer(L,3),lua_typename(L,lua_type(L,3))); lua_topointer(L,3),lua_typename(L,lua_type(L,3)));*/
assert(lua_isuserdata(L,1)); // just in case assert(lua_isuserdata(L,1)); /* just in case */
lua_getmetatable(L,1); // get the meta table lua_getmetatable(L,1); /* get the meta table */
assert(lua_istable(L,-1)); // just in case assert(lua_istable(L,-1)); /* just in case */
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))
{ {
// look for the key in the .set table /* look for the key in the .set table */
lua_pushvalue(L,2); // key lua_pushvalue(L,2); /* key */
lua_rawget(L,-2); lua_rawget(L,-2);
if (lua_iscfunction(L,-1)) if (lua_iscfunction(L,-1))
{ // found it so call the fn & return its value { /* found it so call the fn & return its value */
lua_pushvalue(L,1); // userdata lua_pushvalue(L,1); /* userdata */
lua_pushvalue(L,3); // value lua_pushvalue(L,3); /* value */
lua_call(L,2,0); lua_call(L,2,0);
return 0; return 0;
} }
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 */
// NEW: looks for the __setitem() fn /* NEW: looks for the __setitem() fn
// this is a user provided set fn this is a user provided set fn */
SWIG_Lua_get_table(L,"__setitem"); // find the fn SWIG_Lua_get_table(L,"__setitem"); /* find the fn */
if (lua_iscfunction(L,-1)) // if its there if (lua_iscfunction(L,-1)) /* if its there */
{ // found it so call the fn & return its value { /* found it so call the fn & return its value */
lua_pushvalue(L,1); // the userdata lua_pushvalue(L,1); /* the userdata */
lua_pushvalue(L,2); // the parameter lua_pushvalue(L,2); /* the parameter */
lua_pushvalue(L,3); // the value lua_pushvalue(L,3); /* the value */
lua_call(L,3,0); // 3 values in ,0 out lua_call(L,3,0); /* 3 values in ,0 out */
lua_remove(L,-2); // stack tidy, remove metatable lua_remove(L,-2); /* stack tidy, remove metatable */
return 1; return 1;
} }
return 0; return 0;
} }
// the class.destruct method called by the interpreter /* the class.destruct method called by the interpreter */
SWIGINTERN int SWIG_Lua_class_destruct(lua_State* L) SWIGINTERN int SWIG_Lua_class_destruct(lua_State* L)
{ {
// there should be 1 params passed in /* there should be 1 params passed in
// (1) userdata (not the meta table) (1) userdata (not the meta table) */
swig_lua_userdata* usr; swig_lua_userdata* usr;
swig_lua_class* clss; swig_lua_class* clss;
// printf("SWIG_Lua_class_destruct\n"); DEBUG_PRINT("SWIG_Lua_class_destruct\n");
// DEBUG_STACK(L); DEBUG_STACK(L);
assert(lua_isuserdata(L,-1)); // just in case assert(lua_isuserdata(L,-1)); /* just in case */
usr=(swig_lua_userdata*)lua_touserdata(L,-1); // get it usr=(swig_lua_userdata*)lua_touserdata(L,-1); /* get it */
// if must be destroyed & has a destructor /* if must be destroyed & has a destructor */
if (usr->own) // if must be destroyed if (usr->own) /* if must be destroyed */
{ {
clss=(swig_lua_class*)usr->type->clientdata; // get the class clss=(swig_lua_class*)usr->type->clientdata; /* get the class */
if (clss && clss->destructor) // there is a destroy fn if (clss && clss->destructor) /* there is a destroy fn */
{ {
clss->destructor(usr->ptr); // bye bye clss->destructor(usr->ptr); /* bye bye */
} }
} }
return 0; return 0;
} }
// gets the swig class registry (or creates it) /* gets the swig class registry (or creates it) */
SWIGINTERN void SWIG_Lua_get_class_registry(lua_State* L) SWIGINTERN void SWIG_Lua_get_class_registry(lua_State* L)
{ {
// add this all into the swig registry: /* add this all into the swig registry: */
lua_pushstring(L,"SWIG"); lua_pushstring(L,"SWIG");
lua_rawget(L,LUA_REGISTRYINDEX); // get the registry lua_rawget(L,LUA_REGISTRYINDEX); /* get the registry */
if (!lua_istable(L,-1)) // not there if (!lua_istable(L,-1)) /* not there */
{ // must be first time, so add it { /* must be first time, so add it */
lua_pop(L,1); // remove the result lua_pop(L,1); /* remove the result */
lua_pushstring(L,"SWIG"); lua_pushstring(L,"SWIG");
lua_newtable(L); lua_newtable(L);
lua_rawset(L,LUA_REGISTRYINDEX); lua_rawset(L,LUA_REGISTRYINDEX);
// then get it /* then get it */
lua_pushstring(L,"SWIG"); lua_pushstring(L,"SWIG");
lua_rawget(L,LUA_REGISTRYINDEX); lua_rawget(L,LUA_REGISTRYINDEX);
} }
} }
// helper fn to get the classes metatable from the register /* helper fn to get the classes metatable from the register */
SWIGINTERN void SWIG_Lua_get_class_metatable(lua_State* L,const char* cname) SWIGINTERN void SWIG_Lua_get_class_metatable(lua_State* L,const char* cname)
{ {
SWIG_Lua_get_class_registry(L); // get the registry SWIG_Lua_get_class_registry(L); /* get the registry */
lua_pushstring(L,cname); // get the name lua_pushstring(L,cname); /* get the name */
lua_rawget(L,-2); // get it lua_rawget(L,-2); /* get it */
lua_remove(L,-2); // tidy up (remove registry) lua_remove(L,-2); /* tidy up (remove registry) */
} }
// helper add a variable to a registered class /* helper add a variable to a registered class */
SWIGINTERN void SWIG_Lua_add_class_variable(lua_State* L,const char* name,swig_lua_wrapper_func getFn,swig_lua_wrapper_func setFn) SWIGINTERN void SWIG_Lua_add_class_variable(lua_State* L,const char* name,swig_lua_wrapper_func getFn,swig_lua_wrapper_func setFn)
{ {
assert(lua_istable(L,-1)); // just in case assert(lua_istable(L,-1)); /* just in case */
SWIG_Lua_get_table(L,".get"); // find the .get table SWIG_Lua_get_table(L,".get"); /* find the .get table */
assert(lua_istable(L,-1)); // just in case assert(lua_istable(L,-1)); /* just in case */
// if (lua_istable(L,-1)) // should be a table:
SWIG_Lua_add_function(L,name,getFn); SWIG_Lua_add_function(L,name,getFn);
lua_pop(L,1); // tidy stack (remove table) lua_pop(L,1); /* tidy stack (remove table) */
if (setFn) if (setFn)
{ {
SWIG_Lua_get_table(L,".set"); // find the .set table SWIG_Lua_get_table(L,".set"); /* find the .set table */
assert(lua_istable(L,-1)); // just in case assert(lua_istable(L,-1)); /* just in case */
// if (lua_istable(L,-1)) // should be a table:
SWIG_Lua_add_function(L,name,setFn); SWIG_Lua_add_function(L,name,setFn);
lua_pop(L,1); // tidy stack (remove table) lua_pop(L,1); /* tidy stack (remove table) */
} }
} }
// helper to recursively add class details (attributes & operations) /* helper to recursively add class details (attributes & operations) */
SWIGINTERN void SWIG_Lua_add_class_details(lua_State* L,swig_lua_class* clss) SWIGINTERN void SWIG_Lua_add_class_details(lua_State* L,swig_lua_class* clss)
{ {
int i;//,j; int i;
// call all the base classes first: we can then override these later: /* call all the base classes first: we can then override these later: */
swig_lua_class* base;
for(i=0;clss->bases[i];i++) for(i=0;clss->bases[i];i++)
{ {
// printf("add base class feature %s\n",clss->bases[i]->name); fflush(stdout);
SWIG_Lua_add_class_details(L,clss->bases[i]); SWIG_Lua_add_class_details(L,clss->bases[i]);
} }
/* add fns */
// add fns
for(i=0;clss->attributes[i].name;i++){ for(i=0;clss->attributes[i].name;i++){
SWIG_Lua_add_class_variable(L,clss->attributes[i].name,clss->attributes[i].getmethod,clss->attributes[i].setmethod); SWIG_Lua_add_class_variable(L,clss->attributes[i].name,clss->attributes[i].getmethod,clss->attributes[i].setmethod);
} }
// add methods to the metatable /* add methods to the metatable */
SWIG_Lua_get_table(L,".fn"); // find the .fn table SWIG_Lua_get_table(L,".fn"); /* find the .fn table */
assert(lua_istable(L,-1)); // just in case assert(lua_istable(L,-1)); /* just in case */
for(i=0;clss->methods[i].name;i++){ for(i=0;clss->methods[i].name;i++){
SWIG_Lua_add_function(L,clss->methods[i].name,clss->methods[i].method); SWIG_Lua_add_function(L,clss->methods[i].name,clss->methods[i].method);
} }
lua_pop(L,1); // tidy stack (remove table) lua_pop(L,1); /* tidy stack (remove table) */
// add operator overloads /* add operator overloads
// these look ANY method which start with "__" and assume they these look ANY method which start with "__" and assume they
// are operator overloads & add them to the metatable are operator overloads & add them to the metatable
// (this might mess up is someone defines a method __gc (the destructor) (this might mess up is someone defines a method __gc (the destructor)*/
for(i=0;clss->methods[i].name;i++){ for(i=0;clss->methods[i].name;i++){
if (clss->methods[i].name[0]=='_' && clss->methods[i].name[1]=='_'){ if (clss->methods[i].name[0]=='_' && clss->methods[i].name[1]=='_'){
SWIG_Lua_add_function(L,clss->methods[i].name,clss->methods[i].method); SWIG_Lua_add_function(L,clss->methods[i].name,clss->methods[i].method);
@ -475,101 +459,95 @@ SWIGINTERN void SWIG_Lua_add_class_details(lua_State* L,swig_lua_class* clss)
} }
} }
// performs the entire class registration process /* performs the entire class registration process */
SWIGINTERN void SWIG_Lua_class_register(lua_State* L,swig_lua_class* clss) SWIGINTERN void SWIG_Lua_class_register(lua_State* L,swig_lua_class* clss)
{ {
// add its constructor to module with the name of the class /* add its constructor to module with the name of the class
// so you can do MyClass(...) as well as new_MyClass(...) so you can do MyClass(...) as well as new_MyClass(...)
// BUT only if a constructor is defined BUT only if a constructor is defined
// (this overcomes the problem of pure virtual classes without constructors) (this overcomes the problem of pure virtual classes without constructors)*/
if (clss->constructor) if (clss->constructor)
SWIG_Lua_add_function(L,clss->name,clss->constructor); SWIG_Lua_add_function(L,clss->name,clss->constructor);
SWIG_Lua_get_class_registry(L); // get the registry SWIG_Lua_get_class_registry(L); /* get the registry */
lua_pushstring(L,clss->name); // get the name lua_pushstring(L,clss->name); /* get the name */
lua_newtable(L); // create the metatable lua_newtable(L); /* create the metatable */
// add string of class name called ".type" /* add string of class name called ".type" */
lua_pushstring(L,".type"); lua_pushstring(L,".type");
lua_pushstring(L,clss->name); lua_pushstring(L,clss->name);
lua_rawset(L,-3); lua_rawset(L,-3);
// add a table called ".get" /* add a table called ".get" */
lua_pushstring(L,".get"); lua_pushstring(L,".get");
lua_newtable(L); lua_newtable(L);
lua_rawset(L,-3); lua_rawset(L,-3);
// add a table called ".set" /* add a table called ".set" */
lua_pushstring(L,".set"); lua_pushstring(L,".set");
lua_newtable(L); lua_newtable(L);
lua_rawset(L,-3); lua_rawset(L,-3);
// add a table called ".fn" /* add a table called ".fn" */
lua_pushstring(L,".fn"); lua_pushstring(L,".fn");
lua_newtable(L); lua_newtable(L);
lua_rawset(L,-3); lua_rawset(L,-3);
// add accessor fns for using the .get,.set&.fn /* add accessor fns for using the .get,.set&.fn */
SWIG_Lua_add_function(L,"__index",SWIG_Lua_class_get); SWIG_Lua_add_function(L,"__index",SWIG_Lua_class_get);
SWIG_Lua_add_function(L,"__newindex",SWIG_Lua_class_set); SWIG_Lua_add_function(L,"__newindex",SWIG_Lua_class_set);
SWIG_Lua_add_function(L,"__gc",SWIG_Lua_class_destruct); SWIG_Lua_add_function(L,"__gc",SWIG_Lua_class_destruct);
// add it /* add it */
lua_rawset(L,-3); // metatable into registry lua_rawset(L,-3); /* metatable into registry */
lua_pop(L,1); // tidy stack (remove registry) lua_pop(L,1); /* tidy stack (remove registry) */
SWIG_Lua_get_class_metatable(L,clss->name); SWIG_Lua_get_class_metatable(L,clss->name);
SWIG_Lua_add_class_details(L,clss); // recursive adding of details (atts & ops) SWIG_Lua_add_class_details(L,clss); /* recursive adding of details (atts & ops) */
lua_pop(L,1); // tidy stack (remove class metatable) lua_pop(L,1); /* tidy stack (remove class metatable) */
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Class/structure conversion fns * Class/structure conversion fns
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
// pushes a new object into the lua stack /* pushes a new object into the lua stack */
SWIGRUNTIME void SWIG_Lua_NewPointerObj(lua_State* L,void* ptr,swig_type_info *type, int own) SWIGRUNTIME void SWIG_Lua_NewPointerObj(lua_State* L,void* ptr,swig_type_info *type, int own)
{ {
swig_lua_userdata* usr;
if (!ptr){ if (!ptr){
lua_pushnil(L); lua_pushnil(L);
return; return;
} }
swig_lua_userdata* usr=(swig_lua_userdata*)lua_newuserdata(L,sizeof(swig_lua_userdata)); // get data usr=(swig_lua_userdata*)lua_newuserdata(L,sizeof(swig_lua_userdata)); /* get data */
usr->ptr=ptr; // set the ptr usr->ptr=ptr; /* set the ptr */
usr->type=type; usr->type=type;
usr->own=own; usr->own=own;
// printf("ptr %p type %s class %p\n",ptr,type->name,type->clientdata); if (type->clientdata) /* there is clientdata: so add the metatable */
if (type->clientdata) // there is clientdata: so add the metatable
{ {
SWIG_Lua_get_class_metatable(L,((swig_lua_class*)(type->clientdata))->name); SWIG_Lua_get_class_metatable(L,((swig_lua_class*)(type->clientdata))->name);
if (lua_istable(L,-1)) if (lua_istable(L,-1))
{ {
// printf("added metatable for %p %s\n",ptr,type->name);
lua_setmetatable(L,-2); lua_setmetatable(L,-2);
} }
else else
{ {
// printf("no metatable for %p %s\n",ptr,type->name);
lua_pop(L,1); lua_pop(L,1);
} }
} }
} }
// takes a object from the lua stack & converts it into an object of the correct type /* takes a object from the lua stack & converts it into an object of the correct type
// (if possible) (if possible) */
SWIGRUNTIME int SWIG_Lua_ConvertPtr(lua_State* L,int index,void** ptr,swig_type_info *type,int flags) SWIGRUNTIME int SWIG_Lua_ConvertPtr(lua_State* L,int index,void** ptr,swig_type_info *type,int flags)
{ {
swig_lua_userdata* usr; swig_lua_userdata* usr;
swig_cast_info *cast; swig_cast_info *cast;
// assert(lua_isuserdata(L,index)); // just in case usr=(swig_lua_userdata*)lua_touserdata(L,index); /* get data */
usr=(swig_lua_userdata*)lua_touserdata(L,index); // get data
// printf("SWIG_Lua_ConvertPtr(%p,%p) %s %s\n",usr->type,type,usr->type->name,type->name);
if (usr) if (usr)
{ {
cast=SWIG_TypeCheckStruct(usr->type,type); cast=SWIG_TypeCheckStruct(usr->type,type);
if (cast) if (cast)
{ {
*ptr=SWIG_TypeCast(cast,usr->ptr); *ptr=SWIG_TypeCast(cast,usr->ptr);
return 0; //ok return 0; /* ok */
} }
} }
return 1; // error return 1; /* error */
} }
SWIGRUNTIME void* SWIG_Lua_MustGetPtr(lua_State* L,int index,swig_type_info *type,int flags, SWIGRUNTIME void* SWIG_Lua_MustGetPtr(lua_State* L,int index,swig_type_info *type,int flags,
@ -583,28 +561,28 @@ SWIGRUNTIME void* SWIG_Lua_MustGetPtr(lua_State* L,int index,swig_type_info *typ
return result; return result;
} }
// lua callable function to get the userdata's type /* lua callable function to get the userdata's type */
SWIGRUNTIME int SWIG_Lua_type(lua_State* L) SWIGRUNTIME int SWIG_Lua_type(lua_State* L)
{ {
swig_lua_userdata* usr; swig_lua_userdata* usr;
if (!lua_isuserdata(L,1)) // just in case if (!lua_isuserdata(L,1)) /* just in case */
return 0; // nil reply return 0; /* nil reply */
usr=(swig_lua_userdata*)lua_touserdata(L,1); // get data usr=(swig_lua_userdata*)lua_touserdata(L,1); /* get data */
lua_pushstring(L,usr->type->name); lua_pushstring(L,usr->type->name);
return 1; return 1;
} }
// lua callable function to compare userdata's value /* lua callable function to compare userdata's value
// the issue is that two userdata may point to the same thing the issue is that two userdata may point to the same thing
// but to lua, they are different objects but to lua, they are different objects */
SWIGRUNTIME int SWIG_Lua_equal(lua_State* L) SWIGRUNTIME int SWIG_Lua_equal(lua_State* L)
{ {
int result; int result;
swig_lua_userdata *usr1,*usr2; swig_lua_userdata *usr1,*usr2;
if (!lua_isuserdata(L,1) || !lua_isuserdata(L,2)) // just in case if (!lua_isuserdata(L,1) || !lua_isuserdata(L,2)) /* just in case */
return 0; // nil reply return 0; /* nil reply */
usr1=(swig_lua_userdata*)lua_touserdata(L,1); // get data usr1=(swig_lua_userdata*)lua_touserdata(L,1); /* get data */
usr2=(swig_lua_userdata*)lua_touserdata(L,2); // get data usr2=(swig_lua_userdata*)lua_touserdata(L,2); /* get data */
result=(usr1->ptr==usr2->ptr && usr1->type==usr2->type); result=(usr1->ptr==usr2->ptr && usr1->type==usr2->type);
lua_pushboolean(L,result); lua_pushboolean(L,result);
return 1; return 1;
@ -614,6 +592,7 @@ SWIGRUNTIME int SWIG_Lua_equal(lua_State* L)
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* global variable support code: class/struct typemap functions * global variable support code: class/struct typemap functions
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
/* Install Constants */ /* Install Constants */
SWIGINTERN void SWIGINTERN void
SWIG_Lua_InstallConstants(lua_State* L, swig_lua_const_info constants[]) { SWIG_Lua_InstallConstants(lua_State* L, swig_lua_const_info constants[]) {
@ -641,11 +620,10 @@ SWIG_Lua_InstallConstants(lua_State* L, swig_lua_const_info constants[]) {
lua_rawset(L,-3); lua_rawset(L,-3);
break; break;
case SWIG_LUA_BINARY: case SWIG_LUA_BINARY:
// TODO?? /* TODO?? */
// obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype)); /* obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype)); */
break; break;
default: default:
//obj = 0;
break; break;
} }
} }
@ -659,13 +637,13 @@ SWIG_Lua_GetModule(lua_State* L) {
lua_rawget(L,LUA_REGISTRYINDEX); lua_rawget(L,LUA_REGISTRYINDEX);
if (lua_islightuserdata(L,-1)) if (lua_islightuserdata(L,-1))
ret=(swig_module_info*)lua_touserdata(L,-1); ret=(swig_module_info*)lua_touserdata(L,-1);
lua_pop(L,1); // tidy lua_pop(L,1); /* tidy */
return ret; return ret;
} }
SWIGRUNTIME void SWIGRUNTIME void
SWIG_Lua_SetModule(lua_State* L, swig_module_info *module) { SWIG_Lua_SetModule(lua_State* L, swig_module_info *module) {
// add this all into the Lua registry: /* add this all into the Lua registry: */
lua_pushstring(L,"swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME); lua_pushstring(L,"swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME);
lua_pushlightuserdata(L,(void*)module); lua_pushlightuserdata(L,(void*)module);
lua_rawset(L,LUA_REGISTRYINDEX); lua_rawset(L,LUA_REGISTRYINDEX);

14
SWIG/Source/Modules/lua.cxx
View file

@ -76,6 +76,7 @@ private:
File *f_header; File *f_header;
File *f_wrappers; File *f_wrappers;
File *f_init; File *f_init;
File *f_initbeforefunc;
String *PrefixPlusUnderscore; String *PrefixPlusUnderscore;
String *s_cmd_tab; // table of command names String *s_cmd_tab; // table of command names
String *s_var_tab; // table of global variables String *s_var_tab; // table of global variables
@ -102,6 +103,7 @@ public:
f_header = 0; f_header = 0;
f_wrappers = 0; f_wrappers = 0;
f_init = 0; f_init = 0;
f_initbeforefunc = 0;
PrefixPlusUnderscore = 0; PrefixPlusUnderscore = 0;
s_cmd_tab=s_var_tab=s_const_tab=0; s_cmd_tab=s_var_tab=s_const_tab=0;
@ -185,12 +187,14 @@ NEW LANGUAGE NOTE:END ************************************************/
f_init = NewString(""); f_init = NewString("");
f_header = NewString(""); f_header = NewString("");
f_wrappers = NewString(""); f_wrappers = NewString("");
f_initbeforefunc = NewString("");
/* Register file targets with the SWIG file handler */ /* Register file targets with the SWIG file handler */
Swig_register_filebyname("header", f_header); Swig_register_filebyname("header", f_header);
Swig_register_filebyname("wrapper", f_wrappers); Swig_register_filebyname("wrapper", f_wrappers);
Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("runtime", f_runtime);
Swig_register_filebyname("init", f_init); Swig_register_filebyname("init", f_init);
Swig_register_filebyname("initbeforefunc", f_initbeforefunc);
/* NEW LANGUAGE NOTE:*********************************************** /* NEW LANGUAGE NOTE:***********************************************
s_cmd_tab,s_var_tab & s_const_tab hold the names of the fns for s_cmd_tab,s_var_tab & s_const_tab hold the names of the fns for
@ -226,8 +230,11 @@ NEW LANGUAGE NOTE:END ************************************************/
// Swig_name_register("construct","%c_create"); // Swig_name_register("construct","%c_create");
// Swig_name_register("destroy","%c_destroy"); // Swig_name_register("destroy","%c_destroy");
/* Emit code for children */ /* %init code inclusion, effectively in the SWIG_init function */
Printf(f_init,"#ifdef __cplusplus\nextern \"C\"\n#endif\n");
Printf(f_init, "void SWIG_init_user(lua_State* L)\n{\n");
Language::top(n); Language::top(n);
Printf(f_init, "}\n" );
Printf(f_wrappers,"#ifdef __cplusplus\n}\n#endif\n"); Printf(f_wrappers,"#ifdef __cplusplus\n}\n#endif\n");
@ -238,6 +245,7 @@ NEW LANGUAGE NOTE:END ************************************************/
Printv(f_wrappers, s_cmd_tab, s_var_tab, s_const_tab,NIL); Printv(f_wrappers, s_cmd_tab, s_var_tab, s_const_tab,NIL);
SwigType_emit_type_table(f_runtime, f_wrappers); SwigType_emit_type_table(f_runtime, f_wrappers);
//
/* Close the initialization function */ /* Close the initialization function */
// Printf(f_init, "}\n"); // Printf(f_init, "}\n");
@ -251,10 +259,12 @@ NEW LANGUAGE NOTE:END ************************************************/
Delete(s_const_tab); Delete(s_const_tab);
Dump(f_header, f_runtime); Dump(f_header, f_runtime);
Dump(f_wrappers, f_runtime); Dump(f_wrappers, f_runtime);
Dump(f_initbeforefunc, f_runtime);
Wrapper_pretty_print(f_init, f_runtime); Wrapper_pretty_print(f_init, f_runtime);
Delete(f_header); Delete(f_header);
Delete(f_wrappers); Delete(f_wrappers);
Delete(f_init); Delete(f_init);
Delete(f_initbeforefunc);
Close(f_runtime); Close(f_runtime);
Delete(f_runtime); Delete(f_runtime);
@ -542,10 +552,10 @@ NEW LANGUAGE NOTE:END ************************************************/
/* Close the function */ /* Close the function */
Printv(f->code, "return SWIG_arg;\n",NIL); Printv(f->code, "return SWIG_arg;\n",NIL);
// Printf(f->code, "return %d;\n",returnval);
// add the failure cleanup code: // add the failure cleanup code:
Printv(f->code, "\nfail:\n",NIL); Printv(f->code, "\nfail:\n",NIL);
Printv(f->code, "$cleanup","lua_error(L);\n",NIL); Printv(f->code, "$cleanup","lua_error(L);\n",NIL);
Printv(f->code, "return SWIG_arg;\n",NIL);
Printf(f->code, "}\n"); Printf(f->code, "}\n");
/* Substitute the cleanup code */ /* Substitute the cleanup code */