AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moc: support nested q_namespaces

Browse Source 
Nested namespaces are quite common, therefore moc should support them.

Task-number: QTBUG-55415
Change-Id: I756cab36d498eb4342b402d255836d5d30f07b30
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
BogDan Vatra 2016-09-28 19:27:11 +03:00
parent 5dbcced3bf
commit 87583738f9
4 changed files with 181 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/tools/moc/moc.cpp
View File

@ -538,7 +538,6 @@ bool Moc::parseMaybeFunction(const ClassDef *cdef, FunctionDef *def)
return true;
}
void Moc::parse()
{
QVector<NamespaceDef> namespaceList;
@ -560,9 +559,27 @@ void Moc::parse()
until(RBRACE);
def.end = index;
index = def.begin + 1;
const bool parseNamespace = currentFilenames.size() <= 1;
if (parseNamespace) {
for (int i = namespaceList.size() - 1; i >= 0; --i) {
if (inNamespace(&namespaceList.at(i))) {
def.qualified.prepend(namespaceList.at(i).classname + "::");
}
}
}
while (parseNamespace && inNamespace(&def) && hasNext()) {
switch (next()) {
case NAMESPACE:
if (test(IDENTIFIER)) {
if (test(EQ)) {
// namespace Foo = Bar::Baz;
until(SEMIC);
} else if (!test(SEMIC)) {
until(RBRACE);
}
}
break;
case Q_NAMESPACE_TOKEN:
def.hasQNamespace = true;
break;
@ -857,13 +874,22 @@ void Moc::parse()
continue;
ClassDef def;
static_cast<BaseDef &>(def) = static_cast<BaseDef>(n);
if (!def.qualified.isEmpty())
def.qualified += "::";
def.qualified += def.classname;
def.hasQGadget = true;
classList += def;
auto it = std::find_if(classList.begin(), classList.end(), [&def](const ClassDef &val) {
return def.classname == val.classname && def.qualified == val.qualified;
});
if (it != classList.end()) {
it->classInfoList += def.classInfoList;
it->enumDeclarations.unite(def.enumDeclarations);
it->enumList += def.enumList;
it->flagAliases.unite(def.flagAliases);
} else {
knownGadgets.insert(def.classname, def.qualified);
knownGadgets.insert(def.qualified, def.qualified);
classList += def;
}
}
}

72
tests/auto/tools/moc/namespace.h
View File

@ -1,7 +1,77 @@
#pragma once
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef NAMESPACE_H
#define NAMESPACE_H
#include <QObject>
#include "namespace_no_merge.h"
// moc should not merge namespace_no_merge.h content with this one !
namespace FooNamespace {
Q_NAMESPACE
enum class Enum1 {
Key1,
Key2
};
Q_ENUM_NS(Enum1)
namespace FooNestedNamespace {
Q_NAMESPACE
enum class Enum2 {
Key3,
Key4
};
Q_ENUM_NS(Enum2)
}
using namespace FooNamespace;
namespace Bar = FooNamespace;
// Moc should merge this namespace with the previous one
namespace FooNestedNamespace {
Q_NAMESPACE
enum class Enum3 {
Key5,
Key6
};
Q_ENUM_NS(Enum3)
namespace FooMoreNestedNamespace {
Q_NAMESPACE
enum class Enum4 {
Key7,
Key8
};
Q_ENUM_NS(Enum4)
}
}
}
#endif // NAMESPACE_H

74
tests/auto/tools/moc/namespace_no_merge.h Normal file
View File

@ -0,0 +1,74 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef NAMESPACE_NO_MERGE_H
#define NAMESPACE_NO_MERGE_H
#include <QObject>
namespace FooNamespace {
Q_NAMESPACE
enum class MEnum1 {
Key1,
Key2
};
Q_ENUM_NS(MEnum1)
namespace FooNestedNamespace {
Q_NAMESPACE
enum class MEnum2 {
Key3,
Key4
};
Q_ENUM_NS(MEnum2)
}
using namespace FooNamespace;
namespace Bar = FooNamespace;
// Moc should merge this namespace with the previous one
namespace FooNestedNamespace {
Q_NAMESPACE
enum class MEnum3 {
Key5,
Key6
};
Q_ENUM_NS(MEnum3)
namespace FooMoreNestedNamespace {
Q_NAMESPACE
enum class MEnum4 {
Key7,
Key8
};
Q_ENUM_NS(MEnum4)
}
}
}
#endif // NAMESPACE_NO_MERGE_H

4
tests/auto/tools/moc/tst_moc.cpp
View File

@ -3777,6 +3777,10 @@ void tst_Moc::testQNamespace()
QCOMPARE(meta.name(), "TestEnum1");
QCOMPARE(meta.enclosingMetaObject(), &TestQNamespace::staticMetaObject);
QCOMPARE(meta.keyCount(), 2);
QCOMPARE(FooNamespace::staticMetaObject.enumeratorCount(), 1);
QCOMPARE(FooNamespace::FooNestedNamespace::staticMetaObject.enumeratorCount(), 2);
QCOMPARE(FooNamespace::FooNestedNamespace::FooMoreNestedNamespace::staticMetaObject.enumeratorCount(), 1);
}
QTEST_MAIN(tst_Moc)