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

[IDE] Remove IBAction / IBOutlet specific SyntaxStructureKind values, and pass through the DeclAttributes instead.

Browse Source 
Swift SVN r10028
This commit is contained in:
Sonny Falk
2013-11-07 19:35:30 +00:00
parent 72be5e8f59
commit 2ba1d6cec9
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/swift/IDE/SyntaxModel.h
View File

@@ -14,6 +14,7 @@
#define SWIFT_IDE_SYNTAX_MODEL_H
#include "swift/Basic/SourceLoc.h"
#include "swift/AST/Attr.h"
namespace swift {
class SourceManager;
@@ -50,13 +51,12 @@ enum class SyntaxStructureKind : uint8_t {
FreeFunction,
InstanceFunction,
StaticFunction,
IBActionFunction,
InstanceVariable,
IBOutletVariable
};
struct SyntaxStructureNode {
SyntaxStructureKind Kind;
DeclAttributes Attrs;
CharSourceRange Range;
CharSourceRange NameRange;
};

17
lib/IDE/SyntaxModel.cpp
View File

@@ -167,15 +167,14 @@ bool ModelASTWalker::walkToDeclPre(Decl *D) {
if (DC->isTypeContext()) {
if (FD && FD->isStatic())
Kind = SyntaxStructureKind::StaticFunction;
else if (AFD->getAttrs().isIBAction())
Kind = SyntaxStructureKind::IBActionFunction;
else
Kind = SyntaxStructureKind::InstanceFunction;
}
else
Kind = SyntaxStructureKind::FreeFunction;
pushStructureNode({Kind, CharSourceRange(SM, SR.Start, SR.End),
pushStructureNode({Kind, AFD->getAttrs(),
CharSourceRange(SM, SR.Start, SR.End),
CharSourceRange(SM, NL, NL.getAdvancedLoc(
AFD->getName().getLength()))});
}
@@ -184,7 +183,8 @@ bool ModelASTWalker::walkToDeclPre(Decl *D) {
SyntaxStructureKind Kind = syntaxStructureKindFromNominalTypeDecl(NTD);
SourceRange SR = NTD->getSourceRange();
SourceLoc NL = NTD->getNameLoc();
pushStructureNode({Kind, CharSourceRange(SM, SR.Start, SR.End),
pushStructureNode({Kind, NTD->getAttrs(),
CharSourceRange(SM, SR.Start, SR.End),
CharSourceRange(SM, NL, NL.getAdvancedLoc(
NTD->getName().getLength()))});
}
@@ -193,12 +193,9 @@ bool ModelASTWalker::walkToDeclPre(Decl *D) {
if (DC->isTypeContext()) {
SourceRange SR = VD->getSourceRange();
SourceLoc NL = VD->getNameLoc();
SyntaxStructureKind Kind;
if (VD->getAttrs().isIBOutlet())
Kind = SyntaxStructureKind::IBOutletVariable;
else
Kind = SyntaxStructureKind::InstanceVariable;
pushStructureNode({Kind, CharSourceRange(SM, SR.Start, SR.End),
SyntaxStructureKind Kind = SyntaxStructureKind::InstanceVariable;
pushStructureNode({Kind, VD->getAttrs(),
CharSourceRange(SM, SR.Start, SR.End),
CharSourceRange(SM, NL, NL.getAdvancedLoc(
VD->getName().getLength()))});
}