Change jvm implementation after adding configuration dsl

This commit is contained in:
Ilya Chernikov
2018-03-02 19:05:50 +01:00
parent 1723ff658d
commit 0f0934aaa2
7 changed files with 31 additions and 22 deletions
@@ -36,8 +36,7 @@ object ScriptCompileConfigurationParams {
}
// DSL
inline
fun scriptConfiguration(from: HeterogeneousMap = HeterogeneousMap(), body: ScriptCompileConfigurationParams.Builder.() -> Unit) =
inline fun scriptConfiguration(from: HeterogeneousMap = HeterogeneousMap(), body: ScriptCompileConfigurationParams.Builder.() -> Unit) =
ScriptCompileConfigurationParams.Builder().build(from, body)
@@ -19,8 +19,7 @@ open class ScriptEvaluationEnvironmentParams : HeterogeneousMapBuilder() {
}
}
inline
fun scriptEvaluationEnvironment(from: HeterogeneousMap = HeterogeneousMap(), body: ScriptEvaluationEnvironmentParams.() -> Unit) =
inline fun scriptEvaluationEnvironment(from: HeterogeneousMap = HeterogeneousMap(), body: ScriptEvaluationEnvironmentParams.() -> Unit) =
ScriptEvaluationEnvironmentParams().build(from, body)
typealias ScriptEvaluationEnvironment = HeterogeneousMap
@@ -13,6 +13,5 @@ class ProcessedScriptDataParams : HeterogeneousMapBuilder() {
}
}
inline
fun processedScriptData(from: HeterogeneousMap = HeterogeneousMap(), body: ProcessedScriptDataParams.() -> Unit) =
inline fun processedScriptData(from: HeterogeneousMap = HeterogeneousMap(), body: ProcessedScriptDataParams.() -> Unit) =
ProcessedScriptDataParams().build(from, body)
@@ -44,8 +44,7 @@ open class HeterogeneousMapBuilder {
}
}
inline
fun <T : HeterogeneousMapBuilder> T.build(from: HeterogeneousMap = HeterogeneousMap(), body: T.() -> Unit): HeterogeneousMap {
inline fun <T : HeterogeneousMapBuilder> T.build(from: HeterogeneousMap = HeterogeneousMap(), body: T.() -> Unit): HeterogeneousMap {
body()
return HeterogeneousMap(from, pairs)
}