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

fixes for the examples and tcl to use the old Tcl_SetResult()... methods

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7962 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2005-12-09 22:39:43 +00:00
commit efcc7aeacf
8 changed files with 47 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/Modules/tcl8.cxx
View file

@ -299,7 +299,10 @@ public:
f = NewWrapper();
#ifdef SWIG_USE_RESULTOBJ
Wrapper_add_local(f,"resultobj", "Tcl_Obj *resultobj = NULL");
#endif
String *wname = Swig_name_wrapper(iname);
if (overname) {
@ -436,8 +439,13 @@ public:
for (i=0,p = parms; p;i++) {
if ((tm = Getattr(p,"tmap:argout"))) {
Replaceall(tm,"$source",Getattr(p,"lname"));
#ifdef SWIG_USE_RESULTOBJ
Replaceall(tm,"$target","resultobj");
Replaceall(tm,"$result","resultobj");
#else
Replaceall(tm,"$target","(Tcl_GetObjResult(interp))");
Replaceall(tm,"$result","(Tcl_GetObjResult(interp))");
#endif
Replaceall(tm,"$arg",Getattr(p,"emit:input"));
Replaceall(tm,"$input",Getattr(p,"emit:input"));
Printv(outarg,tm,"\n",NIL);
@ -455,8 +463,13 @@ public:
/* Return value if necessary */
if ((tm = Swig_typemap_lookup_new("out",n,"result",0))) {
Replaceall(tm,"$source", "result");
Replaceall(tm,"$target", "resultobj");
Replaceall(tm,"$result", "resultobj");
#ifdef SWIG_USE_RESULTOBJ
Replaceall(tm,"$target","resultobj");
Replaceall(tm,"$result","resultobj");
#else
Replaceall(tm,"$target","(Tcl_GetObjResult(interp))");
Replaceall(tm,"$result","(Tcl_GetObjResult(interp))");
#endif
if(GetFlag(n,"feature:new")) {
Replaceall(tm,"$owner","SWIG_POINTER_OWN");
} else {
@ -486,7 +499,9 @@ public:
Replaceall(tm,"$source","result");
Printf(f->code,"%s\n", tm);
}
#ifdef SWIG_USE_RESULTOBJ
Printv(f->code, "if (resultobj) Tcl_SetObjResult(interp, resultobj);\n", NIL);
#endif
Printv(f->code, "return TCL_OK;\n", NIL);
Printv(f->code, "fail:\n", cleanup, "return TCL_ERROR;\n", NIL);
Printv(f->code,"}\n", NIL);