azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop FunctionImplN and ExtensionFunctionImplN

Browse Source 
We have FunctionImpl and ExtensionFunctionImpl classes now (2 classes, not 46)
This commit is contained in:
Alexander Udalov
2014-05-13 16:51:10 +04:00
parent 41eb0deaa0
commit 51a16fe491
4 changed files with 8 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/runtime.jvm/src/kotlin/ExtensionFunctionsImpl.kt
-91
View File
@@ -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
import java.io.Serializable
public abstract class ExtensionFunctionImpl0<in T, out R> : ExtensionFunction0<T, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl1<in T, in P1, out R> : ExtensionFunction1<T, P1, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl2<in T, in P1, in P2, out R> : ExtensionFunction2<T, P1, P2, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl3<in T, in P1, in P2, in P3, out R> : ExtensionFunction3<T, P1, P2, P3, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl4<in T, in P1, in P2, in P3, in P4, out R> : ExtensionFunction4<T, P1, P2, P3, P4, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl5<in T, in P1, in P2, in P3, in P4, in P5, out R> : ExtensionFunction5<T, P1, P2, P3, P4, P5, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl6<in T, in P1, in P2, in P3, in P4, in P5, in P6, out R> : ExtensionFunction6<T, P1, P2, P3, P4, P5, P6, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl7<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, out R> : ExtensionFunction7<T, P1, P2, P3, P4, P5, P6, P7, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl8<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, out R> : ExtensionFunction8<T, P1, P2, P3, P4, P5, P6, P7, P8, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl9<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, out R> : ExtensionFunction9<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl10<in T, in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, out R> : ExtensionFunction10<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl11<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> : ExtensionFunction11<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl12<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> : ExtensionFunction12<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl13<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> : ExtensionFunction13<T, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class ExtensionFunctionImpl14<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> : ExtensionFunction14<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 ExtensionFunctionImpl15<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> : ExtensionFunction15<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 ExtensionFunctionImpl16<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> : ExtensionFunction16<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 ExtensionFunctionImpl17<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> : ExtensionFunction17<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 ExtensionFunctionImpl18<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> : ExtensionFunction18<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 ExtensionFunctionImpl19<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> : ExtensionFunction19<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 ExtensionFunctionImpl20<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> : ExtensionFunction20<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 ExtensionFunctionImpl21<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> : ExtensionFunction21<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 ExtensionFunctionImpl22<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> : ExtensionFunction22<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()}"
}
core/runtime.jvm/src/kotlin/FunctionsImpl.kt
-91
View File
@@ -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
import java.io.Serializable
public abstract class FunctionImpl0<out R> : Function0<R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl1<in P1, out R> : Function1<P1, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl2<in P1, in P2, out R> : Function2<P1, P2, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl3<in P1, in P2, in P3, out R> : Function3<P1, P2, P3, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl4<in P1, in P2, in P3, in P4, out R> : Function4<P1, P2, P3, P4, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl5<in P1, in P2, in P3, in P4, in P5, out R> : Function5<P1, P2, P3, P4, P5, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl6<in P1, in P2, in P3, in P4, in P5, in P6, out R> : Function6<P1, P2, P3, P4, P5, P6, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl7<in P1, in P2, in P3, in P4, in P5, in P6, in P7, out R> : Function7<P1, P2, P3, P4, P5, P6, P7, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl8<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, out R> : Function8<P1, P2, P3, P4, P5, P6, P7, P8, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl9<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, out R> : Function9<P1, P2, P3, P4, P5, P6, P7, P8, P9, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl10<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, out R> : Function10<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl11<in P1, in P2, in P3, in P4, in P5, in P6, in P7, in P8, in P9, in P10, in P11, out R> : Function11<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl12<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> : Function12<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl13<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> : Function13<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl14<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> : Function14<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, R>, Serializable {
override fun toString() = "${getClass().getGenericSuperclass()}"
}
public abstract class FunctionImpl15<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> : Function15<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 FunctionImpl16<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> : Function16<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 FunctionImpl17<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> : Function17<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 FunctionImpl18<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> : Function18<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 FunctionImpl19<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> : Function19<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 FunctionImpl20<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> : Function20<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 FunctionImpl21<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> : Function21<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 FunctionImpl22<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> : Function22<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()}"
}
generators/src/org/jetbrains/jet/generators/builtins/functions.kt
+1 -1
View File
@@ -34,7 +34,7 @@ enum class FunctionKind(
K_EXTENSION_FUNCTION : FunctionKind("KExtensionFunction", true, "ExtensionFunction")
fun getFileName() = (if (isReflection()) "reflect/" else "") + classNamePrefix + "s.kt"
fun getImplFileName() = (if (isReflection()) "reflect/" else "") + classNamePrefix + "sImpl.kt"
fun getImplFileName() = "reflect/" + classNamePrefix + "sImpl.kt"
fun getClassName(i: Int) = classNamePrefix + i
fun getImplClassName(i: Int) = classNamePrefix + "Impl" + i
fun getSuperClassName(i: Int) = superClassNamePrefix?.plus(i)
generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
+7 -2
View File
@@ -59,8 +59,13 @@ fun generateBuiltIns(generate: (File, (PrintWriter) -> BuiltInsSourceGenerator)
assertExists(RUNTIME_JVM_DIR)
for (kind in FunctionKind.values()) {
generate(File(if (kind.isReflection()) REFLECTION_DIR else BUILT_INS_SRC_DIR, kind.getFileName())) { GenerateFunctions(it, kind) }
generate(File(RUNTIME_JVM_DIR, kind.getImplFileName()), { GenerateFunctionsImpl(it, kind) })
if (kind.isReflection()) {
generate(File(REFLECTION_DIR, kind.getFileName())) { GenerateFunctions(it, kind) }
generate(File(RUNTIME_JVM_DIR, kind.getImplFileName()), { GenerateFunctionsImpl(it, kind) })
}
else {
generate(File(BUILT_INS_SRC_DIR, kind.getFileName())) { GenerateFunctions(it, kind) }
}
}
generate(File(BUILT_INS_NATIVE_DIR, "Arrays.kt")) { GenerateArrays(it) }