From 7ba853bece5756a361b6ed8a69d3dc2f43a0ac75 Mon Sep 17 00:00:00 2001 From: Renato Filho Date: Mon, 30 Aug 2010 19:11:38 -0300 Subject: Created function to discovery when a class implement a container type. Reviewer: Hugo Parente Lima Luciano Wolf --- abstractmetabuilder.cpp | 1 + tests/CMakeLists.txt | 1 + tests/testcontainer.cpp | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/testcontainer.h | 35 ++++++++++++++++++++++++++++ typesystem.h | 17 +++++++++++++- 5 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 tests/testcontainer.cpp create mode 100644 tests/testcontainer.h diff --git a/abstractmetabuilder.cpp b/abstractmetabuilder.cpp index d2a0caa84..e650b5f06 100644 --- a/abstractmetabuilder.cpp +++ b/abstractmetabuilder.cpp @@ -1475,6 +1475,7 @@ bool AbstractMetaBuilder::setupInheritance(AbstractMetaClass *metaClass) if (templ) { setupInheritance(templ); inheritTemplate(metaClass, templ, info); + metaClass->typeEntry()->setBaseContainerType(templ->typeEntry()); return true; } } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index acd9fcc96..ce054e2e5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -13,6 +13,7 @@ declare_test(testaddfunction) declare_test(testcodeinjection) declare_test(testconversionoperator) declare_test(testconversionruletag) +declare_test(testcontainer) declare_test(testctorinformation) declare_test(testdtorinformation) declare_test(testenum) diff --git a/tests/testcontainer.cpp b/tests/testcontainer.cpp new file mode 100644 index 000000000..1f5af51fa --- /dev/null +++ b/tests/testcontainer.cpp @@ -0,0 +1,61 @@ +/* +* This file is part of the API Extractor project. +* +* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +* +* Contact: PySide team +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* version 2 as published by the Free Software Foundation. +* +* 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 +* General Public License for more details. +* +* You should have received a copy of the GNU 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 +* +*/ + +#include "testcontainer.h" +#include +#include "testutil.h" + +void TestContainer::testContainerType() +{ + const char* cppCode ="\ + namespace std {\ + template\ + class list { \ + T get(int x) { return 0; }\ + };\ + }\ + class A : public std::list {\ + };\ + "; + const char* xmlCode = "\ + \ + \ + \ + \ + "; + + TestUtil t(cppCode, xmlCode, true); + AbstractMetaClassList classes = t.builder()->classes(); + QCOMPARE(classes.count(), 2); + //search for class A + AbstractMetaClass* classA = classes.findClass("A"); + QVERIFY(classA); + QVERIFY(classA->typeEntry()->baseContainerType()); + QCOMPARE(reinterpret_cast(classA->typeEntry()->baseContainerType())->type(), ContainerTypeEntry::ListContainer); +} + + + +QTEST_APPLESS_MAIN(TestContainer) + +#include "testcontainer.moc" diff --git a/tests/testcontainer.h b/tests/testcontainer.h new file mode 100644 index 000000000..d760c5a68 --- /dev/null +++ b/tests/testcontainer.h @@ -0,0 +1,35 @@ +/* +* This file is part of the API Extractor project. +* +* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +* +* Contact: PySide team +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* version 2 as published by the Free Software Foundation. +* +* 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 +* General Public License for more details. +* +* You should have received a copy of the GNU 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 TESTCONTAINER_H +#define TESTCONTAINER_H +#include + +class TestContainer : public QObject +{ + Q_OBJECT +private slots: + void testContainerType(); +}; + +#endif diff --git a/typesystem.h b/typesystem.h index a5c954a9c..4a0e6c7ce 100644 --- a/typesystem.h +++ b/typesystem.h @@ -932,6 +932,7 @@ public: return m_version; } + private: QString m_name; Type m_type; @@ -1378,7 +1379,8 @@ public: m_genericClass(false), m_typeFlags(0), m_copyableFlag(Unknown), - m_hashFunction("") + m_hashFunction(""), + m_baseContainerType(0) { } @@ -1399,6 +1401,7 @@ public: centry->setDefaultSuperclass(defaultSuperclass()); centry->setCodeSnips(codeSnips()); centry->setTargetLangPackage(targetLangPackage()); + centry->setBaseContainerType(baseContainerType()); return centry; } @@ -1579,6 +1582,16 @@ public: m_hashFunction = hashFunction; } + void setBaseContainerType(const ComplexTypeEntry *baseContainer) + { + m_baseContainerType = baseContainer; + } + + const ComplexTypeEntry* baseContainerType() const + { + return m_baseContainerType; + } + private: AddedFunctionList m_addedFunctions; @@ -1601,6 +1614,8 @@ private: TypeFlags m_typeFlags; CopyableFlag m_copyableFlag; QString m_hashFunction; + + const ComplexTypeEntry* m_baseContainerType; }; class APIEXTRACTOR_API ContainerTypeEntry : public ComplexTypeEntry -- cgit v1.2.3