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

Move and rename KFunctionImpl classes

Browse Source 
Move from package "kotlin.reflect" to "kotlin.reflect.jvm.internal". They are
internal detail of the compiler and should not be used directly (especially now
that "kotlin.reflect" is in default import paths).

Also rename "KFunctionImplN" to "KFunctionNImpl", because this name makes more
sense
This commit is contained in:
Alexander Udalov
2014-05-13 21:40:55 +04:00
parent de8b2b3668
commit 5488a8402f
7 changed files with 87 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/jet/generators/builtins/functions.kt
+5 -3
View File
@@ -34,9 +34,9 @@ enum class FunctionKind(
K_EXTENSION_FUNCTION : FunctionKind("KExtensionFunction", true, "ExtensionFunction")
fun getFileName() = (if (isReflection()) "reflect/" else "") + classNamePrefix + "s.kt"
fun getImplFileName() = "reflect/" + classNamePrefix + "sImpl.kt"
fun getImplFileName() = "reflect/jvm/internal/${classNamePrefix}sImpl.kt"
fun getClassName(i: Int) = classNamePrefix + i
fun getImplClassName(i: Int) = classNamePrefix + "Impl" + i
fun getImplClassName(i: Int) = classNamePrefix + i + "Impl"
fun getSuperClassName(i: Int) = superClassNamePrefix?.plus(i)
fun isReflection() = superClassNamePrefix != null
@@ -103,7 +103,9 @@ class GenerateFunctions(out: PrintWriter, kind: FunctionKind) : GenerateFunction
}
}
class GenerateFunctionsImpl(out: PrintWriter, kind: FunctionKind) : GenerateFunctionsBase(out, kind) {
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()
generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
+1 -1
View File
@@ -61,7 +61,7 @@ fun generateBuiltIns(generate: (File, (PrintWriter) -> BuiltInsSourceGenerator)
for (kind in FunctionKind.values()) {
if (kind.isReflection()) {
generate(File(REFLECTION_DIR, kind.getFileName())) { GenerateFunctions(it, kind) }
generate(File(RUNTIME_JVM_DIR, kind.getImplFileName()), { GenerateFunctionsImpl(it, kind) })
generate(File(RUNTIME_JVM_DIR, kind.getImplFileName()), { GenerateKFunctionsImpl(it, kind) })
}
else {
generate(File(BUILT_INS_SRC_DIR, kind.getFileName())) { GenerateFunctions(it, kind) }