From 54c21ffbf304a6bed43e7760c11716a9454e1937 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 16 May 2014 20:55:04 +0400
Subject: [PATCH] Delete K*FunctionNImpl classes

In favor of KFunctionImpl, KMemberFunctionImpl and KExtensionFunctionImpl
---
 .../jvm/internal/KExtensionFunctionsImpl.kt   | 91 -------------------
 .../reflect/jvm/internal/KFunctionsImpl.kt    | 91 -------------------
 .../jvm/internal/KMemberFunctionsImpl.kt      | 91 -------------------
 .../jet/generators/builtins/functions.kt      | 35 +------
 .../generators/builtins/generateBuiltIns.kt   |  8 +-
 5 files changed, 5 insertions(+), 311 deletions(-)
 delete mode 100644 core/runtime.jvm/src/kotlin/reflect/jvm/internal/KExtensionFunctionsImpl.kt
 delete mode 100644 core/runtime.jvm/src/kotlin/reflect/jvm/internal/KFunctionsImpl.kt
 delete mode 100644 core/runtime.jvm/src/kotlin/reflect/jvm/internal/KMemberFunctionsImpl.kt

diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KExtensionFunctionsImpl.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KExtensionFunctionsImpl.kt
deleted file mode 100644
index 65b076ef0bc..00000000000
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KExtensionFunctionsImpl.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2010-2014 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.
- */
-
-// Auto-generated file. DO NOT EDIT!
-
-package kotlin.reflect.jvm.internal
-
-import java.io.Serializable
-
-public abstract class KExtensionFunction0Impl<in T, out R> : KExtensionFunction0<T, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction1Impl<in T, in P1, out R> : KExtensionFunction1<T, P1, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction2Impl<in T, in P1, in P2, out R> : KExtensionFunction2<T, P1, P2, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction3Impl<in T, in P1, in P2, in P3, out R> : KExtensionFunction3<T, P1, P2, P3, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction4Impl<in T, in P1, in P2, in P3, in P4, out R> : KExtensionFunction4<T, P1, P2, P3, P4, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction5Impl<in T, in P1, in P2, in P3, in P4, in P5, out R> : KExtensionFunction5<T, P1, P2, P3, P4, P5, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction6Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, out R> : KExtensionFunction6<T, P1, P2, P3, P4, P5, P6, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction7Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, out R> : KExtensionFunction7<T, P1, P2, P3, P4, P5, P6, P7, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction8Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, out R> : KExtensionFunction8<T, P1, P2, P3, P4, P5, P6, P7, P8, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction9Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, out R> : KExtensionFunction9<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction10Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, out R> : KExtensionFunction10<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction11Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, out R> : KExtensionFunction11<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction12Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, out R> : KExtensionFunction12<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction13Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, out R> : KExtensionFunction13<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction14Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, out R> : KExtensionFunction14<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction15Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, out R> : KExtensionFunction15<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction16Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, out R> : KExtensionFunction16<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction17Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, out R> : KExtensionFunction17<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction18Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, out R> : KExtensionFunction18<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction19Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, out R> : KExtensionFunction19<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction20Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, in P20, out R> : KExtensionFunction20<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction21Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, in P20, in P21, out R> : KExtensionFunction21<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KExtensionFunction22Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, in P20, in P21, in P22, out R> : KExtensionFunction22<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KFunctionsImpl.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KFunctionsImpl.kt
deleted file mode 100644
index fa8c3c5bf0c..00000000000
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KFunctionsImpl.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2010-2014 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.
- */
-
-// Auto-generated file. DO NOT EDIT!
-
-package kotlin.reflect.jvm.internal
-
-import java.io.Serializable
-
-public abstract class KFunction0Impl<out R> : KFunction0<R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction1Impl<in P1, out R> : KFunction1<P1, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction2Impl<in P1, in P2, out R> : KFunction2<P1, P2, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction3Impl<in P1, in P2, in P3, out R> : KFunction3<P1, P2, P3, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction4Impl<in P1, in P2, in P3, in P4, out R> : KFunction4<P1, P2, P3, P4, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction5Impl<in P1, in P2, in P3, in P4, in P5, out R> : KFunction5<P1, P2, P3, P4, P5, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction6Impl<in P1, in P2, in P3, in P4, in P5, in P6, out R> : KFunction6<P1, P2, P3, P4, P5, P6, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction7Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, out R> : KFunction7<P1, P2, P3, P4, P5, P6, P7, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction8Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, out R> : KFunction8<P1, P2, P3, P4, P5, P6, P7, P8, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction9Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, out R> : KFunction9<P1, P2, P3, P4, P5, P6, P7, P8, P9, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction10Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, out R> : KFunction10<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction11Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, out R> : KFunction11<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction12Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, out R> : KFunction12<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction13Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, out R> : KFunction13<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction14Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, out R> : KFunction14<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction15Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, out R> : KFunction15<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction16Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, out R> : KFunction16<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction17Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, out R> : KFunction17<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction18Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, out R> : KFunction18<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction19Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, out R> : KFunction19<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction20Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, in P20, out R> : KFunction20<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction21Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, in P20, in P21, out R> : KFunction21<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KFunction22Impl<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, in P20, in P21, in P22, out R> : KFunction22<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
diff --git a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KMemberFunctionsImpl.kt b/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KMemberFunctionsImpl.kt
deleted file mode 100644
index af64bae9e27..00000000000
--- a/core/runtime.jvm/src/kotlin/reflect/jvm/internal/KMemberFunctionsImpl.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2010-2014 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.
- */
-
-// Auto-generated file. DO NOT EDIT!
-
-package kotlin.reflect.jvm.internal
-
-import java.io.Serializable
-
-public abstract class KMemberFunction0Impl<in T, out R> : KMemberFunction0<T, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction1Impl<in T, in P1, out R> : KMemberFunction1<T, P1, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction2Impl<in T, in P1, in P2, out R> : KMemberFunction2<T, P1, P2, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction3Impl<in T, in P1, in P2, in P3, out R> : KMemberFunction3<T, P1, P2, P3, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction4Impl<in T, in P1, in P2, in P3, in P4, out R> : KMemberFunction4<T, P1, P2, P3, P4, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction5Impl<in T, in P1, in P2, in P3, in P4, in P5, out R> : KMemberFunction5<T, P1, P2, P3, P4, P5, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction6Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, out R> : KMemberFunction6<T, P1, P2, P3, P4, P5, P6, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction7Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, out R> : KMemberFunction7<T, P1, P2, P3, P4, P5, P6, P7, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction8Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, out R> : KMemberFunction8<T, P1, P2, P3, P4, P5, P6, P7, P8, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction9Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, out R> : KMemberFunction9<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction10Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, out R> : KMemberFunction10<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction11Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, out R> : KMemberFunction11<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction12Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, out R> : KMemberFunction12<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction13Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, out R> : KMemberFunction13<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction14Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, out R> : KMemberFunction14<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction15Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, out R> : KMemberFunction15<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction16Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, out R> : KMemberFunction16<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction17Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, out R> : KMemberFunction17<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction18Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, out R> : KMemberFunction18<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction19Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, out R> : KMemberFunction19<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction20Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, in P20, out R> : KMemberFunction20<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction21Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, in P20, in P21, out R> : KMemberFunction21<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
-public abstract class KMemberFunction22Impl<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, in P12, in P13, in P14, in P15, in P16, in P17, in P18, in P19, in P20, in P21, in P22, out R> : KMemberFunction22<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22, R>, Serializable {
-    override fun toString() = "${getClass().getGenericSuperclass()}"
-}
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/functions.kt b/generators/src/org/jetbrains/jet/generators/builtins/functions.kt
index 2b4dacb2c86..9e767276bac 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/functions.kt
+++ b/generators/src/org/jetbrains/jet/generators/builtins/functions.kt
@@ -34,16 +34,15 @@ enum class FunctionKind(
     K_EXTENSION_FUNCTION : FunctionKind("KExtensionFunction", true, "ExtensionFunction")
 
     fun getFileName() = (if (isReflection()) "reflect/" else "") + classNamePrefix + "s.kt"
-    fun getImplFileName() = "reflect/jvm/internal/${classNamePrefix}sImpl.kt"
     fun getClassName(i: Int) = classNamePrefix + i
-    fun getImplClassName(i: Int) = classNamePrefix + i + "Impl"
     fun getSuperClassName(i: Int) = superClassNamePrefix?.plus(i)
+    fun getPackage() = if (isReflection()) "kotlin.reflect" else "kotlin"
 
-    fun isReflection() = superClassNamePrefix != null
+    fun isReflection() = name() startsWith "K"
 }
 
