From b162a65e855a13df8668cea3ad58eca06b56dbfe Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Mon, 13 Jul 2015 20:36:24 +0300 Subject: [PATCH] Changed the way the constraints are written in tests SUBTYPE T Int -> T <: Int --- .../checkStatus/conflictingConstraints.bounds | 4 +- .../conflictingConstraints.constraints | 4 +- .../checkStatus/successful.bounds | 4 +- .../checkStatus/successful.constraints | 4 +- .../typeConstructorMismatch.bounds | 2 +- .../typeConstructorMismatch.constraints | 2 +- .../checkStatus/unknownParameters.bounds | 2 +- .../checkStatus/unknownParameters.constraints | 2 +- .../checkStatus/violatedUpperBound.bounds | 21 ----- .../violatedUpperBound.constraints | 4 - .../computeValues/contradiction.bounds | 4 +- .../computeValues/contradiction.constraints | 4 +- .../computeValues/subTypeOfUpperBounds.bounds | 4 +- .../subTypeOfUpperBounds.constraints | 4 +- .../superTypeOfLowerBounds1.bounds | 4 +- .../superTypeOfLowerBounds1.constraints | 4 +- .../superTypeOfLowerBounds2.bounds | 6 +- .../superTypeOfLowerBounds2.constraints | 6 +- .../{declarations => }/declarations.kt | 0 .../integerValueTypes/byteOverflow.bounds | 4 +- .../byteOverflow.constraints | 4 +- .../integerValueTypes/defaultLong.bounds | 4 +- .../integerValueTypes/defaultLong.constraints | 4 +- .../integerValueTypes/numberAndAny.bounds | 4 +- .../numberAndAny.constraints | 4 +- .../integerValueTypes/numberAndString.bounds | 4 +- .../numberAndString.constraints | 4 +- .../integerValueTypes/severalNumbers.bounds | 4 +- .../severalNumbers.constraints | 4 +- .../integerValueTypes/simpleByte.bounds | 4 +- .../integerValueTypes/simpleByte.constraints | 4 +- .../integerValueTypes/simpleInt.bounds | 2 +- .../integerValueTypes/simpleInt.constraints | 2 +- .../integerValueTypes/simpleShort.bounds | 4 +- .../integerValueTypes/simpleShort.constraints | 4 +- .../direct/contravariant/varEqDepEq.bounds | 4 +- .../contravariant/varEqDepEq.constraints | 4 +- .../direct/contravariant/varEqDepSub.bounds | 4 +- .../contravariant/varEqDepSub.constraints | 4 +- .../direct/contravariant/varEqDepSuper.bounds | 4 +- .../contravariant/varEqDepSuper.constraints | 4 +- .../direct/contravariant/varSubDepEq.bounds | 4 +- .../contravariant/varSubDepEq.constraints | 4 +- .../direct/contravariant/varSubDepSub.bounds | 4 +- .../contravariant/varSubDepSub.constraints | 4 +- .../contravariant/varSubDepSuper.bounds | 4 +- .../contravariant/varSubDepSuper.constraints | 4 +- .../direct/contravariant/varSuperDepEq.bounds | 4 +- .../contravariant/varSuperDepEq.constraints | 4 +- .../contravariant/varSuperDepSub.bounds | 4 +- .../contravariant/varSuperDepSub.constraints | 4 +- .../contravariant/varSuperDepSuper.bounds | 4 +- .../varSuperDepSuper.constraints | 4 +- .../direct/covariant/varEqDepEq.bounds | 4 +- .../direct/covariant/varEqDepEq.constraints | 4 +- .../direct/covariant/varEqDepSub.bounds | 4 +- .../direct/covariant/varEqDepSub.constraints | 4 +- .../direct/covariant/varEqDepSuper.bounds | 4 +- .../covariant/varEqDepSuper.constraints | 4 +- .../direct/covariant/varSubDepEq.bounds | 4 +- .../direct/covariant/varSubDepEq.constraints | 4 +- .../direct/covariant/varSubDepSub.bounds | 4 +- .../direct/covariant/varSubDepSub.constraints | 4 +- .../direct/covariant/varSubDepSuper.bounds | 4 +- .../covariant/varSubDepSuper.constraints | 4 +- .../direct/covariant/varSuperDepEq.bounds | 4 +- .../covariant/varSuperDepEq.constraints | 4 +- .../direct/covariant/varSuperDepSub.bounds | 4 +- .../covariant/varSuperDepSub.constraints | 4 +- .../direct/covariant/varSuperDepSuper.bounds | 4 +- .../covariant/varSuperDepSuper.constraints | 4 +- .../direct/invariant/varEqDepEq.bounds | 4 +- .../direct/invariant/varEqDepEq.constraints | 4 +- .../direct/invariant/varEqDepSub.bounds | 4 +- .../direct/invariant/varEqDepSub.constraints | 4 +- .../direct/invariant/varEqDepSuper.bounds | 4 +- .../invariant/varEqDepSuper.constraints | 4 +- .../direct/invariant/varSubDepEq.bounds | 4 +- .../direct/invariant/varSubDepEq.constraints | 4 +- .../direct/invariant/varSubDepSub.bounds | 4 +- .../direct/invariant/varSubDepSub.constraints | 4 +- .../direct/invariant/varSubDepSuper.bounds | 4 +- .../invariant/varSubDepSuper.constraints | 4 +- .../direct/invariant/varSuperDepEq.bounds | 4 +- .../invariant/varSuperDepEq.constraints | 4 +- .../direct/invariant/varSuperDepSub.bounds | 4 +- .../invariant/varSuperDepSub.constraints | 4 +- .../direct/invariant/varSuperDepSuper.bounds | 4 +- .../invariant/varSuperDepSuper.constraints | 4 +- .../interdependency/interdependency1.bounds | 6 +- .../interdependency1.constraints | 6 +- .../interdependency/interdependency2.bounds | 6 +- .../interdependency2.constraints | 6 +- .../interdependency/interdependency3.bounds | 6 +- .../interdependency3.constraints | 6 +- .../nullable/contravariant/varEqDepEq.bounds | 4 +- .../contravariant/varEqDepEq.constraints | 4 +- .../nullable/contravariant/varEqDepSub.bounds | 4 +- .../contravariant/varEqDepSub.constraints | 4 +- .../contravariant/varEqDepSuper.bounds | 4 +- .../contravariant/varEqDepSuper.constraints | 4 +- .../nullable/contravariant/varSubDepEq.bounds | 4 +- .../contravariant/varSubDepEq.constraints | 4 +- .../contravariant/varSubDepSub.bounds | 4 +- .../contravariant/varSubDepSub.constraints | 4 +- .../contravariant/varSubDepSuper.bounds | 4 +- .../contravariant/varSubDepSuper.constraints | 4 +- .../contravariant/varSuperDepEq.bounds | 4 +- .../contravariant/varSuperDepEq.constraints | 4 +- .../contravariant/varSuperDepSub.bounds | 4 +- .../contravariant/varSuperDepSub.constraints | 4 +- .../contravariant/varSuperDepSuper.bounds | 4 +- .../varSuperDepSuper.constraints | 4 +- .../nullable/covariant/varEqDepEq.bounds | 4 +- .../nullable/covariant/varEqDepEq.constraints | 4 +- .../nullable/covariant/varEqDepSub.bounds | 4 +- .../covariant/varEqDepSub.constraints | 4 +- .../nullable/covariant/varEqDepSuper.bounds | 4 +- .../covariant/varEqDepSuper.constraints | 4 +- .../nullable/covariant/varSubDepEq.bounds | 4 +- .../covariant/varSubDepEq.constraints | 4 +- .../nullable/covariant/varSubDepSub.bounds | 4 +- .../covariant/varSubDepSub.constraints | 4 +- .../nullable/covariant/varSubDepSuper.bounds | 4 +- .../covariant/varSubDepSuper.constraints | 4 +- .../nullable/covariant/varSuperDepEq.bounds | 4 +- .../covariant/varSuperDepEq.constraints | 4 +- .../nullable/covariant/varSuperDepSub.bounds | 4 +- .../covariant/varSuperDepSub.constraints | 4 +- .../covariant/varSuperDepSuper.bounds | 4 +- .../covariant/varSuperDepSuper.constraints | 4 +- .../nullable/invariant/varEqDepEq.bounds | 4 +- .../nullable/invariant/varEqDepEq.constraints | 4 +- .../nullable/invariant/varEqDepSub.bounds | 4 +- .../invariant/varEqDepSub.constraints | 4 +- .../nullable/invariant/varEqDepSuper.bounds | 4 +- .../invariant/varEqDepSuper.constraints | 4 +- .../nullable/invariant/varSubDepEq.bounds | 4 +- .../invariant/varSubDepEq.constraints | 4 +- .../nullable/invariant/varSubDepSub.bounds | 4 +- .../invariant/varSubDepSub.constraints | 4 +- .../nullable/invariant/varSubDepSuper.bounds | 4 +- .../invariant/varSubDepSuper.constraints | 4 +- .../nullable/invariant/varSuperDepEq.bounds | 4 +- .../invariant/varSuperDepEq.constraints | 4 +- .../nullable/invariant/varSuperDepSub.bounds | 4 +- .../invariant/varSuperDepSub.constraints | 4 +- .../invariant/varSuperDepSuper.bounds | 4 +- .../invariant/varSuperDepSuper.constraints | 4 +- .../other/constraintForNullables.bounds | 4 +- .../other/constraintForNullables.constraints | 4 +- .../other/nestedConsumer.bounds | 4 +- .../other/nestedConsumer.constraints | 4 +- .../other/nestedConsumer1.bounds | 4 +- .../other/nestedConsumer1.constraints | 4 +- .../other/nestedInvConsumer.bounds | 4 +- .../other/nestedInvConsumer.constraints | 4 +- .../other/nestedInvProducer.bounds | 4 +- .../other/nestedInvProducer.constraints | 4 +- .../other/nestedProducer.bounds | 4 +- .../other/nestedProducer.constraints | 4 +- .../other/nestedProducerAndConsumer.bounds | 4 +- .../nestedProducerAndConsumer.constraints | 4 +- .../other/severalOccurrences.bounds | 4 +- .../other/severalOccurrences.constraints | 4 +- .../severalVariables/other/simpleFun.bounds | 10 +-- .../other/simpleFun.constraints | 6 +- .../other/simpleThreeVars.bounds | 6 +- .../other/simpleThreeVars.constraints | 6 +- .../simpleThreeVarsNoIncorporation.bounds | 6 +- ...simpleThreeVarsNoIncorporation.constraints | 6 +- ...simpleThreeVarsNoIncorporationFixed.bounds | 6 +- ...eThreeVarsNoIncorporationFixed.constraints | 6 +- .../recursive/implicitlyRecursive.bounds | 6 +- .../recursive/implicitlyRecursive.constraints | 6 +- .../recursive/mutuallyRecursive.bounds | 4 +- .../recursive/mutuallyRecursive.constraints | 4 +- .../recursive/simpleRecursive.bounds | 4 +- .../recursive/simpleRecursive.constraints | 4 +- .../reversed/contravariant/varEqDepEq.bounds | 4 +- .../contravariant/varEqDepEq.constraints | 4 +- .../reversed/contravariant/varEqDepSub.bounds | 4 +- .../contravariant/varEqDepSub.constraints | 4 +- .../contravariant/varEqDepSuper.bounds | 4 +- .../contravariant/varEqDepSuper.constraints | 4 +- .../reversed/contravariant/varSubDepEq.bounds | 4 +- .../contravariant/varSubDepEq.constraints | 4 +- .../contravariant/varSubDepSub.bounds | 4 +- .../contravariant/varSubDepSub.constraints | 4 +- .../contravariant/varSubDepSuper.bounds | 4 +- .../contravariant/varSubDepSuper.constraints | 4 +- .../contravariant/varSuperDepEq.bounds | 4 +- .../contravariant/varSuperDepEq.constraints | 4 +- .../contravariant/varSuperDepSub.bounds | 4 +- .../contravariant/varSuperDepSub.constraints | 4 +- .../contravariant/varSuperDepSuper.bounds | 4 +- .../varSuperDepSuper.constraints | 4 +- .../reversed/covariant/varEqDepEq.bounds | 4 +- .../reversed/covariant/varEqDepEq.constraints | 4 +- .../reversed/covariant/varEqDepSub.bounds | 4 +- .../covariant/varEqDepSub.constraints | 4 +- .../reversed/covariant/varEqDepSuper.bounds | 4 +- .../covariant/varEqDepSuper.constraints | 4 +- .../reversed/covariant/varSubDepEq.bounds | 4 +- .../covariant/varSubDepEq.constraints | 4 +- .../reversed/covariant/varSubDepSub.bounds | 4 +- .../covariant/varSubDepSub.constraints | 4 +- .../reversed/covariant/varSubDepSuper.bounds | 4 +- .../covariant/varSubDepSuper.constraints | 4 +- .../reversed/covariant/varSuperDepEq.bounds | 4 +- .../covariant/varSuperDepEq.constraints | 4 +- .../reversed/covariant/varSuperDepSub.bounds | 4 +- .../covariant/varSuperDepSub.constraints | 4 +- .../covariant/varSuperDepSuper.bounds | 4 +- .../covariant/varSuperDepSuper.constraints | 4 +- .../reversed/invariant/varEqDepEq.bounds | 4 +- .../reversed/invariant/varEqDepEq.constraints | 4 +- .../reversed/invariant/varEqDepSub.bounds | 4 +- .../invariant/varEqDepSub.constraints | 4 +- .../reversed/invariant/varEqDepSuper.bounds | 4 +- .../invariant/varEqDepSuper.constraints | 4 +- .../reversed/invariant/varSubDepEq.bounds | 4 +- .../invariant/varSubDepEq.constraints | 4 +- .../reversed/invariant/varSubDepSub.bounds | 4 +- .../invariant/varSubDepSub.constraints | 4 +- .../reversed/invariant/varSubDepSuper.bounds | 4 +- .../invariant/varSubDepSuper.constraints | 4 +- .../reversed/invariant/varSuperDepEq.bounds | 4 +- .../invariant/varSuperDepEq.constraints | 4 +- .../reversed/invariant/varSuperDepSub.bounds | 4 +- .../invariant/varSuperDepSub.constraints | 4 +- .../invariant/varSuperDepSuper.bounds | 4 +- .../invariant/varSuperDepSuper.constraints | 4 +- .../severalVariables/simpleDependency.bounds | 2 +- .../simpleDependency.constraints | 2 +- .../severalVariables/simpleEquality.bounds | 4 +- .../simpleEquality.constraints | 4 +- .../severalVariables/simpleEquality1.bounds | 4 +- .../simpleEquality1.constraints | 4 +- .../simpleReversedDependency.bounds | 4 +- .../simpleReversedDependency.constraints | 4 +- .../severalVariables/simpleSubtype.bounds | 4 +- .../simpleSubtype.constraints | 4 +- .../severalVariables/simpleSubtype1.bounds | 4 +- .../simpleSubtype1.constraints | 4 +- .../constraintSystem/variance/consumer.bounds | 2 +- .../variance/consumer.constraints | 2 +- .../variance/invariant.bounds | 2 +- .../variance/invariant.constraints | 2 +- .../constraintSystem/variance/producer.bounds | 2 +- .../variance/producer.constraints | 2 +- .../AbstractConstraintSystemTest.kt | 78 +++++++++---------- .../ConstraintSystemTestData.kt | 2 +- .../ConstraintSystemTestGenerated.java | 6 -- 254 files changed, 541 insertions(+), 574 deletions(-) delete mode 100644 compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds delete mode 100644 compiler/testData/constraintSystem/checkStatus/violatedUpperBound.constraints rename compiler/testData/constraintSystem/{declarations => }/declarations.kt (100%) diff --git a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds b/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds index 3c867761ed0..c94c7bdeead 100644 --- a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds +++ b/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds @@ -1,7 +1,7 @@ VARIABLES T -SUBTYPE T Int -SUPERTYPE T String +T <: Int +T >: String type parameter bounds: T <: Int, >: String diff --git a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.constraints b/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.constraints index a5ac8d81123..73b1e047485 100644 --- a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.constraints +++ b/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.constraints @@ -1,4 +1,4 @@ VARIABLES T -SUBTYPE T Int -SUPERTYPE T String \ No newline at end of file +T <: Int +T >: String diff --git a/compiler/testData/constraintSystem/checkStatus/successful.bounds b/compiler/testData/constraintSystem/checkStatus/successful.bounds index 43ac39868b2..c1078ef1761 100644 --- a/compiler/testData/constraintSystem/checkStatus/successful.bounds +++ b/compiler/testData/constraintSystem/checkStatus/successful.bounds @@ -1,7 +1,7 @@ VARIABLES T -SUBTYPE T Int -SUPERTYPE T Int +T <: Int +T >: Int type parameter bounds: T <: Int, >: Int diff --git a/compiler/testData/constraintSystem/checkStatus/successful.constraints b/compiler/testData/constraintSystem/checkStatus/successful.constraints index c1b1b12a5fd..a6d9b0b7d12 100644 --- a/compiler/testData/constraintSystem/checkStatus/successful.constraints +++ b/compiler/testData/constraintSystem/checkStatus/successful.constraints @@ -1,4 +1,4 @@ VARIABLES T -SUBTYPE T Int -SUPERTYPE T Int \ No newline at end of file +T <: Int +T >: Int diff --git a/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds b/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds index c009c45087d..99a37d6f2a9 100644 --- a/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds +++ b/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds @@ -1,6 +1,6 @@ VARIABLES T -SUBTYPE List Int +List <: Int type parameter bounds: T diff --git a/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.constraints b/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.constraints index 2e3b5a78d74..eedca733b0e 100644 --- a/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.constraints +++ b/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.constraints @@ -1,3 +1,3 @@ VARIABLES T -SUBTYPE List Int \ No newline at end of file +List <: Int diff --git a/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds b/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds index c0af2c301bb..db3ee6b0013 100644 --- a/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds +++ b/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds @@ -1,6 +1,6 @@ VARIABLES T -SUBTYPE Any Any +Any <: Any type parameter bounds: T diff --git a/compiler/testData/constraintSystem/checkStatus/unknownParameters.constraints b/compiler/testData/constraintSystem/checkStatus/unknownParameters.constraints index 9e0d87313e9..01d5712133b 100644 --- a/compiler/testData/constraintSystem/checkStatus/unknownParameters.constraints +++ b/compiler/testData/constraintSystem/checkStatus/unknownParameters.constraints @@ -1,3 +1,3 @@ VARIABLES T -SUBTYPE Any Any \ No newline at end of file +Any <: Any diff --git a/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds b/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds deleted file mode 100644 index 1d6590c012d..00000000000 --- a/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds +++ /dev/null @@ -1,21 +0,0 @@ -VARIABLES T - -SUBTYPE T Int -SUBTYPE T String weak - -type parameter bounds: -T <: Int, <: String - -status: --hasCannotCaptureTypesError: false --hasConflictingConstraints: true --hasContradiction: true --hasErrorInConstrainingTypes: false --hasParameterConstraintError: false --hasTypeInferenceIncorporationError: false --hasUnknownParameters: false --hasViolatedUpperBound: true --isSuccessful: false - -result: -T=??? diff --git a/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.constraints b/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.constraints deleted file mode 100644 index ef8b411f40e..00000000000 --- a/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.constraints +++ /dev/null @@ -1,4 +0,0 @@ -VARIABLES T - -SUBTYPE T Int -SUBTYPE T String weak \ No newline at end of file diff --git a/compiler/testData/constraintSystem/computeValues/contradiction.bounds b/compiler/testData/constraintSystem/computeValues/contradiction.bounds index 24bbf15b783..bc12fb789f0 100644 --- a/compiler/testData/constraintSystem/computeValues/contradiction.bounds +++ b/compiler/testData/constraintSystem/computeValues/contradiction.bounds @@ -1,7 +1,7 @@ VARIABLES T -SUBTYPE T B -SUPERTYPE T A +T <: B +T >: A type parameter bounds: T <: B, >: A diff --git a/compiler/testData/constraintSystem/computeValues/contradiction.constraints b/compiler/testData/constraintSystem/computeValues/contradiction.constraints index c90fa4b41d5..86de4a85dd0 100644 --- a/compiler/testData/constraintSystem/computeValues/contradiction.constraints +++ b/compiler/testData/constraintSystem/computeValues/contradiction.constraints @@ -1,4 +1,4 @@ VARIABLES T -SUBTYPE T B -SUPERTYPE T A \ No newline at end of file +T <: B +T >: A diff --git a/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds b/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds index 377928d944f..a3bfb8d58b0 100644 --- a/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds +++ b/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds @@ -1,7 +1,7 @@ VARIABLES T -SUBTYPE T A -SUBTYPE T B +T <: A +T <: B type parameter bounds: T <: A, <: B diff --git a/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.constraints b/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.constraints index c7c0b551365..9cd0d24fe2c 100644 --- a/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.constraints +++ b/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.constraints @@ -1,4 +1,4 @@ VARIABLES T -SUBTYPE T A -SUBTYPE T B \ No newline at end of file +T <: A +T <: B diff --git a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds index b2ef6ae5068..b4285612fe6 100644 --- a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds +++ b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds @@ -1,7 +1,7 @@ VARIABLES T -SUBTYPE T A -SUPERTYPE T C +T <: A +T >: C type parameter bounds: T <: A, >: C diff --git a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.constraints b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.constraints index 7a4c1d73476..40d55d2f8c8 100644 --- a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.constraints +++ b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.constraints @@ -1,4 +1,4 @@ VARIABLES T -SUBTYPE T A -SUPERTYPE T C \ No newline at end of file +T <: A +T >: C diff --git a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds index d6b88ca835c..478086db7c2 100644 --- a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds +++ b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds @@ -1,8 +1,8 @@ VARIABLES T -SUBTYPE T A -SUPERTYPE T B -SUPERTYPE T C +T <: A +T >: B +T >: C type parameter bounds: T <: A, >: B, >: C diff --git a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.constraints b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.constraints index fc1003c2de3..e1fed467904 100644 --- a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.constraints +++ b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.constraints @@ -1,5 +1,5 @@ VARIABLES T -SUBTYPE T A -SUPERTYPE T B -SUPERTYPE T C \ No newline at end of file +T <: A +T >: B +T >: C diff --git a/compiler/testData/constraintSystem/declarations/declarations.kt b/compiler/testData/constraintSystem/declarations.kt similarity index 100% rename from compiler/testData/constraintSystem/declarations/declarations.kt rename to compiler/testData/constraintSystem/declarations.kt diff --git a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds b/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds index 29d70c2e4d0..cf0ce4a09e2 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds @@ -1,7 +1,7 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1000) -SUBTYPE T Byte +T >: IntegerValueType(1000) +T <: Byte type parameter bounds: T >: IntegerValueType(1000), <: Byte diff --git a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.constraints b/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.constraints index 008d49843d5..0473f499c94 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.constraints +++ b/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.constraints @@ -1,4 +1,4 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1000) -SUBTYPE T Byte \ No newline at end of file +T >: IntegerValueType(1000) +T <: Byte diff --git a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds b/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds index b8a0f48d824..74f5472c15c 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds @@ -1,7 +1,7 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) -SUPERTYPE T IntegerValueType(10000000000) +T >: IntegerValueType(1) +T >: IntegerValueType(10000000000) type parameter bounds: T >: IntegerValueType(1), >: IntegerValueType(10000000000) diff --git a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.constraints b/compiler/testData/constraintSystem/integerValueTypes/defaultLong.constraints index 2ba8bedaa26..6270d70a68a 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.constraints +++ b/compiler/testData/constraintSystem/integerValueTypes/defaultLong.constraints @@ -1,4 +1,4 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) -SUPERTYPE T IntegerValueType(10000000000) \ No newline at end of file +T >: IntegerValueType(1) +T >: IntegerValueType(10000000000) diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds b/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds index e2184e2315e..7c413e2e518 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds @@ -1,7 +1,7 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) -SUBTYPE T Any +T >: IntegerValueType(1) +T <: Any type parameter bounds: T >: IntegerValueType(1), <: Any diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.constraints b/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.constraints index 89f32451478..da000c8feb0 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.constraints +++ b/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.constraints @@ -1,4 +1,4 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) -SUBTYPE T Any \ No newline at end of file +T >: IntegerValueType(1) +T <: Any diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds b/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds index aed516efeff..2bbaa4171d7 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds @@ -1,7 +1,7 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) -SUPERTYPE T String +T >: IntegerValueType(1) +T >: String type parameter bounds: T >: IntegerValueType(1), >: String diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.constraints b/compiler/testData/constraintSystem/integerValueTypes/numberAndString.constraints index 300daefcb17..9f91f37e011 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.constraints +++ b/compiler/testData/constraintSystem/integerValueTypes/numberAndString.constraints @@ -1,4 +1,4 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) -SUPERTYPE T String \ No newline at end of file +T >: IntegerValueType(1) +T >: String diff --git a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds b/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds index 187b41062f0..c9a92d60e95 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds @@ -1,7 +1,7 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) -SUPERTYPE T IntegerValueType(1000) +T >: IntegerValueType(1) +T >: IntegerValueType(1000) type parameter bounds: T >: IntegerValueType(1), >: IntegerValueType(1000) diff --git a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.constraints b/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.constraints index 0e58b001f34..bafce1a8007 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.constraints +++ b/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.constraints @@ -1,4 +1,4 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) -SUPERTYPE T IntegerValueType(1000) \ No newline at end of file +T >: IntegerValueType(1) +T >: IntegerValueType(1000) diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds index a4fae5c8324..e6dd0530abd 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds @@ -1,7 +1,7 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) -SUBTYPE T Byte +T >: IntegerValueType(1) +T <: Byte type parameter bounds: T >: IntegerValueType(1), <: Byte diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.constraints b/compiler/testData/constraintSystem/integerValueTypes/simpleByte.constraints index a8cb3c80fe3..9da0fc9e2c2 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.constraints +++ b/compiler/testData/constraintSystem/integerValueTypes/simpleByte.constraints @@ -1,4 +1,4 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) -SUBTYPE T Byte \ No newline at end of file +T >: IntegerValueType(1) +T <: Byte diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds index 7cde4a14c94..e5bfdb6bba6 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds @@ -1,6 +1,6 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) +T >: IntegerValueType(1) type parameter bounds: T >: IntegerValueType(1) diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.constraints b/compiler/testData/constraintSystem/integerValueTypes/simpleInt.constraints index 2a2545431db..aa8f78b19f4 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.constraints +++ b/compiler/testData/constraintSystem/integerValueTypes/simpleInt.constraints @@ -1,3 +1,3 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) \ No newline at end of file +T >: IntegerValueType(1) diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds index b1d6044ccdc..83c7f50083d 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds +++ b/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds @@ -1,7 +1,7 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) -SUBTYPE T Short +T >: IntegerValueType(1) +T <: Short type parameter bounds: T >: IntegerValueType(1), <: Short diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.constraints b/compiler/testData/constraintSystem/integerValueTypes/simpleShort.constraints index 2de8feeb212..a3ba83baf5d 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.constraints +++ b/compiler/testData/constraintSystem/integerValueTypes/simpleShort.constraints @@ -1,4 +1,4 @@ VARIABLES T -SUPERTYPE T IntegerValueType(1) -SUBTYPE T Short \ No newline at end of file +T >: IntegerValueType(1) +T <: Short diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.bounds index 767c74294bc..93379428dad 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -EQUAL P Consumer +T := Int +P := Consumer type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.constraints index e0751422bfb..e4e3eb8e1b0 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -EQUAL P Consumer +T := Int +P := Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.bounds index 7576d950b1a..52adc70cbf3 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -SUBTYPE P Consumer +T := Int +P <: Consumer type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.constraints index 75fcfd4c9ff..67567cd2dee 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -SUBTYPE P Consumer +T := Int +P <: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.bounds index 65d4e213440..2a6af20e622 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -SUPERTYPE P Consumer +T := Int +P >: Consumer type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.constraints index 7a1aec72d51..52d5a35b1e8 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -SUPERTYPE P Consumer +T := Int +P >: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.bounds index 6882e64a517..3f40aac7c0d 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -EQUAL P Consumer +T <: Int +P := Consumer type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.constraints index 656c4453f9b..53d27506f5e 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -EQUAL P Consumer +T <: Int +P := Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.bounds index 36ece479442..eb2067accb7 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P Consumer +T <: Int +P <: Consumer type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.constraints index 2350a783ecd..dfa315bf976 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P Consumer +T <: Int +P <: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.bounds index dc9bd4ee09f..93f9afb9610 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUPERTYPE P Consumer +T <: Int +P >: Consumer type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.constraints index 9aecf5e8d88..fa629778192 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUPERTYPE P Consumer +T <: Int +P >: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.bounds index aab4a696ef5..a737ec275dd 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -EQUAL P Consumer +T >: Int +P := Consumer type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.constraints index cbfda275da8..0549095d95c 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -EQUAL P Consumer +T >: Int +P := Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.bounds index e43f73ab278..732e2825709 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -SUBTYPE P Consumer +T >: Int +P <: Consumer type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.constraints index 568af53e3ad..eafcc55663e 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -SUBTYPE P Consumer +T >: Int +P <: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.bounds index c5e1ad524d5..53e2d9a1d0d 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -SUPERTYPE P Consumer +T >: Int +P >: Consumer type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.constraints index 8b0dfe5cacc..3f9d691fab5 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -SUPERTYPE P Consumer +T >: Int +P >: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.bounds index fa29eb3243c..a84ceea90b3 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -EQUAL P Producer +T := Int +P := Producer type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.constraints index 2746dec14a2..b8682d147da 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -EQUAL P Producer +T := Int +P := Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.bounds index 25302882cae..333ccca8bef 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -SUBTYPE P Producer +T := Int +P <: Producer type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.constraints index bbf66b8dc5c..35965dee809 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -SUBTYPE P Producer +T := Int +P <: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.bounds index 8f82371393f..cb9dc556a9a 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -SUPERTYPE P Producer +T := Int +P >: Producer type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.constraints index bf14baf3586..dc9922a8970 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -SUPERTYPE P Producer +T := Int +P >: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.bounds index 994192067e0..158b947451b 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -EQUAL P Producer +T <: Int +P := Producer type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.constraints index ffb31352379..e396ec93736 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -EQUAL P Producer +T <: Int +P := Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.bounds index 9a1c367b17e..d06e4aabe62 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P Producer +T <: Int +P <: Producer type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.constraints index 6393295827d..591c1e73a05 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P Producer +T <: Int +P <: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.bounds index fc04cd651dd..0cfe13d7fe4 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUPERTYPE P Producer +T <: Int +P >: Producer type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.constraints index b5020891ab8..f5afe6e411d 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUPERTYPE P Producer +T <: Int +P >: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.bounds index c20ba05af7e..58cd194a3a8 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -EQUAL P Producer +T >: Int +P := Producer type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.constraints index 879c938ebd8..80c0c77152d 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -EQUAL P Producer +T >: Int +P := Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.bounds index 663ed0261f1..012c754855b 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -SUBTYPE P Producer +T >: Int +P <: Producer type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.constraints index f433623b950..d6697a53b90 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -SUBTYPE P Producer +T >: Int +P <: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.bounds index e687ac76a53..7fcc24506eb 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -SUPERTYPE P Producer +T >: Int +P >: Producer type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.constraints index 8138eb7582f..b2345b38016 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -SUPERTYPE P Producer +T >: Int +P >: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.bounds index 2bf6c5e8394..605be5c1245 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -EQUAL P My +T := Int +P := My type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.constraints index a422162d64a..8dbe999f027 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -EQUAL P My +T := Int +P := My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.bounds index 49bb91d9ec6..4db5d355c22 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -SUBTYPE P My +T := Int +P <: My type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.constraints index b04f0ca41a0..3d7c94d3f01 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -SUBTYPE P My +T := Int +P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.bounds index bddbf2341d0..cb02905c3de 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -SUPERTYPE P My +T := Int +P >: My type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.constraints index 3b0b9ae47e3..ce2fae0e68e 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -SUPERTYPE P My +T := Int +P >: My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.bounds index 420b8574da7..ce9e75b129d 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -EQUAL P My +T <: Int +P := My type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.constraints index 877c4529d1b..07b20eef913 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -EQUAL P My +T <: Int +P := My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.bounds index 5ce7369428f..772a83b45a2 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P My +T <: Int +P <: My type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.constraints index 90ae60529e4..3e58fb5b2a1 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P My +T <: Int +P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.bounds index bfd0363ae79..57d3219b315 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUPERTYPE P My +T <: Int +P >: My type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.constraints index d51ee811788..802fa4fa77f 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUPERTYPE P My +T <: Int +P >: My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.bounds index ce9772e5472..e063aadb4b0 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -EQUAL P My +T >: Int +P := My type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.constraints index 785f2d53719..b4c5f83202f 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -EQUAL P My +T >: Int +P := My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.bounds index 2a890311f20..0e0efdceff8 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -SUBTYPE P My +T >: Int +P <: My type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.constraints index 9d1ebe0beac..da6df183aa5 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -SUBTYPE P My +T >: Int +P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.bounds index 50c3e7a4752..d02a3bda19f 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -SUPERTYPE P My +T >: Int +P >: My type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.constraints index e5f1c829e43..34597d6a9a7 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -SUPERTYPE P My +T >: Int +P >: My diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.bounds b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.bounds index 0dd2f8ada64..7da19bb43dc 100644 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.bounds +++ b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.bounds @@ -1,9 +1,9 @@ VARIABLES T P E FIX_VARIABLES -SUBTYPE P My -SUBTYPE Successor P -SUBTYPE Int T +P <: My +Successor <: P +Int <: T type parameter bounds: T := T*, := E*, >: Int, := Int diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.constraints b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.constraints index 2652dc43ebc..700a203d296 100644 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.constraints +++ b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.constraints @@ -1,6 +1,6 @@ VARIABLES T P E FIX_VARIABLES -SUBTYPE P My -SUBTYPE Successor P -SUBTYPE Int T +P <: My +Successor <: P +Int <: T diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.bounds b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.bounds index 409c0397e2b..d1c12fbfb04 100644 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.bounds +++ b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.bounds @@ -1,9 +1,9 @@ VARIABLES T P E FIX_VARIABLES -SUBTYPE P My -SUBTYPE Int T -SUBTYPE Successor P +P <: My +Int <: T +Successor <: P type parameter bounds: T >: Int, := T*, := E*, := Int diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.constraints b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.constraints index 3ca6e06e52a..c659df345ce 100644 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.constraints +++ b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.constraints @@ -1,6 +1,6 @@ VARIABLES T P E FIX_VARIABLES -SUBTYPE P My -SUBTYPE Int T -SUBTYPE Successor P +P <: My +Int <: T +Successor <: P diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.bounds b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.bounds index 18ab4706b1a..3345b301150 100644 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.bounds +++ b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.bounds @@ -1,9 +1,9 @@ VARIABLES T P E FIX_VARIABLES -SUBTYPE Int T -SUBTYPE Successor P -SUBTYPE P My +Int <: T +Successor <: P +P <: My type parameter bounds: T >: Int, := T*, := E*, := Int diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.constraints b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.constraints index f97c8a922fe..c004de9df4c 100644 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.constraints +++ b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.constraints @@ -1,6 +1,6 @@ VARIABLES T P E FIX_VARIABLES -SUBTYPE Int T -SUBTYPE Successor P -SUBTYPE P My +Int <: T +Successor <: P +P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.bounds index 7a0185605f3..c75ca7b1e4b 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -EQUAL P Consumer +T := Int +P := Consumer type parameter bounds: T := Int, >: Int, <: Int? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.constraints index 3b81189be3a..c1736b057c7 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -EQUAL P Consumer +T := Int +P := Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.bounds index d17252889f9..192ea287dd4 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -SUBTYPE P Consumer +T := Int +P <: Consumer type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.constraints index 960d36fb28b..55f677f6ddb 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -SUBTYPE P Consumer +T := Int +P <: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.bounds index 5e12daa2b73..cdc2b78a7ff 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -SUPERTYPE P Consumer +T := Int +P >: Consumer type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.constraints index b9b310e4a6d..09f513cc7b4 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -SUPERTYPE P Consumer +T := Int +P >: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.bounds index f09b862aa25..f28d713b932 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -EQUAL P Consumer +T <: Int +P := Consumer type parameter bounds: T <: Int, <: Int? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.constraints index 7c34b1d8080..5271ac8ec41 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -EQUAL P Consumer +T <: Int +P := Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.bounds index 56aacfab893..3cf761b0bbc 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P Consumer +T <: Int +P <: Consumer type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.constraints index 10ace6ad50f..ae64ed7c915 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P Consumer +T <: Int +P <: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.bounds index 0cde5ba6e85..22e08657fce 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUPERTYPE P Consumer +T <: Int +P >: Consumer type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.constraints index ae5462e8c59..5ed24171e25 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUPERTYPE P Consumer +T <: Int +P >: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.bounds index 3da6d94e777..198d5797635 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -EQUAL P Consumer +T >: Int +P := Consumer type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.constraints index ae38a91ed57..af1292bcb12 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -EQUAL P Consumer +T >: Int +P := Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.bounds index e89d4a562fc..f8802073cf1 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -SUBTYPE P Consumer +T >: Int +P <: Consumer type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.constraints index b100806bf89..c40e9e4214e 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -SUBTYPE P Consumer +T >: Int +P <: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.bounds index b495badd3a4..a26fb134d3e 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -SUPERTYPE P Consumer +T >: Int +P >: Consumer type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.constraints index dffa79e2c6b..154953e0dc0 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -SUPERTYPE P Consumer +T >: Int +P >: Consumer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.bounds index 357b1270a3e..2dce152d14c 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -EQUAL P Producer +T := Int +P := Producer type parameter bounds: T := Int, >: Int, <: Int? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.constraints index 6948d6c0b3b..c26a6ffd4e8 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -EQUAL P Producer +T := Int +P := Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.bounds index 3d01d408444..494df6e0593 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -SUBTYPE P Producer +T := Int +P <: Producer type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.constraints index a505a22a8b6..05b999bba72 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -SUBTYPE P Producer +T := Int +P <: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.bounds index c22ace7b431..3274bad3c3a 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -SUPERTYPE P Producer +T := Int +P >: Producer type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.constraints index 7220d3f21a0..696c4319d1d 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -SUPERTYPE P Producer +T := Int +P >: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.bounds index b0c6573afd0..01c64e2e871 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -EQUAL P Producer +T <: Int +P := Producer type parameter bounds: T <: Int, <: Int? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.constraints index b22b4c68253..bca5d5feb30 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -EQUAL P Producer +T <: Int +P := Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.bounds index 4036de96dea..bc211c8a178 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P Producer +T <: Int +P <: Producer type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.constraints index 7bd66f85cd3..7a0eaffde51 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P Producer +T <: Int +P <: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.bounds index 0894f51acb5..0205bd703c2 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUPERTYPE P Producer +T <: Int +P >: Producer type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.constraints index f68d9fc5a41..d0250712a47 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUPERTYPE P Producer +T <: Int +P >: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.bounds index ac9716b151d..b605afccf08 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -EQUAL P Producer +T >: Int +P := Producer type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.constraints index 6257394ddff..514bbd7d40c 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -EQUAL P Producer +T >: Int +P := Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.bounds index 42576564a78..0c89b4904be 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -SUBTYPE P Producer +T >: Int +P <: Producer type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.constraints index a1f80514814..a38123fd422 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -SUBTYPE P Producer +T >: Int +P <: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.bounds index 65fd417579b..a0983242baa 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -SUPERTYPE P Producer +T >: Int +P >: Producer type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.constraints index 2b1331f8bed..3e222362b82 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -SUPERTYPE P Producer +T >: Int +P >: Producer diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.bounds index 72fb56675de..a58d69765d7 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -EQUAL P My +T := Int +P := My type parameter bounds: T := Int, >: Int, <: Int? diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.constraints index 88264911d2c..84f297651e6 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -EQUAL P My +T := Int +P := My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.bounds index 1fdc719c1bf..edd6bb74e33 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -SUBTYPE P My +T := Int +P <: My type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.constraints index 197a280d8ff..d37a697ae35 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -SUBTYPE P My +T := Int +P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.bounds index 35370ceea94..84bd8e2f19b 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T Int -SUPERTYPE P My +T := Int +P >: My type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.constraints index cf7a4a42f5a..f693412f981 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T Int -SUPERTYPE P My +T := Int +P >: My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.bounds index e8c1cc16eba..109e639b135 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -EQUAL P My +T <: Int +P := My type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.constraints index ff5bbb95a3e..5fd3076befd 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -EQUAL P My +T <: Int +P := My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.bounds index 5bbd2622220..1398031e1db 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P My +T <: Int +P <: My type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.constraints index 47a4cbb90f6..1814a0991d0 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P My +T <: Int +P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.bounds index e4685fb8780..b6bd04c1ee7 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUPERTYPE P My +T <: Int +P >: My type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.constraints index 3c9bb446453..7b6aad251dc 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUPERTYPE P My +T <: Int +P >: My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.bounds index 64218af7abd..364a456010a 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -EQUAL P My +T >: Int +P := My type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.constraints index 1065f6916e5..e6f0b95000a 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -EQUAL P My +T >: Int +P := My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.bounds index dec3f74f059..812cef1a783 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -SUBTYPE P My +T >: Int +P <: My type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.constraints index 841df121682..f78eb65acfe 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -SUBTYPE P My +T >: Int +P <: My diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.bounds index e0a2bd62868..bbe55fa05f8 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE T Int -SUPERTYPE P My +T >: Int +P >: My type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.constraints index 2ec50dca2bc..003e8f08470 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE T Int -SUPERTYPE P My +T >: Int +P >: My diff --git a/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.bounds b/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.bounds index b3338f2d3ef..2b7abe5e0fb 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.bounds +++ b/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T? P? -SUBTYPE P Int +T? <: P? +P <: Int type parameter bounds: T <: P?*, <: P*, <: Int, <: Int? diff --git a/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.constraints b/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.constraints index df99da1ee94..673300163fa 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.constraints +++ b/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T? P? -SUBTYPE P Int +T? <: P? +P <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.bounds index d91e89886b7..0981df3ed2a 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.bounds +++ b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE Int T -EQUAL P Consumer> +Int <: T +P := Consumer> type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.constraints b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.constraints index 11a84f8f0bf..2bcb86860f2 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.constraints +++ b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE Int T -EQUAL P Consumer> \ No newline at end of file +Int <: T +P := Consumer> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.bounds index e2c18c29f81..a2a48f29dd7 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.bounds +++ b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE Int T -SUBTYPE P Consumer>> +Int <: T +P <: Consumer>> type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.constraints b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.constraints index 37ec32c12f6..42efc5e0b40 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.constraints +++ b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE Int T -SUBTYPE P Consumer>> \ No newline at end of file +Int <: T +P <: Consumer>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.bounds index bffb550873a..075eb977f1d 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.bounds +++ b/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE Int T -SUBTYPE P My>> +Int <: T +P <: My>> type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.constraints b/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.constraints index 9550d7f43e8..9106bea3942 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.constraints +++ b/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE Int T -SUBTYPE P My>> \ No newline at end of file +Int <: T +P <: My>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.bounds index 842dc6ea2a4..954ba31220b 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.bounds +++ b/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P My>> +T <: Int +P <: My>> type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.constraints b/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.constraints index cf13d9fe377..adddfa74b0a 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.constraints +++ b/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P My>> \ No newline at end of file +T <: Int +P <: My>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.bounds index 17b2a13fe09..02bb5b42f4b 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.bounds +++ b/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P Producer>> +T <: Int +P <: Producer>> type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.constraints b/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.constraints index ac48c96fd07..a6504127d85 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.constraints +++ b/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P Producer>> \ No newline at end of file +T <: Int +P <: Producer>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.bounds index 2d574cc3282..8a228f73979 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.bounds +++ b/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE Int T -SUBTYPE P Producer>> +Int <: T +P <: Producer>> type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.constraints b/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.constraints index 5b65fe00289..ee92ca64885 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.constraints +++ b/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE Int T -SUBTYPE P Producer>> +Int <: T +P <: Producer>> diff --git a/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.bounds b/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.bounds index c8f586e0643..2b703b86732 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.bounds +++ b/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P Fun,Producer> +T <: Int +P <: Fun,Producer> type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.constraints b/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.constraints index 21995bde4f7..61c4ed5cfcf 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.constraints +++ b/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P Fun,Producer> \ No newline at end of file +T <: Int +P <: Fun,Producer> diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleFun.bounds b/compiler/testData/constraintSystem/severalVariables/other/simpleFun.bounds index 14722a37620..0bb4a19c34c 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleFun.bounds +++ b/compiler/testData/constraintSystem/severalVariables/other/simpleFun.bounds @@ -1,13 +1,13 @@ VARIABLES T P E -SUBTYPE Int T -SUBTYPE P String -SUBTYPE E Fun +Int <: T +P <: String +E <: Fun type parameter bounds: T >: Int P <: String -E <: Fun*, <: Fun +E <: Fun*, <: Fun*, <: Fun, <: Fun* status: -hasCannotCaptureTypesError: false @@ -23,4 +23,4 @@ status: result: T=Int P=String -E=Fun +E=Fun \ No newline at end of file diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleFun.constraints b/compiler/testData/constraintSystem/severalVariables/other/simpleFun.constraints index 29ac24ec9fe..cc3233beeec 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleFun.constraints +++ b/compiler/testData/constraintSystem/severalVariables/other/simpleFun.constraints @@ -1,5 +1,5 @@ VARIABLES T P E -SUBTYPE Int T -SUBTYPE P String -SUBTYPE E Fun \ No newline at end of file +Int <: T +P <: String +E <: Fun diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.bounds b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.bounds index 6f1826c443c..1f5b59f30f9 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.bounds +++ b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.bounds @@ -1,8 +1,8 @@ VARIABLES T P E -SUBTYPE T P -SUBTYPE P E -SUBTYPE E Int +T <: P +P <: E +E <: Int type parameter bounds: T <: P*, <: E*, <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.constraints b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.constraints index f41341a3ef0..50616113b85 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.constraints +++ b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.constraints @@ -1,5 +1,5 @@ VARIABLES T P E -SUBTYPE T P -SUBTYPE P E -SUBTYPE E Int +T <: P +P <: E +E <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.bounds b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.bounds index 8dbddcf9c42..b4e6f9195b4 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.bounds +++ b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.bounds @@ -1,8 +1,8 @@ VARIABLES T P E -SUBTYPE T P -SUBTYPE P E -SUBTYPE Int E +T <: P +P <: E +Int <: E type parameter bounds: T <: P*, <: E* diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.constraints b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.constraints index 0c5479367b1..4ffb5c15c74 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.constraints +++ b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.constraints @@ -1,5 +1,5 @@ VARIABLES T P E -SUBTYPE T P -SUBTYPE P E -SUBTYPE Int E +T <: P +P <: E +Int <: E diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.bounds b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.bounds index 9647fc7cf43..fb24c3779eb 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.bounds +++ b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.bounds @@ -1,9 +1,9 @@ VARIABLES T P E FIX_VARIABLES -SUBTYPE T P -SUBTYPE P E -SUBTYPE Int E +T <: P +P <: E +Int <: E type parameter bounds: T <: P*, <: E*, <: Int, := Int diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.constraints b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.constraints index 83e149c9e95..e926273422b 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.constraints +++ b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.constraints @@ -1,6 +1,6 @@ VARIABLES T P E FIX_VARIABLES -SUBTYPE T P -SUBTYPE P E -SUBTYPE Int E +T <: P +P <: E +Int <: E diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.bounds b/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.bounds index ddc2b06e136..b3fced08758 100644 --- a/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.bounds +++ b/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.bounds @@ -1,8 +1,8 @@ VARIABLES T P E -SUBTYPE T Producer

