curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-03-16 07:56:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

js engine can no longer access java; we're finally using ES6

Browse Source
This commit is contained in:
minjaesong
2020-10-20 10:46:22 +09:00
parent f8db6f1186
commit ca672f23c2
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/torvald/tsvm/VMRunnerFactory.kt
View File

@@ -1,9 +1,11 @@
package net.torvald.tsvm package net.torvald.tsvm
import jdk.nashorn.api.scripting.NashornScriptEngineFactory
import net.torvald.tsvm.peripheral.GraphicsAdapter import net.torvald.tsvm.peripheral.GraphicsAdapter
import net.torvald.tsvm.vdc.Videotron2K import net.torvald.tsvm.vdc.Videotron2K
import java.io.FileReader import java.io.FileReader
import javax.script.ScriptContext import javax.script.ScriptContext
import javax.script.ScriptEngine
import javax.script.ScriptEngineManager import javax.script.ScriptEngineManager
import javax.script.SimpleScriptContext import javax.script.SimpleScriptContext
import kotlin.test.assertNotNull import kotlin.test.assertNotNull
@@ -58,11 +60,13 @@ object VMRunnerFactory {
} }
} }
} }
else -> { "js" -> {
object : VMRunner(extension) { object : VMRunner(extension) {
private val engine = ScriptEngineManager().getEngineByExtension(extension) private val engine: ScriptEngine// = ScriptEngineManager().getEngineByExtension(extension)
init { init {
val engineFactory = NashornScriptEngineFactory()
engine = engineFactory.getScriptEngine("-strict", "--no-java", "--no-syntax-extensions", "--language=es6")
assertNotNull(engine, "Script engine for extension $extension not found") assertNotNull(engine, "Script engine for extension $extension not found")
} }
@@ -100,7 +104,7 @@ object VMRunnerFactory {
} }
} }
} }
//else -> throw UnsupportedOperationException("Unsupported script extension: $extension") else -> throw UnsupportedOperationException("Unsupported script extension: $extension")
} }
} }