From 2fe5f789212613754a70dd053d9633810ed039b4 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 21 Aug 2018 13:01:45 +0300 Subject: [PATCH] Rename ScriptEvaluationEnvironment into ScriptEvaluationConfiguration --- .../experimental/api/scriptCompilation.kt | 2 +- .../experimental/api/scriptEvaluation.kt | 24 +++++++++---------- .../experimental/host/BasicScriptingHost.kt | 4 ++-- .../jvmhost/impl/KJVMCompilerImpl.kt | 4 ++-- .../jvmhost/jvmScriptEvaluation.kt | 10 ++++---- .../experimental/jvm/jvmScriptEnvironment.kt | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptCompilation.kt b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptCompilation.kt index 3c2f270a2f4..920c9cf4b1a 100644 --- a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptCompilation.kt +++ b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptCompilation.kt @@ -129,5 +129,5 @@ interface CompiledScript { val compilationConfiguration: ScriptCompilationConfiguration - suspend fun instantiate(scriptEvaluationEnvironment: ScriptEvaluationEnvironment?): ResultWithDiagnostics + suspend fun instantiate(scriptEvaluationConfiguration: ScriptEvaluationConfiguration?): ResultWithDiagnostics } diff --git a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptEvaluation.kt b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptEvaluation.kt index 4cdefff459e..91c50cd5657 100644 --- a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptEvaluation.kt +++ b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptEvaluation.kt @@ -9,30 +9,30 @@ package kotlin.script.experimental.api import kotlin.script.experimental.util.PropertiesCollection -interface ScriptEvaluationEnvironmentKeys +interface ScriptEvaluationConfigurationKeys -class ScriptEvaluationEnvironment(baseEvaluationEnvironments: Iterable, body: Builder.() -> Unit) : +class ScriptEvaluationConfiguration(baseEvaluationEnvironments: Iterable, body: Builder.() -> Unit) : PropertiesCollection(Builder(baseEvaluationEnvironments).apply(body).data) { constructor(body: Builder.() -> Unit = {}) : this(emptyList(), body) constructor( - vararg baseEvaluationEnvironments: ScriptEvaluationEnvironment, body: Builder.() -> Unit = {} - ) : this(baseEvaluationEnvironments.asIterable(), body) + vararg baseConfigurations: ScriptEvaluationConfiguration, body: Builder.() -> Unit = {} + ) : this(baseConfigurations.asIterable(), body) - class Builder internal constructor(baseEvaluationEnvironments: Iterable) : + class Builder internal constructor(baseEvaluationEnvironments: Iterable) : ScriptCompilationConfigurationKeys, PropertiesCollection.Builder(baseEvaluationEnvironments) - companion object : ScriptEvaluationEnvironmentKeys + companion object : ScriptEvaluationConfigurationKeys } -val ScriptEvaluationEnvironmentKeys.implicitReceivers by PropertiesCollection.key>() +val ScriptEvaluationConfigurationKeys.implicitReceivers by PropertiesCollection.key>() -val ScriptEvaluationEnvironmentKeys.contextVariables by PropertiesCollection.key>() // external variables +val ScriptEvaluationConfigurationKeys.contextVariables by PropertiesCollection.key>() // external variables -val ScriptEvaluationEnvironmentKeys.constructorArgs by PropertiesCollection.key>() +val ScriptEvaluationConfigurationKeys.constructorArgs by PropertiesCollection.key>() -val ScriptEvaluationEnvironmentKeys.runArgs by PropertiesCollection.key>() +val ScriptEvaluationConfigurationKeys.runArgs by PropertiesCollection.key>() sealed class ResultValue { class Value(val name: String, val value: Any?, val type: String) : ResultValue() { @@ -42,12 +42,12 @@ sealed class ResultValue { object Unit : ResultValue() } -data class EvaluationResult(val returnValue: ResultValue, val environment: ScriptEvaluationEnvironment?) +data class EvaluationResult(val returnValue: ResultValue, val configuration: ScriptEvaluationConfiguration?) interface ScriptEvaluator { suspend operator fun invoke( compiledScript: CompiledScript<*>, - scriptEvaluationEnvironment: ScriptEvaluationEnvironment? + scriptEvaluationConfiguration: ScriptEvaluationConfiguration? ): ResultWithDiagnostics } diff --git a/libraries/scripting/common/src/kotlin/script/experimental/host/BasicScriptingHost.kt b/libraries/scripting/common/src/kotlin/script/experimental/host/BasicScriptingHost.kt index 7dee7bb616d..458d563f998 100644 --- a/libraries/scripting/common/src/kotlin/script/experimental/host/BasicScriptingHost.kt +++ b/libraries/scripting/common/src/kotlin/script/experimental/host/BasicScriptingHost.kt @@ -31,11 +31,11 @@ abstract class BasicScriptingHost( open fun eval( script: ScriptSource, scriptCompilationConfiguration: ScriptCompilationConfiguration, - environment: ScriptEvaluationEnvironment? + configuration: ScriptEvaluationConfiguration? ): ResultWithDiagnostics = runInCoroutineContext { compiler(script, scriptCompilationConfiguration).onSuccess { - evaluator(it, environment) + evaluator(it, configuration) } } } diff --git a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt index 422bec3eaa5..6c4b0825097 100644 --- a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt +++ b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt @@ -55,8 +55,8 @@ class KJvmCompiledScript( private val scriptClassFQName: String ) : CompiledScript { - override suspend fun instantiate(scriptEvaluationEnvironment: ScriptEvaluationEnvironment?): ResultWithDiagnostics = try { - val baseClassLoader = scriptEvaluationEnvironment?.get(JvmScriptEvaluationEnvironment.baseClassLoader) + override suspend fun instantiate(scriptEvaluationConfiguration: ScriptEvaluationConfiguration?): ResultWithDiagnostics = try { + val baseClassLoader = scriptEvaluationConfiguration?.get(JvmScriptEvaluationEnvironment.baseClassLoader) ?: Thread.currentThread().contextClassLoader val dependencies = compilationConfiguration[ScriptCompilationConfiguration.dependencies] ?.flatMap { (it as? JvmDependency)?.classpath?.map { it.toURI().toURL() } ?: emptyList() } diff --git a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/jvmScriptEvaluation.kt b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/jvmScriptEvaluation.kt index 9eb6a25554a..2e4701609f7 100644 --- a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/jvmScriptEvaluation.kt +++ b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/jvmScriptEvaluation.kt @@ -17,16 +17,16 @@ open class JvmScriptEvaluationEnvironment : PropertiesCollection.Builder() { val JvmScriptEvaluationEnvironment.baseClassLoader by PropertiesCollection.key(Thread.currentThread().contextClassLoader) -val ScriptEvaluationEnvironment.jvm get() = JvmScriptEvaluationEnvironment() +val ScriptEvaluationConfiguration.jvm get() = JvmScriptEvaluationEnvironment() open class BasicJvmScriptEvaluator : ScriptEvaluator { override suspend operator fun invoke( compiledScript: CompiledScript<*>, - scriptEvaluationEnvironment: ScriptEvaluationEnvironment? + scriptEvaluationConfiguration: ScriptEvaluationConfiguration? ): ResultWithDiagnostics = try { - val obj = compiledScript.instantiate(scriptEvaluationEnvironment) + val obj = compiledScript.instantiate(scriptEvaluationConfiguration) when (obj) { is ResultWithDiagnostics.Failure -> obj is ResultWithDiagnostics.Success -> { @@ -37,7 +37,7 @@ open class BasicJvmScriptEvaluator : ScriptEvaluator { if (scriptObject !is Class<*>) ResultWithDiagnostics.Failure(ScriptDiagnostic("expecting class in this implementation, got ${scriptObject?.javaClass}")) else { - val receivers = scriptEvaluationEnvironment?.get(ScriptEvaluationEnvironment.implicitReceivers) + val receivers = scriptEvaluationConfiguration?.get(ScriptEvaluationConfiguration.implicitReceivers) val instance = if (receivers == null) { scriptObject.getConstructor().newInstance() } else { @@ -45,7 +45,7 @@ open class BasicJvmScriptEvaluator : ScriptEvaluator { } // TODO: fix result value - ResultWithDiagnostics.Success(EvaluationResult(ResultValue.Value("", instance, ""), scriptEvaluationEnvironment)) + ResultWithDiagnostics.Success(EvaluationResult(ResultValue.Value("", instance, ""), scriptEvaluationConfiguration)) } } } diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptEnvironment.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptEnvironment.kt index 06fc68d6dab..ca779292594 100644 --- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptEnvironment.kt +++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptEnvironment.kt @@ -53,7 +53,7 @@ class JvmGetScriptingClass : GetScriptingClass { if (dependencies == null) { dependencies = newDeps } else { - if (newDeps != dependencies) throw IllegalArgumentException("scripting environment dependencies changed") + if (newDeps != dependencies) throw IllegalArgumentException("scripting configuration dependencies changed") } if (!baseClassLoaderIsInitialized) {