aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/typesystem_specifying_types.rst8
-rw-r--r--tests/CMakeLists.txt1
-rw-r--r--tests/testprimitivetypetag.cpp55
-rw-r--r--tests/testprimitivetypetag.h36
-rw-r--r--typesystem.cpp3
-rw-r--r--typesystem.h14
6 files changed, 117 insertions, 0 deletions
diff --git a/doc/typesystem_specifying_types.rst b/doc/typesystem_specifying_types.rst
index 68b85f5f..66536cf7 100644
--- a/doc/typesystem_specifying_types.rst
+++ b/doc/typesystem_specifying_types.rst
@@ -77,6 +77,7 @@ primitive-type
<primitive-type name="..."
since="..."
target-name="..."
+ default-constructor="..."
preferred-conversion="yes | no" />
</typesystem>
@@ -93,6 +94,13 @@ primitive-type
and "long long" become "long" but we should prefer the "qint64" version. For
this reason we mark "long long" with preferred-conversion="no".
+ The *optional* **preferred-conversion** attribute tells how to build a default
+ instance of the primitive type. It should be a constructor call capable of
+ creating a instance of the primitive type. Example: a class "Foo" could have
+ a **preferred-conversion** value set to "Foo()". Usually this attribute is
+ used only for classes declared as primitive types and not for primitive C++
+ types, but that depends on the application using *ApiExtractor*.
+
.. _namespace:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9fc31be5..c9f27f39 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -20,6 +20,7 @@ declare_test(testimplicitconversions)
declare_test(testmodifydocumentation)
declare_test(testmodifyfunction)
declare_test(testmultipleinheritance)
+declare_test(testprimitivetypetag)
declare_test(testrefcounttag)
declare_test(testreferencetopointer)
declare_test(testremoveimplconv)
diff --git a/tests/testprimitivetypetag.cpp b/tests/testprimitivetypetag.cpp
new file mode 100644
index 00000000..ebd245bf
--- /dev/null
+++ b/tests/testprimitivetypetag.cpp
@@ -0,0 +1,55 @@
+/*
+* This file is part of the API Extractor 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 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 "testprimitivetypetag.h"
+#include <QtTest/QTest>
+#include "testutil.h"
+
+void TestPrimitiveTypeTag::testPrimitiveTypeDefaultConstructor()
+{
+ const char* cppCode ="\
+ struct A {};\
+ struct B {};\
+ ";
+ const char* xmlCode = "\
+ <typesystem package=\"Foo\"> \
+ <primitive-type name='A' default-constructor='A()'/> \
+ <object-type name='B' /> \
+ </typesystem>";
+ TestUtil t(cppCode, xmlCode, false);
+
+ AbstractMetaClassList classes = t.builder()->classes();
+ QCOMPARE(classes.count(), 1);
+ AbstractMetaClass* classB = classes.findClass("B");
+ QVERIFY(classB);
+
+ PrimitiveTypeEntry* typeEntry = TypeDatabase::instance()->findPrimitiveType("A");
+ QVERIFY(typeEntry);
+ QVERIFY(typeEntry->hasDefaultConstructor());
+ QCOMPARE(typeEntry->defaultConstructor(), QString("A()"));
+}
+
+QTEST_APPLESS_MAIN(TestPrimitiveTypeTag)
+
+#include "testprimitivetypetag.moc"
+
diff --git a/tests/testprimitivetypetag.h b/tests/testprimitivetypetag.h
new file mode 100644
index 00000000..676174dd
--- /dev/null
+++ b/tests/testprimitivetypetag.h
@@ -0,0 +1,36 @@
+/*
+* This file is part of the API Extractor 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 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 TESTPRIMITIVETYPETAG_H
+#define TESTPRIMITIVETYPETAG_H
+
+#include <QObject>
+
+class TestPrimitiveTypeTag : public QObject
+{
+ Q_OBJECT
+ private slots:
+ void testPrimitiveTypeDefaultConstructor();
+};
+
+#endif
diff --git a/typesystem.cpp b/typesystem.cpp
index d5f12747..6049ea06 100644
--- a/typesystem.cpp
+++ b/typesystem.cpp
@@ -361,6 +361,7 @@ bool Handler::startElement(const QString &, const QString &n,
attributes["target-lang-api-name"] = QString();
attributes["preferred-conversion"] = "yes";
attributes["preferred-target-lang-type"] = "yes";
+ attributes["default-constructor"] = QString();
break;
case StackElement::ContainerTypeEntry:
attributes["type"] = QString();
@@ -434,6 +435,7 @@ bool Handler::startElement(const QString &, const QString &n,
QString targetLangApiName = attributes["target-lang-api-name"];
QString preferredConversion = attributes["preferred-conversion"].toLower();
QString preferredTargetLangType = attributes["preferred-target-lang-type"].toLower();
+ QString defaultConstructor = attributes["default-constructor"];
if (targetLangName.isEmpty())
targetLangName = name;
@@ -444,6 +446,7 @@ bool Handler::startElement(const QString &, const QString &n,
type->setCodeGeneration(m_generate);
type->setTargetLangName(targetLangName);
type->setTargetLangApiName(targetLangApiName);
+ type->setDefaultConstructor(defaultConstructor);
bool preferred;
preferred = convertBoolean(preferredConversion, "preferred-conversion", true);
diff --git a/typesystem.h b/typesystem.h
index b609950b..23b9d24c 100644
--- a/typesystem.h
+++ b/typesystem.h
@@ -1054,6 +1054,19 @@ public:
m_targetLangApiName = targetLangApiName;
}
+ QString defaultConstructor() const
+ {
+ return m_defaultConstructor;
+ }
+ void setDefaultConstructor(const QString& defaultConstructor)
+ {
+ m_defaultConstructor = defaultConstructor;
+ }
+ bool hasDefaultConstructor() const
+ {
+ return !m_defaultConstructor.isEmpty();
+ }
+
/**
* The PrimitiveTypeEntry pointed by this type entry if it
* represents an alias (i.e. a typedef).
@@ -1100,6 +1113,7 @@ public:
private:
QString m_targetLangName;
QString m_targetLangApiName;
+ QString m_defaultConstructor;
uint m_preferredConversion : 1;
uint m_preferredTargetLangType : 1;
PrimitiveTypeEntry* m_aliasedTypeEntry;