summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2010-08-30 19:11:38 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-09 19:10:08 -0300
commit7ba853bece5756a361b6ed8a69d3dc2f43a0ac75 (patch)
tree640d988195ab48d6911c411109c884652a51de12
parentb55c812e620e4c31c0b4658534c74930124995a4 (diff)
Created function to discovery when a class implement a container type.
Reviewer: Hugo Parente Lima <hugo.pl@gmail.com> Luciano Wolf <luciano.wolf@openbossa.org>
-rw-r--r--abstractmetabuilder.cpp1
-rw-r--r--tests/CMakeLists.txt1
-rw-r--r--tests/testcontainer.cpp61
-rw-r--r--tests/testcontainer.h35
-rw-r--r--typesystem.h17
5 files changed, 114 insertions, 1 deletions
diff --git a/abstractmetabuilder.cpp b/abstractmetabuilder.cpp
index d2a0caa8..e650b5f0 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 acd9fcc9..ce054e2e 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 00000000..1f5af51f
--- /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 <contact@pyside.org>
+*
+* 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 <QtTest/QTest>
+#include "testutil.h"
+
+void TestContainer::testContainerType()
+{
+ const char* cppCode ="\
+ namespace std {\
+ template<class T>\
+ class list { \
+ T get(int x) { return 0; }\
+ };\
+ }\
+ class A : public std::list<int> {\
+ };\
+ ";
+ const char* xmlCode = "\
+ <typesystem package=\"Foo\"> \
+ <namespace-type name='std' generate='no' /> \
+ <container-type name='std::list' type='list' /> \
+ <object-type name='A'/> \
+ </typesystem>";
+
+ 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<const ContainerTypeEntry*>(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 00000000..d760c5a6
--- /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 <contact@pyside.org>
+*
+* 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 <QObject>
+
+class TestContainer : public QObject
+{
+ Q_OBJECT
+private slots:
+ void testContainerType();
+};
+
+#endif
diff --git a/typesystem.h b/typesystem.h
index a5c954a9..4a0e6c7c 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