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

[CodeComplete] Complete the right hand side of assignment expressions.

Browse Source 
When users complete the right-hand side of an assignment expression, we only
show the results whose types are convertible to those of the left-hand side.

Swift SVN r31357
This commit is contained in:
Xi Ge
2015-08-20 01:35:30 +00:00
parent 0604d88bda
commit c33e3efe59
7 changed files with 199 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/Sema/CSGen.cpp
View File

@@ -991,7 +991,7 @@ namespace {
ConstraintSystem &getConstraintSystem() const { return CS; }
Type visitErrorExpr(ErrorExpr *E) {
virtual Type visitErrorExpr(ErrorExpr *E) {
// FIXME: Can we do anything with error expressions at this point?
return nullptr;
}
@@ -2726,22 +2726,35 @@ void ConstraintSystem::optimizeConstraints(Expr *e) {
class InferUnresolvedMemberConstraintGenerator : public ConstraintGenerator {
Expr *Target;
TypeVariableType* VT;
public:
TypeVariableType *VT;
Type createFreeTypeVariableType(Expr *E) {
auto &CS = getConstraintSystem();
return VT = CS.createTypeVariable(CS.getConstraintLocator(nullptr),
TypeVariableOptions::TVO_CanBindToLValue);
}
public:
InferUnresolvedMemberConstraintGenerator(Expr *Target, ConstraintSystem &CS) :
ConstraintGenerator(CS), Target(Target) {};
virtual ~InferUnresolvedMemberConstraintGenerator() = default;
Type visitUnresolvedMemberExpr(UnresolvedMemberExpr *expr) override {
if (Target != expr) {
Type visitUnresolvedMemberExpr(UnresolvedMemberExpr *Expr) override {
if (Target != Expr) {
// If expr is not the target, do the default constraint generation.
return ConstraintGenerator::visitUnresolvedMemberExpr(expr);
return ConstraintGenerator::visitUnresolvedMemberExpr(Expr);
}
// Otherwise, create a type variable saying we know nothing about this expr.
auto &CS = getConstraintSystem();
return VT = CS.createTypeVariable(CS.getConstraintLocator(nullptr),
TypeVariableOptions::TVO_CanBindToLValue);
return createFreeTypeVariableType(Expr);
}
Type visitErrorExpr(ErrorExpr *Expr) override {
if (Target != Expr) {
// If expr is not the target, do the default constraint generation.
return ConstraintGenerator::visitErrorExpr(Expr);
}
// Otherwise, create a type variable saying we know nothing about this expr.
return createFreeTypeVariableType(Expr);
}
Type getResolvedType(Solution &S) {
@@ -2749,9 +2762,9 @@ public:
}
};
bool swift::typeCheckUnresolvedMember(DeclContext &DC,
UnresolvedMemberExpr* E, Expr *Parent,
SmallVectorImpl<Type> &PossibleTypes) {
bool swift::typeCheckUnresolvedExpr(DeclContext &DC,
Expr *E, Expr *Parent,
SmallVectorImpl<Type> &PossibleTypes) {
ConstraintSystemOptions Options = ConstraintSystemFlags::AllowFixes;
auto *TypeChecker = static_cast<class TypeChecker*>(DC.getASTContext().
getLazyResolver());