Rename ScriptDefinition to ScriptCompileConfiguration
This commit is contained in:
+2
-2
@@ -30,11 +30,11 @@ abstract class BasicScriptingHost(
|
||||
|
||||
open fun eval(
|
||||
script: ScriptSource,
|
||||
scriptDefinition: ScriptDefinition,
|
||||
scriptCompilationConfiguration: ScriptCompilationConfiguration,
|
||||
environment: ScriptEvaluationEnvironment?
|
||||
): ResultWithDiagnostics<EvaluationResult> =
|
||||
runInCoroutineContext {
|
||||
compiler(script, scriptDefinition).onSuccess {
|
||||
compiler(script, scriptCompilationConfiguration).onSuccess {
|
||||
evaluator(it, environment)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,9 +16,9 @@ fun ScriptSource.getScriptText(): String = when {
|
||||
else -> throw RuntimeException("unable to get text from null script")
|
||||
}
|
||||
|
||||
fun getMergedScriptText(script: ScriptSource, configuration: ScriptDefinition?): String {
|
||||
fun getMergedScriptText(script: ScriptSource, configuration: ScriptCompilationConfiguration?): String {
|
||||
val originalScriptText = script.getScriptText()
|
||||
val sourceFragments = configuration?.get(ScriptDefinition.sourceFragments)
|
||||
val sourceFragments = configuration?.get(ScriptCompilationConfiguration.sourceFragments)
|
||||
return if (sourceFragments == null || sourceFragments.isEmpty()) {
|
||||
originalScriptText
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user