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

Fix and test evaluation of scripts with default configurations

Browse Source
This commit is contained in:
Ilya Chernikov
2019-07-23 15:54:11 +02:00
parent 961607673d
commit cefd4a35c5
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/jvmScriptCompilation.kt
+9 -3
View File
@@ -31,16 +31,22 @@ interface CompiledJvmScriptsCache {
} }
open class JvmScriptCompiler( open class JvmScriptCompiler(
hostConfiguration: ScriptingHostConfiguration = defaultJvmScriptingHostConfiguration, baseHostConfiguration: ScriptingHostConfiguration = defaultJvmScriptingHostConfiguration,
val compilerProxy: ScriptJvmCompilerProxy = ScriptJvmCompilerIsolated(hostConfiguration.withDefaults()), compilerProxy: ScriptJvmCompilerProxy? = null,
val cache: CompiledJvmScriptsCache = CompiledJvmScriptsCache.NoCache val cache: CompiledJvmScriptsCache = CompiledJvmScriptsCache.NoCache
) : ScriptCompiler { ) : ScriptCompiler {
val hostConfiguration = baseHostConfiguration.withDefaults()
val compilerProxy: ScriptJvmCompilerProxy = compilerProxy ?: ScriptJvmCompilerIsolated(hostConfiguration)
override suspend operator fun invoke( override suspend operator fun invoke(
script: SourceCode, script: SourceCode,
scriptCompilationConfiguration: ScriptCompilationConfiguration scriptCompilationConfiguration: ScriptCompilationConfiguration
): ResultWithDiagnostics<CompiledScript<*>> = ): ResultWithDiagnostics<CompiledScript<*>> =
scriptCompilationConfiguration.refineBeforeParsing(script).onSuccess { refinedConfiguration -> scriptCompilationConfiguration.with {
hostConfiguration(this@JvmScriptCompiler.hostConfiguration)
}.refineBeforeParsing(script).onSuccess { refinedConfiguration ->
val cached = cache.get(script, refinedConfiguration) val cached = cache.get(script, refinedConfiguration)
if (cached != null) return cached.asSuccess() if (cached != null) return cached.asSuccess()