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

Move invokable parts to JSR223 only, remove unneeded code

Browse Source
This commit is contained in:
Ilya Chernikov
2016-12-09 17:14:09 +01:00
parent aab1759dc5
commit fc416476a8
9 changed files with 64 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223JvmDaemonCompileScriptEngine.kt
+1 -2
View File
@@ -58,9 +58,8 @@ class KotlinJsr223JvmDaemonCompileScriptEngine(
// TODO: bindings passing works only once on the first eval, subsequent setContext/setBindings call have no effect. Consider making it dynamic, but take history into account
val localEvaluator by lazy { GenericReplCompiledEvaluator(templateClasspath, Thread.currentThread().contextClassLoader, getScriptArgs(getContext()), scriptArgsTypes) }
override val replScriptInvoker: ReplScriptInvoker get() = localEvaluator
override val replEvaluator: ReplCompiledEvaluator get() = localEvaluator
override val replScriptEvaluator: ReplEvaluatorBase get() = localEvaluator
}
libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223JvmLocalScriptEngine.kt
+1 -2
View File
@@ -51,9 +51,8 @@ class KotlinJsr223JvmLocalScriptEngine(
// TODO: bindings passing works only once on the first eval, subsequent setContext/setBindings call have no effect. Consider making it dynamic, but take history into account
val localEvaluator by lazy { GenericReplCompiledEvaluator(templateClasspath, Thread.currentThread().contextClassLoader, getScriptArgs(getContext()), scriptArgsTypes) }
override val replScriptInvoker: ReplScriptInvoker get() = localEvaluator
override val replEvaluator: ReplCompiledEvaluator get() = localEvaluator
override val replScriptEvaluator: ReplEvaluatorBase get() = localEvaluator
private fun makeScriptDefinition(templateClasspath: List<File>, templateClassName: String): KotlinScriptDefinition {
val classloader = URLClassLoader(templateClasspath.map { it.toURI().toURL() }.toTypedArray(), this.javaClass.classLoader)