summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generator/cppgenerator.cpp34
-rw-r--r--libshiboken/bindingmanager.cpp2
-rw-r--r--tests/samplebinding/class_fields_test.py9
3 files changed, 36 insertions, 9 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index 92dbf1f7..28ab0b71 100644
--- a/generator/cppgenerator.cpp
+++ b/generator/cppgenerator.cpp
@@ -2709,18 +2709,40 @@ void CppGenerator::writeGetterFunction(QTextStream& s, const AbstractMetaField*
{
s << "static PyObject* " << cpythonGetterFunctionName(metaField) << "(PyObject* self, void*)" << endl;
s << '{' << endl;
- s << INDENT << "return ";
+ s << INDENT << "PyObject* val = ";
QString cppField;
+ AbstractMetaType *metaType = metaField->type();
+ // Force use of pointer to return internal variable memory
+ bool useReference = (!metaType->isConstant() &&
+ !metaType->isEnum() &&
+ !metaType->isPrimitive() &&
+ metaType->indirections() == 0);
+
#ifdef AVOID_PROTECTED_HACK
if (metaField->isProtected())
- cppField = QString("((%1*)%2)->%3()").arg(wrapperName(metaField->enclosingClass())).arg(cpythonWrapperCPtr(metaField->enclosingClass(), "self")).arg(protectedFieldGetterName(metaField));
+ cppField = QString("(%1(%2*)%3)->%4()")
+ .arg(useReference ? '&' : ' ')
+ .arg(wrapperName(metaField->enclosingClass()))
+ .arg(cpythonWrapperCPtr(metaField->enclosingClass(), "self"))
+ .arg(protectedFieldGetterName(metaField));
else
#endif
- cppField= QString("%1->%2").arg(cpythonWrapperCPtr(metaField->enclosingClass(), "self")).arg(metaField->name());
- writeToPythonConversion(s, metaField->type(), metaField->enclosingClass(), cppField);
- s << ';' << endl;
- s << '}' << endl;
+ cppField= QString("%1%2->%3")
+ .arg(useReference ? '&' : ' ')
+ .arg(cpythonWrapperCPtr(metaField->enclosingClass(), "self"))
+ .arg(metaField->name());
+
+ if (useReference) {
+ s << INDENT << "Shiboken::createWrapper(" << cppField << ");" << endl;
+ s << INDENT << "Shiboken::Object::releaseOwnership(val);" << endl;
+ } else {
+ writeToPythonConversion(s, metaField->type(), metaField->enclosingClass(), cppField);
+ s << ';' << endl;
+ }
+
+ s << INDENT << "return val;" << endl
+ << endl << '}' << endl;
}
void CppGenerator::writeSetterFunction(QTextStream& s, const AbstractMetaField* metaField)
diff --git a/libshiboken/bindingmanager.cpp b/libshiboken/bindingmanager.cpp
index 3aa4c88e..ba9f77eb 100644
--- a/libshiboken/bindingmanager.cpp
+++ b/libshiboken/bindingmanager.cpp
@@ -128,8 +128,6 @@ void BindingManager::BindingManagerPrivate::assignWrapper(SbkObject* wrapper, co
WrapperMap::iterator iter = wrapperMapper.find(cptr);
if (iter == wrapperMapper.end())
wrapperMapper.insert(std::make_pair(cptr, wrapper));
- else
- iter->second = wrapper;
}
BindingManager::BindingManager()
diff --git a/tests/samplebinding/class_fields_test.py b/tests/samplebinding/class_fields_test.py
index f0791e1d..c01a6bf0 100644
--- a/tests/samplebinding/class_fields_test.py
+++ b/tests/samplebinding/class_fields_test.py
@@ -64,7 +64,14 @@ class TestAccessingCppFields(unittest.TestCase):
new_value = Point(-10, 537)
d.valueTypeField = new_value
self.assertEqual(d.valueTypeField, new_value)
- self.assert_(not d.valueTypeField == old_value)
+
+ #object modify
+ d.valueTypeField.setX(10)
+ d.valueTypeField.setY(20)
+ self.assertEqual(d.valueTypeField.x(), 10)
+ self.assertEqual(d.valueTypeField.y(), 20)
+
+
# attribution with invalid type
self.assertRaises(TypeError, lambda : setattr(d, 'valueTypeField', 123))