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

Extensive bug fixes to variable linking.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@735 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2000-08-30 20:24:44 +00:00
commit a59ad4b201
1 changed files with 70 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

91
SWIG/Source/Modules1.1/tcl8.cxx
View file

@ -41,7 +41,7 @@ static String *class_name = 0;
static String *class_type = 0; static String *class_type = 0;
static String *real_classname = 0; static String *real_classname = 0;
static Hash *repeatcmd = 0; static Hash *repeatcmd = 0;
static Hash *setget = 0;
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* TCL8::parse_args() * TCL8::parse_args()
@ -108,7 +108,6 @@ TCL8::parse() {
methods = NewString(""); methods = NewString("");
attributes = NewString(""); attributes = NewString("");
repeatcmd = NewHash(); repeatcmd = NewHash();
setget = NewHash();
Swig_banner(f_runtime); Swig_banner(f_runtime);
@ -526,11 +525,22 @@ TCL8::create_function(char *name, char *iname, SwigType *d, ParmList *l) {
* TCL8::link_variable() * TCL8::link_variable()
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
static Hash *setf = 0;
static Hash *getf = 0;
void void
TCL8::link_variable(char *name, char *iname, SwigType *t) { TCL8::link_variable(char *name, char *iname, SwigType *t) {
String *new_name = 0; String *setname;
String *getname;
int isarray = 0; int isarray = 0;
int readonly = 0;
int setable = 1;
int tc;
if (!setf) setf = NewHash();
if (!getf) getf = NewHash();
/* See if there were any typemaps */ /* See if there were any typemaps */
if (Swig_typemap_search((char *)"varin",t,name) || (Swig_typemap_search((char*)"varout",t,name))) { if (Swig_typemap_search((char *)"varin",t,name) || (Swig_typemap_search((char*)"varout",t,name))) {
@ -538,29 +548,31 @@ TCL8::link_variable(char *name, char *iname, SwigType *t) {
input_file, line_number); input_file, line_number);
} }
if (Status & STAT_READONLY) readonly = 1;
isarray = SwigType_isarray(t); isarray = SwigType_isarray(t);
if (isarray) { tc = SwigType_type(t);
Printf(stderr,"%s:%d: Array variable '%s' will be read-only.\n", input_file, line_number, name); setname = Getattr(setf,t);
new_name = NewStringf("_swig_%s",name); getname = Getattr(getf,t);
Printf(f_wrappers,"static %s = (%s) %s;\n", SwigType_lstr(t,new_name), SwigType_lstr(t,0), name);
name = Char(new_name);
}
/* Dump a collection of set/get functions suitable for variable tracing */ /* Dump a collection of set/get functions suitable for variable tracing */
if (!Getattr(setget,SwigType_lstr(t,0))) { if (!getname) {
Setattr(setget,SwigType_lstr(t,0),"1");
Wrapper *get, *set; Wrapper *get, *set;
setname = NewStringf("_swig_%s_set", Swig_string_mangle(t));
getname = NewStringf("_swig_%s_get", Swig_string_mangle(t));
get = NewWrapper(); get = NewWrapper();
set = NewWrapper(); set = NewWrapper();
Printv(set->def, "static char *_swig_", SwigType_manglestr(t), "_set(ClientData clientData, Tcl_Interp *interp, char *name1, char *name2, int flags) {",0); Printv(set->def, "static char *", setname, "(ClientData clientData, Tcl_Interp *interp, char *name1, char *name2, int flags) {",0);
Printv(get->def, "static char *_swig_", SwigType_manglestr(t), "_get(ClientData clientData, Tcl_Interp *interp, char *name1, char *name2, int flags) {",0); Printv(get->def, "static char *", getname, "(ClientData clientData, Tcl_Interp *interp, char *name1, char *name2, int flags) {",0);
SwigType *lt = Swig_clocal_type(t); SwigType *lt = Swig_clocal_type(t);
if ((tc != T_USER) && (!isarray))
SwigType_add_pointer(lt); SwigType_add_pointer(lt);
Wrapper_add_localv(get,"addr",SwigType_lstr(lt,"addr"),0); Wrapper_add_localv(get,"addr",SwigType_lstr(lt,"addr"),0);
Wrapper_add_localv(set,"addr",SwigType_lstr(lt,"addr"),0); Wrapper_add_localv(set,"addr",SwigType_lstr(lt,"addr"),0);
Printv(set->code, "addr = (", SwigType_lstr(lt,0), ") clientData;\n", 0); Printv(set->code, "addr = (", SwigType_lstr(lt,0), ") clientData;\n", 0);
Printv(get->code, "addr = (", SwigType_lstr(lt,0), ") clientData;\n", 0); Printv(get->code, "addr = (", SwigType_lstr(lt,0), ") clientData;\n", 0);
if ((tc != T_USER) && (!isarray))
SwigType_del_pointer(lt); SwigType_del_pointer(lt);
Delete(lt); Delete(lt);
Wrapper_add_local(set, "value", "char *value"); Wrapper_add_local(set, "value", "char *value");
@ -569,7 +581,7 @@ TCL8::link_variable(char *name, char *iname, SwigType *t) {
Printv(set->code, "value = Tcl_GetVar2(interp, name1, name2, flags);\n", Printv(set->code, "value = Tcl_GetVar2(interp, name1, name2, flags);\n",
"if (!value) return NULL;\n", 0); "if (!value) return NULL;\n", 0);
switch(SwigType_type(t)) { switch(tc) {
case T_INT: case T_INT:
case T_SHORT: case T_SHORT:
case T_USHORT: case T_USHORT:
@ -628,8 +640,8 @@ TCL8::link_variable(char *name, char *iname, SwigType *t) {
"*(addr) = *((", SwigType_lstr(t,0), ") ptr);\n", "*(addr) = *((", SwigType_lstr(t,0), ") ptr);\n",
"}\n", "}\n",
0); 0);
SwigType_del_pointer(t);
SwigType_del_pointer(t);
Wrapper_add_local(get,"value", "Tcl_Obj *value"); Wrapper_add_local(get,"value", "Tcl_Obj *value");
SwigType_add_pointer(t); SwigType_add_pointer(t);
SwigType_remember(t); SwigType_remember(t);
@ -648,7 +660,36 @@ TCL8::link_variable(char *name, char *iname, SwigType *t) {
Printv(get->code, "Tcl_SetVar2(interp,name1,name2,*addr, flags);\n",0); Printv(get->code, "Tcl_SetVar2(interp,name1,name2,*addr, flags);\n",0);
break; break;
case T_POINTER: case T_ARRAY: case T_REFERENCE: case T_ARRAY:
{
SwigType *aop;
SwigType *ta = Copy(t);
aop = SwigType_pop(ta);
/* Printf(stdout,"'%s' '%s'\n", ta, aop);*/
if (SwigType_type(ta) == T_CHAR) {
String *dim = SwigType_array_getdim(aop,0);
if (dim && Len(dim)) {
Printf(set->code, "strncpy(addr,value,%s);\n", dim);
}
Printv(get->code, "Tcl_SetVar2(interp,name1,name2,addr, flags);\n",0);
} else {
setable = 0;
readonly = 1;
Printf(stderr,"%s:%d: Array variable '%s' will be read-only.\n", input_file, line_number, name);
Wrapper_add_local(get,"value","Tcl_Obj *value");
SwigType_remember(t);
Printv(get->code,
"value = SWIG_NewPointerObj(addr, SWIGTYPE", SwigType_manglestr(t), ");\n",
"Tcl_SetVar2(interp,name1,name2,Tcl_GetStringFromObj(value,NULL), flags);\n",
"Tcl_DecrRefCount(value);\n",
0);
}
Delete(ta);
Delete(aop);
}
break;
case T_POINTER: case T_REFERENCE:
SwigType_remember(t); SwigType_remember(t);
Printv(set->code, "{\n", Printv(set->code, "{\n",
"void *ptr;\n", "void *ptr;\n",
@ -660,7 +701,6 @@ TCL8::link_variable(char *name, char *iname, SwigType *t) {
0); 0);
Wrapper_add_local(get,"value","Tcl_Obj *value"); Wrapper_add_local(get,"value","Tcl_Obj *value");
SwigType_remember(t);
Printv(get->code, Printv(get->code,
"value = SWIG_NewPointerObj(*addr, SWIGTYPE", SwigType_manglestr(t), ");\n", "value = SWIG_NewPointerObj(*addr, SWIGTYPE", SwigType_manglestr(t), ");\n",
"Tcl_SetVar2(interp,name1,name2,Tcl_GetStringFromObj(value,NULL), flags);\n", "Tcl_SetVar2(interp,name1,name2,Tcl_GetStringFromObj(value,NULL), flags);\n",
@ -678,27 +718,30 @@ TCL8::link_variable(char *name, char *iname, SwigType *t) {
Printv(set->code, "return NULL;\n", "}\n",0); Printv(set->code, "return NULL;\n", "}\n",0);
Printv(get->code, "return NULL;\n", "}\n",0); Printv(get->code, "return NULL;\n", "}\n",0);
Wrapper_print(get,f_wrappers); Wrapper_print(get,f_wrappers);
Setattr(getf,Copy(t),getname);
if (setable) {
Wrapper_print(set,f_wrappers); Wrapper_print(set,f_wrappers);
Setattr(setf,Copy(t),setname);
}
DelWrapper(get); DelWrapper(get);
DelWrapper(set); DelWrapper(set);
} }
Printv(var_info, tab4,"{ SWIG_prefix \"", iname, "\", (void *) &", name, ", _swig_", SwigType_manglestr(t), "_get,", 0); Printv(var_info, tab4,"{ SWIG_prefix \"", iname, "\", (void *) ", isarray ? "" : "&", name, ",", getname, ",", 0);
if ((Status & STAT_READONLY) || (isarray)) { if (readonly) {
static int readonly = 0; static int readonlywrap = 0;
if (!readonly) { if (!readonlywrap) {
Wrapper *ro = NewWrapper(); Wrapper *ro = NewWrapper();
Printf(ro->def, "static char *_swig_readonly(ClientData clientData, Tcl_Interp *interp, char *name1, char *name2, int flags) {"); Printf(ro->def, "static char *_swig_readonly(ClientData clientData, Tcl_Interp *interp, char *name1, char *name2, int flags) {");
Printv(ro->code, "return \"Variable is read-only\";\n", "}\n", 0); Printv(ro->code, "return \"Variable is read-only\";\n", "}\n", 0);
Wrapper_print(ro,f_wrappers); Wrapper_print(ro,f_wrappers);
readonly = 1; readonlywrap = 1;
DelWrapper(ro); DelWrapper(ro);
} }
Printf(var_info, "_swig_readonly},\n"); Printf(var_info, "_swig_readonly},\n");
} else { } else {
Printv(var_info, "_swig_", SwigType_manglestr(t), "_set},\n",0); Printv(var_info, setname, "},\n",0);
} }
Delete(new_name);
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------