From d9b6a5c2badf9302b0ac32780d632bda22327561 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 19 Mar 2013 15:25:23 +0400
Subject: [PATCH] Removed JetTupleType.

---
 .../TypeTransformingVisitor.java              |  5 --
 .../jetbrains/jet/lang/psi/JetTupleType.java  | 54 -------------------
 .../jetbrains/jet/lang/psi/JetVisitor.java    |  5 --
 .../jet/lang/psi/JetVisitorVoid.java          |  5 --
 .../jet/lang/resolve/TypeResolver.java        |  6 ---
 5 files changed, 75 deletions(-)
 delete mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTupleType.java

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 1bb679518a7..1fe067442e1 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
@@ -87,11 +87,6 @@ public class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
                 : KotlinBuiltIns.getInstance().getExtensionFunction(type.getParameters().size()), type);
     }
 
-    @Override
-    public JetType visitTupleType(JetTupleType type, Void data) {
-        return visitCommonType(KotlinBuiltIns.getInstance().getTuple(type.getComponentTypeRefs().size()), type);
-    }
-
     @Override
     public JetType visitUserType(JetUserType type, Void data) {
         JetUserType qualifier = type.getQualifier();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTupleType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTupleType.java
deleted file mode 100644
index 683a8bd09a7..00000000000
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTupleType.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.lang.psi;
-
-import com.intellij.lang.ASTNode;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.JetNodeTypes;
-
-import java.util.List;
-
-@Deprecated // Tuples are to be removed in Kotlin M4
-public class JetTupleType extends JetTypeElement {
-
-    @Deprecated // Tuples are to be removed in Kotlin M4
-    public JetTupleType(@NotNull ASTNode node) {
-        super(node);
-    }
-
-    @NotNull
-    @Override
-    public List<JetTypeReference> getTypeArgumentsAsTypes() {
-        return getComponentTypeRefs();
-    }
-
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitTupleType(this);
-    }
-
-    @Override
-    public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
-        return visitor.visitTupleType(this, data);
-    }
-
-    @NotNull
-    @Deprecated // Tuples are to be removed in Kotlin M4
-    public List<JetTypeReference> getComponentTypeRefs() {
-        return findChildrenByType(JetNodeTypes.TYPE_REFERENCE);
-    }
-}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java
index 1ea72f51e5a..6fd1e441a77 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java
@@ -330,11 +330,6 @@ public class JetVisitor<R, D> extends PsiElementVisitor {
         return visitTypeElement(type, data);
     }
 
-    @Deprecated // Tuples are to be removed in Kotlin M4
-    public R visitTupleType(JetTupleType type, D data) {
-        return visitTypeElement(type, data);
-    }
-
     public R visitFunctionType(JetFunctionType type, D data) {
         return visitTypeElement(type, data);
     }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java
index 6ed38047045..164e3d8404f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java
@@ -319,11 +319,6 @@ public class JetVisitorVoid extends PsiElementVisitor {
         visitTypeElement(type);
     }
 
-    @Deprecated // Tuples are to be removed in Kotlin M4
-    public void visitTupleType(JetTupleType type) {
-        visitTypeElement(type);
-    }
-
     public void visitFunctionType(JetFunctionType type) {
         visitTypeElement(type);
     }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
index ebe8d23779f..b3f5ec37689 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
@@ -192,12 +192,6 @@ public class TypeResolver {
                     result[0] = TypeUtils.makeNullable(baseType);
                 }
 
-                @Override
-                public void visitTupleType(JetTupleType type) {
-                    // TODO: remove this method completely when tuples are droppped
-                    throw new IllegalStateException("Tuples are not supported: " + type.getText());
-                }
-
                 @Override
                 public void visitFunctionType(JetFunctionType type) {
                     JetTypeReference receiverTypeRef = type.getReceiverTypeRef();