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

Renaming remaining former "environment"-related identifiers

Browse Source
This commit is contained in:
Ilya Chernikov
2018-09-03 20:25:14 +02:00
parent 7860220e76
commit 836ea28fe7
12 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/BasicJvmScriptingHost.kt
+3 -3
View File
@@ -11,17 +11,17 @@ import kotlin.script.experimental.api.ScriptEvaluator
import kotlin.script.experimental.host.ScriptingHostConfiguration
import kotlin.script.experimental.host.createCompilationConfigurationFromTemplate
import kotlin.script.experimental.host.BasicScriptingHost
import kotlin.script.experimental.jvm.defaultJvmScriptingEnvironment
import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
open class BasicJvmScriptingHost(
hostConfiguration: ScriptingHostConfiguration = defaultJvmScriptingEnvironment,
hostConfiguration: ScriptingHostConfiguration = defaultJvmScriptingHostConfiguration,
compiler: JvmScriptCompiler = JvmScriptCompiler(hostConfiguration),
evaluator: ScriptEvaluator = BasicJvmScriptEvaluator()
) : BasicScriptingHost(compiler, evaluator)
inline fun <reified T : Any> createCompilationConfigurationFromTemplate(
hostConfiguration: ScriptingHostConfiguration = defaultJvmScriptingEnvironment,
hostConfiguration: ScriptingHostConfiguration = defaultJvmScriptingHostConfiguration,
noinline body: ScriptCompilationConfiguration.Builder.() -> Unit = {}
): ScriptCompilationConfiguration = createCompilationConfigurationFromTemplate(
KotlinType(T::class),
libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt
+2 -2
View File
@@ -46,7 +46,7 @@ import kotlin.script.experimental.jvm.JvmDependency
import kotlin.script.experimental.jvm.impl.BridgeDependenciesResolver
import kotlin.script.experimental.jvm.javaHome
import kotlin.script.experimental.jvm.jvm
import kotlin.script.experimental.jvmhost.JvmScriptEvaluationEnvironment
import kotlin.script.experimental.jvmhost.JvmScriptEvaluationConfiguration
import kotlin.script.experimental.jvmhost.KJvmCompilerProxy
import kotlin.script.experimental.jvmhost.baseClassLoader
import kotlin.script.experimental.util.getOrError
@@ -58,7 +58,7 @@ class KJvmCompiledScript<out ScriptBase : Any>(
) : CompiledScript<ScriptBase> {
override suspend fun getClass(scriptEvaluationConfiguration: ScriptEvaluationConfiguration?): ResultWithDiagnostics<KClass<*>> = try {
val baseClassLoader = scriptEvaluationConfiguration?.get(JvmScriptEvaluationEnvironment.baseClassLoader)
val baseClassLoader = scriptEvaluationConfiguration?.get(JvmScriptEvaluationConfiguration.baseClassLoader)
?: Thread.currentThread().contextClassLoader
val dependencies = compilationConfiguration[ScriptCompilationConfiguration.dependencies]
?.flatMap { (it as? JvmDependency)?.classpath?.map { it.toURI().toURL() } ?: emptyList() }
libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/jvmHostUtil.kt
+3 -3
View File
@@ -6,11 +6,11 @@
package kotlin.script.experimental.jvmhost.impl
import kotlin.script.experimental.host.ScriptingHostConfiguration
import kotlin.script.experimental.jvm.defaultJvmScriptingEnvironment
import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
fun ScriptingHostConfiguration.withDefaults(): ScriptingHostConfiguration =
if (this == defaultJvmScriptingEnvironment) {
if (this == defaultJvmScriptingHostConfiguration) {
this
} else {
ScriptingHostConfiguration(defaultJvmScriptingEnvironment, this)
ScriptingHostConfiguration(defaultJvmScriptingHostConfiguration, this)
}
libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/jvmScriptCompilation.kt
+2 -2
View File
@@ -9,7 +9,7 @@ package kotlin.script.experimental.jvmhost
import kotlin.script.experimental.api.*
import kotlin.script.experimental.host.ScriptingHostConfiguration
import kotlin.script.experimental.jvm.defaultJvmScriptingEnvironment
import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
import kotlin.script.experimental.jvmhost.impl.KJvmCompilerImpl
import kotlin.script.experimental.jvmhost.impl.withDefaults
@@ -30,7 +30,7 @@ interface CompiledJvmScriptsCache {
}
open class JvmScriptCompiler(
hostConfiguration: ScriptingHostConfiguration = defaultJvmScriptingEnvironment,
hostConfiguration: ScriptingHostConfiguration = defaultJvmScriptingHostConfiguration,
val compilerProxy: KJvmCompilerProxy = KJvmCompilerImpl(hostConfiguration.withDefaults()),
val cache: CompiledJvmScriptsCache = CompiledJvmScriptsCache.NoCache
) : ScriptCompiler {
libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/jvmScriptEvaluation.kt
+4 -4
View File
@@ -10,14 +10,14 @@ package kotlin.script.experimental.jvmhost
import kotlin.script.experimental.api.*
import kotlin.script.experimental.util.PropertiesCollection
open class JvmScriptEvaluationEnvironment : PropertiesCollection.Builder() {
open class JvmScriptEvaluationConfiguration : PropertiesCollection.Builder() {
companion object : JvmScriptEvaluationEnvironment()
companion object : JvmScriptEvaluationConfiguration()
}
val JvmScriptEvaluationEnvironment.baseClassLoader by PropertiesCollection.key<ClassLoader?>(Thread.currentThread().contextClassLoader)
val JvmScriptEvaluationConfiguration.baseClassLoader by PropertiesCollection.key<ClassLoader?>(Thread.currentThread().contextClassLoader)
val ScriptEvaluationConfiguration.jvm get() = JvmScriptEvaluationEnvironment()
val ScriptEvaluationConfiguration.jvm get() = JvmScriptEvaluationConfiguration()
open class BasicJvmScriptEvaluator : ScriptEvaluator {