aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Lima <hugo.lima@openbossa.org>2010-02-08 09:36:00 -0200
committerHugo Lima <hugo.lima@openbossa.org>2010-02-08 16:07:06 -0200
commit8d037108eb0216e178855bb2ba22a09154454ea9 (patch)
treedf204c80ee818acce691357cbef7ea448bd5072d
parent20998c0dc9532630ba549af9a8321cd736c79368 (diff)
Fix AbstractMetaFunction::implicitConversions.
- Public ctors added by the user with 1 value-type parameter are always added to the implicity conversion list. - If the ctor visibility of an function was modified from public to private, the function isn't added to the result. Reviewed by Renato Ara├║jo <renato.filho@openbossa.org>
-rw-r--r--abstractmetabuilder.cpp1
-rw-r--r--abstractmetalang.cpp5
-rw-r--r--abstractmetalang.h2
-rw-r--r--tests/CMakeLists.txt1
-rw-r--r--tests/testimplicitconversions.cpp122
-rw-r--r--tests/testimplicitconversions.h40
6 files changed, 168 insertions, 3 deletions
diff --git a/abstractmetabuilder.cpp b/abstractmetabuilder.cpp
index 1061b043..87826eb3 100644
--- a/abstractmetabuilder.cpp
+++ b/abstractmetabuilder.cpp
@@ -1446,6 +1446,7 @@ AbstractMetaFunction *AbstractMetaBuilder::traverseFunction(const AddedFunction&
}
}
+ metaFunction->setOriginalAttributes(metaFunction->attributes());
return metaFunction;
}
diff --git a/abstractmetalang.cpp b/abstractmetalang.cpp
index 2724d6ce..94114e3e 100644
--- a/abstractmetalang.cpp
+++ b/abstractmetalang.cpp
@@ -1104,13 +1104,14 @@ AbstractMetaFunctionList AbstractMetaClass::implicitConversions() const
{
AbstractMetaFunctionList list = queryFunctions(Constructors);
AbstractMetaFunctionList returned;
+ if (!hasCloneOperator())
+ return returned;
foreach (AbstractMetaFunction *f, list) {
if ((f->actualMinimumArgumentCount() == 1 || f->arguments().size() == 1)
&& !f->isExplicit()
&& !f->isCopyConstructor()
&& !f->isModifiedRemoved()
- && !f->isUserAdded()
- && hasCloneOperator()) {
+ && (f->originalAttributes() & Public)) {
returned += f;
}
}
diff --git a/abstractmetalang.h b/abstractmetalang.h
index 590ccd71..e3d6ad74 100644
--- a/abstractmetalang.h
+++ b/abstractmetalang.h
@@ -93,7 +93,7 @@ public:
class APIEXTRACTOR_API AbstractMetaAttributes
{
public:
- AbstractMetaAttributes() : m_attributes(0) {};
+ AbstractMetaAttributes() : m_attributes(0), m_originalAttributes(0) {};
enum Attribute {
None = 0x00000000,
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9795694b..995e40d4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -19,3 +19,4 @@ declare_test(testremoveimplconv)
declare_test(testmultipleinheritance)
declare_test(testmodifyfunction)
declare_test(testcodeinjection)
+declare_test(testimplicitconversions)
diff --git a/tests/testimplicitconversions.cpp b/tests/testimplicitconversions.cpp
new file mode 100644
index 00000000..350ec8b6
--- /dev/null
+++ b/tests/testimplicitconversions.cpp
@@ -0,0 +1,122 @@
+/*
+* 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 "testimplicitconversions.h"
+#include "testutil.h"
+#include <QtTest/QTest>
+
+void TestImplicitConversions::testWithPrivateCtors()
+{
+ const char* cppCode ="\
+ class B;\
+ class C;\
+ \
+ class A {\
+ A(const B&);\
+ public:\
+ A(const C&);\
+ };\
+ \
+ class B {};\
+ class C {};\
+ ";
+ const char* xmlCode = "\
+ <typesystem package=\"Foo\"> \
+ <value-type name=\"A\"/> \
+ <value-type name=\"B\"/> \
+ <value-type name=\"C\"/> \
+ </typesystem>";
+ TestUtil t(cppCode, xmlCode);
+ AbstractMetaClassList classes = t.builder()->classes();
+ QCOMPARE(classes.count(), 3);
+
+ AbstractMetaClass* classA = classes.findClass("A");
+ AbstractMetaClass* classC = classes.findClass("C");
+ AbstractMetaFunctionList implicitConvs = classA->implicitConversions();
+ QCOMPARE(implicitConvs.count(), 1);
+ QCOMPARE(implicitConvs.first()->arguments().first()->type()->typeEntry(), classC->typeEntry());
+}
+
+void TestImplicitConversions::testWithModifiedVisibility()
+{
+ const char* cppCode ="\
+ class B;\
+ class A {\
+ public:\
+ A(const B&);\
+ };\
+ \
+ class B {};\
+ ";
+ const char* xmlCode = "\
+ <typesystem package=\"Foo\">\
+ <value-type name=\"A\">\
+ <modify-function signature='A(const B&amp;)'>\
+ <access modifier='private' />\
+ </modify-function>\
+ </value-type>\
+ <value-type name=\"B\"/>\
+ </typesystem>";
+ TestUtil t(cppCode, xmlCode);
+ AbstractMetaClassList classes = t.builder()->classes();
+ QCOMPARE(classes.count(), 2);
+ AbstractMetaClass* classA = classes.findClass("A");
+ AbstractMetaClass* classB = classes.findClass("B");
+ AbstractMetaFunctionList implicitConvs = classA->implicitConversions();
+ QCOMPARE(implicitConvs.count(), 1);
+ QCOMPARE(implicitConvs.first()->arguments().first()->type()->typeEntry(), classB->typeEntry());
+}
+
+
+void TestImplicitConversions::testWithAddedCtor()
+{
+ const char* cppCode ="\
+ class B;\
+ class A {\
+ public:\
+ A(const B&);\
+ };\
+ \
+ class B {};\
+ class C {};\
+ ";
+ const char* xmlCode = "\
+ <typesystem package=\"Foo\">\
+ <value-type name=\"A\">\
+ <add-function signature='A(const C&amp;)' />\
+ </value-type>\
+ <value-type name=\"B\"/>\
+ <value-type name=\"C\"/>\
+ </typesystem>";
+ TestUtil t(cppCode, xmlCode);
+ AbstractMetaClassList classes = t.builder()->classes();
+ QCOMPARE(classes.count(), 3);
+ AbstractMetaClass* classA = classes.findClass("A");
+ AbstractMetaFunctionList implicitConvs = classA->implicitConversions();
+ QCOMPARE(implicitConvs.count(), 2);
+}
+
+QTEST_APPLESS_MAIN(TestImplicitConversions)
+
+#include "testimplicitconversions.moc"
+
diff --git a/tests/testimplicitconversions.h b/tests/testimplicitconversions.h
new file mode 100644
index 00000000..68369bc4
--- /dev/null
+++ b/tests/testimplicitconversions.h
@@ -0,0 +1,40 @@
+/*
+* 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 TESTIMPLICITCONVERSIONS_H
+#define TESTIMPLICITCONVERSIONS_H
+
+#include <QObject>
+
+class AbstractMetaBuilder;
+
+class TestImplicitConversions : public QObject
+{
+ Q_OBJECT
+private slots:
+ void testWithPrivateCtors();
+ void testWithModifiedVisibility();
+ void testWithAddedCtor();
+};
+
+#endif