diff options
| -rw-r--r-- | ApiExtractor/abstractmetabuilder.cpp | 74 | ||||
| -rw-r--r-- | ApiExtractor/typesystem.cpp | 5 | ||||
| -rw-r--r-- | ApiExtractor/typesystem.h | 2 | ||||
| -rw-r--r-- | tests/samplebinding/addedfunction_with_container_args_test.py | 48 | ||||
| -rw-r--r-- | tests/samplebinding/typesystem_sample.xml | 36 |
5 files changed, 151 insertions, 14 deletions
diff --git a/ApiExtractor/abstractmetabuilder.cpp b/ApiExtractor/abstractmetabuilder.cpp index 8bac23cfc..0b9441490 100644 --- a/ApiExtractor/abstractmetabuilder.cpp +++ b/ApiExtractor/abstractmetabuilder.cpp @@ -55,6 +55,55 @@ static QString stripTemplateArgs(const QString &name) return pos < 0 ? name : name.left(pos); } +static QStringList parseTemplateType(const QString& name) { + int n = name.indexOf('<'); + if (n <= 0) { + // If name starts with '<' or contains an unmatched (i.e. any) '>', we + // reject it + if (n == 0 || name.count(">")) + return QStringList(); + // Doesn't look like a template instantiation; just return the name + return QStringList() << name; + } + + // Split the type name into the template name and template arguments; the + // part before the opening '<' is the template name + // + // Example: + // "foo<A, bar<B, C>, D>" -> ( "foo", "A", "bar<B, C>", "D" ) + QStringList result; + result << name.left(n).trimmed(); + + // Extract template arguments + int i, depth = 1; + const int l = name.length(); + for (i = n + 1; i < l; ++i) { + // Consume balanced '<'/'>' within a single argument so that we won't + // split on ',' as part of a single argument which is itself a + // multi-argument template type + if (name[i] == '<') { + ++depth; + } else if (name[i] == '>') { + if (--depth == 0) + break; + } else if (name[i] == ',' && depth == 1) { + // Encountered ',' in template argument list that is not within + // another template name; add current argument to result and start + // working on the next argument + result << name.mid(n + 1, i - n - 1).trimmed(); + n = i; + } + } + if (i >= l) // arg list not closed + return QStringList(); + if (i + 1 < l) // arg list closed before end of name + return QStringList(); + + // Add final argument and return result + result << name.mid(n + 1, i - n - 1).trimmed(); + return result; +} + AbstractMetaBuilder::AbstractMetaBuilder() : m_currentClass(0), m_logDirectory(QString('.')+QDir::separator()) { } @@ -2002,15 +2051,14 @@ AbstractMetaType* AbstractMetaBuilder::translateType(double vr, const AddedFunct // test if the type is a template, like a container bool isTemplate = false; - QString templateArg; - if (!type) { - QRegExp r("(.*)<(.*)>$"); - if (r.indexIn(typeInfo.name) != -1) { - templateArg = r.cap(2); - if (templateArg.contains(',')) - ReportHandler::warning("add-function tag doesn't support container types with more than one argument or template arguments."); - else - isTemplate = (type = typeDb->findContainerType(r.cap(1))); + QStringList templateArgs; + if (!type && typeInfo.name.contains('<')) { + const QStringList& parsedType = parseTemplateType(typeInfo.name); + if (parsedType.isEmpty()) { + ReportHandler::warning(QString("Template type parsing failed for '%1'").arg(typeInfo.name)); + } else { + templateArgs = parsedType.mid(1); + isTemplate = (type = typeDb->findContainerType(parsedType[0])); } } @@ -2042,13 +2090,11 @@ AbstractMetaType* AbstractMetaBuilder::translateType(double vr, const AddedFunct metaType->setReference(typeInfo.isReference); metaType->setConstant(typeInfo.isConstant); if (isTemplate) { - type = typeDb->findType(templateArg); - if (type) { - AbstractMetaType* metaArgType = createMetaType(); - metaArgType->setTypeEntry(type); + foreach (const QString& templateArg, templateArgs) { + AbstractMetaType* metaArgType = translateType(vr, AddedFunction::TypeInfo::fromSignature(templateArg)); metaType->addInstantiation(metaArgType); - metaType->setTypeUsagePattern(AbstractMetaType::ContainerPattern); } + metaType->setTypeUsagePattern(AbstractMetaType::ContainerPattern); } return metaType; diff --git a/ApiExtractor/typesystem.cpp b/ApiExtractor/typesystem.cpp index 9a99ce5f5..9925a390f 100644 --- a/ApiExtractor/typesystem.cpp +++ b/ApiExtractor/typesystem.cpp @@ -2202,6 +2202,11 @@ AddedFunction::AddedFunction(QString signature, QString returnType, double vr) : } } +AddedFunction::TypeInfo AddedFunction::TypeInfo::fromSignature(const QString& signature) +{ + return parseType(signature); +} + QString ComplexTypeEntry::targetLangApiName() const { return strings_jobject; diff --git a/ApiExtractor/typesystem.h b/ApiExtractor/typesystem.h index 98f5cb76e..054967201 100644 --- a/ApiExtractor/typesystem.h +++ b/ApiExtractor/typesystem.h @@ -473,6 +473,8 @@ struct AddedFunction */ struct TypeInfo { TypeInfo() : isConstant(false), indirections(0), isReference(false) {} + static TypeInfo fromSignature(const QString& signature); + QString name; bool isConstant; int indirections; diff --git a/tests/samplebinding/addedfunction_with_container_args_test.py b/tests/samplebinding/addedfunction_with_container_args_test.py new file mode 100644 index 000000000..85971ebb5 --- /dev/null +++ b/tests/samplebinding/addedfunction_with_container_args_test.py @@ -0,0 +1,48 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright 2013 Kitware, Inc. +# +# This file is part of the Shiboken Python Bindings Generator project. +# +# Copyright (C) 2013 Digia Plc 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 + +'''Test cases for added functions with nested and multi-argument container types.''' + +import unittest +from sample import sum2d, sumproduct + +class TestAddedFunctionsWithContainerArgs(unittest.TestCase): + '''Tests added functions with nested and multi-argument container types.''' + + def testNestedContainerType(self): + '''Test added function with single-argument containers.''' + values = [[1,2],[3,4,5],[6]] + self.assertEqual(sum2d(values), 21) + + def testMultiArgContainerType(self): + '''Test added function with a two-argument container.''' + values = [(1,2),(3,4),(5,6)] + self.assertEqual(sumproduct(values), 44) + +if __name__ == '__main__': + unittest.main() diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml index 4e3a9245b..824697f23 100644 --- a/tests/samplebinding/typesystem_sample.xml +++ b/tests/samplebinding/typesystem_sample.xml @@ -1513,6 +1513,42 @@ </modify-function> </function> + <!-- Tests add-function for nested template types --> + <add-function signature="sum2d(std::list<std::list<int> >)" return-type="int"> + <inject-code class="target" position="beginning"> + typedef std::list<int> Inner; + typedef std::list<Inner> Outer; + + int result = 0; + + Outer::const_iterator oiter, oend = %1.end(); + for (oiter = %1.begin(); oiter != oend; ++oiter) { + const Inner& inner = *oiter; + Inner::const_iterator iiter, iend = inner.end(); + for (iiter = inner.begin(); iiter != iend; ++iiter) + result += *iiter; + } + + %PYARG_0 = %CONVERTTOPYTHON[int](result); + </inject-code> + </add-function> + + <!-- Tests add-function for nested template types --> + <add-function signature="sumproduct(std::list<std::pair<int, int> >)" return-type="int"> + <inject-code class="target" position="beginning"> + typedef std::pair<int, int> Pair; + typedef std::list<Pair> List; + + int result = 0; + + List::const_iterator iter, end = %1.end(); + for (iter = %1.begin(); iter != end; ++iter) + result += iter->first * iter->second; + + %PYARG_0 = %CONVERTTOPYTHON[int](result); + </inject-code> + </add-function> + <value-type name="InjectCode"> <!-- |