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

Add getter/setter type computations to VarDecl and SubscriptDecl.

Browse Source 
Use the getter type computation for dynamic subscript references so
that we can handle optional subscripts in protocols properly.


Swift SVN r9975
This commit is contained in:
Doug Gregor
2013-11-05 23:31:13 +00:00
parent 5736258087
commit d79b1758c1
3 changed files with 118 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
lib/AST/Decl.cpp
View File

@@ -838,6 +838,54 @@ void VarDecl::setComputedAccessors(ASTContext &Context, SourceLoc LBraceLoc,
Set->makeSetter(this);
}
Type VarDecl::getGetterType() const {
// If we have a getter, use its type.
if (auto getter = getGetter())
return getter->getType();
// Otherwise, compute the type.
GenericParamList *outerParams = nullptr;
auto selfTy = getDeclContext()->getSelfTypeInContext(/*isStatic=*/false,
/*isConstructor=*/false,
&outerParams);
// Form the getter type.
auto &ctx = getASTContext();
Type getterTy = FunctionType::get(TupleType::getEmpty(ctx), getType(), ctx);
// Add 'self'.
if (outerParams)
getterTy = PolymorphicFunctionType::get(selfTy, getterTy, outerParams, ctx);
else
getterTy = FunctionType::get(selfTy, getterTy, ctx);
return getterTy;
}
Type VarDecl::getSetterType() const {
// If we have a getter, use its type.
if (auto setter = getSetter())
return setter->getType();
// Otherwise, compute the type.
GenericParamList *outerParams = nullptr;
auto selfTy = getDeclContext()->getSelfTypeInContext(/*isStatic=*/false,
/*isConstructor=*/false,
&outerParams);
// Form the element -> () function type.
auto &ctx = getASTContext();
Type setterTy = FunctionType::get(getType(), TupleType::getEmpty(ctx),
ctx);
// Prepend the 'self' type.
if (outerParams)
setterTy = PolymorphicFunctionType::get(selfTy, setterTy, outerParams, ctx);
else
setterTy = FunctionType::get(selfTy, setterTy, ctx);
return setterTy;
}
bool VarDecl::isAnonClosureParam() const {
auto name = getName();
if (name.empty())
@@ -1169,6 +1217,61 @@ static bool isIntegralType(Type type) {
return false;
}
Type SubscriptDecl::getGetterType() const {
// If we have a getter, use its type.
if (auto getter = getGetter())
return getter->getType();
// Otherwise, compute the type.
GenericParamList *outerParams = nullptr;
auto selfTy = getDeclContext()->getSelfTypeInContext(/*isStatic=*/false,
/*isConstructor=*/false,
&outerParams);
// Form the () -> element function type.
auto &ctx = getASTContext();
Type getterTy = FunctionType::get(TupleType::getEmpty(ctx), getElementType(),
ctx);
// Prepend the indices.
getterTy = FunctionType::get(getIndices()->getType(), getterTy, ctx);
// Prepend the 'self' type.
if (outerParams)
getterTy = PolymorphicFunctionType::get(selfTy, getterTy, outerParams, ctx);
else
getterTy = FunctionType::get(selfTy, getterTy, ctx);
return getterTy;
}
Type SubscriptDecl::getSetterType() const {
// If we have a getter, use its type.
if (auto setter = getSetter())
return setter->getType();
// Otherwise, compute the type.
GenericParamList *outerParams = nullptr;
auto selfTy = getDeclContext()->getSelfTypeInContext(/*isStatic=*/false,
/*isConstructor=*/false,
&outerParams);
// Form the element -> () function type.
auto &ctx = getASTContext();
Type setterTy = FunctionType::get(getElementType(), TupleType::getEmpty(ctx),
ctx);
// Prepend the indices.
setterTy = FunctionType::get(getIndices()->getType(), setterTy, ctx);
// Prepend the 'self' type.
if (outerParams)
setterTy = PolymorphicFunctionType::get(selfTy, setterTy, outerParams, ctx);
else
setterTy = FunctionType::get(selfTy, setterTy, ctx);
return setterTy;
}
ObjCSubscriptKind SubscriptDecl::getObjCSubscriptKind() const {
auto indexTy = getIndices()->getType();