averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include extensions in ClangModuleUnit::getTopLevelDecls.

Browse Source 
We don't do this very efficiently, but it does work. And now that it's working,
drop some special cases in module interface printing -- just always print
Clang decls in Clang source order.

Swift SVN r21901
This commit is contained in:
Jordan Rose
2014-09-12 02:54:50 +00:00
parent 6851d95735
commit 167d2f4bbb
5 changed files with 43 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/IDE/ModuleInterfacePrinting.cpp
View File

@@ -229,17 +229,6 @@ void swift::ide::printSubmoduleInterface(
if (D->hasClangNode()) {
addToClangDecls(D);
// When picking regular comments from clang headers, make sure that
// extensions/categories are printed in the right source location
// otherwise the comments will be out-of-place.
if (Options.PrintRegularClangComments) {
if (auto NTD = dyn_cast<NominalTypeDecl>(D)) {
for (auto Ext : NTD->getExtensions()) {
if (Ext->hasClangNode())
addToClangDecls(Ext);
}
}
}
continue;
}
if (FullModuleName.empty()) {
@@ -298,11 +287,14 @@ void swift::ide::printSubmoduleInterface(
auto PrintDecl = [&](Decl *D) -> bool {
if (auto Ext = dyn_cast<ExtensionDecl>(D)) {
// When picking regular comments from clang headers, make sure that
// extensions/categories are printed in the right source location
// otherwise the comments will be out-of-place.
if (!(Options.PrintRegularClangComments && Ext->hasClangNode()))
return false;
// Clang extensions (categories) are always printed in source order.
// Swift extensions are printed with their associated type unless it's
// a cross-module extension.
if (!Ext->hasClangNode()) {
auto ExtendedNominal = Ext->getExtendedType()->getAnyNominal();
if (Ext->getModuleContext() == ExtendedNominal->getModuleContext())
return false;
}
}
ASTPrinter &Printer = *PrinterToUse;
@@ -310,7 +302,7 @@ void swift::ide::printSubmoduleInterface(
Printer << "\n";
if (auto NTD = dyn_cast<NominalTypeDecl>(D)) {
for (auto Ext : NTD->getExtensions()) {
if (Options.PrintRegularClangComments && Ext->hasClangNode())
if (Ext->hasClangNode())
continue; // will be printed in its source location, see above.
Printer << "\n";
Ext->print(Printer, AdjustedOptions);