gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Declare outermost namespace first.

Browse Source
This commit is contained in:
Axel Naumann 2014-09-23 20:48:42 +02:00 committed by sftnight
parent 5b4a3bacf8
commit 5b5fa04652
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Interpreter/ForwardDeclPrinter.cpp
View File

@ -1263,20 +1263,22 @@ namespace cling {
std::string ForwardDeclPrinter::PrintEnclosingDeclContexts(llvm::raw_ostream& Stream,
const DeclContext* DC) {
// Return closing "} } } }"...
size_t numClose = 0;
SmallVector<const DeclContext*, 16> DeclCtxs;
for(; DC && !DC->isTranslationUnit(); DC = DC->getParent()) {
if (const NamespaceDecl* ND = dyn_cast<NamespaceDecl>(DC)) {
PrintNamespaceOpen(Stream, ND);
++numClose;
} else if (const LinkageSpecDecl* LSD = dyn_cast<LinkageSpecDecl>(DC)) {
PrintLinkageOpen(Stream, LSD);
++numClose;
} else {
if (!isa<NamespaceDecl>(DC) && !isa<LinkageSpecDecl>(DC)) {
Log() << "Skipping unhandled " << DC->getDeclKindName() << '\n';
skipDecl(0, 0);
return "";
}
DeclCtxs.push_back(DC);
}
return std::string(numClose, '}');
for (auto I = DeclCtxs.rbegin(), E = DeclCtxs.rend(); I != E; ++I) {
if (const NamespaceDecl* ND = dyn_cast<NamespaceDecl>(*I))
PrintNamespaceOpen(Stream, ND);
else if (const LinkageSpecDecl* LSD = dyn_cast<LinkageSpecDecl>(*I))
PrintLinkageOpen(Stream, LSD);
}
return std::string(DeclCtxs.size(), '}');
}
}//end namespace cling