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

Rename ExpUnqalifiedLookup to UnqualifiedLookup, UnqualifiedLookup to LegacyUnqualifiedLookup

Browse Source
This commit is contained in:
David Ungar
2019-02-19 10:53:51 -07:00
parent 65f8f73992
commit ef9f99e37c
2 changed files with 76 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
include/swift/AST/NameLookup.h
View File

@@ -84,6 +84,8 @@ public:
ValueDecl *getBaseDecl() const;
};
class LegacyUnqualifiedLookup; // for verifyEqual below
/// This class implements and represents the result of performing
/// unqualified lookup (i.e. lookup for a plain identifier).
class UnqualifiedLookup {
@@ -108,9 +110,6 @@ public:
///
/// If the current DeclContext is nested in a function body, the SourceLoc
/// is used to determine which declarations in that body are visible.
UnqualifiedLookup(const char *dummy, DeclName Name, DeclContext *DC,
LazyResolver *TypeResolver, SourceLoc Loc = SourceLoc(),
Options options = Options());
UnqualifiedLookup(DeclName Name, DeclContext *DC, LazyResolver *TypeResolver,
SourceLoc Loc = SourceLoc(), Options options = Options());
@@ -121,6 +120,10 @@ public:
/// That is, \c makeArrayRef(Results).take_front(IndexOfFirstOuterResults)
/// will be Results from the innermost scope that had results, and the
/// remaining elements of Results will be from parent scopes of this one.
///
/// Allows unqualified name lookup to return results from outer scopes.
/// This is necessary for disambiguating calls to functions like `min` and
/// `max`.
size_t IndexOfFirstOuterResult;
/// Return true if anything was found by the name lookup.
@@ -129,69 +132,7 @@ public:
/// Get the result as a single type, or a null type if that fails.
TypeDecl *getSingleTypeResult();
public: // for exp debugging
SourceFile const *recordedSF = nullptr;
DeclName recordedName;
bool recordedIsCascadingUse = false;
};
inline UnqualifiedLookup::Options operator|(UnqualifiedLookup::Flags flag1,
UnqualifiedLookup::Flags flag2) {
return UnqualifiedLookup::Options(flag1) | flag2;
}
/// This class implements and represents the result of performing
/// unqualified lookup (i.e. lookup for a plain identifier).
class ExpUnqualifiedLookup {
public:
using Flags = UnqualifiedLookup::Flags;
using Options = UnqualifiedLookup::Options;
/// Lookup an unqualified identifier \p Name in the context.
///
/// If the current DeclContext is nested in a function body, the SourceLoc
/// is used to determine which declarations in that body are visible.
ExpUnqualifiedLookup(DeclName Name, DeclContext *DC,
LazyResolver *TypeResolver, SourceLoc Loc = SourceLoc(),
Options options = Options());
SmallVector<LookupResultEntry, 4> Results;
/// The index of the first result that isn't from the innermost scope
/// with results.
///
/// That is, \c makeArrayRef(Results).take_front(IndexOfFirstOuterResults)
/// will be Results from the innermost scope that had results, and the
/// remaining elements of Results will be from parent scopes of this one.
///
/// Allows unqualified name lookup to return results from outer scopes.
/// This is necessary for disambiguating calls to functions like `min` and
/// `max`.
size_t IndexOfFirstOuterResult;
/// Return true if anything was found by the name lookup.
bool isSuccess() const { return !Results.empty(); }
/// Get the result as a single type, or a null type if that fails.
TypeDecl *getSingleTypeResult();
bool operator==(const UnqualifiedLookup &other) const {
if (Results.size() != other.Results.size())
return false;
for (size_t i: indices(Results)) {
const auto &e = Results[i];
const auto &oe = other.Results[i];
if (e.getValueDecl() != oe.getValueDecl())
return false;
if (e.getDeclContext() != oe.getDeclContext())
return false;
if (e.getBaseDecl() != oe.getBaseDecl())
return false;
}
return IndexOfFirstOuterResult == other.IndexOfFirstOuterResult;
}
bool verifyEqual(const UnqualifiedLookup &) const;
bool verifyEqual(const LegacyUnqualifiedLookup &&) const;
public: // for exp debugging
SourceFile const *recordedSF = nullptr;
@@ -235,7 +176,51 @@ public: // for exp debugging
};
std::vector<PerScopeLookupState> breadcrumbs;
void dumpBreadcrumbs() const;
};
};
inline UnqualifiedLookup::Options operator|(UnqualifiedLookup::Flags flag1,
UnqualifiedLookup::Flags flag2) {
return UnqualifiedLookup::Options(flag1) | flag2;
}
/// This class implements and represents the result of performing
/// unqualified lookup (i.e. lookup for a plain identifier).
/// It is being kept around in order to check the refactoring against the new
/// UnqualifiedLookup above.
class LegacyUnqualifiedLookup {
public:
using Flags = UnqualifiedLookup::Flags;
using Options = UnqualifiedLookup::Options;
/// Lookup an unqualified identifier \p Name in the context.
///
/// If the current DeclContext is nested in a function body, the SourceLoc
/// is used to determine which declarations in that body are visible.
LegacyUnqualifiedLookup(DeclName Name, DeclContext *DC,
LazyResolver *TypeResolver,
SourceLoc Loc = SourceLoc(),
Options options = Options());
SmallVector<LookupResultEntry, 4> Results;
/// The index of the first result that isn't from the innermost scope
/// with results.
///
/// That is, \c makeArrayRef(Results).take_front(IndexOfFirstOuterResults)
/// will be Results from the innermost scope that had results, and the
/// remaining elements of Results will be from parent scopes of this one.
size_t IndexOfFirstOuterResult;
/// Return true if anything was found by the name lookup.
bool isSuccess() const { return !Results.empty(); }
/// Get the result as a single type, or a null type if that fails.
TypeDecl *getSingleTypeResult();
public: // for exp debugging
SourceFile const *recordedSF = nullptr;
DeclName recordedName;
bool recordedIsCascadingUse = false;
};
/// Describes the reason why a certain declaration is visible.
enum class DeclVisibilityKind {