From 6208bdb6daece2bd18121982bc4e54155f68aca2 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Wed, 26 Dec 2012 14:18:21 +0400
Subject: [PATCH] rename (swap SUB_TYPE and SUPER_TYPE)

---
 .../calls/inference/ConstraintSystemImpl.java | 24 +++++++++----------
 .../calls/inference/TypeConstraintsImpl.java  |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java
index a63372b5d1f..80bd161f20a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java
@@ -146,7 +146,7 @@ public class ConstraintSystemImpl implements ConstraintSystem {
             @Nullable JetType constrainingType,
             @NotNull ConstraintPosition constraintPosition
     ) {
-        addConstraint(SUB_TYPE, subjectType, constrainingType, constraintPosition);
+        addConstraint(SUPER_TYPE, subjectType, constrainingType, constraintPosition);
     }
 
     @Override
@@ -155,7 +155,7 @@ public class ConstraintSystemImpl implements ConstraintSystem {
             @Nullable JetType constrainingType,
             @NotNull ConstraintPosition constraintPosition
     ) {
-        addConstraint(SUPER_TYPE, subjectType, constrainingType, constraintPosition);
+        addConstraint(SUB_TYPE, subjectType, constrainingType, constraintPosition);
     }
 
     private void addConstraint(@NotNull ConstraintKind constraintKind,
@@ -209,7 +209,7 @@ public class ConstraintSystemImpl implements ConstraintSystem {
             return;
         }
         switch (constraintKind) {
-            case SUPER_TYPE: {
+            case SUB_TYPE: {
                 if (KotlinBuiltIns.getInstance().isNothingOrNullableNothing(constrainingType)) break;
                 JetType correspondingSupertype = TypeCheckingProcedure.findCorrespondingSupertype(constrainingType, subjectType);
                 if (correspondingSupertype != null) {
@@ -217,7 +217,7 @@ public class ConstraintSystemImpl implements ConstraintSystem {
                 }
                 break;
             }
-            case SUB_TYPE: {
+            case SUPER_TYPE: {
                 if (KotlinBuiltIns.getInstance().isNothingOrNullableNothing(subjectType)) break;
                 JetType correspondingSupertype = TypeCheckingProcedure.findCorrespondingSupertype(subjectType, constrainingType);
                 if (correspondingSupertype != null) {
@@ -283,10 +283,10 @@ public class ConstraintSystemImpl implements ConstraintSystem {
         if (typeParameterVariance != INVARIANT) {
             varianceForTypeParameter = typeParameterVariance;
         }
-        else if (upperConstraintKind == SUB_TYPE) {
+        else if (upperConstraintKind == SUPER_TYPE) {
             varianceForTypeParameter = constrainingTypeProjection.getProjectionKind();
         }
-        else if (upperConstraintKind == SUPER_TYPE) {
+        else if (upperConstraintKind == SUB_TYPE) {
             varianceForTypeParameter = subjectTypeProjection.getProjectionKind();
         }
         else {
@@ -299,11 +299,11 @@ public class ConstraintSystemImpl implements ConstraintSystem {
     /**
      * Let class {@code MyClass<T, out R, in S>} is declared.<br/><br/>
      *
-     * If upperConstraintKind is SUB_TYPE:
+     * If upperConstraintKind is SUPER_TYPE:
      * {@code MyClass<A, B, C> <: MyClass<D, E, F>}, <br/>
      * then constraints {@code A = D, B <: E, C >: F} are generated. <br/><br/>
      *
-     * If upperConstraintKind is SUPER_TYPE:
+     * If upperConstraintKind is SUB_TYPE:
      * {@code MyClass<A, B, C> >: MyClass<D, E, F>}, <br/>
      * then constraints {@code A = D, B >: E, C <: F} are generated. <br/><br/>
      *
@@ -322,11 +322,11 @@ public class ConstraintSystemImpl implements ConstraintSystem {
         if (upperConstraintKind == EQUAL || typeParameterVariance == INVARIANT) {
             return EQUAL;
         }
-        if ((upperConstraintKind == SUPER_TYPE && typeParameterVariance == OUT_VARIANCE) ||
-            (upperConstraintKind == SUB_TYPE   && typeParameterVariance == IN_VARIANCE)) {
-            return SUPER_TYPE;
+        if ((upperConstraintKind == SUB_TYPE && typeParameterVariance == OUT_VARIANCE) ||
+            (upperConstraintKind == SUPER_TYPE && typeParameterVariance == IN_VARIANCE)) {
+            return SUB_TYPE;
         }
-        return SUB_TYPE;
+        return SUPER_TYPE;
     }
 
     @NotNull
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraintsImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraintsImpl.java
index 4b0ad02b8cf..44baecc3bda 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraintsImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraintsImpl.java
@@ -44,10 +44,10 @@ public class TypeConstraintsImpl implements TypeConstraints {
 
     public void addBound(@NotNull ConstraintKind constraintKind, @NotNull JetType type) {
         switch (constraintKind) {
-            case SUPER_TYPE:
+            case SUB_TYPE:
                 lowerBounds.add(type);
                 break;
-            case SUB_TYPE:
+            case SUPER_TYPE:
                 upperBounds.add(type);
                 break;
             case EQUAL:
@@ -93,6 +93,6 @@ public class TypeConstraintsImpl implements TypeConstraints {
     }
 
     public static enum ConstraintKind {
-        SUB_TYPE, SUPER_TYPE, EQUAL
+        SUPER_TYPE, SUB_TYPE, EQUAL
     }
 }