Refactor repl and JSR 223 support code, add separate example jars for each type of JSR 223 repl (with tests)

2016-09-26 17:56:26 +02:00
parent 079fece9b4
commit 10d259771c
22 changed files with 925 additions and 152 deletions
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.cli.common.repl
+
+import java.io.Reader
+import javax.script.*
+
+abstract class KotlinJsr223JvmScriptEngineBase(protected val myFactory: ScriptEngineFactory) : AbstractScriptEngine(), ScriptEngine {
+
+    protected var lineCount = 0
+
+    protected val history = arrayListOf<ReplCodeLine>()
+
+    abstract fun  eval(codeLine: ReplCodeLine, history: Iterable<ReplCodeLine>): ReplEvalResult
+
+    override fun eval(script: String, context: ScriptContext?): Any? {
+
+        lineCount += 1
+        // TODO bind to context
+        val codeLine = ReplCodeLine(lineCount, script)
+
+        val evalResult = eval(codeLine, history)
+
+        val ret = when (evalResult) {
+            is ReplEvalResult.ValueResult -> evalResult.value
+            is ReplEvalResult.UnitResult -> null
+            is ReplEvalResult.Error -> throw ScriptException(evalResult.message)
+            is ReplEvalResult.Incomplete -> throw ScriptException("error: incomplete code")
+            is ReplEvalResult.HistoryMismatch -> throw ScriptException("Repl history mismatch at line: ${evalResult.lineNo}")
+        }
+        history.add(codeLine)
+        // TODO update context
+        return ret
+    }
+
+    override fun eval(script: Reader, context: ScriptContext?): Any? = eval(script.readText(), context)
+
+    override fun createBindings(): Bindings = SimpleBindings()
+
+    override fun getFactory(): ScriptEngineFactory = myFactory
+}
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.cli.common.repl
+
+import org.jetbrains.kotlin.cli.common.KotlinVersion
+import javax.script.ScriptEngine
+import javax.script.ScriptEngineFactory
+
+abstract class KotlinJsr223JvmScriptEngineFactoryBase : ScriptEngineFactory {
+
+    override fun getLanguageName(): String = "kotlin"
+    override fun getLanguageVersion(): String = KotlinVersion.VERSION
+    override fun getEngineName(): String = "kotlin"
+    override fun getEngineVersion(): String = KotlinVersion.VERSION
+    override fun getExtensions(): List<String> = listOf("kts")
+    override fun getMimeTypes(): List<String> = listOf("text/x-kotlin")
+    override fun getNames(): List<String> = listOf("kotlin")
+
+    override fun getOutputStatement(toDisplay: String?): String = "print(\"$toDisplay\")"
+    override fun getMethodCallSyntax(obj: String, m: String, vararg args: String): String = "$obj.$m(${args.joinToString()})"
+
+    override fun getProgram(vararg statements: String): String {
+        val sep = System.getProperty("line.separator")
+        return statements.joinToString(sep) + sep
+    }
+
+    override fun getParameter(key: String?): Any? =
+            when (key) {
+                ScriptEngine.NAME -> engineName
+                ScriptEngine.LANGUAGE -> languageName
+                ScriptEngine.LANGUAGE_VERSION -> languageVersion
+                ScriptEngine.ENGINE -> engineName
+                ScriptEngine.ENGINE_VERSION -> engineVersion
+                else -> null
+            }
+}