From a589323eaf8713cc3906736cc145ad3aaef768b3 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Fri, 12 Dec 2014 16:41:51 +0300 Subject: [PATCH] Rename: TypeCheckerTypingConstraints -> TypeCheckerProcedureCallbacks --- .../resolve/calls/inference/ConstraintSystemImpl.kt | 4 ++-- .../jet/lang/types/checker/JetTypeChecker.java | 6 +++--- ...s.java => TypeCheckerProcedureCallbacksImpl.java} | 2 +- .../lang/types/checker/TypeCheckingProcedure.java | 12 ++++++------ ...ints.java => TypeCheckingProcedureCallbacks.java} | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) rename core/descriptors/src/org/jetbrains/jet/lang/types/checker/{TypeCheckerTypingConstraints.java => TypeCheckerProcedureCallbacksImpl.java} (95%) rename core/descriptors/src/org/jetbrains/jet/lang/types/checker/{TypingConstraints.java => TypeCheckingProcedureCallbacks.java} (96%) diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.kt index 8d2558357a9..1e825b1fc7c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.kt @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl.ConstraintKind import org.jetbrains.jet.lang.types.checker.TypeCheckingProcedure -import org.jetbrains.jet.lang.types.checker.TypingConstraints +import org.jetbrains.jet.lang.types.checker.TypeCheckingProcedureCallbacks import org.jetbrains.jet.lang.types.TypeConstructor import java.util.LinkedHashMap import java.util.HashSet @@ -214,7 +214,7 @@ public class ConstraintSystemImpl : ConstraintSystem { } private fun addConstraint(constraintKind: ConstraintKind, subType: JetType?, superType: JetType?, constraintPosition: ConstraintPosition) { - val typeCheckingProcedure = TypeCheckingProcedure(object : TypingConstraints { + val typeCheckingProcedure = TypeCheckingProcedure(object : TypeCheckingProcedureCallbacks { private var isTopLevel = true override fun assertEqualTypes(a: JetType, b: JetType, typeCheckingProcedure: TypeCheckingProcedure): Boolean { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/JetTypeChecker.java b/core/descriptors/src/org/jetbrains/jet/lang/types/checker/JetTypeChecker.java index e4b3b20cd6d..96235e4f8e4 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/JetTypeChecker.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/checker/JetTypeChecker.java @@ -26,9 +26,9 @@ public class JetTypeChecker { boolean equals(@NotNull TypeConstructor a, @NotNull TypeConstructor b); } - public static final JetTypeChecker DEFAULT = new JetTypeChecker(new TypeCheckingProcedure(new TypeCheckerTypingConstraints())); + public static final JetTypeChecker DEFAULT = new JetTypeChecker(new TypeCheckingProcedure(new TypeCheckerProcedureCallbacksImpl())); - public static final JetTypeChecker FLEXIBLE_UNEQUAL_TO_INFLEXIBLE = new JetTypeChecker(new TypeCheckingProcedure(new TypeCheckerTypingConstraints()) { + public static final JetTypeChecker FLEXIBLE_UNEQUAL_TO_INFLEXIBLE = new JetTypeChecker(new TypeCheckingProcedure(new TypeCheckerProcedureCallbacksImpl()) { @Override protected boolean heterogeneousEquivalence(JetType inflexibleType, JetType flexibleType) { return false; @@ -37,7 +37,7 @@ public class JetTypeChecker { @NotNull public static JetTypeChecker withAxioms(@NotNull final TypeConstructorEquality equalityAxioms) { - return new JetTypeChecker(new TypeCheckingProcedure(new TypeCheckerTypingConstraints() { + return new JetTypeChecker(new TypeCheckingProcedure(new TypeCheckerProcedureCallbacksImpl() { @Override public boolean assertEqualTypeConstructors(@NotNull TypeConstructor constructor1, @NotNull TypeConstructor constructor2) { return constructor1.equals(constructor2) || equalityAxioms.equals(constructor1, constructor2); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckerTypingConstraints.java b/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckerProcedureCallbacksImpl.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckerTypingConstraints.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckerProcedureCallbacksImpl.java index 0a053ad2b7d..7e09a459a33 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckerTypingConstraints.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckerProcedureCallbacksImpl.java @@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.TypeProjection; -class TypeCheckerTypingConstraints implements TypingConstraints { +class TypeCheckerProcedureCallbacksImpl implements TypeCheckingProcedureCallbacks { @Override public boolean assertEqualTypes(@NotNull JetType a, @NotNull JetType b, @NotNull TypeCheckingProcedure typeCheckingProcedure) { return typeCheckingProcedure.equalTypes(a, b); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java b/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java index b46c1e79ad6..d5b96b0e993 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java @@ -32,19 +32,19 @@ public class TypeCheckingProcedure { // as the second parameter, applying the substitution of type arguments to it @Nullable public static JetType findCorrespondingSupertype(@NotNull JetType subtype, @NotNull JetType supertype) { - return findCorrespondingSupertype(subtype, supertype, new TypeCheckerTypingConstraints()); + return findCorrespondingSupertype(subtype, supertype, new TypeCheckerProcedureCallbacksImpl()); } // This method returns the supertype of the first parameter that has the same constructor // as the second parameter, applying the substitution of type arguments to it @Nullable - public static JetType findCorrespondingSupertype(@NotNull JetType subtype, @NotNull JetType supertype, @NotNull TypingConstraints typingConstraints) { + public static JetType findCorrespondingSupertype(@NotNull JetType subtype, @NotNull JetType supertype, @NotNull TypeCheckingProcedureCallbacks typeCheckingProcedureCallbacks) { TypeConstructor constructor = subtype.getConstructor(); - if (typingConstraints.assertEqualTypeConstructors(constructor, supertype.getConstructor())) { + if (typeCheckingProcedureCallbacks.assertEqualTypeConstructors(constructor, supertype.getConstructor())) { return subtype; } for (JetType immediateSupertype : constructor.getSupertypes()) { - JetType correspondingSupertype = findCorrespondingSupertype(immediateSupertype, supertype, typingConstraints); + JetType correspondingSupertype = findCorrespondingSupertype(immediateSupertype, supertype, typeCheckingProcedureCallbacks); if (correspondingSupertype != null) { return TypeSubstitutor.create(subtype).safeSubstitute(correspondingSupertype, Variance.INVARIANT); } @@ -62,9 +62,9 @@ public class TypeCheckingProcedure { return isOutProjected ? KotlinBuiltIns.getInstance().getNothingType() : argument.getType(); } - private final TypingConstraints constraints; + private final TypeCheckingProcedureCallbacks constraints; - public TypeCheckingProcedure(TypingConstraints constraints) { + public TypeCheckingProcedure(TypeCheckingProcedureCallbacks constraints) { this.constraints = constraints; } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypingConstraints.java b/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedureCallbacks.java similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypingConstraints.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedureCallbacks.java index 51a3072c11c..1ecf017acea 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypingConstraints.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedureCallbacks.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.types.TypeProjection; /** * Methods of this class return true to continue type checking and false to fail */ -public interface TypingConstraints { +public interface TypeCheckingProcedureCallbacks { boolean assertEqualTypes(@NotNull JetType a, @NotNull JetType b, @NotNull TypeCheckingProcedure typeCheckingProcedure); boolean assertEqualTypeConstructors(@NotNull TypeConstructor a, @NotNull TypeConstructor b);