Remove ScriptCompileConfiguration as separate entity, refactor pieces accordingly
This commit is contained in:
+2
-3
@@ -23,7 +23,6 @@ import kotlinx.coroutines.experimental.runBlocking
|
||||
import kotlin.script.experimental.api.*
|
||||
|
||||
abstract class BasicScriptingHost(
|
||||
val scriptDefinition: ScriptDefinition,
|
||||
val compiler: ScriptCompiler,
|
||||
val evaluator: ScriptEvaluator
|
||||
) {
|
||||
@@ -31,11 +30,11 @@ abstract class BasicScriptingHost(
|
||||
|
||||
open fun eval(
|
||||
script: ScriptSource,
|
||||
compileConfiguration: ScriptCompileConfiguration?,
|
||||
scriptDefinition: ScriptDefinition,
|
||||
environment: ScriptEvaluationEnvironment?
|
||||
): ResultWithDiagnostics<EvaluationResult> =
|
||||
runInCoroutineContext {
|
||||
compiler(script, scriptDefinition, compileConfiguration).onSuccess {
|
||||
compiler(script, scriptDefinition).onSuccess {
|
||||
evaluator(it, environment)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,10 +7,7 @@ package kotlin.script.experimental.host
|
||||
|
||||
import java.io.File
|
||||
import java.net.URL
|
||||
import kotlin.script.experimental.api.ScriptCompileConfiguration
|
||||
import kotlin.script.experimental.api.ScriptSource
|
||||
import kotlin.script.experimental.api.ScriptSourceNamedFragment
|
||||
import kotlin.script.experimental.api.sourceFragments
|
||||
import kotlin.script.experimental.api.*
|
||||
|
||||
fun ScriptSource.getScriptText(): String = when {
|
||||
text != null -> text!!
|
||||
@@ -19,9 +16,9 @@ fun ScriptSource.getScriptText(): String = when {
|
||||
else -> throw RuntimeException("unable to get text from null script")
|
||||
}
|
||||
|
||||
fun getMergedScriptText(script: ScriptSource, configuration: ScriptCompileConfiguration?): String {
|
||||
fun getMergedScriptText(script: ScriptSource, configuration: ScriptDefinition?): String {
|
||||
val originalScriptText = script.getScriptText()
|
||||
val sourceFragments = configuration?.get(ScriptCompileConfiguration.sourceFragments)
|
||||
val sourceFragments = configuration?.get(ScriptDefinition.sourceFragments)
|
||||
return if (sourceFragments == null || sourceFragments.isEmpty()) {
|
||||
originalScriptText
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user