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

[IDE] Clean up and simplify syntaxStructureKindFromNominalTypeDecl().

Browse Source 
Swift SVN r9883
This commit is contained in:
Sonny Falk
2013-11-01 22:09:26 +00:00
parent 25a4ed62f3
commit 473cd24818
1 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/IDE/SyntaxModel.cpp
View File

@@ -117,23 +117,18 @@ private:
bool popStructureNode();
};
bool SyntaxStructureKindFromNominalTypeDecl(NominalTypeDecl *N,
SyntaxStructureKind* Kind) {
SyntaxStructureKind Result;
SyntaxStructureKind syntaxStructureKindFromNominalTypeDecl(NominalTypeDecl *N) {
if (isa<ClassDecl>(N))
Result = SyntaxStructureKind::Class;
return SyntaxStructureKind::Class;
else if (isa<StructDecl>(N))
Result = SyntaxStructureKind::Struct;
return SyntaxStructureKind::Struct;
else if (isa<ProtocolDecl>(N))
Result = SyntaxStructureKind::Protocol;
else if (isa<EnumDecl>(N))
Result = SyntaxStructureKind::Enum;
else
return false;
if (Kind)
*Kind = Result;
return true;
return SyntaxStructureKind::Protocol;
else {
// All other known NominalTypeDecl derived classes covered, so assert() here.
assert(isa<EnumDecl>(N));
return SyntaxStructureKind::Enum;
}
}
} // anonymous namespace
@@ -184,15 +179,12 @@ bool ModelASTWalker::walkToDeclPre(Decl *D) {
}
}
else if (NominalTypeDecl *NTD = dyn_cast<NominalTypeDecl>(D)) {
SyntaxStructureKind Kind;
if (SyntaxStructureKindFromNominalTypeDecl(NTD, &Kind)) {
SourceRange SR = NTD->getSourceRange();
SourceLoc NL = NTD->getNameLoc();
pushStructureNode({Kind,
CharSourceRange(SM, SR.Start, SR.End),
CharSourceRange(SM, NL, NL.getAdvancedLoc(
NTD->getName().getLength()))});
}
SyntaxStructureKind Kind = syntaxStructureKindFromNominalTypeDecl(NTD);
SourceRange SR = NTD->getSourceRange();
SourceLoc NL = NTD->getNameLoc();
pushStructureNode({Kind, CharSourceRange(SM, SR.Start, SR.End),
CharSourceRange(SM, NL, NL.getAdvancedLoc(
NTD->getName().getLength()))});
}
else if (VarDecl *VD = dyn_cast<VarDecl>(D)) {
const DeclContext *DC = VD->getDeclContext();
@@ -220,9 +212,8 @@ bool ModelASTWalker::walkToDeclPost(swift::Decl *D) {
popStructureNode();
}
}
else if (NominalTypeDecl *NTD = dyn_cast<NominalTypeDecl>(D)) {
if (SyntaxStructureKindFromNominalTypeDecl(NTD, nullptr))
popStructureNode();
else if (isa<NominalTypeDecl>(D)) {
popStructureNode();
}
return true;
}