azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deep substitution now doesn't lose variance info.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-11-08 16:43:52 +04:00
parent 3f18bb6d4b
commit b3311f717d
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java
+4 -5
View File
@@ -71,14 +71,13 @@ public class SubstitutionUtils {
for (int i = 0; i < arguments.size(); i++) { for (int i = 0; i < arguments.size(); i++) {
TypeProjection argument = arguments.get(i); TypeProjection argument = arguments.get(i);
TypeParameterDescriptor typeParameterDescriptor = parameters.get(i); TypeParameterDescriptor parameter = parameters.get(i);
JetType substitute = substitutor.substitute(argument.getType(), Variance.INVARIANT); TypeProjection substitute = substitutor.substitute(argument);
assert substitute != null; assert substitute != null;
TypeProjection substitutedTypeProjection = new TypeProjection(argument.getProjectionKind(), substitute); substitution.put(parameter.getTypeConstructor(), substitute);
substitution.put(typeParameterDescriptor.getTypeConstructor(), substitutedTypeProjection);
if (fullSubstitution != null) { if (fullSubstitution != null) {
fullSubstitution.put(typeParameterDescriptor.getTypeConstructor(), substitutedTypeProjection); fullSubstitution.put(parameter.getTypeConstructor(), substitute);
} }
} }
if (KotlinBuiltIns.getInstance().isNothingOrNullableNothing(context)) return; if (KotlinBuiltIns.getInstance().isNothingOrNullableNothing(context)) return;
compiler/frontend/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java
+8 -2
View File
@@ -125,12 +125,18 @@ public class TypeSubstitutor {
@Nullable @Nullable
public JetType substitute(@NotNull JetType type, @NotNull Variance howThisTypeIsUsed) { public JetType substitute(@NotNull JetType type, @NotNull Variance howThisTypeIsUsed) {
TypeProjection projection = substitute(new TypeProjection(howThisTypeIsUsed, type));
return projection == null ? null : projection.getType();
}
@Nullable
public TypeProjection substitute(@NotNull TypeProjection typeProjection) {
if (isEmpty()) { if (isEmpty()) {
return type; return typeProjection;
} }
try { try {
return unsafeSubstitute(new TypeProjection(howThisTypeIsUsed, type), 0).getType(); return unsafeSubstitute(typeProjection, 0);
} catch (SubstitutionException e) { } catch (SubstitutionException e) {
return null; return null;
} }