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

AST: Rename getOrigAttrs() to getParsedAttrs().

Browse Source 
To match terminology used elsewhere in the compiler (e.g. "parsed accessor")
rename "original attributes" to "parsed atributes". Additionally, make sure the
attributes returned by `getParsedAttrs()` really are just the parsed ones by
skipping implicit attributes in addition to the ones expanded from macros.
This commit is contained in:
Allan Shortlidge
2023-11-01 22:28:19 -07:00
parent 9bc4e4bc8e
commit e879c07542
8 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/IDE/SyntaxModel.cpp
View File

@@ -409,7 +409,7 @@ private:
static bool findUrlStartingLoc(StringRef Text, unsigned &Start,
std::regex& Regex);
bool annotateIfConfigConditionIdentifiers(Expr *Cond);
bool handleAttrs(const OrigDeclAttributes &Attrs);
bool handleAttrs(const ParsedDeclAttributes &Attrs);
bool handleAttrs(const TypeAttributes &Attrs);
using DeclAttributeAndRange = std::pair<const DeclAttribute *, SourceRange>;
@@ -503,7 +503,7 @@ CharSourceRange innerCharSourceRangeFromSourceRange(const SourceManager &SM,
static void setDecl(SyntaxStructureNode &N, Decl *D) {
N.Dcl = D;
N.Attrs = D->getOriginalAttrs();
N.Attrs = D->getParsedAttrs();
N.DocRange = D->getRawComment().getCharSourceRange();
}
@@ -873,7 +873,7 @@ ASTWalker::PreWalkAction ModelASTWalker::walkToDeclPre(Decl *D) {
// attached to syntactically).
if (!isa<EnumElementDecl>(D) &&
!(isa<VarDecl>(D) && cast<VarDecl>(D)->getParentPatternBinding())) {
if (!handleAttrs(D->getOriginalAttrs()))
if (!handleAttrs(D->getParsedAttrs()))
return Action::SkipChildren();
}
@@ -956,7 +956,7 @@ ASTWalker::PreWalkAction ModelASTWalker::walkToDeclPre(Decl *D) {
passTokenNodesUntil(ArgStart, PassNodesBehavior::ExcludeNodeAtLocation);
}
SN.Range = charSourceRangeFromSourceRange(SM, PD->getSourceRange());
SN.Attrs = PD->getOriginalAttrs();
SN.Attrs = PD->getParsedAttrs();
SN.TypeRange = charSourceRangeFromSourceRange(SM,
PD->getTypeSourceRangeForDiagnostics());
pushStructureNode(SN, PD);
@@ -970,7 +970,7 @@ ASTWalker::PreWalkAction ModelASTWalker::walkToDeclPre(Decl *D) {
Contained = VD;
});
if (Contained) {
if (!handleAttrs(Contained->getOriginalAttrs()))
if (!handleAttrs(Contained->getParsedAttrs()))
return Action::SkipChildren();
break;
}
@@ -1042,7 +1042,7 @@ ASTWalker::PreWalkAction ModelASTWalker::walkToDeclPre(Decl *D) {
// We need to handle the special case where attributes semantically
// attach to enum element decls while syntactically locate before enum case decl.
if (auto *element = EnumCaseD->getFirstElement()) {
if (!handleAttrs(element->getOriginalAttrs()))
if (!handleAttrs(element->getParsedAttrs()))
return Action::SkipChildren();
}
if (pushStructureNode(SN, D)) {
@@ -1240,7 +1240,7 @@ bool ModelASTWalker::handleSpecialDeclAttribute(const DeclAttribute *D,
return false;
}
bool ModelASTWalker::handleAttrs(const OrigDeclAttributes &Attrs) {
bool ModelASTWalker::handleAttrs(const ParsedDeclAttributes &Attrs) {
SmallVector<DeclAttributeAndRange, 4> DeclRanges;
for (auto *At : Attrs) {
if (At->getRangeWithAt().isValid())