Implement "legacy" REPL wrappers on top of the "new" scripting infrastructure

2019-04-30 15:43:33 +02:00
parent 010ae5326d
commit 46915df56f
18 changed files with 631 additions and 127 deletions
@@ -43,7 +43,15 @@ open class BasicJvmScriptEvaluator : ScriptEvaluator {
                            ?.resultOrNull()
                            ?: configuration

-                    scriptClass.evalWithConfigAndOtherScriptsResults(refinedEvalConfiguration, importedScriptsEvalResults).let {
+                    val instance =
+                        scriptClass.evalWithConfigAndOtherScriptsResults(refinedEvalConfiguration, importedScriptsEvalResults)
+
+                    val resultValue = compiledScript.resultField?.let { (resultFieldName, resultType) ->
+                        val resultField = scriptClass.java.getDeclaredField(resultFieldName).apply { isAccessible = true }
+                        ResultValue.Value(resultFieldName, resultField.get(instance), resultType.typeName, instance)
+                    } ?: ResultValue.Value("", instance, "", instance)
+
+                    EvaluationResult(resultValue, refinedEvalConfiguration).let {
                        sharedScripts?.put(scriptClass, it)
                        ResultWithDiagnostics.Success(it)
                    }
@@ -61,9 +69,15 @@ open class BasicJvmScriptEvaluator : ScriptEvaluator {
    private fun KClass<*>.evalWithConfigAndOtherScriptsResults(
        refinedEvalConfiguration: ScriptEvaluationConfiguration,
        importedScriptsEvalResults: List<EvaluationResult>
-    ): EvaluationResult {
+    ): Any {
        val args = ArrayList<Any?>()

+        refinedEvalConfiguration[ScriptEvaluationConfiguration.previousSnippets]?.let {
+            if (it.isNotEmpty()) {
+                args.add(it.toTypedArray())
+            }
+        }
+
        refinedEvalConfiguration[ScriptEvaluationConfiguration.constructorArgs]?.let {
            args.addAll(it)
        }
@@ -81,10 +95,7 @@ open class BasicJvmScriptEvaluator : ScriptEvaluator {
        val ctor = java.constructors.single()
        val instance = ctor.newInstance(*args.toArray())

-        return EvaluationResult(
-            ResultValue.Value("", instance, "", instance),
-            refinedEvalConfiguration
-        )
+        return instance
    }
 }

@@ -16,6 +16,7 @@ internal class KJvmCompiledScriptData(
    var sourceLocationId: String?,
    var compilationConfiguration: ScriptCompilationConfiguration,
    var scriptClassFQName: String,
+    var resultField: Pair<String, KotlinType>?,
    var otherScripts: List<CompiledScript<*>> = emptyList()
 ) : Serializable {

@@ -24,6 +25,7 @@ internal class KJvmCompiledScriptData(
        outputStream.writeObject(sourceLocationId)
        outputStream.writeObject(otherScripts)
        outputStream.writeObject(scriptClassFQName)
+        outputStream.writeObject(resultField)
    }

    @Suppress("UNCHECKED_CAST")
@@ -32,11 +34,12 @@ internal class KJvmCompiledScriptData(
        sourceLocationId = inputStream.readObject() as String?
        otherScripts = inputStream.readObject() as List<CompiledScript<*>>
        scriptClassFQName = inputStream.readObject() as String
+        resultField = inputStream.readObject() as Pair<String, KotlinType>?
    }

    companion object {
        @JvmStatic
-        private val serialVersionUID = 3L
+        private val serialVersionUID = 4L
    }
 }

@@ -49,9 +52,13 @@ class KJvmCompiledScript<out ScriptBase : Any> internal constructor(
        sourceLocationId: String?,
        compilationConfiguration: ScriptCompilationConfiguration,
        scriptClassFQName: String,
+        resultField: Pair<String, KotlinType>?,
        otherScripts: List<CompiledScript<*>> = emptyList(),
        compiledModule: KJvmCompiledModule? // module should be null for imported (other) scripts, so only one reference to the module is kept
-    ): this(KJvmCompiledScriptData(sourceLocationId, compilationConfiguration, scriptClassFQName, otherScripts), compiledModule)
+    ) : this(
+        KJvmCompiledScriptData(sourceLocationId, compilationConfiguration, scriptClassFQName, resultField, otherScripts),
+        compiledModule
+    )

    override val sourceLocationId: String?
        get() = data.sourceLocationId
@@ -65,6 +72,9 @@ class KJvmCompiledScript<out ScriptBase : Any> internal constructor(
    val scriptClassFQName: String
        get() = data.scriptClassFQName

+    override val resultField: Pair<String, KotlinType>?
+        get() = data.resultField
+
    override suspend fun getClass(scriptEvaluationConfiguration: ScriptEvaluationConfiguration?): ResultWithDiagnostics<KClass<*>> = try {
        // ensuring proper defaults are used
        val actualEvaluationConfiguration = scriptEvaluationConfiguration ?: ScriptEvaluationConfiguration()
@@ -168,7 +178,8 @@ fun KJvmCompiledScript<*>.toBytes(): ByteArray {
    } finally {
        try {
            oos?.close()
-        } catch (e: IOException) {}
+        } catch (e: IOException) {
+        }
    }
 }