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

Static member variables are working.

Browse source 
Fixed some corner cases with protected members of director classes.

Now dying in director_finalizer.



git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/szager-python-builtin@12371 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Stefan Zager 2011-01-05 08:35:28 +00:00
commit b77b64944b
5 changed files with 525 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

241
Lib/python/builtin.swg
View file

@ -1,3 +1,10 @@
#define PYSWIG_UNARYFUNC_CLOSURE(wrapper) \
SWIGINTERN PyObject* \
wrapper##_closure (PyObject *a) \
{ \
return wrapper(a, NULL); \
}
#define PYSWIG_BINARYFUNC_CLOSURE(wrapper) \ #define PYSWIG_BINARYFUNC_CLOSURE(wrapper) \
SWIGINTERN PyObject* \ SWIGINTERN PyObject* \
wrapper##_closure (PyObject *a, PyObject *b) \ wrapper##_closure (PyObject *a, PyObject *b) \
@ -115,28 +122,13 @@ wrapper##_closure (PyObject *a, PyObject *b, PyObject *c) \
return result; \ return result; \
} }
SWIGINTERN int
pyswig_setter_closure (PyObject *obj, PyObject *val, void *closure)
{
if (!closure)
return -1;
PyObject *tuple = PyTuple_New(1);
assert(tuple);
PyTuple_SET_ITEM(tuple, 0, val);
Py_XINCREF(val);
PyObject *result = ((PyCFunction) closure)(obj, tuple);
Py_DECREF(tuple);
Py_XDECREF(result);
return result ? 0 : -1;
}
#ifdef __cplusplus #ifdef __cplusplus
namespace { namespace {
template <typename _Tp> struct PySwigBuiltin : public SwigPyObject { template <typename _Tp> struct SwigPyBuiltin : public SwigPyObject {
typedef PySwigBuiltin<_Tp> this_type; typedef SwigPyBuiltin<_Tp> this_type;
typedef _Tp obj_type; typedef _Tp obj_type;
typedef obj_type* pointer; typedef obj_type* pointer;
typedef obj_type& reference; typedef obj_type& reference;
@ -154,7 +146,7 @@ template <typename _Tp> struct PySwigBuiltin : public SwigPyObject {
template <typename _Tp> void py_builtin_dealloc (PyObject *pyobj) template <typename _Tp> void py_builtin_dealloc (PyObject *pyobj)
{ {
typedef PySwigBuiltin<_Tp> builtin_type; typedef SwigPyBuiltin<_Tp> builtin_type;
builtin_type *obj = (builtin_type*) pyobj; builtin_type *obj = (builtin_type*) pyobj;
if (obj->own) if (obj->own)
delete reinterpret_cast<_Tp*>(obj->ptr); delete reinterpret_cast<_Tp*>(obj->ptr);
@ -164,3 +156,216 @@ template <typename _Tp> void py_builtin_dealloc (PyObject *pyobj)
} // namespace { } // namespace {
#endif #endif
SWIGRUNTIME int py_builtin_bad_init (PyObject *self, PyObject *args, PyObject *kwds)
{
PyErr_Format(PyExc_TypeError, "Cannot create new instances of type '%.300s'", self->ob_type->tp_name);
return -1;
}
SWIGRUNTIME void py_builtin_bad_dealloc (PyObject *pyobj)
{
SwigPyObject *sobj = (SwigPyObject*) pyobj;
if (sobj->own) {
PyErr_Format(PyExc_TypeError,
"Swig detected a memory leak in type '%s': no callable destructor found.",
pyobj->ob_type->tp_name);
}
}
typedef struct {
PyCFunction get;
PyCFunction set;
} SwigPyGetSet;
SWIGRUNTIME PyObject*
pyswig_getter_closure (PyObject *obj, void *closure)
{
if (!closure)
return SWIG_Py_Void();
SwigPyGetSet *getset = (SwigPyGetSet*) closure;
if (!getset->get)
return SWIG_Py_Void();
PyObject *tuple = PyTuple_New(0);
assert(tuple);
PyObject *result = (*getset->get)(obj, tuple);
Py_DECREF(tuple);
return result;
}
SWIGRUNTIME int
pyswig_setter_closure (PyObject *obj, PyObject *val, void *closure)
{
if (!closure)
return -1;
SwigPyGetSet *getset = (SwigPyGetSet*) closure;
if (!getset->set)
return -1;
PyObject *tuple = PyTuple_New(1);
assert(tuple);
PyTuple_SET_ITEM(tuple, 0, val);
Py_XINCREF(val);
PyObject *result = (*getset->set)(obj, tuple);
Py_DECREF(tuple);
Py_XDECREF(result);
return result ? 0 : -1;
}
SWIGRUNTIME PyObject*
pyswig_static_getter_closure (PyObject *obj, void *closure)
{
if (!closure)
return SWIG_Py_Void();
SwigPyGetSet *getset = (SwigPyGetSet*) closure;
if (!getset->get)
return SWIG_Py_Void();
PyObject *tuple = PyTuple_New(0);
assert(tuple);
PyObject *result = (*getset->get)(obj, tuple);
Py_DECREF(tuple);
return result;
}
SWIGRUNTIME int
pyswig_static_setter_closure (PyObject *obj, PyObject *val, void *closure)
{
if (!closure)
return -1;
SwigPyGetSet *getset = (SwigPyGetSet*) closure;
if (!getset->set)
return -1;
PyObject *tuple = PyTuple_New(1);
assert(tuple);
PyTuple_SET_ITEM(tuple, 0, val);
Py_XINCREF(val);
PyObject *result = (*getset->set)(obj, tuple);
Py_DECREF(tuple);
Py_XDECREF(result);
return result ? 0 : -1;
}
SWIGRUNTIME void
SwigPyStaticVar_dealloc(PyDescrObject *descr)
{
_PyObject_GC_UNTRACK(descr);
Py_XDECREF(descr->d_type);
Py_XDECREF(descr->d_name);
PyObject_GC_Del(descr);
}
SWIGRUNTIME PyObject *
SwigPyStaticVar_repr(PyGetSetDescrObject *descr)
{
return PyString_FromFormat("<class attribute '%s' of type '%s'>",
PyString_AsString(descr->d_name),
descr->d_type->tp_name);
}
SWIGRUNTIME int
SwigPyStaticVar_traverse(PyObject *self, visitproc visit, void *arg)
{
PyDescrObject *descr = (PyDescrObject *)self;
Py_VISIT(descr->d_type);
return 0;
}
SWIGRUNTIME PyObject *
SwigPyStaticVar_get (PyGetSetDescrObject *descr, PyObject *obj, PyObject *type)
{
if (descr->d_getset->get != NULL)
return descr->d_getset->get(obj, descr->d_getset->closure);
PyErr_Format(PyExc_AttributeError,
"attribute '%.300s' of '%.100s' objects is not readable",
PyString_AsString(descr->d_name),
descr->d_type->tp_name);
return NULL;
}
SWIGRUNTIME int
SwigPyStaticVar_set (PyGetSetDescrObject *descr, PyObject *obj, PyObject *value)
{
int res;
if (descr->d_getset->set != NULL)
return descr->d_getset->set(obj, value, descr->d_getset->closure);
PyErr_Format(PyExc_AttributeError,
"attribute '%.300s' of '%.100s' objects is not writable",
PyString_AsString(descr->d_name),
descr->d_type->tp_name);
return -1;
}
SWIGRUNTIME PyTypeObject SwigPyStaticVar_Type = {
PyObject_HEAD_INIT(&PyType_Type)
0,
"swig_static_var_getset_descriptor",
sizeof(PyGetSetDescrObject),
0,
(destructor)SwigPyStaticVar_dealloc, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_compare */
(reprfunc)SwigPyStaticVar_repr, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
PyObject_GenericGetAttr, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
0, /* tp_doc */
SwigPyStaticVar_traverse, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
0, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
(descrgetfunc)SwigPyStaticVar_get, /* tp_descr_get */
(descrsetfunc)SwigPyStaticVar_set, /* tp_descr_set */
};
SWIGRUNTIME int
SwigPyObjectType_setattro(PyTypeObject *type, PyObject *name, PyObject *value)
{
PyObject *attribute = _PyType_Lookup(type, name);
if (attribute != NULL) {
/* Implement descriptor functionality, if any */
descrsetfunc local_set = attribute->ob_type->tp_descr_set;
if (local_set != NULL)
return local_set(attribute, (PyObject*) type, value);
PyErr_Format(PyExc_AttributeError,
"cannot modify read-only attribute '%.50s.%.400s'",
type->tp_name, PyString_AS_STRING(name));
} else {
PyErr_Format(PyExc_AttributeError,
"type '%.50s' has no attribute '%.400s'",
type->tp_name, PyString_AS_STRING(name));
}
return -1;
}
SWIGINTERN PyGetSetDescrObject*
SwigPyStaticVar_new_getset (PyTypeObject *type, PyGetSetDef *getset)
{
PyGetSetDescrObject *descr = (PyGetSetDescrObject*) PyType_GenericAlloc(&SwigPyStaticVar_Type, 0);
assert(descr);
Py_XINCREF(type);
descr->d_type = type;
descr->d_name = PyString_InternFromString(getset->name);
descr->d_getset = getset;
if (descr->d_name == NULL) {
Py_DECREF(descr);
descr = NULL;
}
return descr;
}

19
Lib/python/pyinit.swg
View file

@ -340,12 +340,25 @@ SWIG_init(void) {
#if defined(SWIGPYTHON_BUILTIN) #if defined(SWIGPYTHON_BUILTIN)
PyTypeObject *builtin_pytype = 0; PyTypeObject *builtin_pytype = 0;
PyObject *propargs = NULL, *propget = NULL, *propset = NULL, *propobj = NULL; #ifdef __cplusplus
std::vector<PyTypeObject*> builtin_bases; std::vector<PyTypeObject*> builtin_bases;
#endif
swig_type_info *builtin_basetype = 0; swig_type_info *builtin_basetype = 0;
PyObject *base_tuple = NULL; PyObject *tuple = NULL;
PyGetSetDescrObject *static_getset = NULL;
int i; int i;
// metatype is used to implement static member variables.
PyObject *metatype_args = Py_BuildValue("(s(O){})", "SwigPyObjectType", &PyType_Type);
assert(metatype_args);
PyTypeObject *metatype = (PyTypeObject*) PyType_Type.tp_call((PyObject*) &PyType_Type, metatype_args, NULL);
assert(metatype);
Py_DECREF(metatype_args);
metatype->tp_setattro = (setattrofunc) &SwigPyObjectType_setattro;
assert(PyType_Ready(metatype) >= 0);
SWIG_Python_builtin_imports(); SWIG_Python_builtin_imports();
#endif #endif
@ -361,6 +374,6 @@ SWIG_init(void) {
SWIG_InitializeModule(0); SWIG_InitializeModule(0);
SWIG_InstallConstants(d,swig_const_table); SWIG_InstallConstants(d,swig_const_table);
%} %}

41
Lib/python/pyrun.swg
View file

@ -332,6 +332,9 @@ typedef struct {
swig_type_info *ty; swig_type_info *ty;
int own; int own;
PyObject *next; PyObject *next;
#ifdef SWIGPYTHON_BUILTIN
PyObject *dict;
#endif
} SwigPyObject; } SwigPyObject;
SWIGRUNTIME PyObject * SWIGRUNTIME PyObject *
@ -384,19 +387,19 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
const char *name = SWIG_TypePrettyName(v->ty); const char *name = SWIG_TypePrettyName(v->ty);
PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", name, v); PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", name, v);
if (v->next) { if (v->next) {
#ifdef METH_NOARGS # ifdef METH_NOARGS
PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next); PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next);
#else # else
PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args); PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args);
#endif # endif
#if PY_VERSION_HEX >= 0x03000000 # if PY_VERSION_HEX >= 0x03000000
PyObject *joined = PyUnicode_Concat(repr, nrep); PyObject *joined = PyUnicode_Concat(repr, nrep);
Py_DecRef(repr); Py_DecRef(repr);
Py_DecRef(nrep); Py_DecRef(nrep);
repr = joined; repr = joined;
#else # else
PyString_ConcatAndDel(&repr,nrep); PyString_ConcatAndDel(&repr,nrep);
#endif # endif
} }
return repr; return repr;
} }
@ -468,9 +471,8 @@ SwigPyObject_Check(PyObject *op) {
#ifdef SWIGPYTHON_BUILTIN #ifdef SWIGPYTHON_BUILTIN
PyTypeObject *target_tp = SwigPyObject_type(); PyTypeObject *target_tp = SwigPyObject_type();
PyTypeObject *obj_tp; PyTypeObject *obj_tp;
for (obj_tp = op->ob_type; obj_tp; obj_tp = obj_tp->tp_base) if (PyType_IsSubtype(op->ob_type, target_tp))
if (obj_tp == target_tp) return 1;
return 1;
return (strcmp(op->ob_type->tp_name, "SwigPyObject") == 0); return (strcmp(op->ob_type->tp_name, "SwigPyObject") == 0);
#else #else
return (Py_TYPE(op) == SwigPyObject_type()) return (Py_TYPE(op) == SwigPyObject_type())
@ -1080,6 +1082,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
if (ptr) *ptr = 0; if (ptr) *ptr = 0;
return SWIG_OK; return SWIG_OK;
} }
if (ty && ty->clientdata && ((SwigPyClientData*) ty->clientdata)->pytype) { if (ty && ty->clientdata && ((SwigPyClientData*) ty->clientdata)->pytype) {
PyTypeObject *target_tp = ((SwigPyClientData*) ty->clientdata)->pytype; PyTypeObject *target_tp = ((SwigPyClientData*) ty->clientdata)->pytype;
PyTypeObject *obj_tp; PyTypeObject *obj_tp;
@ -1096,6 +1099,9 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
} }
} }
} }
int res = SWIG_ERROR;
SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj); SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj);
if (own) if (own)
*own = 0; *own = 0;
@ -1135,9 +1141,8 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
if (flags & SWIG_POINTER_DISOWN) { if (flags & SWIG_POINTER_DISOWN) {
sobj->own = 0; sobj->own = 0;
} }
return SWIG_OK; res = SWIG_OK;
} else { } else {
int res = SWIG_ERROR;
if (flags & SWIG_POINTER_IMPLICIT_CONV) { if (flags & SWIG_POINTER_IMPLICIT_CONV) {
SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0; SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
if (data && !data->implicitconv) { if (data && !data->implicitconv) {
@ -1173,8 +1178,8 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
} }
} }
} }
return res;
} }
return res;
} }
/* Convert a function ptr value */ /* Convert a function ptr value */
@ -1357,6 +1362,9 @@ SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
newobj->ty = type; newobj->ty = type;
newobj->own = own; newobj->own = own;
newobj->next = 0; newobj->next = 0;
#ifdef SWIGPYTHON_BUILTIN
newobj->dict = 0;
#endif
return (PyObject*) newobj; return (PyObject*) newobj;
} }
return SWIG_Py_Void(); return SWIG_Py_Void();
@ -1388,10 +1396,19 @@ SWIG_Python_NewBuiltinObj(PyObject *self, void *ptr, swig_type_info *type, int f
assert(clientdata->pytype); assert(clientdata->pytype);
int own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0; int own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
SwigPyObject *newobj = (SwigPyObject*) self; SwigPyObject *newobj = (SwigPyObject*) self;
if (newobj->ptr) {
PyObject *next_self = clientdata->pytype->tp_alloc(clientdata->pytype, 0);
while (newobj->next) newobj = (SwigPyObject*) newobj->next;
newobj->next = next_self;
newobj = (SwigPyObject*) next_self;
}
newobj->ptr = ptr; newobj->ptr = ptr;
newobj->own = own; newobj->own = own;
newobj->ty = type; newobj->ty = type;
newobj->next = 0; newobj->next = 0;
#ifdef SWIGPYTHON_BUILTIN
newobj->dict = 0;
#endif
return 0; return 0;
} }

