From 0b3437861067c50ccc64155f00672f2a7eac6f64 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 19 Mar 2013 15:27:13 +0400 Subject: [PATCH] Removed JetTupleExpression. --- .../jet/lang/cfg/JetControlFlowProcessor.java | 8 ---- .../jet/lang/psi/JetTupleExpression.java | 47 ------------------- .../jetbrains/jet/lang/psi/JetVisitor.java | 5 -- .../jet/lang/psi/JetVisitorVoid.java | 5 -- .../BasicExpressionTypingVisitor.java | 6 --- 5 files changed, 71 deletions(-) delete mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java index 8595d62cf24..630ff2c390a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -743,14 +743,6 @@ public class JetControlFlowProcessor { processLocalDeclaration(accessor); } - @Override - public void visitTupleExpression(JetTupleExpression expression) { - for (JetExpression entry : expression.getEntries()) { - generateInstructions(entry, false); - } - builder.read(expression); - } - @Override public void visitBinaryWithTypeRHSExpression(JetBinaryExpressionWithTypeRHS expression) { IElementType operationType = expression.getOperationSign().getReferencedNameElementType(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java deleted file mode 100644 index 524a553455c..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTupleExpression.java +++ /dev/null @@ -1,47 +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 com.intellij.psi.util.PsiTreeUtil; -import org.jetbrains.annotations.NotNull; - -import java.util.List; - -@Deprecated // Tuples are to be removed in Kotlin M4 -public class JetTupleExpression extends JetExpressionImpl { - - @Deprecated // Tuples are to be removed in Kotlin M4 - public JetTupleExpression(@NotNull ASTNode node) { - super(node); - } - - @Override - public void accept(@NotNull JetVisitorVoid visitor) { - visitor.visitTupleExpression(this); - } - - @Override - public R accept(@NotNull JetVisitor visitor, D data) { - return visitor.visitTupleExpression(this, data); - } - - @Deprecated // Tuples are to be removed in Kotlin M4 - public List getEntries() { - return PsiTreeUtil.getChildrenOfTypeAsList(this, JetExpression.class); - } -} 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 6fd1e441a77..b2dd04a8477 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java @@ -161,11 +161,6 @@ public class JetVisitor extends PsiElementVisitor { return visitExpression(expression, data); } - @Deprecated // Tuples are to be removed in Kotlin M4 - public R visitTupleExpression(JetTupleExpression expression, D data) { - return visitExpression(expression, data); - } - public R visitPrefixExpression(JetPrefixExpression expression, D data) { return visitUnaryExpression(expression, 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 164e3d8404f..e331a2b5d87 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java @@ -151,11 +151,6 @@ public class JetVisitorVoid extends PsiElementVisitor { visitExpression(expression); } - @Deprecated // Tuples are to be removed in Kotlin M4 - public void visitTupleExpression(JetTupleExpression expression) { - visitExpression(expression); - } - public void visitPrefixExpression(JetPrefixExpression expression) { visitUnaryExpression(expression); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index a13fa26f35a..c59cf1811b1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -362,12 +362,6 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { return false; } - @Override - public JetTypeInfo visitTupleExpression(JetTupleExpression expression, ExpressionTypingContext context) { - // TODO: remove this method completely when tuples are droppped - throw new IllegalStateException("Tuples are not supported: " + expression.getText()); - } - @NotNull private List checkArgumentTypes(@NotNull List argumentTypes, @NotNull List arguments, @NotNull List expectedArgumentTypes, @NotNull ExpressionTypingContext context) { if (arguments.size() == 0 || argumentTypes.size() != arguments.size() || expectedArgumentTypes.size() != arguments.size()) {