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

Python: Cleanup container back ref

Browse source 
Use a single function in a fragment.
Use SWIG_Python_GetSwigThis instead of
directly grabbing the 'this' attribute.
This commit is contained in:
Jake Cobb 2018-04-18 20:39:56 -04:00
commit cc2dc6b192
1 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Lib/python/pycontainer.swg
View file

@ -36,12 +36,26 @@
%include <std_except.i> %include <std_except.i>
%fragment("container_owner_attribute", "header") { %fragment("reference_container_owner", "header") {
PyObject* container_owner_attribute() { namespace swig {
static PyObject* name = SWIG_Python_str_FromChar("__owner"); /**
return name; * Call to add a back-reference to the owning object when returning a
* reference from a container. Will only set the reference if <code>child</code>
* is a SWIG wrapper object that does not own the pointer.
*
* @return if the reference was set or not
*/
bool reference_container_owner(PyObject* child, PyObject* owner) {
static PyObject* attr = SWIG_Python_str_FromChar("__owner");
SwigPyObject* swigThis = SWIG_Python_GetSwigThis(child);
if (swigThis && (swigThis->own & SWIG_POINTER_OWN) != SWIG_POINTER_OWN) {
PyObject_GenericSetAttr(child, attr, owner);
return true;
}
return false;
} }
} }
}
%fragment(SWIG_Traits_frag(swig::SwigPtr_PyObject),"header",fragment="StdTraits") { %fragment(SWIG_Traits_frag(swig::SwigPtr_PyObject),"header",fragment="StdTraits") {
namespace swig { namespace swig {
@ -774,15 +788,8 @@ namespace swig
return self->size(); return self->size();
} }
%typemap(ret, fragment="container_owner_attribute") value_type& { %typemap(ret, fragment="reference_container_owner") value_type& {
PyObject* swigThis = PyObject_GetAttrString($result, "this"); swig::reference_container_owner($result, $self);
PyErr_Clear();
if (swigThis && SwigPyObject_Check(swigThis) &&
(reinterpret_cast<SwigPyObject*>(swigThis)->own & SWIG_POINTER_OWN) != SWIG_POINTER_OWN) {
// try to store reference to parent
PyObject_GenericSetAttr($result, container_owner_attribute(), $self);
}
Py_XDECREF(swigThis);
} }
} }
%enddef %enddef