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 UncheckedOptional to ImplicitlyUnwrappedOptional.

Browse Source 
Swift SVN r17232
This commit is contained in:
Ted Kremenek
2014-05-02 06:13:57 +00:00
parent 2442d063ef
commit 050fd53af7
55 changed files with 367 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Sema/CSSimplify.cpp
View File

@@ -978,16 +978,16 @@ ConstraintSystem::matchTypes(Type type1, Type type2, TypeMatchKind kind,
conversionsOrFixes.push_back(
ConversionRestrictionKind::OptionalToOptional);
} else if (optionalKind2 == OTK_Optional &&
decl1 == TC.Context.getUncheckedOptionalDecl()) {
decl1 == TC.Context.getImplicitlyUnwrappedOptionalDecl()) {
assert(boundGenericType1->getGenericArgs().size() == 1);
conversionsOrFixes.push_back(
ConversionRestrictionKind::UncheckedOptionalToOptional);
} else if (optionalKind2 == OTK_UncheckedOptional &&
ConversionRestrictionKind::ImplicitlyUnwrappedOptionalToOptional);
} else if (optionalKind2 == OTK_ImplicitlyUnwrappedOptional &&
kind >= TypeMatchKind::Conversion &&
decl1 == TC.Context.getOptionalDecl()) {
assert(boundGenericType1->getGenericArgs().size() == 1);
conversionsOrFixes.push_back(
ConversionRestrictionKind::OptionalToUncheckedOptional);
ConversionRestrictionKind::OptionalToImplicitlyUnwrappedOptional);
}
}
@@ -1002,7 +1002,7 @@ ConstraintSystem::matchTypes(Type type1, Type type2, TypeMatchKind kind,
{
Type objectType1;
if (concrete && kind >= TypeMatchKind::Conversion &&
(objectType1 = lookThroughUncheckedOptionalType(type1))) {
(objectType1 = lookThroughImplicitlyUnwrappedOptionalType(type1))) {
conversionsOrFixes.push_back(
ConversionRestrictionKind::ForceUnchecked);
}
@@ -1464,8 +1464,8 @@ ConstraintSystem::simplifyMemberConstraint(const Constraint &constraint) {
Type baseTy = simplifyType(constraint.getFirstType());
Type baseObjTy = baseTy->getRValueType();
// Try to look through UncheckedOptional<T>; the result is always an r-value.
if (auto objTy = lookThroughUncheckedOptionalType(baseObjTy)) {
// Try to look through ImplicitlyUnwrappedOptional<T>; the result is always an r-value.
if (auto objTy = lookThroughImplicitlyUnwrappedOptionalType(baseObjTy)) {
increaseScore(SK_ForceUnchecked);
baseTy = baseObjTy = objTy;
}
@@ -1883,8 +1883,8 @@ ConstraintSystem::simplifyApplicableFnConstraint(const Constraint &constraint) {
/*wantRValue=*/true);
auto desugar2 = type2->getDesugaredType();
// Try to look through UncheckedOptional<T>; the result is always an r-value.
if (auto objTy = lookThroughUncheckedOptionalType(desugar2)) {
// Try to look through ImplicitlyUnwrappedOptional<T>; the result is always an r-value.
if (auto objTy = lookThroughImplicitlyUnwrappedOptionalType(desugar2)) {
type2 = objTy;
desugar2 = type2->getDesugaredType();
}
@@ -2134,8 +2134,8 @@ ConstraintSystem::simplifyRestrictedConstraint(ConversionRestrictionKind restric
// T $< U ===> T! $< U?
// also:
// T <c U ===> T? <c U!
case ConversionRestrictionKind::OptionalToUncheckedOptional:
case ConversionRestrictionKind::UncheckedOptionalToOptional:
case ConversionRestrictionKind::OptionalToImplicitlyUnwrappedOptional:
case ConversionRestrictionKind::ImplicitlyUnwrappedOptionalToOptional:
case ConversionRestrictionKind::OptionalToOptional: {
addContextualScore();
assert(matchKind >= TypeMatchKind::Subtype);
@@ -2161,7 +2161,7 @@ ConstraintSystem::simplifyRestrictedConstraint(ConversionRestrictionKind restric
assert(matchKind >= TypeMatchKind::Conversion);
auto boundGenericType1 = type1->castTo<BoundGenericType>();
assert(boundGenericType1->getDecl()->classifyAsOptionalType()
== OTK_UncheckedOptional);
== OTK_ImplicitlyUnwrappedOptional);
assert(boundGenericType1->getGenericArgs().size() == 1);
Type valueType1 = boundGenericType1->getGenericArgs()[0];
increaseScore(SK_ForceUnchecked);