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

Reverted modification in TypeTransformingVisitor in "Renamed & moved AllInjectorsGenerator".

Browse Source 
It was not relevant to that commit: it was squashed accidentally during interactive rebasing.
This commit is contained in:
Evgeny Gerashchenko
2012-11-13 12:43:54 +04:00
parent 044487cf37
commit c5e9deb906
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
+2 -6
View File
@@ -124,9 +124,9 @@ class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
TypeProjection argument = arguments.get(i); TypeProjection argument = arguments.get(i);
JetType alternativeType = computeType(argumentAlternativeTypeElement, argument.getType(), originalToAltTypeParameters); JetType alternativeType = computeType(argumentAlternativeTypeElement, argument.getType(), originalToAltTypeParameters);
Variance variance = argument.getProjectionKind(); Variance variance = argument.getProjectionKind();
Variance altVariance;
if (type instanceof JetUserType) { if (type instanceof JetUserType) {
JetTypeProjection typeProjection = ((JetUserType) type).getTypeArguments().get(i); JetTypeProjection typeProjection = ((JetUserType) type).getTypeArguments().get(i);
Variance altVariance = Variance.INVARIANT;
switch (typeProjection.getProjectionKind()) { switch (typeProjection.getProjectionKind()) {
case IN: case IN:
altVariance = Variance.IN_VARIANCE; altVariance = Variance.IN_VARIANCE;
@@ -137,16 +137,12 @@ class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
case STAR: case STAR:
throw new AlternativeSignatureMismatchException("Star projection is not available in alternative signatures"); throw new AlternativeSignatureMismatchException("Star projection is not available in alternative signatures");
default: default:
altVariance = Variance.INVARIANT;
} }
if (altVariance != variance && variance != Variance.INVARIANT) { if (altVariance != variance && variance != Variance.INVARIANT) {
throw new AlternativeSignatureMismatchException("Variance mismatch, actual: %s, in alternative signature: %s", variance, altVariance); throw new AlternativeSignatureMismatchException("Variance mismatch, actual: %s, in alternative signature: %s", variance, altVariance);
} }
} }
else { altArguments.add(new TypeProjection(variance, alternativeType));
altVariance = variance;
}
altArguments.add(new TypeProjection(altVariance, alternativeType));
} }
TypeConstructor typeConstructor; TypeConstructor typeConstructor;