Fix bug#495 - "Broken rich compare operators if they use an object-type as parameter"

8 files changed, 158 insertions, 7 deletions

diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index cbfa5ffc..7f6ae27b 100644
--- a/generator/cppgenerator.cpp
+++ b/generator/cppgenerator.cpp
@@ -531,6 +531,8 @@ void CppGenerator::writeVirtualMethodNative(QTextStream &s, const AbstractMetaFu
 
     const TypeEntry* type = func->type() ? func->type()->typeEntry() : 0;
 
+    const QString funcName = func->isOperatorOverload() ? pythonOperatorFunctionName(func) : func->name();
+
     QString prefix = wrapperName(func->ownerClass()) + "::";
     s << functionSignature(func, prefix, "", Generator::SkipDefaultValues|Generator::OriginalTypeDescription) << endl;
     s << "{" << endl;
@@ -582,7 +584,7 @@ void CppGenerator::writeVirtualMethodNative(QTextStream &s, const AbstractMetaFu
     s << INDENT << "Shiboken::GilState gil;" << endl;
 
     s << INDENT << "Shiboken::AutoDecRef py_override(Shiboken::BindingManager::instance().getOverride(this, \"";
-    s << func->name() << "\"));" << endl;
+    s << funcName << "\"));" << endl;
 
     s << INDENT << "if (py_override.isNull()) {" << endl;
     {
@@ -597,7 +599,7 @@ void CppGenerator::writeVirtualMethodNative(QTextStream &s, const AbstractMetaFu
 
         if (func->isAbstract()) {
             s << INDENT << "PyErr_SetString(PyExc_NotImplementedError, \"pure virtual method '";
-            s << func->ownerClass()->name() << '.' << func->name();
+            s << func->ownerClass()->name() << '.' << funcName;
             s << "()' not implemented.\");" << endl;
             s << INDENT << "return ";
             if (func->type()) {
@@ -751,7 +753,7 @@ void CppGenerator::writeVirtualMethodNative(QTextStream &s, const AbstractMetaFu
                 {
                     Indentation indent(INDENT);
                     s << INDENT << "PyErr_Format(PyExc_TypeError, \"Invalid return value in function %s, expected %s, got %s.\", \""
-                    << func->ownerClass()->name() << '.' << func->name() << "\", " << desiredType
+                    << func->ownerClass()->name() << '.' << funcName << "\", " << desiredType
                     << ", " PYTHON_RETURN_VAR "->ob_type->tp_name);" << endl;
                     s << INDENT << "return " << defaultReturnExpr << ';' << endl;
                 }
@@ -2838,14 +2840,22 @@ void CppGenerator::writeRichCompareFunction(QTextStream& s, const AbstractMetaCl
                     Indentation indent(INDENT);
                     s << INDENT << "// " << func->signature() << endl;
                     s << INDENT;
-                    s << translateTypeForWrapperMethod(type, metaClass, ExcludeReference | ExcludeConst);
+                    s << translateTypeForWrapperMethod(type, 0, ExcludeReference | ExcludeConst);
+                    if (type->isObject() || type->isQObject())
+                        s << '&';
                     s << " cppOther = ";
-                    writeToCppConversion(s, type, metaClass, "other", ExcludeReference | ExcludeConst);
+                    writeToCppConversion(s, type, 0, "other", ExcludeReference | ExcludeConst);
                     s << ';' << endl;
 
                     s << INDENT << "result = ";
-                    writeToPythonConversion(s, func->type(), metaClass, CPP_SELF_VAR " " + op + " cppOther");
-                    s << ';' << endl;
+                    if (!func->type()) {
+                        s << "Py_None;" << endl;
+                        s << INDENT << "Py_INCREF(Py_None);" << endl;
+                        s << INDENT << CPP_SELF_VAR " " << op << " cppOther; // this op return void" << endl;
+                    } else {
+                        writeToPythonConversion(s, func->type(), metaClass, CPP_SELF_VAR " " + op + " cppOther");
+                        s << ';' << endl;
+                    }
                 }
                 s << INDENT << '}';
             }
diff --git a/tests/libsample/CMakeLists.txt b/tests/libsample/CMakeLists.txt
index b6cd1b92..e1abe6a9 100644
--- a/tests/libsample/CMakeLists.txt
+++ b/tests/libsample/CMakeLists.txt
@@ -19,6 +19,7 @@ multiple_derived.cpp
 objectmodel.cpp
 objecttype.cpp
 objecttypelayout.cpp
+objecttypeoperators.cpp
 objectview.cpp
 overload.cpp
 overloadsort.cpp
diff --git a/tests/libsample/objecttypeoperators.cpp b/tests/libsample/objecttypeoperators.cpp
new file mode 100644
index 00000000..08c49b1a
--- /dev/null
+++ b/tests/libsample/objecttypeoperators.cpp
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the Shiboken Python Binding Generator project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "objecttypeoperators.h"
+
+ObjectTypeOperators::ObjectTypeOperators(const std::string key) : m_key(key)
+{
+}
+
+bool ObjectTypeOperators::operator==(const ObjectTypeOperators& other) const
+{
+    return m_key == other.m_key;
+}
+
+bool ObjectTypeOperators::operator==(const std::string& other) const
+{
+    return m_key == other;
+}
+
+const ObjectTypeOperators& ObjectTypeOperators::operator<(const ObjectTypeOperators& other) const
+{
+    return m_key < other.m_key ? *this : other;
+}
+
diff --git a/tests/libsample/objecttypeoperators.h b/tests/libsample/objecttypeoperators.h
new file mode 100644
index 00000000..1d65eb16
--- /dev/null
+++ b/tests/libsample/objecttypeoperators.h
@@ -0,0 +1,50 @@
+/*
+ * This file is part of the Shiboken Python Binding Generator project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef OBJECTTYPEOPERATORS_H
+#define OBJECTTYPEOPERATORS_H
+
+#include "libsamplemacros.h"
+#include <string>
+
+class LIBSAMPLE_API ObjectTypeOperators
+{
+public:
+    ObjectTypeOperators(const std::string key);
+
+    bool operator==(const ObjectTypeOperators& other) const;
+    bool operator==(const std::string& other) const;
+    const ObjectTypeOperators& operator<(const ObjectTypeOperators& other) const;
+
+    // chaos!
+    virtual void operator>(const ObjectTypeOperators&) { m_key.append("operator>"); }
+
+    std::string key() const { return m_key; }
+
+private:
+    std::string m_key;
+
+    ObjectTypeOperators(ObjectTypeOperators&);
+    ObjectTypeOperators& operator=(ObjectTypeOperators&);
+};
+
+#endif // OBJECTTYPEOPERATORS_H
diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt
index 8e7daf3c..1fa95501 100644
--- a/tests/samplebinding/CMakeLists.txt
+++ b/tests/samplebinding/CMakeLists.txt
@@ -45,6 +45,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/nondefaultctor_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/objectmodel_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/objecttype_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/objecttypelayout_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/sample/objecttypeoperators_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/objectview_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/objtypereference_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/oddbooluser_wrapper.cpp
diff --git a/tests/samplebinding/global.h b/tests/samplebinding/global.h
index 95094f7d..181ed29f 100644
--- a/tests/samplebinding/global.h
+++ b/tests/samplebinding/global.h
@@ -24,6 +24,7 @@
 #include "objecttype.h"
 #include "objecttypelayout.h"
 #include "objecttypereference.h"
+#include "objecttypeoperators.h"
 #include "objectview.h"
 #include "oddbool.h"
 #include "overload.h"
diff --git a/tests/samplebinding/objecttypeoperators_test.py b/tests/samplebinding/objecttypeoperators_test.py
new file mode 100644
index 00000000..d03c9bc4
--- /dev/null
+++ b/tests/samplebinding/objecttypeoperators_test.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# This file is part of the Shiboken Python Bindings Generator project.
+#
+# Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+#
+# Contact: PySide team <contact@pyside.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# version 2.1 as published by the Free Software Foundation. Please
+# review the following information to ensure the GNU Lesser General
+# Public License version 2.1 requirements will be met:
+# http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+# #
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+import unittest
+from sample import *
+
+class ObjectTypeOperatorsTest(unittest.TestCase):
+
+    def testIt(self):
+        a = ObjectTypeOperators("a")
+        b = ObjectTypeOperators("b")
+        self.assertFalse(a == b)
+        self.assertEqual(a, a < b)
+
+        # this should change a.key() and return nothing.
+        self.assertEqual(None, a > b)
+        self.assertEqual(a.key(), "aoperator>")
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index 67956bc0..576c5465 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -1274,6 +1274,8 @@
 
     <object-type name="HandleHolder" />
 
+    <object-type name="ObjectTypeOperators" />
+
     <!-- type used in abstract method -->
     <object-type name="HideType" generate="no" />