-abstract class GenerateFunctionsBase(out: PrintWriter, val kind: FunctionKind): BuiltInsSourceGenerator(out) {
-    override fun getPackage() = if (kind.isReflection()) "kotlin.reflect" else "kotlin"
+class GenerateFunctions(out: PrintWriter, val kind: FunctionKind) : BuiltInsSourceGenerator(out) {
+    override fun getPackage() = kind.getPackage()
 
     fun generateTypeParameters(i: Int, variance: Boolean) {
         out.print("<")
@@ -60,9 +59,7 @@ abstract class GenerateFunctionsBase(out: PrintWriter, val kind: FunctionKind):
         if (variance) out.print("out ")
         out.print("R>")
     }
-}
 
-class GenerateFunctions(out: PrintWriter, kind: FunctionKind) : GenerateFunctionsBase(out, kind) {
     override fun generateBody() {
         for (i in 0..MAX_PARAM_COUNT) {
             out.print("public trait " + kind.getClassName(i))
@@ -102,27 +99,3 @@ class GenerateFunctions(out: PrintWriter, kind: FunctionKind) : GenerateFunction
         out.println("): R")
     }
 }
-
-class GenerateKFunctionsImpl(out: PrintWriter, kind: FunctionKind) : GenerateFunctionsBase(out, kind) {
-    override fun getPackage() = "kotlin.reflect.jvm.internal"
-
-    override fun generateBody() {
-        out.println("import java.io.Serializable")
-        out.println()
-        for (i in 0..MAX_PARAM_COUNT) {
-            out.print("public abstract class " + kind.getImplClassName(i))
-            generateTypeParameters(i, true)
-            out.print(" : ")
-            out.print(kind.getClassName(i))
-            generateTypeParameters(i, false)
-            out.println(", Serializable {")
-            generateToStringForFunctionImpl()
-            out.println("}")
-        }
-    }
-
-    fun generateToStringForFunctionImpl() {
-        // TODO: don't generate this in every function, create a common superclass for all functions / extension functions
-        out.println("    override fun toString() = \"\${getClass().getGenericSuperclass()}\"")
-    }
-}
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt b/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
index b3952068cbf..ae5d506cf84 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
+++ b/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
@@ -59,13 +59,7 @@ fun generateBuiltIns(generate: (File, (PrintWriter) -> BuiltInsSourceGenerator)
     assertExists(RUNTIME_JVM_DIR)
 
     for (kind in FunctionKind.values()) {
-        if (kind.isReflection()) {
-            generate(File(REFLECTION_DIR, kind.getFileName())) { GenerateFunctions(it, kind) }
-            generate(File(RUNTIME_JVM_DIR, kind.getImplFileName()), { GenerateKFunctionsImpl(it, kind) })
-        }
-        else {
-            generate(File(BUILT_INS_SRC_DIR, kind.getFileName())) { GenerateFunctions(it, kind) }
-        }
+        generate(File(if (kind.isReflection()) REFLECTION_DIR else BUILT_INS_SRC_DIR, kind.getFileName())) { GenerateFunctions(it, kind) }
     }
 
     generate(File(BUILT_INS_NATIVE_DIR, "Arrays.kt")) { GenerateArrays(it) }