Renaming remaining former "environment"-related identifiers

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
@@ -27,7 +27,7 @@ fun createCompilationConfigurationFromTemplate(
): ScriptCompilationConfiguration {
val getScriptingClass = hostConfiguration[ScriptingHostConfiguration.getScriptingClass]
?: throw IllegalArgumentException("${ERROR_MSG_PREFIX}Expecting 'getScriptingClass' parameter in the scripting environment")
?: throw IllegalArgumentException("${ERROR_MSG_PREFIX}Expecting 'getScriptingClass' parameter in the scripting host configuration")
val baseClass: KClass<*> =
try {
@@ -12,17 +12,17 @@ import kotlin.script.experimental.util.PropertiesCollection
interface ScriptingHostConfigurationKeys
class ScriptingHostConfiguration(baseScriptingEnvironments: Iterable<ScriptingHostConfiguration>, body: Builder.() -> Unit) :
PropertiesCollection(Builder(baseScriptingEnvironments).apply(body).data) {
class ScriptingHostConfiguration(baseScriptingConfigurations: Iterable<ScriptingHostConfiguration>, body: Builder.() -> Unit) :
PropertiesCollection(Builder(baseScriptingConfigurations).apply(body).data) {
constructor(body: Builder.() -> Unit = {}) : this(emptyList(), body)
constructor(
vararg baseConfigurations: ScriptingHostConfiguration, body: Builder.() -> Unit = {}
) : this(baseConfigurations.asIterable(), body)
class Builder internal constructor(baseScriptingEnvironments: Iterable<ScriptingHostConfiguration>) :
class Builder internal constructor(baseScriptingHostConfigurations: Iterable<ScriptingHostConfiguration>) :
ScriptingHostConfigurationKeys,
PropertiesCollection.Builder(baseScriptingEnvironments)
PropertiesCollection.Builder(baseScriptingHostConfigurations)
companion object : ScriptingHostConfigurationKeys
}