fix(emscripten playground): better capture of console.log output

Author: SuperFola

.gitignore

@@ -30,8 +30,7 @@ include/Ark/Constants.hpp
 
 # WASM
 /public/node_modules
-/public/*.wasm.wasm
-/public/*.wasm.js
+/public/ArkEmscripten.*
 /public/package.json
 /public/package-lock.json
 

CHANGELOG.md

@@ -60,6 +60,7 @@
 - `APPEND_IN_PLACE_SYM` and `APPEND_IN_PLACE_SYM_INDEX` super instructions
 - `PUSH_RETURN_ADDRESS` instruction now replaces the VM auto push of IP/PP
 - remove the stack swapping by pushing arguments in the reverse order by which they are loaded
+- wasm export: we can now run ArkScript code on the web!
 
 ### Changed
 - instructions are on 4 bytes: 1 byte for the instruction, 1 byte of padding, 2 bytes for an immediate argument

public/index.html

@@ -13,24 +13,29 @@
 </div>
 
 <script>
-    let output = "";
     log = console.log;
+    var can_capture = false;
+
     window.console.log = (message) => {
-        output = message;
+        log(message);
+        if (can_capture)
+            document.getElementById("output").value += message + "\n";
     };
 
     var Module = {
         onRuntimeInitialized: function () {
             document.getElementById("run").addEventListener("click", () => {
+                document.getElementById("output").value = "";
                 const code = document.getElementById("code").value;
-                console.log(code);
 
                 try {
+                    can_capture = true;
                     Module.run(code);
-                    document.getElementById("output").innerText = output;
                 } catch (e) {
-                    document.getElementById("output").innerText = e;
+                    document.getElementById("output").value = e;
                 }
+
+                can_capture = false;
             });
         }
     };

src/arkscript/main.cpp

@@ -209,9 +209,9 @@ int main(int argc, char** argv)
                     "sizeof(Ark::Value)    = {}B\n"
                     "      sizeof(Value_t) = {}B\n"
                     "      sizeof(ValueType) = {}B\n"
-                    "      sizeof(ProcType)  = {}B\n"
-                    "      sizeof(Ark::Closure)  = {}B\n"
-                    "      sizeof(Ark::UserType) = {}B\n"
+                    "      sizeof(Ark::Procedure) = {}B\n"
+                    "      sizeof(Ark::Closure)   = {}B\n"
+                    "      sizeof(Ark::UserType)  = {}B\n"
                     "\nVirtual Machine\n"
                     "sizeof(Ark::VM)       = {}B\n"
                     "      sizeof(Ark::State)    = {}B\n"