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

Clean and fix new scripting API

Browse Source
This commit is contained in:
Ilya Chernikov
2018-07-13 19:05:37 +02:00
parent f2a8e5c248
commit a54675abe7
20 changed files with 111 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/examples/scripting/jvm-maven-deps/host/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host/host.kt
+5 -7
View File
@@ -21,19 +21,17 @@ import kotlin.script.experimental.misc.*
fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
val scriptCompiler = JvmScriptCompiler(KJVMCompilerImpl(), DummyCompiledJvmScriptCache())
val scriptDefinition = ScriptDefinitionFromAnnotatedBaseClass(
KotlinType(MyScriptWithMavenDeps::class),
ScriptingEnvironment(
ScriptingEnvironmentProperties.baseClass<MyScriptWithMavenDeps>(),
ScriptingEnvironmentProperties.getScriptingClass(JvmGetScriptingClass())
)
)
val host = JvmBasicScriptingHost(
scriptDefinition.compilationConfigurator,
scriptCompiler,
scriptDefinition.evaluator
)
val host = JvmBasicScriptingHost(scriptCompiler, scriptDefinition.evaluator)
return host.eval(scriptFile.toScriptSource(), ScriptCompileConfiguration(myJvmConfigParams), ScriptEvaluationEnvironment())
return host.eval(
scriptFile.toScriptSource(), scriptDefinition, ScriptCompileConfiguration(myJvmConfigParams), ScriptEvaluationEnvironment()
)
}
fun main(vararg args: String) {
libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt
+5 -7
View File
@@ -25,19 +25,17 @@ val myJvmConfigParams = jvmJavaHomeParams + with(ScriptCompileConfigurationPrope
fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
val scriptCompiler = JvmScriptCompiler(KJVMCompilerImpl(), DummyCompiledJvmScriptCache())
val scriptDefinition = ScriptDefinitionFromAnnotatedBaseClass(
KotlinType(MyScript::class),
ScriptingEnvironment(
ScriptingEnvironmentProperties.baseClass<MyScript>(),
ScriptingEnvironmentProperties.getScriptingClass(JvmGetScriptingClass())
)
)
val host = JvmBasicScriptingHost(
scriptDefinition.compilationConfigurator,
scriptCompiler,
scriptDefinition.evaluator
)
val host = JvmBasicScriptingHost(scriptCompiler, scriptDefinition.evaluator)
return host.eval(scriptFile.toScriptSource(), ScriptCompileConfiguration(myJvmConfigParams), ScriptEvaluationEnvironment())
return host.eval(
scriptFile.toScriptSource(), scriptDefinition, ScriptCompileConfiguration(myJvmConfigParams), ScriptEvaluationEnvironment()
)
}
fun main(vararg args: String) {