Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Removed JetTupleType.

  • Loading branch information...
commit d9b6a5c2badf9302b0ac32780d632bda22327561 1 parent 2807664
Evgeny Gerashchenko geevee authored
5 compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
@@ -88,11 +88,6 @@ public JetType visitFunctionType(JetFunctionType type, Void data) {
88 88 }
89 89
90 90 @Override
91   - public JetType visitTupleType(JetTupleType type, Void data) {
92   - return visitCommonType(KotlinBuiltIns.getInstance().getTuple(type.getComponentTypeRefs().size()), type);
93   - }
94   -
95   - @Override
96 91 public JetType visitUserType(JetUserType type, Void data) {
97 92 JetUserType qualifier = type.getQualifier();
98 93
54 compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTupleType.java
... ... @@ -1,54 +0,0 @@
1   -/*
2   - * Copyright 2010-2013 JetBrains s.r.o.
3   - *
4   - * Licensed under the Apache License, Version 2.0 (the "License");
5   - * you may not use this file except in compliance with the License.
6   - * You may obtain a copy of the License at
7   - *
8   - * http://www.apache.org/licenses/LICENSE-2.0
9   - *
10   - * Unless required by applicable law or agreed to in writing, software
11   - * distributed under the License is distributed on an "AS IS" BASIS,
12   - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13   - * See the License for the specific language governing permissions and
14   - * limitations under the License.
15   - */
16   -
17   -package org.jetbrains.jet.lang.psi;
18   -
19   -import com.intellij.lang.ASTNode;
20   -import org.jetbrains.annotations.NotNull;
21   -import org.jetbrains.jet.JetNodeTypes;
22   -
23   -import java.util.List;
24   -
25   -@Deprecated // Tuples are to be removed in Kotlin M4
26   -public class JetTupleType extends JetTypeElement {
27   -
28   - @Deprecated // Tuples are to be removed in Kotlin M4
29   - public JetTupleType(@NotNull ASTNode node) {
30   - super(node);
31   - }
32   -
33   - @NotNull
34   - @Override
35   - public List<JetTypeReference> getTypeArgumentsAsTypes() {
36   - return getComponentTypeRefs();
37   - }
38   -
39   - @Override
40   - public void accept(@NotNull JetVisitorVoid visitor) {
41   - visitor.visitTupleType(this);
42   - }
43   -
44   - @Override
45   - public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
46   - return visitor.visitTupleType(this, data);
47   - }
48   -
49   - @NotNull
50   - @Deprecated // Tuples are to be removed in Kotlin M4
51   - public List<JetTypeReference> getComponentTypeRefs() {
52   - return findChildrenByType(JetNodeTypes.TYPE_REFERENCE);
53   - }
54   -}
5 compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java
@@ -330,11 +330,6 @@ public R visitUserType(JetUserType type, D data) {
330 330 return visitTypeElement(type, data);
331 331 }
332 332
333   - @Deprecated // Tuples are to be removed in Kotlin M4
334   - public R visitTupleType(JetTupleType type, D data) {
335   - return visitTypeElement(type, data);
336   - }
337   -
338 333 public R visitFunctionType(JetFunctionType type, D data) {
339 334 return visitTypeElement(type, data);
340 335 }
5 compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java
@@ -319,11 +319,6 @@ public void visitUserType(JetUserType type) {
319 319 visitTypeElement(type);
320 320 }
321 321
322   - @Deprecated // Tuples are to be removed in Kotlin M4
323   - public void visitTupleType(JetTupleType type) {
324   - visitTypeElement(type);
325   - }
326   -
327 322 public void visitFunctionType(JetFunctionType type) {
328 323 visitTypeElement(type);
329 324 }
6 compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
@@ -193,12 +193,6 @@ else if (TypeUtils.hasNullableSuperType(baseType)) {
193 193 }
194 194
195 195 @Override
196   - public void visitTupleType(JetTupleType type) {
197   - // TODO: remove this method completely when tuples are droppped
198   - throw new IllegalStateException("Tuples are not supported: " + type.getText());
199   - }
200   -
201   - @Override
202 196 public void visitFunctionType(JetFunctionType type) {
203 197 JetTypeReference receiverTypeRef = type.getReceiverTypeRef();
204 198 JetType receiverType = receiverTypeRef == null ? null : resolveType(scope, receiverTypeRef, trace, checkBounds);

0 comments on commit d9b6a5c

Please sign in to comment.
Something went wrong with that request. Please try again.