From ca27637ef2ba648b44ad679863afb28308860d3d Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 19 Mar 2013 16:10:21 +0400
Subject: [PATCH] Removed usages of getTuple() and isTupleType()

---
 .../jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java   | 4 ++--
 .../java/kotlinSignature/TypeTransformingVisitor.java        | 3 ++-
 .../org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java    | 5 +++++
 idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java         | 2 +-
 .../jet/plugin/references/BuiltInsReferenceResolver.java     | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java
index d4fdf7e46ed..936e0ca3376 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java
@@ -147,9 +147,9 @@ public class IntrinsicMethods {
         declareIntrinsicProperty(Name.identifier("CharSequence"), Name.identifier("length"), new StringLength());
         declareIntrinsicProperty(Name.identifier("String"), Name.identifier("length"), new StringLength());
 
-        Name tuple0Name = KotlinBuiltIns.getInstance().getTuple(0).getName();
+        Name unitName = KotlinBuiltIns.getInstance().getUnit().getName();
         intrinsicsMap.registerIntrinsic(
-                getClassObjectFqName(tuple0Name),
+                getClassObjectFqName(unitName),
                 Name.identifier("VALUE"), -1, new UnitValue());
 
         for (PrimitiveType type : PrimitiveType.NUMBER_TYPES) {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
index 1fe067442e1..53c0d85bc24 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
@@ -95,8 +95,9 @@ public class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
         String shortName = type.getReferenceExpression().getReferencedName();
         String longName = (qualifier == null ? "" : qualifier.getText() + ".") + shortName;
 
+        // TODO remove this code when Unit will be not a synonym for Tuple0
         if (KotlinBuiltIns.UNIT_ALIAS.getName().equals(longName)) {
-            return visitCommonType(KotlinBuiltIns.getInstance().getTuple(0), type);
+            return visitCommonType(KotlinBuiltIns.getInstance().getUnit(), type);
         }
 
         return visitCommonType(longName, type);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
index 2edc14aaf98..fb1f206ea8f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
@@ -429,6 +429,11 @@ public class KotlinBuiltIns {
         return getBuiltInClassByName("Number");
     }
 
+    @NotNull
+    public ClassDescriptor getUnit() {
+        return getBuiltInClassByName("Tuple0");
+    }
+
     @NotNull
     public ClassDescriptor getFunction(int parameterCount) {
         return getBuiltInClassByName("Function" + parameterCount);
diff --git a/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java b/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java
index c5a9fd57076..15440d2e7a3 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java
+++ b/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java
@@ -54,7 +54,7 @@ public class JetPluginUtil {
 
     public static boolean checkTypeIsStandard(JetType type, Project project) {
         if (KotlinBuiltIns.getInstance().isAny(type) || KotlinBuiltIns.getInstance().isNothingOrNullableNothing(type) || KotlinBuiltIns.getInstance().isUnit(type) ||
-            KotlinBuiltIns.getInstance().isTupleType(type) || KotlinBuiltIns.getInstance().isFunctionOrExtensionFunctionType(type)) {
+             KotlinBuiltIns.getInstance().isFunctionOrExtensionFunctionType(type)) {
             return true;
         }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
index d05bfce9a4f..c79e341bd97 100644
--- a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
+++ b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
@@ -56,7 +56,7 @@ import java.util.List;
 public class BuiltInsReferenceResolver extends AbstractProjectComponent {
     private BindingContext bindingContext = null;
 
-    private final FqName TUPLE0_FQ_NAME = DescriptorUtils.getFQName(KotlinBuiltIns.getInstance().getTuple(0)).toSafe();
+    private final FqName TUPLE0_FQ_NAME = DescriptorUtils.getFQName(KotlinBuiltIns.getInstance().getUnit()).toSafe();
 
     public BuiltInsReferenceResolver(
             Project project,