diff options
| -rw-r--r-- | tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/testconversionruletag.cpp | 57 | ||||
| -rw-r--r-- | tests/testconversionruletag.h | 35 | ||||
| -rw-r--r-- | typesystem.cpp | 33 | ||||
| -rw-r--r-- | typesystem.h | 19 |
5 files changed, 130 insertions, 15 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a9d9ddc45..6304c2433 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -12,3 +12,4 @@ declare_test(testabstractmetatype) declare_test(testenum) declare_test(testmodifydocumentation) declare_test(testaddfunction) +declare_test(testconversionruletag) diff --git a/tests/testconversionruletag.cpp b/tests/testconversionruletag.cpp new file mode 100644 index 000000000..609a806bd --- /dev/null +++ b/tests/testconversionruletag.cpp @@ -0,0 +1,57 @@ +/* +* 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 "testconversionruletag.h" +#include <QtTest/QTest> +#include "testutil.h" +#include <QFile> +#include <QTemporaryFile> + +void TestConversionRuleTag::testConversionRuleTag() +{ + // temp file used later + const char conversionData[] = "Hi! I'm a conversion rule."; + QTemporaryFile file; + file.open(); + QCOMPARE(file.write(conversionData), qint64(sizeof(conversionData)-1)); + file.close(); + + const char cppCode[] = "struct A {};"; + QString xmlCode = "\ + <typesystem package=\"Foo\">\ + <value-type name='A'>\ + <conversion-rule file='"+ file.fileName() +"' />\ + </value-type>\ + </typesystem>"; + TestUtil t(cppCode, xmlCode.toLocal8Bit().data()); + AbstractMetaClassList classes = t.builder()->classes(); + AbstractMetaClass* classA = classes.findClass("A"); + QVERIFY(classA); + const ComplexTypeEntry* typeEntry = classA->typeEntry(); + QVERIFY(typeEntry->hasConversionRule()); + QCOMPARE(typeEntry->conversionRule(), QString(conversionData)); +} + +QTEST_APPLESS_MAIN(TestConversionRuleTag) + +#include "testconversionruletag.moc" diff --git a/tests/testconversionruletag.h b/tests/testconversionruletag.h new file mode 100644 index 000000000..afab68889 --- /dev/null +++ b/tests/testconversionruletag.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 TESTCONVERSIONRULE_H +#define TESTCONVERSIONRULE_H +#include <QObject> + +class TestConversionRuleTag : public QObject +{ + Q_OBJECT +private slots: + void testConversionRuleTag(); +}; + +#endif
\ No newline at end of file diff --git a/typesystem.cpp b/typesystem.cpp index 9c1e51df7..1046aed6d 100644 --- a/typesystem.cpp +++ b/typesystem.cpp @@ -881,8 +881,8 @@ bool Handler::startElement(const QString &, const QString &n, attributes["file"] = QString(); break; case StackElement::ConversionRule: - attributes["class"] = ""; - attributes["file"] = ""; + attributes["class"] = QString(); + attributes["file"] = QString(); break; case StackElement::RejectEnumValue: attributes["name"] = ""; @@ -986,10 +986,17 @@ bool Handler::startElement(const QString &, const QString &n, break; case StackElement::ConversionRule: { if (topElement.type != StackElement::ModifyArgument + && topElement.type != StackElement::ValueTypeEntry + && topElement.type != StackElement::ObjectTypeEntry && topElement.type != StackElement::PrimitiveTypeEntry && topElement.type != StackElement::ContainerTypeEntry) { - m_error = "Conversion rules can only be specified for argument modification" - " and to primitive or container types conversion."; + m_error = "Conversion rules can only be specified for argument modification, " + "value-type, object-type, primitive-type or container-type conversion."; + return false; + } + + if (topElement.entry->hasConversionRule()) { + m_error = "Types can have only one conversion rule"; return false; } @@ -1011,7 +1018,8 @@ bool Handler::startElement(const QString &, const QString &n, snip.language = lang; m_functionMods.last().argument_mods.last().conversion_rules.append(snip); } else { - QString sourceFile = attributes["file"].toLower(); + + QString sourceFile = attributes["file"]; if (sourceFile.isEmpty()) { m_error = QString("'file' attribute required; the source file containing the" " containing the conversion functions must be provided"); @@ -1021,17 +1029,13 @@ bool Handler::startElement(const QString &, const QString &n, //Handler constructor.... if (m_generate != TypeEntry::GenerateForSubclass && m_generate != TypeEntry::GenerateNothing) { - if (QFile::exists(sourceFile)) { - QFile conversionSource(sourceFile); - if (conversionSource.open(QIODevice::ReadOnly)) { - CodeSnip snip; - snip.addCode(conversionSource.readAll()); - topElement.entry->addCodeSnip(snip); - } + QFile conversionSource(sourceFile); + if (conversionSource.open(QIODevice::ReadOnly)) { + topElement.entry->setConversionRule(conversionSource.readAll()); } else { ReportHandler::warning("File containing conversion code for " + topElement.entry->name() - + " type does not exist: " + + " type does not exist or is not redable: " + sourceFile); } } @@ -1552,8 +1556,7 @@ bool Handler::startElement(const QString &, const QString &n, element->type = StackElement::InjectCodeInFunction; } else if (topElement.type == StackElement::Root) { - ((TypeSystemTypeEntry *) element->entry)->addCodeSnip(snip); - + element->entry->addCodeSnip(snip); } else if (topElement.type != StackElement::Root) m_codeSnips << snip; diff --git a/typesystem.h b/typesystem.h index 496515c63..420c7c09e 100644 --- a/typesystem.h +++ b/typesystem.h @@ -867,6 +867,24 @@ public: m_include = inc; } + /// Set the type convertion rule + void setConversionRule(const QString& conversionRule) + { + m_conversionRule = conversionRule; + } + + /// Returns the type convertion rule + QString conversionRule() const + { + return m_conversionRule; + } + + /// Returns true if there are any conversiton rule for this type, false otherwise. + bool hasConversionRule() const + { + return !m_conversionRule.isEmpty(); + } + private: QString m_name; Type m_type; @@ -879,6 +897,7 @@ private: IncludeList m_extraIncludes; Include m_include; QHash<QString, bool> m_includesUsed; + QString m_conversionRule; }; typedef QHash<QString, QList<TypeEntry *> > TypeEntryHash; typedef QHash<QString, TypeEntry *> SingleTypeEntryHash; |