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

ASTScope: Rework ConditionalClauseScopes

Browse Source 
The top-level scope for a conditional clause with a pattern is now
ConditionalClausePatternUseScope, which introduces the pattern's
bindings.

Since the patterns are not visible in their own initializer, a new
ConditionalClauseInitializerScope is used for the initializer.
While it is nested inside of the ConditionalClausePatternUseScope,
it's lookup parent skips one level, giving us the desired behavior.
This commit is contained in:
Slava Pestov
2020-10-02 02:43:21 -04:00
parent 66873b94c9
commit 2e67c135fd
8 changed files with 150 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
include/swift/AST/ASTScope.h
View File

@@ -1082,45 +1082,27 @@ protected:
bool lookupLocalsOrMembers(DeclConsumer) const override;
};
/// The scope introduced by a conditional clause in an if/guard/while
/// statement.
/// Since there may be more than one "let foo = ..." in (e.g.) an "if",
/// we allocate a matrushka of these.
class ConditionalClauseScope final : public ASTScopeImpl {
/// The scope introduced by a conditional clause initializer in an
/// if/while/guard statement.
class ConditionalClauseInitializerScope final : public ASTScopeImpl {
public:
LabeledConditionalStmt *const stmt;
const unsigned index;
const SourceLoc endLoc; // cannot get it from the stmt
Expr *const initializer;
const SourceRange bodyRange;
ConditionalClauseScope(LabeledConditionalStmt *stmt, unsigned index,
SourceLoc endLoc)
: stmt(stmt), index(index), endLoc(endLoc) {}
ConditionalClauseInitializerScope(Expr *initializer)
: initializer(initializer) {}
virtual ~ConditionalClauseScope() {}
virtual ~ConditionalClauseInitializerScope() {}
SourceRange
getSourceRangeOfThisASTNode(bool omitAssertions = false) const override;
std::string getClassName() const override;
private:
void expandAScopeThatDoesNotCreateANewInsertionPoint(ScopeCreator &);
protected:
ASTScopeImpl *expandSpecifically(ScopeCreator &scopeCreator) override;
private:
AnnotatedInsertionPoint
expandAScopeThatCreatesANewInsertionPoint(ScopeCreator &);
public:
std::string getClassName() const override;
protected:
void printSpecifics(llvm::raw_ostream &out) const override;
public:
SourceRange
getSourceRangeOfThisASTNode(bool omitAssertions = false) const override;
private:
ArrayRef<StmtConditionElement> getCond() const;
const StmtConditionElement &getStmtConditionElement() const;
protected:
bool isLabeledStmtLookupTerminator() const override;
NullablePtr<const ASTScopeImpl> getLookupParent() const override;
};
/// If, while, & guard statements all start with a conditional clause, then some
@@ -1128,17 +1110,21 @@ protected:
/// the normal lookup rule to pass the lookup scope into the deepest conditional
/// clause.
class ConditionalClausePatternUseScope final : public ASTScopeImpl {
Pattern *const pattern;
const SourceLoc startLoc;
StmtConditionElement sec;
SourceLoc endLoc;
public:
ConditionalClausePatternUseScope(Pattern *pattern, SourceLoc startLoc)
: pattern(pattern), startLoc(startLoc) {}
ConditionalClausePatternUseScope(StmtConditionElement sec, SourceLoc endLoc)
: sec(sec), endLoc(endLoc) {}
SourceRange
getSourceRangeOfThisASTNode(bool omitAssertions = false) const override;
std::string getClassName() const override;
private:
AnnotatedInsertionPoint
expandAScopeThatCreatesANewInsertionPoint(ScopeCreator &);
protected:
ASTScopeImpl *expandSpecifically(ScopeCreator &) override;
bool lookupLocalsOrMembers(DeclConsumer) const override;
@@ -1350,7 +1336,7 @@ public:
protected:
/// Return the lookupParent required to search these.
ASTScopeImpl *createNestedConditionalClauseScopes(ScopeCreator &,
const Stmt *afterConds);
SourceLoc);
};
class IfStmtScope final : public LabeledConditionalStmtScope {
@@ -1408,28 +1394,24 @@ public:
getSourceRangeOfThisASTNode(bool omitAssertions = false) const override;
};
/// A scope after a guard statement that follows lookups into the conditions
/// Also for:
/// The insertion point of the last statement of an active clause in an #if
/// must be the lookup parent
/// of any following scopes. But the active clause may not be the last clause.
/// In short, this is another case where the lookup parent cannot follow the same
/// nesting as the source order. IfConfigUseScope implements this twist. It
/// follows the IfConfig, wraps all subsequent scopes, and redirects the lookup.
class LookupParentDiversionScope final : public ASTScopeImpl {
/// A scope for the body of a guard statement. Lookups from the body must
/// skip the parent scopes for introducing pattern bindings, since they're
/// not visible in the guard body, only after the body ends.
class GuardStmtBodyScope final : public ASTScopeImpl {
public:
ASTScopeImpl *const lookupParent;
const SourceLoc startLoc;
const SourceLoc endLoc;
BraceStmt *const body;
LookupParentDiversionScope(ASTScopeImpl *lookupParent,
SourceLoc startLoc, SourceLoc endLoc)
: lookupParent(lookupParent), startLoc(startLoc), endLoc(endLoc) {}
GuardStmtBodyScope(ASTScopeImpl *lookupParent, BraceStmt *body)
: lookupParent(lookupParent), body(body) {}
SourceRange
getSourceRangeOfThisASTNode(bool omitAssertions = false) const override;
std::string getClassName() const override;
private:
void expandAScopeThatDoesNotCreateANewInsertionPoint(ScopeCreator &);
protected:
ASTScopeImpl *expandSpecifically(ScopeCreator &) override;
NullablePtr<const ASTScopeImpl> getLookupParent() const override {