-SUBTYPE P Producer -SUBTYPE E Producer

+T <: Producer

+P <: Producer +E <: Producer

type parameter bounds: T <: Producer

*, <: Producer>*, <: Producer>>* diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.constraints b/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.constraints index da4f2840fc4..beb7ef775e1 100644 --- a/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.constraints +++ b/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.constraints @@ -1,5 +1,5 @@ VARIABLES T P E -SUBTYPE T Producer

-SUBTYPE P Producer -SUBTYPE E Producer

+T <: Producer

+P <: Producer +E <: Producer

diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.bounds b/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.bounds index eba72e6eaf5..3865153b06b 100644 --- a/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.bounds +++ b/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL T My

-EQUAL P Two +T := My

+P := Two type parameter bounds: T := My

* diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.constraints b/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.constraints index 67356268c6e..2ed17521412 100644 --- a/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.constraints +++ b/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL T My

-EQUAL P Two +T := My

+P := Two diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.bounds b/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.bounds index cf7d6634fcd..1648e2c0267 100644 --- a/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.bounds +++ b/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.bounds @@ -1,7 +1,7 @@ VARIABLES T -EQUAL T Int -EQUAL T My +T := Int +T := My type parameter bounds: T := Int, := My*, := My diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.constraints b/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.constraints index 855ddd3e6d8..b9aa0ae37c9 100644 --- a/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.constraints +++ b/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.constraints @@ -1,4 +1,4 @@ VARIABLES T -EQUAL T Int -EQUAL T My +T := Int +T := My diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.bounds index cf98cfe1213..1795c416d39 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL P Consumer -EQUAL T Int +P := Consumer +T := Int type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.constraints index 8d549c39c52..87ad3fd3433 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL P Consumer -EQUAL T Int +P := Consumer +T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.bounds index 18ee276ac16..401fd9530fd 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE P Consumer -EQUAL T Int +P <: Consumer +T := Int type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.constraints index ec2fdfb23cf..351d8eaf131 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE P Consumer -EQUAL T Int +P <: Consumer +T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.bounds index eb228db31bb..2a742d23c3a 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE P Consumer -EQUAL T Int +P >: Consumer +T := Int type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.constraints index 988014d00a0..369da5efafd 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE P Consumer -EQUAL T Int +P >: Consumer +T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.bounds index f674e15203a..a149983ad25 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL P Consumer -SUBTYPE T Int +P := Consumer +T <: Int type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.constraints index 1108481bcc7..32270663ab3 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL P Consumer -SUBTYPE T Int +P := Consumer +T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.bounds index a30bca567b7..389ff911b14 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE P Consumer -SUBTYPE T Int +P <: Consumer +T <: Int type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.constraints index f6b480df105..554dba141ff 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE P Consumer -SUBTYPE T Int +P <: Consumer +T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.bounds index 56f9a03afcf..99b6278f3a9 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE P Consumer -SUBTYPE T Int +P >: Consumer +T <: Int type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.constraints index ba5d75b2383..133d23b9695 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE P Consumer -SUBTYPE T Int +P >: Consumer +T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.bounds index 45500b013ed..56d84654e41 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL P Consumer -SUPERTYPE T Int +P := Consumer +T >: Int type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.constraints index 987c65f823a..bc5ef67d057 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL P Consumer -SUPERTYPE T Int +P := Consumer +T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.bounds index 67b60d1479f..96d7264ad3b 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE P Consumer -SUPERTYPE T Int +P <: Consumer +T >: Int type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.constraints index 6cd684ec46d..8aa51d752f8 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE P Consumer -SUPERTYPE T Int +P <: Consumer +T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.bounds index 6fc17a3171a..2a8fe671e57 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE P Consumer -SUPERTYPE T Int +P >: Consumer +T >: Int type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.constraints index 39ed31fc197..5508d75c40b 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE P Consumer -SUPERTYPE T Int +P >: Consumer +T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.bounds index 3c66b80507d..a3773af2958 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL P Producer -EQUAL T Int +P := Producer +T := Int type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.constraints index bf63226aebd..e7fb378f929 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL P Producer -EQUAL T Int +P := Producer +T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.bounds index 749c66cfa9a..0d8ad2b94ac 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE P Producer -EQUAL T Int +P <: Producer +T := Int type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.constraints index dfe4439d966..29dd6ed603c 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE P Producer -EQUAL T Int +P <: Producer +T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.bounds index eb1157e8521..300b1ea3056 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE P Producer -EQUAL T Int +P >: Producer +T := Int type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.constraints index 40fe9f33785..ef7338d2564 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE P Producer -EQUAL T Int +P >: Producer +T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.bounds index e58fbc75207..9fa78404a59 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL P Producer -SUBTYPE T Int +P := Producer +T <: Int type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.constraints index f36cf11bb11..fb8e245ccf5 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL P Producer -SUBTYPE T Int +P := Producer +T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.bounds index 04f286917b3..01a5fec3d57 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE P Producer -SUBTYPE T Int +P <: Producer +T <: Int type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.constraints index adfb3431ffd..2d0376eff10 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE P Producer -SUBTYPE T Int +P <: Producer +T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.bounds index 023ece28e13..c0813347848 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE P Producer -SUBTYPE T Int +P >: Producer +T <: Int type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.constraints index 5d73d96277c..b917df226fe 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE P Producer -SUBTYPE T Int +P >: Producer +T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.bounds index 0885b3d60bc..4207c874b2f 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL P Producer -SUPERTYPE T Int +P := Producer +T >: Int type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.constraints index aee017d21bc..ef9b6856bc2 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL P Producer -SUPERTYPE T Int +P := Producer +T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.bounds index ad45ed7c6db..8ae260d9c7c 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE P Producer -SUPERTYPE T Int +P <: Producer +T >: Int type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.constraints index ee18e2cfff3..c59156c590c 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE P Producer -SUPERTYPE T Int +P <: Producer +T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.bounds index d3157cb8c0e..8d7e1902c21 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE P Producer -SUPERTYPE T Int +P >: Producer +T >: Int type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.constraints index 154bc6eccfb..225dedbb5ee 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE P Producer -SUPERTYPE T Int +P >: Producer +T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.bounds index ecedf08544c..22b57745b7b 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL P My -EQUAL T Int +P := My +T := Int type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.constraints index 2ab72319604..4d2c01477ce 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL P My -EQUAL T Int +P := My +T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.bounds index 81a682e5ca7..d87dd002dc8 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE P My -EQUAL T Int +P <: My +T := Int type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.constraints index 0e4e6decd53..82eb3f24f17 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE P My -EQUAL T Int +P <: My +T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.bounds index 8f22965c275..cb319b51e66 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE P My -EQUAL T Int +P >: My +T := Int type parameter bounds: T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.constraints index ff801041f1a..579046f1a40 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE P My -EQUAL T Int +P >: My +T := Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.bounds index e518963ba10..48e44a1583b 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL P My -SUBTYPE T Int +P := My +T <: Int type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.constraints index cc25624bebb..77fa46314fd 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL P My -SUBTYPE T Int +P := My +T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.bounds index 5c15de74f7f..8b737201b99 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE P My -SUBTYPE T Int +P <: My +T <: Int type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.constraints index 8d20982d465..3ec171fd99d 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE P My -SUBTYPE T Int +P <: My +T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.bounds index 7aa3f6787f1..bc766a0170e 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE P My -SUBTYPE T Int +P >: My +T <: Int type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.constraints index 58df9d3ee81..51521bac5f5 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE P My -SUBTYPE T Int +P >: My +T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.bounds index 6dfc882fe47..43a0a302b7c 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.bounds @@ -1,7 +1,7 @@ VARIABLES T P -EQUAL P My -SUPERTYPE T Int +P := My +T >: Int type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.constraints index 21247db3972..855195c6593 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.constraints @@ -1,4 +1,4 @@ VARIABLES T P -EQUAL P My -SUPERTYPE T Int +P := My +T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.bounds index 39072b45d84..8f6fa7723b7 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE P My -SUPERTYPE T Int +P <: My +T >: Int type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.constraints index 35025b0d1b7..cb57ae20f53 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE P My -SUPERTYPE T Int +P <: My +T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.bounds index 631127ad0af..47a058f35a9 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUPERTYPE P My -SUPERTYPE T Int +P >: My +T >: Int type parameter bounds: T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.constraints b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.constraints index 8679f0410bf..57f94b389e7 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.constraints +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUPERTYPE P My -SUPERTYPE T Int +P >: My +T >: Int diff --git a/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds b/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds index 3d719cd2c9c..16181e690db 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds @@ -1,6 +1,6 @@ VARIABLES T P -SUBTYPE T Int +T <: Int type parameter bounds: T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/simpleDependency.constraints b/compiler/testData/constraintSystem/severalVariables/simpleDependency.constraints index 4c5f7e33f88..edc91fdd59c 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleDependency.constraints +++ b/compiler/testData/constraintSystem/severalVariables/simpleDependency.constraints @@ -1,3 +1,3 @@ VARIABLES T P -SUBTYPE T Int \ No newline at end of file +T <: Int diff --git a/compiler/testData/constraintSystem/severalVariables/simpleEquality.bounds b/compiler/testData/constraintSystem/severalVariables/simpleEquality.bounds index 7290a18d89e..cd17ade2378 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleEquality.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleEquality.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -EQUAL T P +T <: Int +T := P type parameter bounds: T <: Int, := P* diff --git a/compiler/testData/constraintSystem/severalVariables/simpleEquality.constraints b/compiler/testData/constraintSystem/severalVariables/simpleEquality.constraints index b34fd87f315..4a053567d4c 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleEquality.constraints +++ b/compiler/testData/constraintSystem/severalVariables/simpleEquality.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -EQUAL T P +T <: Int +T := P diff --git a/compiler/testData/constraintSystem/severalVariables/simpleEquality1.bounds b/compiler/testData/constraintSystem/severalVariables/simpleEquality1.bounds index c9d7700b5bc..838f4ec7630 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleEquality1.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleEquality1.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE Int T -EQUAL T P +Int <: T +T := P type parameter bounds: T >: Int, := P* diff --git a/compiler/testData/constraintSystem/severalVariables/simpleEquality1.constraints b/compiler/testData/constraintSystem/severalVariables/simpleEquality1.constraints index e395d91e7d8..c048debe4f8 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleEquality1.constraints +++ b/compiler/testData/constraintSystem/severalVariables/simpleEquality1.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE Int T -EQUAL T P +Int <: T +T := P diff --git a/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.bounds b/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.bounds index 5c91ddf5be8..cf9fc0fa44a 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE T P +T <: Int +T <: P type parameter bounds: T <: Int, <: P* diff --git a/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.constraints b/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.constraints index 6823743fa36..990c06be17a 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.constraints +++ b/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE T P +T <: Int +T <: P diff --git a/compiler/testData/constraintSystem/severalVariables/simpleSubtype.bounds b/compiler/testData/constraintSystem/severalVariables/simpleSubtype.bounds index 35f2e2d172b..f3c152d1d39 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleSubtype.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleSubtype.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P T +T <: Int +P <: T type parameter bounds: T <: Int, >: P* diff --git a/compiler/testData/constraintSystem/severalVariables/simpleSubtype.constraints b/compiler/testData/constraintSystem/severalVariables/simpleSubtype.constraints index 902c73f7a6a..4c33878795e 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleSubtype.constraints +++ b/compiler/testData/constraintSystem/severalVariables/simpleSubtype.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE T Int -SUBTYPE P T +T <: Int +P <: T diff --git a/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.bounds b/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.bounds index 806f684e0f6..43f191ef7b0 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.bounds @@ -1,7 +1,7 @@ VARIABLES T P -SUBTYPE Int T -SUBTYPE T P +Int <: T +T <: P type parameter bounds: T >: Int, <: P* diff --git a/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.constraints b/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.constraints index 68687efd421..7953a434603 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.constraints +++ b/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.constraints @@ -1,4 +1,4 @@ VARIABLES T P -SUBTYPE Int T -SUBTYPE T P +Int <: T +T <: P diff --git a/compiler/testData/constraintSystem/variance/consumer.bounds b/compiler/testData/constraintSystem/variance/consumer.bounds index eb8ee755b49..c240da76aad 100644 --- a/compiler/testData/constraintSystem/variance/consumer.bounds +++ b/compiler/testData/constraintSystem/variance/consumer.bounds @@ -1,6 +1,6 @@ VARIABLES T -SUBTYPE Consumer Consumer +Consumer <: Consumer type parameter bounds: T <: A diff --git a/compiler/testData/constraintSystem/variance/consumer.constraints b/compiler/testData/constraintSystem/variance/consumer.constraints index aa4ca88a3ee..7c8111bd7cb 100644 --- a/compiler/testData/constraintSystem/variance/consumer.constraints +++ b/compiler/testData/constraintSystem/variance/consumer.constraints @@ -1,3 +1,3 @@ VARIABLES T -SUBTYPE Consumer Consumer \ No newline at end of file +Consumer <: Consumer diff --git a/compiler/testData/constraintSystem/variance/invariant.bounds b/compiler/testData/constraintSystem/variance/invariant.bounds index 1012e4008c9..01e9e36d310 100644 --- a/compiler/testData/constraintSystem/variance/invariant.bounds +++ b/compiler/testData/constraintSystem/variance/invariant.bounds @@ -1,6 +1,6 @@ VARIABLES T -SUBTYPE My My +My <: My type parameter bounds: T := A diff --git a/compiler/testData/constraintSystem/variance/invariant.constraints b/compiler/testData/constraintSystem/variance/invariant.constraints index cb2df5faa67..239de367350 100644 --- a/compiler/testData/constraintSystem/variance/invariant.constraints +++ b/compiler/testData/constraintSystem/variance/invariant.constraints @@ -1,3 +1,3 @@ VARIABLES T -SUBTYPE My My \ No newline at end of file +My <: My diff --git a/compiler/testData/constraintSystem/variance/producer.bounds b/compiler/testData/constraintSystem/variance/producer.bounds index e13388ee294..583b68e8847 100644 --- a/compiler/testData/constraintSystem/variance/producer.bounds +++ b/compiler/testData/constraintSystem/variance/producer.bounds @@ -1,6 +1,6 @@ VARIABLES T -SUBTYPE Producer Producer +Producer <: Producer type parameter bounds: T >: A diff --git a/compiler/testData/constraintSystem/variance/producer.constraints b/compiler/testData/constraintSystem/variance/producer.constraints index 2044f7f1535..a9efb4e6e39 100644 --- a/compiler/testData/constraintSystem/variance/producer.constraints +++ b/compiler/testData/constraintSystem/variance/producer.constraints @@ -1,3 +1,3 @@ VARIABLES T -SUBTYPE Producer Producer \ No newline at end of file +Producer <: Producer diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt index e554e2b80ec..d1031c6d7fd 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt @@ -17,30 +17,24 @@ package org.jetbrains.kotlin.resolve.constraintSystem import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment -import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.diagnostics.rendering.Renderers import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.resolve.TypeResolver import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.SPECIAL -import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.TYPE_BOUND_POSITION import org.jetbrains.kotlin.resolve.calls.inference.registerTypeVariables import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.JetLiteFixture import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.tests.di.createContainerForTests +import org.jetbrains.kotlin.types.ErrorUtils +import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.types.Variance import java.io.File import java.util.ArrayList -import java.util.LinkedHashMap -import java.util.regex.Pattern abstract public class AbstractConstraintSystemTest() : JetLiteFixture() { - private val typePattern = """([\w|<|\,|>|?|\(|\)]+)""" - val constraintPattern = Pattern.compile("""(SUBTYPE|SUPERTYPE|EQUAL)\s+$typePattern\s+$typePattern\s*(weak)?""") - val variablesPattern = Pattern.compile("VARIABLES\\s+(.*)") - val fixVariablesPattern = "FIX_VARIABLES" private var _typeResolver: TypeResolver? = null private val typeResolver: TypeResolver @@ -72,7 +66,7 @@ abstract public class AbstractConstraintSystemTest() : JetLiteFixture() { } private fun analyzeDeclarations(): ConstraintSystemTestData { - val fileName = "declarations/declarations.kt" + val fileName = "declarations.kt" val psiFile = createPsiFile(null, fileName, loadFile(fileName))!! val bindingContext = JvmResolveUtil.analyzeOneFileWithJavaIntegrationAndCheckForErrors(psiFile).bindingContext @@ -81,24 +75,29 @@ abstract public class AbstractConstraintSystemTest() : JetLiteFixture() { public fun doTest(filePath: String) { val constraintsFile = File(filePath) - val constraintsFileText = JetTestUtils.doLoadFile(constraintsFile)!! + val constraintsFileText = constraintsFile.readLines() val constraintSystem = ConstraintSystemImpl() val variables = parseVariables(constraintsFileText) - val fixVariables = constraintsFileText.contains(fixVariablesPattern) + val fixVariables = constraintsFileText.contains("FIX_VARIABLES") val typeParameterDescriptors = variables.map { testDeclarations.getParameterDescriptor(it) } constraintSystem.registerTypeVariables(typeParameterDescriptors, { Variance.INVARIANT }) val constraints = parseConstraints(constraintsFileText) + fun JetType.assertNotError(): JetType { + assert(!ErrorUtils.containsErrorType(this)) { "Type $this is resolved to or contains error type" } + return this + } for (constraint in constraints) { - val firstType = testDeclarations.getType(constraint.firstType) - val secondType = testDeclarations.getType(constraint.secondType) - val position = if (constraint.isWeak) TYPE_BOUND_POSITION.position(0) else SPECIAL.position() + val firstType = testDeclarations.getType(constraint.firstType).assertNotError() + val secondType = testDeclarations.getType(constraint.secondType).assertNotError() + val position = SPECIAL.position() when (constraint.kind) { MyConstraintKind.SUBTYPE -> constraintSystem.addSubtypeConstraint(firstType, secondType, position) MyConstraintKind.SUPERTYPE -> constraintSystem.addSupertypeConstraint(firstType, secondType, position) - MyConstraintKind.EQUAL -> constraintSystem.addConstraint(ConstraintSystemImpl.ConstraintKind.EQUAL, firstType, secondType, position, topLevel = true) + MyConstraintKind.EQUAL -> constraintSystem.addConstraint( + ConstraintSystemImpl.ConstraintKind.EQUAL, firstType, secondType, position, topLevel = true) } } if (fixVariables) constraintSystem.fixVariables() @@ -109,38 +108,37 @@ abstract public class AbstractConstraintSystemTest() : JetLiteFixture() { val result = typeParameterDescriptors.map { val parameterType = testDeclarations.getType(it.getName().asString()) val resultType = resultingSubstitutor.substitute(parameterType, Variance.INVARIANT) - "${it.getName()}=${resultType?.let{ DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(it) }}" + "${it.getName()}=${resultType?.let { DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(it) }}" }.join("\n", prefix = "result:\n") val boundsFile = File(filePath.replace("constraints", "bounds")) - JetTestUtils.assertEqualsToFile(boundsFile, "$constraintsFileText\n\n$resultingStatus\n\n$result") + JetTestUtils.assertEqualsToFile(boundsFile, "${constraintsFileText.join("\n")}\n\n$resultingStatus\n\n$result") } - class MyConstraint(val kind: MyConstraintKind, val firstType: String, val secondType: String, val isWeak: Boolean) - enum class MyConstraintKind { - SUBTYPE, SUPERTYPE, EQUAL + class MyConstraint(val kind: MyConstraintKind, val firstType: String, val secondType: String) + enum class MyConstraintKind + private constructor(val token: String) { + SUBTYPE("<:"), SUPERTYPE(">:"), EQUAL(":=") } - private fun parseVariables(text: String): List { - val matcher = variablesPattern.matcher(text) - if (matcher.find()) { - val variablesText = matcher.group(1)!! - val variables = variablesText.split(' ') - return variables.toList() + private fun parseVariables(lines: List): List { + val first = lines.first() + val variablesString = "VARIABLES " + assert (first.startsWith(variablesString)) { "The first line should contain variables: $first"} + val variables = first.substringAfter(variablesString).split(' ') + return variables.toList() + } + + private fun parseConstraints(lines: List): List { + val kindsMap = MyConstraintKind.values().map { it.token to it }.toMap() + val kinds = kindsMap.keySet() + val linesWithConstraints = lines.filter { line -> kinds.any { kind -> line.contains(kind) } } + return linesWithConstraints.map { + line -> + val kind = kinds.first { line.contains(it) } + val firstType = line.substringBefore(kind).trim() + val secondType = line.substringAfter(kind).trim() + MyConstraint(kindsMap[kind]!!, firstType, secondType) } - throw AssertionError("Type variable names should be declared") - } - - private fun parseConstraints(text: String): List { - val constraints = ArrayList() - val matcher = constraintPattern.matcher(text) - while (matcher.find()) { - val kind = MyConstraintKind.valueOf(matcher.group(1)!!) - val firstType = matcher.group(2)!! - val secondType = matcher.group(3)!! - val isWeak = matcher.groupCount() == 4 && matcher.group(4) == "weak" - constraints.add(MyConstraint(kind, firstType, secondType, isWeak)) - } - return constraints } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt index c47ab6ae95b..fecd1623b5c 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt @@ -52,7 +52,7 @@ public class ConstraintSystemTestData( fun getParameterDescriptor(name: String): TypeParameterDescriptor { return functionFoo.getTypeParameters().firstOrNull { it.getName().asString() == name } ?: - throw AssertionError("Unsupported type parameter name: " + name + ".") + throw AssertionError("Unsupported type parameter name: $name. You may add it to constraintSystem/declarations.kt") } fun getType(name: String): JetType { diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java index 8ccbd2d42c1..4df6fba0cd3 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java @@ -66,12 +66,6 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/unknownParameters.constraints"); doTest(fileName); } - - @TestMetadata("violatedUpperBound.constraints") - public void testViolatedUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/violatedUpperBound.constraints"); - doTest(fileName); - } } @TestMetadata("compiler/testData/constraintSystem/computeValues")