Type parameters of tuples and functions are not reified

This commit is contained in:
Andrey Breslav
2012-06-26 19:25:58 +02:00
parent 61d4f51cde
commit a10d0e9c2b
@@ -172,7 +172,7 @@ public class JetStandardClasses {
TypeParameterDescriptor typeParameterDescriptor = TypeParameterDescriptorImpl.createWithDefaultBound(
classDescriptor,
Collections.<AnnotationDescriptor>emptyList(),
true, Variance.OUT_VARIANCE, Name.identifier("T" + (j + 1)), j);
false, Variance.OUT_VARIANCE, Name.identifier("T" + (j + 1)), j);
parameters.add(typeParameterDescriptor);
PropertyDescriptor propertyDescriptor = new PropertyDescriptor(classDescriptor, Collections.<AnnotationDescriptor>emptyList(), Modality.FINAL, Visibilities.PUBLIC, false, false, Name.identifier("_" + (j + 1)), CallableMemberDescriptor.Kind.DECLARATION);
propertyDescriptor.setType(typeParameterDescriptor.getDefaultType(), Collections.<TypeParameterDescriptorImpl>emptyList(), classDescriptor.getImplicitReceiver(), ReceiverDescriptor.NO_RECEIVER);
@@ -232,7 +232,7 @@ public class JetStandardClasses {
parameters.add(0, TypeParameterDescriptorImpl.createWithDefaultBound(
receiverFunction,
Collections.<AnnotationDescriptor>emptyList(),
true, Variance.IN_VARIANCE, Name.identifier("T"), 0));
false, Variance.IN_VARIANCE, Name.identifier("T"), 0));
RECEIVER_FUNCTION[i] = receiverFunction.initialize(
false,
parameters,
@@ -255,12 +255,12 @@ public class JetStandardClasses {
parameters.add(TypeParameterDescriptorImpl.createWithDefaultBound(
function,
Collections.<AnnotationDescriptor>emptyList(),
true, Variance.IN_VARIANCE, Name.identifier("P" + j), j));
false, Variance.IN_VARIANCE, Name.identifier("P" + j), j));
}
parameters.add(TypeParameterDescriptorImpl.createWithDefaultBound(
function,
Collections.<AnnotationDescriptor>emptyList(),
true, Variance.OUT_VARIANCE, Name.identifier("R"), parameterCount + 1));
false, Variance.OUT_VARIANCE, Name.identifier("R"), parameterCount + 1));
return parameters;
}