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

fix director call for the single container argument case

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5768 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-03-18 20:32:14 +00:00
commit b6119293f3
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
SWIG/Source/Modules/python.cxx
View file

@ -223,7 +223,7 @@ public:
Printf(f_directors_h, "#include <map>\n"); Printf(f_directors_h, "#include <map>\n");
Printf(f_directors_h, "#include <string>\n\n"); Printf(f_directors_h, "#include <string>\n\n");
} }
Printf(f_directors_h, "class Swig::Director;\n\n"); /* Printf(f_directors_h, "class Swig::Director;\n\n"); */
Swig_insert_file("director.swg", f_directors); Swig_insert_file("director.swg", f_directors);
Printf(f_directors, "\n\n"); Printf(f_directors, "\n\n");
Printf(f_directors, "/* ---------------------------------------------------\n"); Printf(f_directors, "/* ---------------------------------------------------\n");
@ -1009,7 +1009,11 @@ public:
Printf(setf->code," return 0;\n"); Printf(setf->code," return 0;\n");
} else { } else {
/* Is a readonly variable. Issue an error */ /* Is a readonly variable. Issue an error */
Printf(setf->def,"static int %s_set(PyObject *) {", wname); if (CPlusPlus) {
Printf(setf->def,"static int %s_set(PyObject *) {", wname);
} else {
Printf(setf->def,"static int %s_set(PyObject *_val) {", wname);
}
Printv(setf->code, Printv(setf->code,
tab4, "PyErr_SetString(PyExc_TypeError,\"Variable ", iname, tab4, "PyErr_SetString(PyExc_TypeError,\"Variable ", iname,
" is read-only.\");\n", " is read-only.\");\n",
@ -1394,7 +1398,7 @@ public:
Printf(w->code, "swig_set_inner(\"%s\", true);\n", name); Printf(w->code, "swig_set_inner(\"%s\", true);\n", name);
if (Len(parse_args) > 0) { if (Len(parse_args) > 0) {
Printf(w->code, "result = PyObject_CallMethod(swig_get_self(), \"%s\", \"%s\" %s);\n", pyname, parse_args, arglist); Printf(w->code, "result = PyObject_CallMethod(swig_get_self(), \"%s\", \"(%s)\" %s);\n", pyname, parse_args, arglist);
} else { } else {
Printf(w->code, "result = PyObject_CallMethod(swig_get_self(), \"%s\", NULL);\n", pyname); Printf(w->code, "result = PyObject_CallMethod(swig_get_self(), \"%s\", NULL);\n", pyname);
} }