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

Delete numbered ExtensionFunction classes and generation logic

Browse Source
This commit is contained in:
Alexander Udalov
2015-05-13 15:14:53 +03:00
parent 2186ce5e8d
commit 6a0a703539
5 changed files with 8 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/kotlin/generators/builtins/functions.kt
+7 -25
View File
@@ -21,30 +21,11 @@ import java.io.PrintWriter
val MAX_PARAM_COUNT = 22
enum class FunctionKind(
val classFqNamePrefix: String,
val docPrefix: String,
val hasReceiverParameter: Boolean
) {
FUNCTION : FunctionKind("kotlin.jvm.functions.Function", "A function", false)
EXTENSION_FUNCTION : FunctionKind("kotlin.ExtensionFunction", "An extension function", true)
val classNamePrefix: String get() = classFqNamePrefix.substringAfterLast('.')
val packageFqName: String get() = classFqNamePrefix.substringBeforeLast('.')
val fileName: String get() = classFqNamePrefix.replace('.', '/') + "s.kt"
fun getClassName(i: Int) = classNamePrefix + i
}
class GenerateFunctions(out: PrintWriter, val kind: FunctionKind) : BuiltInsSourceGenerator(out) {
override fun getPackage() = kind.packageFqName
class GenerateFunctions(out: PrintWriter) : BuiltInsSourceGenerator(out) {
override fun getPackage() = "kotlin.jvm.functions"
fun generateTypeParameters(i: Int, variance: Boolean) {
out.print("<")
if (kind.hasReceiverParameter) {
if (variance) out.print("in ")
out.print("T, ")
}
for (j in 1..i) {
if (variance) out.print("in ")
@@ -64,7 +45,7 @@ class GenerateFunctions(out: PrintWriter, val kind: FunctionKind) : BuiltInsSour
override fun generateBody() {
for (i in 0..MAX_PARAM_COUNT) {
generateDocumentation(i)
out.print("public interface " + kind.getClassName(i))
out.print("public interface Function$i")
generateTypeParameters(i, variance = true)
generateSuperClass()
generateFunctionClassBody(i)
@@ -73,7 +54,7 @@ class GenerateFunctions(out: PrintWriter, val kind: FunctionKind) : BuiltInsSour
fun generateDocumentation(i: Int) {
val suffix = if (i == 1) "" else "s"
out.println("/** ${kind.docPrefix} that takes $i argument${suffix}. */")
out.println("/** A function that takes $i argument${suffix}. */")
}
fun generateSuperClass() {
@@ -91,11 +72,12 @@ class GenerateFunctions(out: PrintWriter, val kind: FunctionKind) : BuiltInsSour
fun generateInvokeSignature(i: Int) {
if (i == 0) {
out.println(" /** Invokes the function. */")
} else {
}
else {
val suffix = if (i == 1) "" else "s"
out.println(" /** Invokes the function with the specified argument${suffix}. */")
}
out.print(" public fun ${if (kind.hasReceiverParameter) "T." else ""}invoke(")
out.print(" public fun invoke(")
for (j in 1..i) {
out.print("p$j: P$j")
if (j < i) {
generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt
+1 -6
View File
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.generators.builtins.generateBuiltIns
import org.jetbrains.kotlin.generators.builtins.arrayIterators.GenerateArrayIterators
import org.jetbrains.kotlin.generators.builtins.arrays.GenerateArrays
import org.jetbrains.kotlin.generators.builtins.functionImpl.GenerateFunctionImpl
import org.jetbrains.kotlin.generators.builtins.functions.FunctionKind
import org.jetbrains.kotlin.generators.builtins.functions.GenerateFunctions
import org.jetbrains.kotlin.generators.builtins.iterators.GenerateIterators
import org.jetbrains.kotlin.generators.builtins.progressionIterators.GenerateProgressionIterators
@@ -67,11 +66,7 @@ fun generateBuiltIns(generate: (File, (PrintWriter) -> BuiltInsSourceGenerator)
assertExists(BUILT_INS_SRC_DIR)
assertExists(RUNTIME_JVM_DIR)
for (kind in FunctionKind.values()) {
val dir = if (kind == FunctionKind.FUNCTION) RUNTIME_JVM_DIR else BUILT_INS_SRC_DIR
generate(File(dir, kind.fileName)) { GenerateFunctions(it, kind) }
}
generate(File(RUNTIME_JVM_DIR, "kotlin/jvm/functions/Functions.kt")) { GenerateFunctions(it) }
generate(File(RUNTIME_JVM_DIR, "kotlin/jvm/internal/FunctionImpl.java")) { GenerateFunctionImpl(it) }
generate(File(BUILT_INS_NATIVE_DIR, "kotlin/Arrays.kt")) { GenerateArrays(it) }
generate(File(BUILT_INS_NATIVE_DIR, "kotlin/Primitives.kt")) { GeneratePrimitives(it) }