Impleted auto code for classes derived from list container.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>

7 files changed, 177 insertions, 0 deletions

diff --git a/cppgenerator.cpp b/cppgenerator.cpp
index df206f79..734f649d 100644
--- a/cppgenerator.cpp
+++ b/cppgenerator.cpp
@@ -2294,6 +2294,11 @@ bool CppGenerator::supportsSequenceProtocol(const AbstractMetaClass* metaClass)
         if (metaClass->hasFunction(funcName))
             return true;
     }
+
+    const ComplexTypeEntry* baseType = metaClass->typeEntry()->baseContainerType();
+    if (baseType && (reinterpret_cast<const ContainerTypeEntry*>(baseType)->type() == ContainerTypeEntry::ListContainer))
+        return true;
+
     return false;
 }
 
@@ -2493,13 +2498,16 @@ void CppGenerator::writeClassDefinition(QTextStream& s, const AbstractMetaClass*
 
 void CppGenerator::writeSequenceMethods(QTextStream& s, const AbstractMetaClass* metaClass)
 {
+
     QMap<QString, QString> funcs;
+    bool injectedCode = false;
 
     QHash< QString, QPair< QString, QString > >::const_iterator it = m_sequenceProtocol.begin();
     for (; it != m_sequenceProtocol.end(); ++it) {
         const AbstractMetaFunction* func = metaClass->findFunction(it.key());
         if (!func)
             continue;
+        injectedCode = true;
         QString funcName = cpythonFunctionName(func);
         QString funcArgs = it.value().first;
         QString funcRetVal = it.value().second;
@@ -2514,6 +2522,9 @@ void CppGenerator::writeSequenceMethods(QTextStream& s, const AbstractMetaClass*
         writeCodeSnips(s, snips,CodeSnip::Any, TypeSystem::TargetLangCode, func, lastArg);
         s << '}' << endl << endl;
     }
+
+    if (!injectedCode)
+        writeStdListWrapperMethods(s, metaClass);
 }
 
 void CppGenerator::writeTypeAsSequenceDefinition(QTextStream& s, const AbstractMetaClass* metaClass)
@@ -2521,9 +2532,20 @@ void CppGenerator::writeTypeAsSequenceDefinition(QTextStream& s, const AbstractM
     QString className = metaClass->qualifiedCppName();
     QMap<QString, QString> funcs;
 
+    bool hasFunctions = false;
     foreach(QString funcName, m_sequenceProtocol.keys()) {
         const AbstractMetaFunction* func = metaClass->findFunction(funcName);
         funcs[funcName] = func ? cpythonFunctionName(func).prepend("&") : "0";
+        if (!hasFunctions && func)
+            hasFunctions = true;
+    }
+
+    //use default implementation
+    if (!hasFunctions) {
+        QString baseName = cpythonBaseName(metaClass->typeEntry());
+        funcs["__len__"] = baseName + "__len__";
+        funcs["__getitem__"] = baseName + "__getitem__";
+        funcs["__setitem__"] = baseName + "__setitem__";
     }
 
     s << "static PySequenceMethods Py" << className << "_as_sequence = {\n"
@@ -3819,3 +3841,45 @@ void CppGenerator::writeObjCopierFunction(QTextStream& s, const AbstractMetaClas
     s << '}' << endl << endl;
 
 }
+
+void CppGenerator::writeStdListWrapperMethods(QTextStream& s, const AbstractMetaClass* metaClass)
+{
+    //len
+    s << "Py_ssize_t " << cpythonBaseName(metaClass->typeEntry()) << "__len__" << "(PyObject* self)" << endl << '{' << endl;
+    s << INDENT << "if (Shiboken::cppObjectIsInvalid(self))" << endl;
+    s << INDENT << INDENT << "return 0;" << endl << endl;
+    s << INDENT << metaClass->qualifiedCppName() << " &cppSelf = Shiboken::Converter<" << metaClass->qualifiedCppName() <<"& >::toCpp(self);" << endl;
+    s << INDENT << "return cppSelf.size();" << endl;
+    s << "}" << endl;
+    
+    //getitem
+    s << "PyObject* " << cpythonBaseName(metaClass->typeEntry()) << "__getitem__" << "(PyObject* self, Py_ssize_t _i)" << endl << '{' << endl;
+    s << INDENT << "if (Shiboken::cppObjectIsInvalid(self))" << endl;
+    s << INDENT << INDENT << "return 0;" << endl << endl;
+    s << INDENT << metaClass->qualifiedCppName() << " &cppSelf = Shiboken::Converter<" << metaClass->qualifiedCppName() <<"& >::toCpp(self);" << endl;
+    s << INDENT << "if (_i < 0 || _i >= (Py_ssize_t) cppSelf.size()) {" << endl;
+    s << INDENT << INDENT <<  "PyErr_SetString(PyExc_IndexError, \"index out of bounds\");" << endl;
+    s << INDENT << INDENT << "return 0;" << endl << INDENT << "}" << endl;
+    s << INDENT << metaClass->qualifiedCppName() << "::iterator _item = cppSelf.begin();" << endl;
+    s << INDENT << "for(Py_ssize_t pos=0; pos < _i; pos++) _item++;" << endl;
+    s << INDENT << "return Shiboken::Converter<" << metaClass->qualifiedCppName() << "::value_type>::toPython(*_item);" << endl;
+    s << "}" << endl;
+
+    //setitem
+    s << "int " << cpythonBaseName(metaClass->typeEntry()) << "__setitem__" << "(PyObject* self, Py_ssize_t _i, PyObject* _value)" << endl << '{' << endl;
+    s << INDENT << "if (Shiboken::cppObjectIsInvalid(self))" << endl;
+    s << INDENT << INDENT << "return -1;" << endl;
+    s << INDENT << metaClass->qualifiedCppName() << " &cppSelf = Shiboken::Converter<" << metaClass->qualifiedCppName() <<"& >::toCpp(self);" << endl;
+    s << INDENT << "if (_i < 0 || _i >= (Py_ssize_t) cppSelf.size()) {" << endl;
+    s << INDENT << INDENT << "PyErr_SetString(PyExc_IndexError, \"list assignment index out of range\");" << endl;
+    s << INDENT << INDENT << "return -1;" << endl << INDENT << "}" << endl;
+    s << INDENT << metaClass->qualifiedCppName() << "::iterator _item = cppSelf.begin();" << endl;
+    s << INDENT << "for(Py_ssize_t pos=0; pos < _i; pos++) _item++;" << endl;
+
+    s << INDENT << metaClass->qualifiedCppName() << "::value_type cppValue = Shiboken::Converter<" <<  metaClass->qualifiedCppName() << "::value_type>::toCpp(_value);" << endl;
+    s << INDENT << "*_item = cppValue;" << endl;
+    s << INDENT << "return 0;";
+    s << endl << "}" << endl;
+}
+
+
diff --git a/cppgenerator.h b/cppgenerator.h
index 0698f735..75bcc9b5 100644
--- a/cppgenerator.h
+++ b/cppgenerator.h
@@ -193,6 +193,9 @@ private:
     void writeHashFunction(QTextStream& s, const AbstractMetaClass* metaClass);
     void writeObjCopierFunction(QTextStream& s, const AbstractMetaClass* metaClass);
 
+    // Write default implementations for sequence protocol
+    void writeStdListWrapperMethods(QTextStream& s, const AbstractMetaClass* metaClass); 
+
     // Maps special function names to function parameters and return types
     // used by CPython API in the sequence protocol.
     QHash<QString, QPair<QString, QString> > m_sequenceProtocol;
diff --git a/tests/libsample/list.h b/tests/libsample/list.h
new file mode 100644
index 00000000..f211e6a7
--- /dev/null
+++ b/tests/libsample/list.h
@@ -0,0 +1,53 @@
+/*
+ * 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 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.
+ *
+ * As a special exception to the GNU Lesser General Public License
+ * version 2.1, the object code form of a "work that uses the Library"
+ * may incorporate material from a header file that is part of the
+ * Library.  You may distribute such object code under terms of your
+ * choice, provided that the incorporated material (i) does not exceed
+ * more than 5% of the total size of the Library; and (ii) is limited to
+ * numerical parameters, data structure layouts, accessors, macros,
+ * inline functions and templates.
+ *
+ * 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
+ */
+
+#ifndef LIST_H
+#define LIST_H
+
+#include <list>
+#include "libsamplemacros.h"
+
+template<class T>
+class LIBSAMPLE_API List : public std::list<T>
+{
+};
+
+class LIBSAMPLE_API IntList : public List<int>
+{
+    public:
+        void append(int v) { insert(end(), v); }
+};
+
+#endif // LIST_H
+
diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt
index a240749a..c4b19c70 100644
--- a/tests/samplebinding/CMakeLists.txt
+++ b/tests/samplebinding/CMakeLists.txt
@@ -23,6 +23,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/event_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/implicitconv_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/implicitbase_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/implicittarget_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/sample/intlist_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/sortedoverload_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/intwrapper_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/injectcode_wrapper.cpp
diff --git a/tests/samplebinding/global.h b/tests/samplebinding/global.h
index 861491c1..f7933536 100644
--- a/tests/samplebinding/global.h
+++ b/tests/samplebinding/global.h
@@ -9,6 +9,7 @@
 #include "implicitconv.h"
 #include "overloadsort.h"
 #include "injectcode.h"
+#include "list.h"
 #include "listuser.h"
 #include "mapuser.h"
 #include "modifications.h"
diff --git a/tests/samplebinding/intlist_test.py b/tests/samplebinding/intlist_test.py
new file mode 100644
index 00000000..fa7be288
--- /dev/null
+++ b/tests/samplebinding/intlist_test.py
@@ -0,0 +1,53 @@
+#!/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 sys
+import unittest
+
+from sample import IntList
+
+class IntListTest(unittest.TestCase):
+
+    def testAutoFunctionsToBaseList(self):
+        lst = IntList()
+        self.assertEqual(len(lst), 0)
+        lst.append(10)
+        self.assertEqual(lst[0], 10)
+        lst.append(20)
+        self.assertEqual(lst[1], 20)
+        lst.append(30)
+        self.assertEqual(lst[2], 30)
+        lst[1] = 25
+        self.assertEqual(lst[0], 10)
+        self.assertEqual(lst[1], 25)
+        self.assertEqual(lst[2], 30)
+        self.assertEqual(len(lst), 3)
+
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index ec5f150d..7b02a4d3 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -39,6 +39,7 @@
         <conversion-rule file="map_conversions.h"/>
         <include file-name="map" location="global"/>
     </container-type>
+    <container-type name="List" type="list" />
 
     <function signature="sumComplexPair(std::pair&lt;Complex, Complex>)" />
     <function signature="gimmeComplexList()" />
@@ -108,6 +109,7 @@
         </add-function>
     </namespace-type>
 
+    <value-type name="IntList" />
     <value-type name="SampleNamespace::SomeClass" />
     <value-type name="SampleNamespace::SomeClass::SomeInnerClass" />
     <object-type name="SampleNamespace::SomeClass::SomeInnerClass::OkThisIsRecursiveEnough" />