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

added assert that constraining type doesn't contain type variables

Browse Source
This commit is contained in:
Svetlana Isakova
2012-07-11 18:48:38 +04:00
parent e7706a022c
commit c9fef98b8d
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintsSystemImpl.java
+26 -13
View File
@@ -136,21 +136,16 @@ public class ConstraintsSystemImpl implements ConstraintsSystem {
DeclarationDescriptor subjectTypeDescriptor = subjectType.getConstructor().getDeclarationDescriptor(); DeclarationDescriptor subjectTypeDescriptor = subjectType.getConstructor().getDeclarationDescriptor();
if (subjectTypeDescriptor instanceof TypeParameterDescriptor) { if (subjectTypeDescriptor instanceof TypeParameterDescriptor) {
if (TypeUtils.dependsOnTypeParameterConstructors(constrainingType, Collections.singleton(DONT_CARE.getConstructor()))) return;
if (subjectType.isNullable()) {
constrainingType = TypeUtils.makeNotNullable(constrainingType);
}
TypeParameterDescriptor typeParameter = (TypeParameterDescriptor) subjectTypeDescriptor; TypeParameterDescriptor typeParameter = (TypeParameterDescriptor) subjectTypeDescriptor;
if (constraintKind == ConstraintKind.SUPER_TYPE) { TypeConstraintsImpl typeConstraints = typeParameterConstraints.get(typeParameter);
typeParameterConstraints.get(typeParameter).addLowerBound(constrainingType); if (typeConstraints != null) {
addBoundToTypeConstraints(constraintKind, subjectType, constrainingType, typeConstraints);
return;
} }
else if (constraintKind == ConstraintKind.SUB_TYPE) { }
typeParameterConstraints.get(typeParameter).addUpperBound(constrainingType); if (constrainingTypeDescriptor instanceof TypeParameterDescriptor) {
} // assert that constraining type doesn't contain type variables
else { assert typeParameterConstraints.get(constrainingTypeDescriptor) == null;
typeParameterConstraints.get(typeParameter).addExactBound(constrainingType);
}
return;
} }
if (constrainingTypeDescriptor instanceof ClassDescriptor && subjectTypeDescriptor instanceof ClassDescriptor) { if (constrainingTypeDescriptor instanceof ClassDescriptor && subjectTypeDescriptor instanceof ClassDescriptor) {
@@ -190,6 +185,24 @@ public class ConstraintsSystemImpl implements ConstraintsSystem {
errorConstraintPositions.add(constraintPosition); errorConstraintPositions.add(constraintPosition);
} }
private void addBoundToTypeConstraints(@NotNull ConstraintKind constraintKind, @NotNull JetType subjectType,
@NotNull JetType constrainingType, @NotNull TypeConstraintsImpl typeConstraints) {
if (TypeUtils.dependsOnTypeParameterConstructors(constrainingType, Collections.singleton(DONT_CARE.getConstructor()))) return;
if (subjectType.isNullable()) {
constrainingType = TypeUtils.makeNotNullable(constrainingType);
}
if (constraintKind == ConstraintKind.SUPER_TYPE) {
typeConstraints.addLowerBound(constrainingType);
}
else if (constraintKind == ConstraintKind.SUB_TYPE) {
typeConstraints.addUpperBound(constrainingType);
}
else {
typeConstraints.addExactBound(constrainingType);
}
}
@NotNull @NotNull
@Override @Override
public Set<TypeParameterDescriptor> getTypeVariables() { public Set<TypeParameterDescriptor> getTypeVariables() {