27
Lib/python/std_pair.i
View file

@ -161,13 +161,28 @@ SwigPython_std_pair_setitem (PyObject *a, Py_ssize_t b, PyObject *c)
} }
%feature("sq_length") std::pair "SwigPython_std_pair_len";
%feature("sq_length") std::pair<T*,U> "SwigPython_std_pair_len";
%feature("sq_length") std::pair<T,U*> "SwigPython_std_pair_len";
%feature("sq_length") std::pair<T*,U*> "SwigPython_std_pair_len";
%feature("tp_repr") std::pair "SwigPython_std_pair_repr";
%feature("tp_repr") std::pair<T*,U> "SwigPython_std_pair_repr";
%feature("tp_repr") std::pair<T,U*> "SwigPython_std_pair_repr";
%feature("tp_repr") std::pair<T*,U*> "SwigPython_std_pair_repr";
%feature("sq_item") std::pair "SwigPython_std_pair_getitem";
%feature("sq_item") std::pair<T*,U> "SwigPython_std_pair_getitem";
%feature("sq_item") std::pair<T,U*> "SwigPython_std_pair_getitem";
%feature("sq_item") std::pair<T*,U*> "SwigPython_std_pair_getitem";
%feature("sq_ass_item") std::pair "SwigPython_std_pair_setitem";
%feature("sq_ass_item") std::pair<T*,U> "SwigPython_std_pair_setitem";
%feature("sq_ass_item") std::pair<T,U*> "SwigPython_std_pair_setitem";
%feature("sq_ass_item") std::pair<T*,U*> "SwigPython_std_pair_setitem";
%define %swig_pair_methods(pair...) %define %swig_pair_methods(pair...)
#if defined(SWIGPYTHON_BUILTIN) #if !defined(SWIGPYTHON_BUILTIN)
%feature("sq_length") pair "SwigPython_std_pair_len";
%feature("tp_repr") pair "SwigPython_std_pair_repr";
%feature("sq_item") pair "SwigPython_std_pair_getitem";
%feature("sq_ass_item") pair "SwigPython_std_pair_setitem";
#else
%extend { %extend {
%pythoncode {def __len__(self): return 2 %pythoncode {def __len__(self): return 2
def __repr__(self): return str((self.first, self.second)) def __repr__(self): return str((self.first, self.second))

451
Source/Modules/python.cxx
View file

@ -33,6 +33,7 @@ static String *global_name = 0;
static int shadow = 1; static int shadow = 1;
static int use_kw = 0; static int use_kw = 0;
static int director_method_index = 0; static int director_method_index = 0;
static int builtin = 0;
static File *f_begin = 0; static File *f_begin = 0;
static File *f_runtime = 0; static File *f_runtime = 0;
@ -48,6 +49,9 @@ static String *f_shadow_imports = 0;
static String *f_shadow_import_stmts = 0; static String *f_shadow_import_stmts = 0;
static String *f_shadow_stubs = 0; static String *f_shadow_stubs = 0;
static Hash *builtin_getset = 0; static Hash *builtin_getset = 0;
static Hash *class_members = 0;
static File *f_builtins = 0;
static String *builtin_tp_init = 0;
static String *methods; static String *methods;
static String *class_name; static String *class_name;
@ -60,12 +64,6 @@ static int no_header_file = 0;
static int py3 = 0; static int py3 = 0;
static Hash *class_members = 0;
static int builtin = 0;
static File *f_builtins = 0;
static String *builtin_tp_init = 0;
/* C++ Support + Shadow Classes */ /* C++ Support + Shadow Classes */
static int have_constructor; static int have_constructor;
@ -172,6 +170,9 @@ static String *getSlot(Node *n, const char *key) {
static String *getClosure(String *functype, String *wrapper) { static String *getClosure(String *functype, String *wrapper) {
static const char *functypes[] = { static const char *functypes[] = {
"unaryfunc", "PYSWIG_UNARYFUNC_CLOSURE",
"getiterfunc", "PYSWIG_UNARYFUNC_CLOSURE",
"iternextfunc", "PYSWIG_UNARYFUNC_CLOSURE",
"binaryfunc", "PYSWIG_BINARYFUNC_CLOSURE", "binaryfunc", "PYSWIG_BINARYFUNC_CLOSURE",
"ternaryfunc", "PYSWIG_TERNARYFUNC_CLOSURE", "ternaryfunc", "PYSWIG_TERNARYFUNC_CLOSURE",
"lenfunc", "PYSWIG_LENFUNC_CLOSURE", "lenfunc", "PYSWIG_LENFUNC_CLOSURE",
@ -571,10 +572,11 @@ public:
f_directors_h = NewString(""); f_directors_h = NewString("");
f_directors = NewString(""); f_directors = NewString("");
builtin_getset = NewHash(); builtin_getset = NewHash();
class_members = NewHash();
if (builtin) { if (builtin) {
f_builtins = NewString(""); f_builtins = NewString("");
Printf(f_builtins, "namespace {\n\n"); Printf(f_builtins, "#ifdef __cplusplus\nnamespace {\n#endif\n\n");
} }
if (directorsEnabled()) { if (directorsEnabled()) {
@ -915,7 +917,7 @@ public:
Printf(f_init, "#endif\n"); Printf(f_init, "#endif\n");
Printf(f_init, "}\n"); Printf(f_init, "}\n");
if (builtin) if (builtin)
Printf(f_builtins, "} // namespace {\n\n"); Printv(f_builtins, "#ifdef __cplusplus\n} // namespace {\n#endif\n\n", NIL);
Printf(f_wrappers, "#ifdef __cplusplus\n"); Printf(f_wrappers, "#ifdef __cplusplus\n");
Printf(f_wrappers, "}\n"); Printf(f_wrappers, "}\n");
@ -1803,7 +1805,7 @@ public:
int maxargs; int maxargs;
char const *wrap_return = (builtin_self && constructor) ? "int " : "PyObject *"; bool return_int = (builtin_self && constructor);
String *tmp = NewString(""); String *tmp = NewString("");
String *dispatch; String *dispatch;
const char *dispatch_code = funpack ? "return %s(self, argc, argv);" : "return %s(self, args);"; const char *dispatch_code = funpack ? "return %s(self, argc, argv);" : "return %s(self, args);";
@ -1820,7 +1822,7 @@ public:
String *symname = Getattr(n, "sym:name"); String *symname = Getattr(n, "sym:name");
String *wname = Swig_name_wrapper(symname); String *wname = Swig_name_wrapper(symname);
Printv(f->def, linkage, wrap_return, wname, "(PyObject *self, PyObject *args) {", NIL); Printv(f->def, linkage, return_int ? "int " : "PyObject *", wname, "(PyObject *self, PyObject *args) {", NIL);
Wrapper_add_local(f, "argc", "int argc"); Wrapper_add_local(f, "argc", "int argc");
Printf(tmp, "PyObject *argv[%d]", maxargs + 1); Printf(tmp, "PyObject *argv[%d]", maxargs + 1);
@ -1865,7 +1867,7 @@ public:
Append(f->code, "fail:\n"); Append(f->code, "fail:\n");
Printf(f->code, "SWIG_SetErrorMsg(PyExc_NotImplementedError," Printf(f->code, "SWIG_SetErrorMsg(PyExc_NotImplementedError,"
"\"Wrong number or type of arguments for overloaded function '%s'.\\n\"" "\n\" Possible C/C++ prototypes are:\\n\"%s);\n", symname, protoTypes); "\"Wrong number or type of arguments for overloaded function '%s'.\\n\"" "\n\" Possible C/C++ prototypes are:\\n\"%s);\n", symname, protoTypes);
Printf(f->code, "return (%s) 0;\n", wrap_return); Printf(f->code, "return %s;\n", return_int ? "-1" : "0");
Delete(protoTypes); Delete(protoTypes);
} }
Printv(f->code, "}\n", NIL); Printv(f->code, "}\n", NIL);
@ -1958,13 +1960,6 @@ public:
if (slot) if (slot)
closure_decl = getClosure(Getattr(n, "feature:pyslot:functype"), wrapper_name); closure_decl = getClosure(Getattr(n, "feature:pyslot:functype"), wrapper_name);
/*
if (builtin_setter || builtin_getter) {
Clear(linkage);
Printv(linkage, "extern ", NIL);
}
*/
if (Getattr(n, "sym:overloaded")) { if (Getattr(n, "sym:overloaded")) {
overname = Getattr(n, "sym:overname"); overname = Getattr(n, "sym:overname");
} else { } else {
@ -2066,6 +2061,14 @@ public:
} }
} }
if (builtin_ctor && checkAttribute(n, "access", "protected")) {
String *tmp_none_comparison = Copy(none_comparison);
Replaceall(tmp_none_comparison, "$arg", "self");
Printf(self_parse, "if (!(%s)) {\n", tmp_none_comparison);
Printv(self_parse, " SWIG_SetErrorMsg(PyExc_RuntimeError, \"accessing abstract class or protected constructor\");\n SWIG_fail;\n}\n", NIL);
Delete(tmp_none_comparison);
}
if (builtin_self && !builtin_ctor) if (builtin_self && !builtin_ctor)
Printf(self_parse, "%s = self;\n", funpack ? "swig_obj[0]" : "obj0"); Printf(self_parse, "%s = self;\n", funpack ? "swig_obj[0]" : "obj0");
@ -2175,10 +2178,14 @@ public:
Printv(f->locals, " char * kwnames[] = ", kwargs, ";\n", NIL); Printv(f->locals, " char * kwnames[] = ", kwargs, ";\n", NIL);
} }
if (tuple_arguments > 0 && (use_parse || allow_kwargs || !modernargs)) { if (use_parse || allow_kwargs || !modernargs) {
Printf(parse_args, ":%s\"", iname); if (builtin && in_class && tuple_arguments == 0) {
Printv(parse_args, arglist, ")) SWIG_fail;\n", NIL); Printf(parse_args, " if (args && PyTuple_Check(args) && PyTuple_GET_SIZE(args) > 0) SWIG_fail;\n");
funpack = 0; } else {
Printf(parse_args, ":%s\"", iname);
Printv(parse_args, arglist, ")) SWIG_fail;\n", NIL);
funpack = 0;
}
} else { } else {
Clear(parse_args); Clear(parse_args);
if (funpack) { if (funpack) {
@ -2513,6 +2520,18 @@ public:
} }
} }
// Put this in tp_init of the PyTypeObject
if (builtin_ctor) {
// Can't use checkAttribute(n, "access", "public") because
// "access" attr isn't set on %extend methods
if ((director_method || !checkAttribute(n, "access", "private")) &&
!Getattr(class_members, iname)) {
Setattr(class_members, iname, n);
if (!builtin_tp_init)
builtin_tp_init = Swig_name_wrapper(iname);
}
}
/* If this is a builtin type, create a PyGetSetDef entry for this member variable. */ /* If this is a builtin type, create a PyGetSetDef entry for this member variable. */
if (builtin_getter) { if (builtin_getter) {
Hash *h = Getattr(builtin_getset, name); Hash *h = Getattr(builtin_getset, name);
@ -2616,10 +2635,9 @@ public:
if (assignable) { if (assignable) {
Setattr(n, "wrap:name", varsetname); Setattr(n, "wrap:name", varsetname);
if (builtin && in_class) { if (builtin && in_class) {
String *method_def = NewStringf("%s_method_def", varsetname); String *set_wrapper = Swig_name_wrapper(setname);
Printf(f_builtins, "static PyMethodDef %s = { const_cast<char*>(\"%s\"), (PyCFunction)%s, METH_VARARGS, \"\" };\n", method_def, name, varsetname); Setattr(n, "builtin:setter", set_wrapper);
Setattr(n, "builtin:setter", method_def); Delete(set_wrapper);
Delete(method_def);
} }
Printf(setf->def, "SWIGINTERN int %s(PyObject *_val) {", varsetname); Printf(setf->def, "SWIGINTERN int %s(PyObject *_val) {", varsetname);
if ((tm = Swig_typemap_lookup("varin", n, name, 0))) { if ((tm = Swig_typemap_lookup("varin", n, name, 0))) {
@ -2653,10 +2671,9 @@ public:
/* Create a function for getting the value of a variable */ /* Create a function for getting the value of a variable */
Setattr(n, "wrap:name", vargetname); Setattr(n, "wrap:name", vargetname);
if (builtin && in_class) { if (builtin && in_class) {
String *method_def = NewStringf("%s_method_def", vargetname); String *get_wrapper = Swig_name_wrapper(getname);
Printf(f_builtins, "static PyMethodDef %s = { const_cast<char*>(\"%s\"), (PyCFunction)%s, METH_NOARGS, \"\" };\n", method_def, name, vargetname); Setattr(n, "builtin:getter", get_wrapper);
Setattr(n, "builtin:getter", method_def); Delete(get_wrapper);
Delete(method_def);
} }
int addfail = 0; int addfail = 0;
Printf(getf->def, "SWIGINTERN PyObject *%s(void) {", vargetname); Printf(getf->def, "SWIGINTERN PyObject *%s(void) {", vargetname);
@ -2967,7 +2984,7 @@ public:
shadow = oldshadow; shadow = oldshadow;
if (shadow) { if (shadow) {
if (builtin) { if (builtin) {
Printf(f_shadow, tab4, "{ \"disown\", (PyCFunction) Swig::Director::pyobj_disown< %s >, METH_NOARGS, \"\" },\n", real_classname); Printf(f_shadow, tab4 "{ \"__disown__\", (PyCFunction) Swig::Director::pyobj_disown< %s >, METH_NOARGS, \"\" },\n", real_classname);
} else { } else {
String *symname = Getattr(n, "sym:name"); String *symname = Getattr(n, "sym:name");
String *mrename = Swig_name_disown(NSPACE_TODO, symname); //Getattr(n, "name")); String *mrename = Swig_name_disown(NSPACE_TODO, symname); //Getattr(n, "name"));
@ -3046,7 +3063,8 @@ public:
void builtin_pre_decl(Node *n, Node *) { void builtin_pre_decl(Node *n, Node *) {
String *name = Getattr(n, "name"); String *name = Getattr(n, "name");
String *rname = SwigType_namestr(name); String *rname = SwigType_namestr(name);
Printf(f_init, tab4 "builtin_pytype = &PySwigBuiltin< %s >::pytype;\n", rname); Printf(f_init, tab4 "builtin_pytype = &SwigPyBuiltin< %s >::pytype;\n", rname);
Printf(f_init, tab4 "builtin_pytype->ob_type = metatype;\n");
Printf(f_init, tab4 "builtin_pytype->tp_new = PyType_GenericNew;\n"); Printf(f_init, tab4 "builtin_pytype->tp_new = PyType_GenericNew;\n");
List *baselist = Getattr(n, "bases"); List *baselist = Getattr(n, "bases");
if (baselist) { if (baselist) {
@ -3068,66 +3086,75 @@ public:
Printv(f_init, " builtin_bases.push_back(SwigPyObject_type());\n", NIL); Printv(f_init, " builtin_bases.push_back(SwigPyObject_type());\n", NIL);
Printv(f_init, " builtin_pytype->tp_base = builtin_bases[0];\n", NIL); Printv(f_init, " builtin_pytype->tp_base = builtin_bases[0];\n", NIL);
Printv(f_init, " Py_INCREF((PyObject*) builtin_bases[0]);\n", NIL); Printv(f_init, " Py_INCREF((PyObject*) builtin_bases[0]);\n", NIL);
Printv(f_init, " base_tuple = PyTuple_New(builtin_bases.size());\n", NIL); Printv(f_init, " tuple = PyTuple_New(builtin_bases.size());\n", NIL);
Printv(f_init, " for (i = 0; i < builtin_bases.size(); ++i) {\n", NIL); Printv(f_init, " for (i = 0; i < builtin_bases.size(); ++i) {\n", NIL);
Printv(f_init, " PyTuple_SET_ITEM(base_tuple, i, (PyObject*) builtin_bases[i]);\n", NIL); Printv(f_init, " PyTuple_SET_ITEM(tuple, i, (PyObject*) builtin_bases[i]);\n", NIL);
Printv(f_init, " Py_INCREF((PyObject*) builtin_bases[i]);\n", NIL); Printv(f_init, " Py_INCREF((PyObject*) builtin_bases[i]);\n", NIL);
Printv(f_init, " }\n", NIL); Printv(f_init, " }\n", NIL);
Printv(f_init, " builtin_bases.clear();\n", NIL); Printv(f_init, " builtin_bases.clear();\n", NIL);
/*
if (base_node) {
String *base_name = Copy(Getattr(base_node, "name"));
SwigType_add_pointer(base_name);
String *base_mname = SwigType_manglestr(base_name);
Printf(f_init, tab4 "builtin_basetype = SWIG_MangledTypeQuery(\"%s\");\n", base_mname);
Printf(f_init, tab4 "if (builtin_basetype && builtin_basetype->clientdata && ((SwigPyClientData*) builtin_basetype->clientdata)->pytype) {\n");
Printf(f_init, tab8 "builtin_pytype->tp_base = ((SwigPyClientData*) builtin_basetype->clientdata)->pytype;\n");
Printf(f_init, tab4 "}\n");
Delete(base_mname);
Delete(base_name);
} else {
Printv(f_init, tab4, "builtin_pytype->tp_base = SwigPyObject_type();\n", NIL);
}
*/
Printf(f_init, tab4 "builtin_pytype->tp_dict = d = PyDict_New();\n"); Printf(f_init, tab4 "builtin_pytype->tp_dict = d = PyDict_New();\n");
Delete(rname); Delete(rname);
} }
virtual bool has_callable_dtor (Node *n, bool protected_ok = false) {
if (GetFlag(n, "private_dtor"))
return false;
if (!protected_ok && GetFlag(n, "protected_dtor"))
return false;
List *baselist = Getattr(n, "bases");
if (!baselist || Len(baselist) == 0)
return true;
for (Iterator b = First(baselist); b.item; b = Next(b))
if (!has_callable_dtor(b.item, true))
return false;
return true;
}
void builtin_post_decl(File *f, Node *n) { void builtin_post_decl(File *f, Node *n) {
String *name = Getattr(n, "name"); String *name = Getattr(n, "name");
String *pname = Copy(name); String *pname = Copy(name);
SwigType_add_pointer(pname); SwigType_add_pointer(pname);
String *symname = Getattr(n, "sym:name"); String *symname = Getattr(n, "sym:name");
String *rname = SwigType_namestr(name); String *rname = SwigType_namestr(name);
String *mname = SwigType_manglestr(pname);
String *templ = NewString(""); String *templ = NewString("");
Printf(templ, "PySwigBuiltin< %s >", rname); Printf(templ, "SwigPyBuiltin< %s >", rname);
char const *tp_init = builtin_tp_init ? Char(builtin_tp_init) : "0"; char const *tp_init = builtin_tp_init ? Char(builtin_tp_init) : Swig_directorclass(n) ? "0" : "py_builtin_bad_init";
// Check for non-public destructor, in which case tp_dealloc should be "0" // Check for non-public destructor, in which case tp_dealloc will issue
// Any class that doesn't explicitly have a private/protected destructor // a warning and allow the memory to leak. Any class that doesn't explicitly
// has an implicit public destructor. // have a private/protected destructor has an implicit public destructor.
String *tp_dealloc = NewString(""); String *tp_dealloc = NewString("");
if (GetFlag(n, "private_dtor")) if (has_callable_dtor(n))
Printv(tp_dealloc, "0", NIL);
else
Printf(tp_dealloc, "py_builtin_dealloc< %s >", rname); Printf(tp_dealloc, "py_builtin_dealloc< %s >", rname);
else
Printv(tp_dealloc, "py_builtin_bad_dealloc", NIL);
Printf(f, "template <> PyGetSetDef PySwigBuiltin< %s >::getset[] = {\n", rname); String *getset_def = NewString("");
Printf(getset_def, "template <> PyGetSetDef SwigPyBuiltin< %s >::getset[] = {\n", rname);
for (DohIterator member_iter = First(builtin_getset); member_iter.item; member_iter = Next(member_iter)) { for (DohIterator member_iter = First(builtin_getset); member_iter.item; member_iter = Next(member_iter)) {
String *mname = member_iter.key; String *memname = member_iter.key;
Hash *mgetset = member_iter.item; Hash *mgetset = member_iter.item;
String *getter = Getattr(mgetset, "getter"); String *getter = Getattr(mgetset, "getter");
String *setter = Getattr(mgetset, "setter"); String *setter = Getattr(mgetset, "setter");
Printf(f, tab4 "{ const_cast<char*>(\"%s\"), (getter) %s, (setter) %s, const_cast<char*>(\"%s.%s\"), (void*) %s },\n", const char *getter_closure = getter ? "pyswig_getter_closure" : "0";
mname, getter ? getter : "0", setter ? "pyswig_setter_closure" : "0", name, mname, setter ? setter : "0"); const char *setter_closure = getter ? "pyswig_setter_closure" : "0";
String *gspair = NewStringf("%s_%s_getset", symname, memname);
Printf(f, "static SwigPyGetSet %s = { %s, %s };\n", gspair, getter ? getter : "0", setter ? setter : "0");
String *entry = NewStringf("{ const_cast<char*>(\"%s\"), (getter) %s, (setter) %s, const_cast<char*>(\"%s.%s\"), (void*) &%s }\n", memname, getter_closure, setter_closure, name, memname, gspair);
if (GetFlag(mgetset, "static")) {
Printf(f, "static PyGetSetDef %s_def = %s;\n", gspair, entry);
Printf(f_init, "static_getset = SwigPyStaticVar_new_getset(metatype, &%s_def);\n", gspair);
Printf(f_init, "PyDict_SetItemString(d, static_getset->d_getset->name, (PyObject*) static_getset);\n", memname); Printf(f_init, "Py_DECREF(static_getset);\n");
} else {
Printf(getset_def, " %s,\n", entry);
}
Delete(gspair);
Delete(entry);
} }
Printv(f, " {NULL} // Sentinel\n", NIL); Printv(f, getset_def, " {NULL} // Sentinel\n", "};\n\n", NIL);
Printv(f, "};\n\n", NIL);
Clear(builtin_getset);
// Number methods // Number methods
Printf(f, "template <> PyNumberMethods PySwigBuiltin< %s >::number_methods = {\n", rname); Printf(f, "template <> PyNumberMethods SwigPyBuiltin< %s >::number_methods = {\n", rname);
Printf(f, " (binaryfunc) %s, // nb_add;\n", getSlot(n, "feature:nb_add")); Printf(f, " (binaryfunc) %s, // nb_add;\n", getSlot(n, "feature:nb_add"));
Printf(f, " (binaryfunc) %s, // nb_subtract;\n", getSlot(n, "feature:nb_subtract")); Printf(f, " (binaryfunc) %s, // nb_subtract;\n", getSlot(n, "feature:nb_subtract"));
Printf(f, " (binaryfunc) %s, // nb_multiply;\n", getSlot(n, "feature:nb_multiply")); Printf(f, " (binaryfunc) %s, // nb_multiply;\n", getSlot(n, "feature:nb_multiply"));
@ -3170,7 +3197,7 @@ public:
Printf(f, "};\n\n"); Printf(f, "};\n\n");
// Sequence methods // Sequence methods
Printf(f, "template <> PySequenceMethods PySwigBuiltin< %s >::sequence_methods = {\n", rname); Printf(f, "template <> PySequenceMethods SwigPyBuiltin< %s >::sequence_methods = {\n", rname);
Printf(f, " (lenfunc) %s, // sq_length\n", getSlot(n, "feature:sq_length")); Printf(f, " (lenfunc) %s, // sq_length\n", getSlot(n, "feature:sq_length"));
Printf(f, " (binaryfunc) %s, // sq_concat\n", getSlot(n, "feature:sq_concat")); Printf(f, " (binaryfunc) %s, // sq_concat\n", getSlot(n, "feature:sq_concat"));
Printf(f, " (ssizeargfunc) %s, // sq_repeat\n", getSlot(n, "feature:sq_repeat")); Printf(f, " (ssizeargfunc) %s, // sq_repeat\n", getSlot(n, "feature:sq_repeat"));
@ -3184,7 +3211,7 @@ public:
Printf(f, "};\n\n"); Printf(f, "};\n\n");
// Mapping methods // Mapping methods
Printf(f, "template <> PyMappingMethods PySwigBuiltin< %s >::mapping_methods = {\n", rname); Printf(f, "template <> PyMappingMethods SwigPyBuiltin< %s >::mapping_methods = {\n", rname);
Printf(f, " (lenfunc) %s, // mp_length;\n", getSlot(n, "feature:mp_length")); Printf(f, " (lenfunc) %s, // mp_length;\n", getSlot(n, "feature:mp_length"));
Printf(f, " (binaryfunc) %s, // mp_subscript;\n", getSlot(n, "feature:mp_subscript")); Printf(f, " (binaryfunc) %s, // mp_subscript;\n", getSlot(n, "feature:mp_subscript"));
Printf(f, " (objobjargproc) %s, // mp_ass_subscript;\n", getSlot(n, "feature:mp_ass_subscript")); Printf(f, " (objobjargproc) %s, // mp_ass_subscript;\n", getSlot(n, "feature:mp_ass_subscript"));
@ -3218,7 +3245,7 @@ public:
// Type object // Type object
String *tp_flags = NewString("Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_CHECKTYPES"); String *tp_flags = NewString("Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_CHECKTYPES");
// TODO: Add more flags based on slots // TODO: Add more flags based on slots
Printf(f, "template <> PyTypeObject PySwigBuiltin< %s >::pytype = {\n", rname); Printf(f, "template <> PyTypeObject SwigPyBuiltin< %s >::pytype = {\n", rname);
Printf(f, " PyObject_HEAD_INIT(NULL)\n"); Printf(f, " PyObject_HEAD_INIT(NULL)\n");
Printf(f, " 0, /*ob_size*/\n"); Printf(f, " 0, /*ob_size*/\n");
Printf(f, " \"%s\", /*tp_name*/\n", symname); Printf(f, " \"%s\", /*tp_name*/\n", symname);
@ -3254,8 +3281,8 @@ public:
Printf(f, " %s, /* tp_dict */\n", getSlot(n, "feature:tp_dict")); Printf(f, " %s, /* tp_dict */\n", getSlot(n, "feature:tp_dict"));
Printf(f, " %s, /* tp_descr_get */\n", getSlot(n, "feature:tp_descr_get")); Printf(f, " %s, /* tp_descr_get */\n", getSlot(n, "feature:tp_descr_get"));
Printf(f, " %s, /* tp_descr_set */\n", getSlot(n, "feature:tp_descr_set")); Printf(f, " %s, /* tp_descr_set */\n", getSlot(n, "feature:tp_descr_set"));
Printf(f, " %s, /* tp_dictoffset */\n", getSlot(n, "feature:tp_dictoffset")); Printf(f, " (size_t)(((char*)&((SwigPyObject *) 64L)->dict) - (char*) 64L), /* tp_dictoffset */\n");
Printf(f, " (initproc)%s, /* tp_init */\n", tp_init); Printf(f, " (initproc)%s, /* tp_init */\n", tp_init);
Printf(f, " %s, /* tp_alloc */\n", getSlot(n, "feature:tp_alloc")); Printf(f, " %s, /* tp_alloc */\n", getSlot(n, "feature:tp_alloc"));
Printf(f, " 0, /* tp_new */\n"); Printf(f, " 0, /* tp_new */\n");
Printf(f, " %s /* tp_free */\n", getSlot(n, "feature:tp_free")); Printf(f, " %s /* tp_free */\n", getSlot(n, "feature:tp_free"));
@ -3277,7 +3304,6 @@ public:
Delete(clientdata); Delete(clientdata);
Delete(templ); Delete(templ);
Delete(mname);
Delete(rname); Delete(rname);
Delete(pname); Delete(pname);
Delete(tp_dealloc); Delete(tp_dealloc);
@ -3350,14 +3376,14 @@ public:
} }
if (builtin) { if (builtin) {
Hash *base_richcompare = NULL;
Hash *richcompare = NULL; Hash *richcompare = NULL;
if (base_node) { if (base_node)
Hash *base_richcompare = Getattr(base_node, "richcompare"); base_richcompare = Getattr(base_node, "richcompare");
assert(base_richcompare); if (base_richcompare)
richcompare = Copy(base_richcompare); richcompare = Copy(base_richcompare);
} else { else
richcompare = NewHash(); richcompare = NewHash();
}
Setattr(n, "richcompare", richcompare); Setattr(n, "richcompare", richcompare);
} }
@ -3424,10 +3450,8 @@ public:
/* Emit all of the members */ /* Emit all of the members */
in_class = 1; in_class = 1;
if (builtin) { if (builtin)
class_members = NewHash();
builtin_pre_decl(n, base_node); builtin_pre_decl(n, base_node);
}
/* Overide the shadow file so we can capture its methods */ /* Overide the shadow file so we can capture its methods */
f_shadow = NewString(""); f_shadow = NewString("");
@ -3447,6 +3471,9 @@ public:
Printv(none_comparison, "$arg != Py_None", NIL); Printv(none_comparison, "$arg != Py_None", NIL);
} }
if (builtin)
Setattr(n, "feature:unref", "1");
Language::classHandler(n); Language::classHandler(n);
in_class = 0; in_class = 0;
@ -3519,7 +3546,7 @@ public:
if (builtin) { if (builtin) {
builtin_post_decl(f_builtins, n); builtin_post_decl(f_builtins, n);
String *rname = SwigType_namestr(real_classname); String *rname = SwigType_namestr(real_classname);
Printf(f_builtins, "template <> PyMethodDef PySwigBuiltin< %s >::methods[] = {\n", rname); Printf(f_builtins, "template <> PyMethodDef SwigPyBuiltin< %s >::methods[] = {\n", rname);
Delete(rname); Delete(rname);
} }
@ -3557,19 +3584,18 @@ public:
} }
Printf(f_shadow_file, "%s_swigregister = %s.%s_swigregister\n", class_name, module, class_name); Printf(f_shadow_file, "%s_swigregister = %s.%s_swigregister\n", class_name, module, class_name);
Printf(f_shadow_file, "%s_swigregister(%s)\n", class_name, class_name); Printf(f_shadow_file, "%s_swigregister(%s)\n", class_name, class_name);
shadow_indent = 0;
Printf(f_shadow_file, "%s\n", f_shadow_stubs);
} }
shadow_indent = 0; shadow_indent = 0;
Printf(f_shadow_file, "%s\n", f_shadow_stubs);
Clear(f_shadow_stubs); Clear(f_shadow_stubs);
} }
if (builtin) { if (builtin) {
Dump(f_shadow, f_builtins); Dump(f_shadow, f_builtins);
Printf(f_builtins, " {NULL} // Sentinel\n};\n\n"); Printf(f_builtins, " {NULL} // Sentinel\n};\n\n");
Delete(class_members); Clear(class_members);
class_members = 0; Clear(builtin_getset);
} }
classic = oldclassic; classic = oldclassic;
@ -3617,27 +3643,28 @@ public:
Language::memberfunctionHandler(n); Language::memberfunctionHandler(n);
shadow = oldshadow; shadow = oldshadow;
if (!Getattr(n, "sym:nextSibling")) { if (builtin && in_class) {
if (builtin && in_class) {
String *name = Getattr(n, "name"); String *name = Getattr(n, "name");
// Can't use checkAttribute(n, "access", "public") because // Can't use checkAttribute(n, "access", "public") because
// "access" attr isn't set on %extend methods // "access" attr isn't set on %extend methods
if (!checkAttribute(n, "access", "private") && if (!checkAttribute(n, "access", "private") &&
!checkAttribute(n, "access", "protected") && //!checkAttribute(n, "access", "protected") &&
strncmp(Char(name), "operator ", 9) && strncmp(Char(name), "operator ", 9) &&
!Getattr(class_members, name)) { !Getattr(class_members, symname)) {
String *fullname = Swig_name_member(NULL, class_name, symname); String *fullname = Swig_name_member(NULL, class_name, symname);
String *wname = Swig_name_wrapper(fullname); String *wname = Swig_name_wrapper(fullname);
Setattr(class_members, name, name); Setattr(class_members, symname, n);
int allow_kwargs = check_kwargs(n); int allow_kwargs = check_kwargs(n);
Printf(f_shadow, " { \"%s\", (PyCFunction) %s, METH_VARARGS%s, \"\" },\n", Printf(f_shadow, " { \"%s\", (PyCFunction) %s, METH_VARARGS%s, \"\" },\n",
name, wname, allow_kwargs ? "|METH_KEYWORDS" : ""); symname, wname, allow_kwargs ? "|METH_KEYWORDS" : "");
Delete(name); Delete(fullname);
Delete(fullname); Delete(wname);
Delete(wname);
} }
} else if (shadow) { }
if (!Getattr(n, "sym:nextSibling")) {
if (shadow && !builtin) {
int fproxy = fastproxy; int fproxy = fastproxy;
if (Strcmp(symname, "__repr__") == 0) { if (Strcmp(symname, "__repr__") == 0) {
have_repr = 1; have_repr = 1;
@ -3712,14 +3739,12 @@ public:
} }
if (builtin && in_class) { if (builtin && in_class) {
String *name = Getattr(n, "name"); if (checkAttribute(n, "access", "public") && !Getattr(class_members, symname)) {
if (checkAttribute(n, "access", "public") && !Getattr(class_members, name)) { String *fullname = Swig_name_member(NULL, class_name, symname);
String *fullname = Swig_name_member(NULL, class_name, name);
String *wname = Swig_name_wrapper(fullname); String *wname = Swig_name_wrapper(fullname);
Setattr(class_members, name, name); Setattr(class_members, symname, n);
String *pyflags = NewString("METH_VARARGS|METH_STATIC"); String *pyflags = NewString("METH_VARARGS|METH_STATIC");
Printf(f_shadow, " { \"%s\", (PyCFunction) %s, %s, \"\" },\n", Char(name), wname, Char(pyflags)); Printf(f_shadow, " { \"%s\", (PyCFunction) %s, %s, \"\" },\n", symname, wname, pyflags);
Delete(name);
Delete(fullname); Delete(fullname);
Delete(wname); Delete(wname);
Delete(pyflags); Delete(pyflags);
@ -3803,108 +3828,100 @@ public:
Swig_restore(n); Swig_restore(n);
if (!Getattr(n, "sym:nextSibling")) { if (!Getattr(n, "sym:nextSibling")) {
if (builtin && in_class) { if (shadow) {
String *name = NewString("new"); int allow_kwargs = (check_kwargs(n) && (!Getattr(n, "sym:overloaded"))) ? 1 : 0;
// Can't use checkAttribute(n, "access", "public") because int handled_as_init = 0;
// "access" attr isn't set on %extend methods if (!have_constructor) {
if ((use_director || String *nname = Getattr(n, "sym:name");
(!checkAttribute(n, "access", "protected") && String *sname = Getattr(getCurrentClass(), "sym:name");
!checkAttribute(n, "access", "private"))) && String *cname = Swig_name_construct(NSPACE_TODO, sname);
!Getattr(class_members, name)) { handled_as_init = (Strcmp(nname, sname) == 0) || (Strcmp(nname, cname) == 0);
Setattr(class_members, name, name); Delete(cname);
String *fullname = Swig_name_member(NULL, name, class_name);
if (!builtin_tp_init)
builtin_tp_init = Swig_name_wrapper(fullname);
Delete(fullname);
}
Delete(name);
} else if (shadow) {
int allow_kwargs = (check_kwargs(n) && (!Getattr(n, "sym:overloaded"))) ? 1 : 0;
int handled_as_init = 0;
if (!have_constructor) {
String *nname = Getattr(n, "sym:name");
String *sname = Getattr(getCurrentClass(), "sym:name");
String *cname = Swig_name_construct(NSPACE_TODO, sname);
handled_as_init = (Strcmp(nname, sname) == 0) || (Strcmp(nname, cname) == 0);
Delete(cname);
}
if (!have_constructor && handled_as_init) {
if (Getattr(n, "feature:shadow")) {
String *pycode = pythoncode(Getattr(n, "feature:shadow"), tab4);
String *pyaction = NewStringf("%s.%s", module, Swig_name_construct(NSPACE_TODO, symname));
Replaceall(pycode, "$action", pyaction);
Delete(pyaction);
Printv(f_shadow, pycode, "\n", NIL);
Delete(pycode);
} else {
String *pass_self = NewString("");
Node *parent = Swig_methodclass(n);
String *classname = Swig_class_name(parent);
String *rclassname = Swig_class_name(getCurrentClass());
assert(rclassname);
String *parms = make_pyParmList(n, true, false, allow_kwargs);
/* Pass 'self' only if using director */
String *callParms = make_pyParmList(n, false, true, allow_kwargs);
if (use_director) {
Insert(callParms, 0, "_self, ");
Printv(pass_self, tab8, NIL);
Printf(pass_self, "if self.__class__ == %s:\n", classname);
//Printv(pass_self, tab8, tab4, "args = (None,) + args\n", tab8, "else:\n", tab8, tab4, "args = (self,) + args\n", NIL);
Printv(pass_self, tab8, tab4, "_self = None\n", tab8, "else:\n", tab8, tab4, "_self = self\n", NIL);
} }
if (!have_constructor && handled_as_init) {
if (!builtin) {
if (Getattr(n, "feature:shadow")) {
String *pycode = pythoncode(Getattr(n, "feature:shadow"), tab4);
String *pyaction = NewStringf("%s.%s", module, Swig_name_construct(NSPACE_TODO, symname));
Replaceall(pycode, "$action", pyaction);
Delete(pyaction);
Printv(f_shadow, pycode, "\n", NIL);
Delete(pycode);
} else {
String *pass_self = NewString("");
Node *parent = Swig_methodclass(n);
String *classname = Swig_class_name(parent);
String *rclassname = Swig_class_name(getCurrentClass());
assert(rclassname);
Printv(f_shadow, tab4, "def __init__(", parms, ")", returnTypeAnnotation(n), ": \n", NIL); String *parms = make_pyParmList(n, true, false, allow_kwargs);
if (have_docstring(n)) /* Pass 'self' only if using director */
Printv(f_shadow, tab8, docstring(n, AUTODOC_CTOR, tab8), "\n", NIL); String *callParms = make_pyParmList(n, false, true, allow_kwargs);
if (have_pythonprepend(n))
Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL); if (use_director) {
Printv(f_shadow, pass_self, NIL); Insert(callParms, 0, "_self, ");
if (fastinit) { Printv(pass_self, tab8, NIL);
Printv(f_shadow, tab8, module, ".", class_name, "_swiginit(self,", funcCall(Swig_name_construct(NSPACE_TODO, symname), callParms), ")\n", NIL); Printf(pass_self, "if self.__class__ == %s:\n", classname);
//Printv(pass_self, tab8, tab4, "args = (None,) + args\n", tab8, "else:\n", tab8, tab4, "args = (self,) + args\n", NIL);
Printv(pass_self, tab8, tab4, "_self = None\n", tab8, "else:\n", tab8, tab4, "_self = self\n", NIL);
}
Printv(f_shadow, tab4, "def __init__(", parms, ")", returnTypeAnnotation(n), ": \n", NIL);
if (have_docstring(n))
Printv(f_shadow, tab8, docstring(n, AUTODOC_CTOR, tab8), "\n", NIL);
if (have_pythonprepend(n))
Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL);
Printv(f_shadow, pass_self, NIL);
if (fastinit) {
Printv(f_shadow, tab8, module, ".", class_name, "_swiginit(self,", funcCall(Swig_name_construct(NSPACE_TODO, symname), callParms), ")\n", NIL);
} else {
Printv(f_shadow,
tab8, "this = ", funcCall(Swig_name_construct(NSPACE_TODO, symname), callParms), "\n",
tab8, "try: self.this.append(this)\n", tab8, "except: self.this = this\n", NIL);
}
if (have_pythonappend(n))
Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n\n", NIL);
Delete(pass_self);
}
have_constructor = 1;
}
} else { } else {
Printv(f_shadow, /* Hmmm. We seem to be creating a different constructor. We're just going to create a
tab8, "this = ", funcCall(Swig_name_construct(NSPACE_TODO, symname), callParms), "\n", function for it. */
tab8, "try: self.this.append(this)\n", tab8, "except: self.this = this\n", NIL); if (Getattr(n, "feature:shadow")) {
} String *pycode = pythoncode(Getattr(n, "feature:shadow"), "");
if (have_pythonappend(n)) String *pyaction = NewStringf("%s.%s", module, Swig_name_construct(NSPACE_TODO, symname));
Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n\n", NIL); Replaceall(pycode, "$action", pyaction);
Delete(pass_self); Delete(pyaction);
} Printv(f_shadow_stubs, pycode, "\n", NIL);
have_constructor = 1; Delete(pycode);
} else { } else {
/* Hmmm. We seem to be creating a different constructor. We're just going to create a String *parms = make_pyParmList(n, false, false, allow_kwargs);
function for it. */ String *callParms = make_pyParmList(n, false, true, allow_kwargs);
if (Getattr(n, "feature:shadow")) { Printv(f_shadow_stubs, "\ndef ", symname, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL);
String *pycode = pythoncode(Getattr(n, "feature:shadow"), ""); if (have_docstring(n))
String *pyaction = NewStringf("%s.%s", module, Swig_name_construct(NSPACE_TODO, symname)); Printv(f_shadow_stubs, tab4, docstring(n, AUTODOC_CTOR, tab4), "\n", NIL);
Replaceall(pycode, "$action", pyaction); if (have_pythonprepend(n))
Delete(pyaction); Printv(f_shadow_stubs, pythoncode(pythonprepend(n), tab4), "\n", NIL);
Printv(f_shadow_stubs, pycode, "\n", NIL); String *subfunc = NULL;
Delete(pycode); if (builtin)
} else { subfunc = Copy(Getattr(getCurrentClass(), "sym:name"));
String *parms = make_pyParmList(n, false, false, allow_kwargs); else
String *callParms = make_pyParmList(n, false, true, allow_kwargs); subfunc = Swig_name_construct(NSPACE_TODO, symname);
Printv(f_shadow_stubs, tab4, "val = ", funcCall(subfunc, callParms), "\n", NIL);
Printv(f_shadow_stubs, "\ndef ", symname, "(", parms, ")", returnTypeAnnotation(n), ":\n", NIL);
if (have_docstring(n))
Printv(f_shadow_stubs, tab4, docstring(n, AUTODOC_CTOR, tab4), "\n", NIL);
if (have_pythonprepend(n))
Printv(f_shadow_stubs, pythoncode(pythonprepend(n), tab4), "\n", NIL);
Printv(f_shadow_stubs, tab4, "val = ", funcCall(Swig_name_construct(NSPACE_TODO, symname), callParms), "\n", NIL);
#ifdef USE_THISOWN #ifdef USE_THISOWN
Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL); Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL);
#endif #endif
if (have_pythonappend(n)) if (have_pythonappend(n))
Printv(f_shadow_stubs, pythoncode(pythonappend(n), tab4), "\n", NIL); Printv(f_shadow_stubs, pythoncode(pythonappend(n), tab4), "\n", NIL);
Printv(f_shadow_stubs, tab4, "return val\n", NIL); Printv(f_shadow_stubs, tab4, "return val\n", NIL);
} Delete(subfunc);
}
}
} }
}
} }
return SWIG_OK; return SWIG_OK;
} }
@ -3915,8 +3932,10 @@ public:
virtual int destructorHandler(Node *n) { virtual int destructorHandler(Node *n) {
if (builtin && in_class) { if (builtin && in_class) {
if (checkAttribute(n, "access", "private") || checkAttribute(n, "access", "protected")) if (checkAttribute(n, "access", "private"))
SetFlag(Swig_methodclass(n), "private_dtor"); SetFlag(Swig_methodclass(n), "private_dtor");
if (checkAttribute(n, "access", "protected"))
SetFlag(Swig_methodclass(n), "protected_dtor");
return SWIG_OK; return SWIG_OK;
} }
@ -4019,7 +4038,7 @@ public:
String *symname = Getattr(n, "sym:name"); String *symname = Getattr(n, "sym:name");
if (shadow) { if (shadow) {
if (GetFlag(n, "hasconsttype")) { if (!builtin && GetFlag(n, "hasconsttype")) {
String *mname = Swig_name_member(NSPACE_TODO, class_name, symname); String *mname = Swig_name_member(NSPACE_TODO, class_name, symname);
Printf(f_shadow_stubs, "%s.%s = %s.%s.%s\n", class_name, symname, module, global_name, mname); Printf(f_shadow_stubs, "%s.%s = %s.%s.%s\n", class_name, symname, module, global_name, mname);
Delete(mname); Delete(mname);
@ -4068,19 +4087,21 @@ public:
} }
String *getter = Getattr(n, "builtin:getter"); String *getter = Getattr(n, "builtin:getter");
String *setter = Getattr(n, "builtin:setter"); String *setter = Getattr(n, "builtin:setter");
if (getter) { Hash *h = NULL;
Printf(f_init, " propargs = PyTuple_New(%d);\n", setter ? 2 : 1); if (getter || setter) {
Printf(f_init, " propget = PyCFunction_New(&%s, NULL);\n", getter); h = Getattr(builtin_getset, symname);
Printf(f_init, " PyTuple_SET_ITEM(propargs, 0, propget);\n"); if (!h) {
if (setter) { h = NewHash();
Printf(f_init, " propset = PyCFunction_New(&%s, NULL);\n", setter); Setattr(h, "static", "1");
Printf(f_init, " PyTuple_SET_ITEM(propargs, 1, propset);\n"); Setattr(builtin_getset, symname, h);
} }
Printf(f_init, " propobj = PyType_Type.tp_call((PyObject*) &PyProperty_Type, propargs, NULL);\n");
Printf(f_init, " Py_DECREF(propargs);\n");
Printf(f_init, " PyDict_SetItemString(d, \"%s\", propobj);\n", symname);
Printf(f_init, " Py_DECREF(propobj);\n");
} }
if (getter)
Setattr(h, "getter", getter);
if (setter)
Setattr(h, "setter", setter);
if (h)
Delete(h);
Delete(mname); Delete(mname);
Delete(getname); Delete(getname);
Delete(wrapgetname); Delete(wrapgetname);