diff options
author | Hugo Lima <hugo.lima@openbossa.org> | 2010-01-20 13:54:36 -0200 |
---|---|---|
committer | Hugo Lima <hugo.lima@openbossa.org> | 2010-01-20 15:56:38 -0200 |
commit | ab2840dfef7bcab2dca312092748326e3f7ce6cf (patch) | |
tree | a257adaa3ae447e7349061ada9d2963e92b12e9d | |
parent | ce806c195494dc0c3c727d508378a434b5a676c6 (diff) |
When a constructor able to trigger implicity conversions is removed
it should not appear in the implicity conversion list.
Reviewed by Marcelo Lira <marcelo.lira@openbossa.org>
-rw-r--r-- | abstractmetalang.cpp | 2 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/testremoveimplconv.cpp | 64 | ||||
-rw-r--r-- | tests/testremoveimplconv.h | 36 |
4 files changed, 102 insertions, 1 deletions
diff --git a/abstractmetalang.cpp b/abstractmetalang.cpp index 101b97cfe..725a4adcc 100644 --- a/abstractmetalang.cpp +++ b/abstractmetalang.cpp @@ -1105,7 +1105,7 @@ AbstractMetaFunctionList AbstractMetaClass::implicitConversions() const AbstractMetaFunctionList list = queryFunctions(Constructors); AbstractMetaFunctionList returned; foreach (AbstractMetaFunction *f, list) { - if (f->arguments().size() == 1 && !f->isExplicit() && !f->isCopyConstructor() && hasCloneOperator()) + if (f->arguments().size() == 1 && !f->isExplicit() && !f->isCopyConstructor() && !f->isModifiedRemoved() && hasCloneOperator()) returned += f; } return returned; diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 78966362c..0a19bd65e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -15,3 +15,4 @@ declare_test(testaddfunction) declare_test(testconversionruletag) declare_test(testreverseoperators) declare_test(testdtorinformation) +declare_test(testremoveimplconv) diff --git a/tests/testremoveimplconv.cpp b/tests/testremoveimplconv.cpp new file mode 100644 index 000000000..48c7640d2 --- /dev/null +++ b/tests/testremoveimplconv.cpp @@ -0,0 +1,64 @@ +/* +* 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 "testremoveimplconv.h" +#include "testutil.h" +#include <QtTest/QTest> + +// When a constructor able to trigger implicity conversions is removed +// it should not appear in the implicity conversion list. +void TestRemoveImplConv::testRemoveImplConv() +{ + const char* cppCode ="\ + struct A {};\ + struct B {};\ + struct C {\ + C(const A&);\ + C(const B&);\ + };\ + "; + const char* xmlCode = "\ + <typesystem package=\"Foo\"> \ + <value-type name='A' /> \ + <value-type name='B' /> \ + <value-type name='C'> \ + <modify-function signature='C(const A&)' remove='all' />\ + </value-type>\ + </typesystem>"; + TestUtil t(cppCode, xmlCode); + AbstractMetaClassList classes = t.builder()->classes(); + QCOMPARE(classes.count(), 3); + AbstractMetaClass* classA = classes.findClass("A"); + QVERIFY(classA); + AbstractMetaClass* classB = classes.findClass("B"); + QVERIFY(classB); + AbstractMetaClass* classC = classes.findClass("C"); + QVERIFY(classC); + AbstractMetaFunctionList implConv = classC->implicitConversions(); + QCOMPARE(implConv.count(), 1); + QCOMPARE(implConv.first()->arguments().first()->type()->typeEntry(), classB->typeEntry()); +} + +QTEST_APPLESS_MAIN(TestRemoveImplConv) + +#include "testremoveimplconv.moc" diff --git a/tests/testremoveimplconv.h b/tests/testremoveimplconv.h new file mode 100644 index 000000000..bacc2a250 --- /dev/null +++ b/tests/testremoveimplconv.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 TESTREMOVEIMPLCONV_H +#define TESTREMOVEIMPLCONV_H + +#include <QObject> + +class TestRemoveImplConv : public QObject +{ +Q_OBJECT +private slots: + void testRemoveImplConv(); +}; + +#endif // TESTREMOVEIMPLCONV_H |