Remove emscripten runtime originally for issue #7

Author: cretz

.gitignore

@@ -11,9 +11,6 @@
 /compiler/bin
 /compiler/build
 /compiler/out
-/emscripten-runtime/bin
-/emscripten-runtime/build
-/emscripten-runtime/out
 /annotations/bin
 /annotations/build
 /annotations/out

build.gradle

@@ -25,12 +25,6 @@ allprojects {
     }
 }
 
-project(':emscripten-runtime') {
-    dependencies {
-        compile project(':annotations')
-    }
-}
-
 project(':compiler') {
     apply plugin: 'kotlin'
     apply plugin: 'application'
@@ -42,8 +36,7 @@ project(':compiler') {
     distZip.archiveName = 'asmble.zip'
 
     dependencies {
-        compile project(':emscripten-runtime')
-
+        compile project(':annotations')
         compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
         compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
         compile "org.ow2.asm:asm-tree:$asm_version"

compiler/src/main/kotlin/asmble/io/Emscripten.kt

@@ -2,7 +2,6 @@ package asmble
 
 import asmble.ast.SExpr
 import asmble.ast.Script
-import asmble.io.Emscripten
 import asmble.io.SExprToAst
 import asmble.io.StrToSExpr
 
@@ -13,7 +12,6 @@ open class BaseTestUnit(val name: String, val wast: String, val expectedOutput:
     open val shouldFail get() = false
     open val skipRunReason: String? get() = null
     open val defaultMaxMemPages get() = 1
-    open val emscriptenMetadata by lazy { Emscripten.metadataFromWast(wast) }
     open val parseResult: StrToSExpr.ParseResult.Success by lazy {
         StrToSExpr.parse(wast).let {
             when (it) {

compiler/src/test/kotlin/asmble/BaseTestUnit.kt

@@ -9,7 +9,6 @@ import asmble.io.ByteWriter
 import asmble.io.SExprToStr
 import org.junit.Assume
 import org.junit.Test
-import run.jvm.emscripten.Env
 import java.io.ByteArrayOutputStream
 import java.io.OutputStreamWriter
 import java.io.PrintWriter
@@ -44,16 +43,6 @@ abstract class TestRunner<out T : BaseTestUnit>(val unit: T) : TestBase() {
             includeBinaryInCompiledClass = true
         ).withHarnessRegistered(PrintWriter(OutputStreamWriter(out, Charsets.UTF_8), true))
 
-        // If there's a staticBump, we are an emscripten mod and we need to include the env
-        var emEnv: Env? = null
-        unit.emscriptenMetadata?.also {
-            emEnv = Env(it.staticBump, out, "unknown-program")
-            val mods = Env.subModules.fold(listOf(Module.Native(emEnv!!))) { mods, subMod ->
-                mods + Module.Native(subMod.apply(emEnv))
-            }
-            scriptContext = scriptContext.withModuleRegistered("env", Module.Composite(mods))
-        }
-
         // This will fail assertions as necessary
         scriptContext = unit.script.commands.fold(scriptContext) { scriptContext, cmd ->
             try {
@@ -65,21 +54,6 @@ abstract class TestRunner<out T : BaseTestUnit>(val unit: T) : TestBase() {
             }
         }
 
-        // If there is a main, we run it w/ no args because emscripten doesn't set it as the start func
-        scriptContext.modules.lastOrNull()?.also { lastMod ->
-            lastMod.cls.methods.find { it.name == "main" && it.returnType == Int::class.java }?.let { mainMethod ->
-                if (mainMethod.parameterTypes.isEmpty())
-                    mainMethod.invoke(lastMod.instance(scriptContext))
-                else if (mainMethod.parameterTypes.asList() == listOf(Int::class.java, Int::class.java))
-                    mainMethod.invoke(lastMod.instance(scriptContext), emEnv?.argc ?: 0, emEnv?.argv ?: 0)
-                else
-                    error("Unrecognized main method params for $mainMethod")
-            }
-        }
-
-        // If there was an emscripten env, we have to run the exit callbacks
-        emEnv?.also { it.runAtExitCallbacks(scriptContext.modules.last().instance(scriptContext)) }
-
         // Check the output
         unit.expectedOutput?.let {
             // Sadly, sometimes the expected output is trimmed in Emscripten tests