diff options
author | BogDan Vatra <bogdan@kdab.com> | 2016-09-28 19:27:11 +0300 |
---|---|---|
committer | BogDan Vatra <bogdan@kdab.com> | 2016-09-28 16:44:19 +0000 |
commit | 87583738f960e83918da3b66e455e75c144fbf8e (patch) | |
tree | fb009e76e859d76837d3f7fd8a0b1549be553ea1 /src/tools | |
parent | 5dbcced3bff9dffd102d07e913bdfccc6f1d2213 (diff) |
moc: support nested q_namespaces
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>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/moc/moc.cpp | 38 |
1 files changed, 32 insertions, 6 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index e4b9b19758..3bd87e1f01 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -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; - knownGadgets.insert(def.classname, def.qualified); - knownGadgets.insert(def.qualified, def.qualified); + 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; + } } } |