From 3f88fa4a45c26563f548329aa14f4ba2f675f7ee Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 19 Mar 2013 16:15:55 +0400
Subject: [PATCH] Removed Tuples.jet.

---
 compiler/frontend/src/jet/Tuples.jet          |  26 --
 .../jet/lang/types/lang/KotlinBuiltIns.java   |   1 -
 compiler/testData/builtin-classes.txt         | 341 ------------------
 .../jet/types/JetTypeCheckerTest.java         |  12 +-
 .../runtime/GenerateTuplesAndFunctions.java   |  28 --
 5 files changed, 6 insertions(+), 402 deletions(-)
 delete mode 100644 compiler/frontend/src/jet/Tuples.jet

diff --git a/compiler/frontend/src/jet/Tuples.jet b/compiler/frontend/src/jet/Tuples.jet
deleted file mode 100644
index 624b702b373..00000000000
--- a/compiler/frontend/src/jet/Tuples.jet
+++ /dev/null
@@ -1,26 +0,0 @@
-// Generated by org.jetbrains.jet.generators.runtime.GenerateTuplesAndFunctions
-
-package jet
-
-public class Tuple1<out T1>(public val _1: T1) {}
-public class Tuple2<out T1, out T2>(public val _1: T1, public val _2: T2) {}
-public class Tuple3<out T1, out T2, out T3>(public val _1: T1, public val _2: T2, public val _3: T3) {}
-public class Tuple4<out T1, out T2, out T3, out T4>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4) {}
-public class Tuple5<out T1, out T2, out T3, out T4, out T5>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5) {}
-public class Tuple6<out T1, out T2, out T3, out T4, out T5, out T6>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6) {}
-public class Tuple7<out T1, out T2, out T3, out T4, out T5, out T6, out T7>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7) {}
-public class Tuple8<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8) {}
-public class Tuple9<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9) {}
-public class Tuple10<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9, public val _10: T10) {}
-public class Tuple11<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9, public val _10: T10, public val _11: T11) {}
-public class Tuple12<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9, public val _10: T10, public val _11: T11, public val _12: T12) {}
-public class Tuple13<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9, public val _10: T10, public val _11: T11, public val _12: T12, public val _13: T13) {}
-public class Tuple14<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9, public val _10: T10, public val _11: T11, public val _12: T12, public val _13: T13, public val _14: T14) {}
-public class Tuple15<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9, public val _10: T10, public val _11: T11, public val _12: T12, public val _13: T13, public val _14: T14, public val _15: T15) {}
-public class Tuple16<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9, public val _10: T10, public val _11: T11, public val _12: T12, public val _13: T13, public val _14: T14, public val _15: T15, public val _16: T16) {}
-public class Tuple17<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16, out T17>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9, public val _10: T10, public val _11: T11, public val _12: T12, public val _13: T13, public val _14: T14, public val _15: T15, public val _16: T16, public val _17: T17) {}
-public class Tuple18<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16, out T17, out T18>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9, public val _10: T10, public val _11: T11, public val _12: T12, public val _13: T13, public val _14: T14, public val _15: T15, public val _16: T16, public val _17: T17, public val _18: T18) {}
-public class Tuple19<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16, out T17, out T18, out T19>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9, public val _10: T10, public val _11: T11, public val _12: T12, public val _13: T13, public val _14: T14, public val _15: T15, public val _16: T16, public val _17: T17, public val _18: T18, public val _19: T19) {}
-public class Tuple20<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16, out T17, out T18, out T19, out T20>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9, public val _10: T10, public val _11: T11, public val _12: T12, public val _13: T13, public val _14: T14, public val _15: T15, public val _16: T16, public val _17: T17, public val _18: T18, public val _19: T19, public val _20: T20) {}
-public class Tuple21<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16, out T17, out T18, out T19, out T20, out T21>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9, public val _10: T10, public val _11: T11, public val _12: T12, public val _13: T13, public val _14: T14, public val _15: T15, public val _16: T16, public val _17: T17, public val _18: T18, public val _19: T19, public val _20: T20, public val _21: T21) {}
-public class Tuple22<out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16, out T17, out T18, out T19, out T20, out T21, out T22>(public val _1: T1, public val _2: T2, public val _3: T3, public val _4: T4, public val _5: T5, public val _6: T6, public val _7: T7, public val _8: T8, public val _9: T9, public val _10: T10, public val _11: T11, public val _12: T12, public val _13: T13, public val _14: T14, public val _15: T15, public val _16: T16, public val _17: T17, public val _18: T18, public val _19: T19, public val _20: T20, public val _21: T21, public val _22: T22) {}
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 d87b856b7c9..2a2efbf1237 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
@@ -78,7 +78,6 @@ public class KotlinBuiltIns {
             BUILT_INS_DIR + "/ExtensionFunctions.jet",
             BUILT_INS_DIR + "/Functions.jet",
             BUILT_INS_DIR + "/Nothing.jet",
-            BUILT_INS_DIR + "/Tuples.jet",
             BUILT_INS_DIR + "/Unit.jet"
     );
 
diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt
index cab6f96121d..aad775b153e 100644
--- a/compiler/testData/builtin-classes.txt
+++ b/compiler/testData/builtin-classes.txt
@@ -1274,347 +1274,6 @@ public final class Tuple0 {
     }
 }
 
-public final class Tuple1</*0*/ out T1> {
-    public constructor Tuple1</*0*/ out T1>(/*0*/ _1 : T1)
-    public final val _1 : T1
-}
-
-public final class Tuple10</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10> {
-    public constructor Tuple10</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10)
-    public final val _1 : T1
-    public final val _10 : T10
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
-public final class Tuple11</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11> {
-    public constructor Tuple11</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11)
-    public final val _1 : T1
-    public final val _10 : T10
-    public final val _11 : T11
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
-public final class Tuple12</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12> {
-    public constructor Tuple12</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12)
-    public final val _1 : T1
-    public final val _10 : T10
-    public final val _11 : T11
-    public final val _12 : T12
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
-public final class Tuple13</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13> {
-    public constructor Tuple13</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13)
-    public final val _1 : T1
-    public final val _10 : T10
-    public final val _11 : T11
-    public final val _12 : T12
-    public final val _13 : T13
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
-public final class Tuple14</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14> {
-    public constructor Tuple14</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14)
-    public final val _1 : T1
-    public final val _10 : T10
-    public final val _11 : T11
-    public final val _12 : T12
-    public final val _13 : T13
-    public final val _14 : T14
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
-public final class Tuple15</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15> {
-    public constructor Tuple15</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15)
-    public final val _1 : T1
-    public final val _10 : T10
-    public final val _11 : T11
-    public final val _12 : T12
-    public final val _13 : T13
-    public final val _14 : T14
-    public final val _15 : T15
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
-public final class Tuple16</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16> {
-    public constructor Tuple16</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16)
-    public final val _1 : T1
-    public final val _10 : T10
-    public final val _11 : T11
-    public final val _12 : T12
-    public final val _13 : T13
-    public final val _14 : T14
-    public final val _15 : T15
-    public final val _16 : T16
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
-public final class Tuple17</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17> {
-    public constructor Tuple17</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16, /*16*/ _17 : T17)
-    public final val _1 : T1
-    public final val _10 : T10
-    public final val _11 : T11
-    public final val _12 : T12
-    public final val _13 : T13
-    public final val _14 : T14
-    public final val _15 : T15
-    public final val _16 : T16
-    public final val _17 : T17
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
-public final class Tuple18</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18> {
-    public constructor Tuple18</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16, /*16*/ _17 : T17, /*17*/ _18 : T18)
-    public final val _1 : T1
-    public final val _10 : T10
-    public final val _11 : T11
-    public final val _12 : T12
-    public final val _13 : T13
-    public final val _14 : T14
-    public final val _15 : T15
-    public final val _16 : T16
-    public final val _17 : T17
-    public final val _18 : T18
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
-public final class Tuple19</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19> {
-    public constructor Tuple19</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16, /*16*/ _17 : T17, /*17*/ _18 : T18, /*18*/ _19 : T19)
-    public final val _1 : T1
-    public final val _10 : T10
-    public final val _11 : T11
-    public final val _12 : T12
-    public final val _13 : T13
-    public final val _14 : T14
-    public final val _15 : T15
-    public final val _16 : T16
-    public final val _17 : T17
-    public final val _18 : T18
-    public final val _19 : T19
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
-public final class Tuple2</*0*/ out T1, /*1*/ out T2> {
-    public constructor Tuple2</*0*/ out T1, /*1*/ out T2>(/*0*/ _1 : T1, /*1*/ _2 : T2)
-    public final val _1 : T1
-    public final val _2 : T2
-}
-
-public final class Tuple20</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19, /*19*/ out T20> {
-    public constructor Tuple20</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19, /*19*/ out T20>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16, /*16*/ _17 : T17, /*17*/ _18 : T18, /*18*/ _19 : T19, /*19*/ _20 : T20)
-    public final val _1 : T1
-    public final val _10 : T10
-    public final val _11 : T11
-    public final val _12 : T12
-    public final val _13 : T13
-    public final val _14 : T14
-    public final val _15 : T15
-    public final val _16 : T16
-    public final val _17 : T17
-    public final val _18 : T18
-    public final val _19 : T19
-    public final val _2 : T2
-    public final val _20 : T20
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
-public final class Tuple21</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19, /*19*/ out T20, /*20*/ out T21> {
-    public constructor Tuple21</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19, /*19*/ out T20, /*20*/ out T21>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16, /*16*/ _17 : T17, /*17*/ _18 : T18, /*18*/ _19 : T19, /*19*/ _20 : T20, /*20*/ _21 : T21)
-    public final val _1 : T1
-    public final val _10 : T10
-    public final val _11 : T11
-    public final val _12 : T12
-    public final val _13 : T13
-    public final val _14 : T14
-    public final val _15 : T15
-    public final val _16 : T16
-    public final val _17 : T17
-    public final val _18 : T18
-    public final val _19 : T19
-    public final val _2 : T2
-    public final val _20 : T20
-    public final val _21 : T21
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
-public final class Tuple22</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19, /*19*/ out T20, /*20*/ out T21, /*21*/ out T22> {
-    public constructor Tuple22</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9, /*9*/ out T10, /*10*/ out T11, /*11*/ out T12, /*12*/ out T13, /*13*/ out T14, /*14*/ out T15, /*15*/ out T16, /*16*/ out T17, /*17*/ out T18, /*18*/ out T19, /*19*/ out T20, /*20*/ out T21, /*21*/ out T22>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9, /*9*/ _10 : T10, /*10*/ _11 : T11, /*11*/ _12 : T12, /*12*/ _13 : T13, /*13*/ _14 : T14, /*14*/ _15 : T15, /*15*/ _16 : T16, /*16*/ _17 : T17, /*17*/ _18 : T18, /*18*/ _19 : T19, /*19*/ _20 : T20, /*20*/ _21 : T21, /*21*/ _22 : T22)
-    public final val _1 : T1
-    public final val _10 : T10
-    public final val _11 : T11
-    public final val _12 : T12
-    public final val _13 : T13
-    public final val _14 : T14
-    public final val _15 : T15
-    public final val _16 : T16
-    public final val _17 : T17
-    public final val _18 : T18
-    public final val _19 : T19
-    public final val _2 : T2
-    public final val _20 : T20
-    public final val _21 : T21
-    public final val _22 : T22
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
-public final class Tuple3</*0*/ out T1, /*1*/ out T2, /*2*/ out T3> {
-    public constructor Tuple3</*0*/ out T1, /*1*/ out T2, /*2*/ out T3>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3)
-    public final val _1 : T1
-    public final val _2 : T2
-    public final val _3 : T3
-}
-
-public final class Tuple4</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4> {
-    public constructor Tuple4</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4)
-    public final val _1 : T1
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-}
-
-public final class Tuple5</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5> {
-    public constructor Tuple5</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5)
-    public final val _1 : T1
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-}
-
-public final class Tuple6</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6> {
-    public constructor Tuple6</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6)
-    public final val _1 : T1
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-}
-
-public final class Tuple7</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7> {
-    public constructor Tuple7</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7)
-    public final val _1 : T1
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-}
-
-public final class Tuple8</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8> {
-    public constructor Tuple8</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8)
-    public final val _1 : T1
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-}
-
-public final class Tuple9</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9> {
-    public constructor Tuple9</*0*/ out T1, /*1*/ out T2, /*2*/ out T3, /*3*/ out T4, /*4*/ out T5, /*5*/ out T6, /*6*/ out T7, /*7*/ out T8, /*8*/ out T9>(/*0*/ _1 : T1, /*1*/ _2 : T2, /*2*/ _3 : T3, /*3*/ _4 : T4, /*4*/ _5 : T5, /*5*/ _6 : T6, /*6*/ _7 : T7, /*7*/ _8 : T8, /*8*/ _9 : T9)
-    public final val _1 : T1
-    public final val _2 : T2
-    public final val _3 : T3
-    public final val _4 : T4
-    public final val _5 : T5
-    public final val _6 : T6
-    public final val _7 : T7
-    public final val _8 : T8
-    public final val _9 : T9
-}
-
 public final annotation class atomic : jet.Annotation {
     public constructor atomic()
 }
diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
index a7fe6e212a9..f66ed6303c8 100644
--- a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
+++ b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
@@ -469,12 +469,12 @@ public class JetTypeCheckerTest extends JetLiteFixture {
     }
 
     public void testEffectiveProjectionKinds() throws Exception {
-        assertSubtype("Tuple1<Int>", "Tuple1<Int>");
-        assertSubtype("Tuple1<out Int>", "Tuple1<out Int>");
-        assertSubtype("Tuple1<out Int>", "Tuple1<Int>");
-        assertSubtype("Tuple1<Int>", "Tuple1<out Int>");
-        assertSubtype("Tuple1<in Int>", "Tuple1<out Any?>");
-        assertSubtype("Tuple1<out Any?>", "Tuple1<in String>");
+        assertSubtype("Base_outT<Int>", "Base_outT<Int>");
+        assertSubtype("Base_outT<out Int>", "Base_outT<out Int>");
+        assertSubtype("Base_outT<out Int>", "Base_outT<Int>");
+        assertSubtype("Base_outT<Int>", "Base_outT<out Int>");
+        assertSubtype("Base_outT<in Int>", "Base_outT<out Any?>");
+        assertSubtype("Base_outT<out Any?>", "Base_outT<in String>");
         assertSubtype("Base_inT<Int>", "Base_inT<Int>");
         assertSubtype("Base_inT<in Int>", "Base_inT<in Int>");
         assertSubtype("Base_inT<in Int>", "Base_inT<Int>");
diff --git a/generators/org/jetbrains/jet/generators/runtime/GenerateTuplesAndFunctions.java b/generators/org/jetbrains/jet/generators/runtime/GenerateTuplesAndFunctions.java
index 756b7095267..d3e0435eae1 100644
--- a/generators/org/jetbrains/jet/generators/runtime/GenerateTuplesAndFunctions.java
+++ b/generators/org/jetbrains/jet/generators/runtime/GenerateTuplesAndFunctions.java
@@ -23,30 +23,6 @@ import java.io.PrintStream;
 public class GenerateTuplesAndFunctions {
     private static final int TUPLE_COUNT = 23;
 
-    private static void generateTuples(PrintStream out, int count) {
-        generated(out);
-        for (int i = 1; i < count; i++) {
-            out.print("public class Tuple" + i);
-            out.print("<");
-            for (int j = 1; j <= i; j++) {
-                out.print("out T" + j);
-                if (j < i) {
-                    out.print(", ");
-                }
-            }
-            out.print(">");
-            out.print("(");
-            for (int j = 1; j <= i; j++) {
-                out.print("public val _" + j + ": " + "T" + j);
-                if (j < i) {
-                    out.print(", ");
-                }
-            }
-            out.print(") {}");
-            out.println();
-        }
-    }
-
     private static void generateFunctions(PrintStream out, int count, boolean extension) {
         generated(out);
         for (int i = 0; i < count; i++) {
@@ -87,10 +63,6 @@ public class GenerateTuplesAndFunctions {
         File baseDir = new File("compiler/frontend/src/jet/");
         assert baseDir.exists() : "Base dir does not exist: " + baseDir.getAbsolutePath();
 
-        PrintStream tuples = new PrintStream(new File(baseDir, "Tuples.jet"));
-        generateTuples(tuples, TUPLE_COUNT);
-        tuples.close();
-
         PrintStream functions = new PrintStream(new File(baseDir, "Functions.jet"));
         generateFunctions(functions, TUPLE_COUNT, false);
         functions.close();