JavaScriptNexus
diff --git a/Collapse file
‎Makefile‎
Copy file name to clipboardExpand all lines: Makefile
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎Makefile‎
Copy file name to clipboardExpand all lines: Makefile
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎run.js‎
Copy file name to clipboardExpand all lines: run.js
+27-4Lines changed: 27 additions & 4 deletions b/Collapse file
‎run.js‎
Copy file name to clipboardExpand all lines: run.js
+27-4Lines changed: 27 additions & 4 deletions
diff --git a/Collapse file
‎compiler/samples/cloud-light.js‎ ‎samples/cloud-light.js‎compiler/samples/cloud-light.js renamed to samples/cloud-light.js
Copy file name to clipboard b/Collapse file
‎compiler/samples/cloud-light.js‎ ‎samples/cloud-light.js‎compiler/samples/cloud-light.js renamed to samples/cloud-light.js
Copy file name to clipboard
diff --git a/Collapse file
‎compiler/samples/cloud.js‎ ‎samples/cloud.js‎compiler/samples/cloud.js renamed to samples/cloud.js
Copy file name to clipboard b/Collapse file
‎compiler/samples/cloud.js‎ ‎samples/cloud.js‎compiler/samples/cloud.js renamed to samples/cloud.js
Copy file name to clipboard
diff --git a/Collapse file
‎compiler/samples/commands.js‎ ‎samples/commands.js‎compiler/samples/commands.js renamed to samples/commands.js
Copy file name to clipboard b/Collapse file
‎compiler/samples/commands.js‎ ‎samples/commands.js‎compiler/samples/commands.js renamed to samples/commands.js
Copy file name to clipboard
diff --git a/Collapse file
‎compiler/samples/complex.js‎ ‎samples/complex.js‎compiler/samples/complex.js renamed to samples/complex.js
Copy file name to clipboard b/Collapse file
‎compiler/samples/complex.js‎ ‎samples/complex.js‎compiler/samples/complex.js renamed to samples/complex.js
Copy file name to clipboard
diff --git a/Collapse file
‎compiler/samples/display-dimmer.js‎ ‎samples/display-dimmer.js‎compiler/samples/display-dimmer.js renamed to samples/display-dimmer.js
Copy file name to clipboard b/Collapse file
‎compiler/samples/display-dimmer.js‎ ‎samples/display-dimmer.js‎compiler/samples/display-dimmer.js renamed to samples/display-dimmer.js
Copy file name to clipboard
diff --git a/Collapse file
‎samples/ex-test.jacs‎
Copy file name to clipboard
-1.63 KB b/Collapse file
‎samples/ex-test.jacs‎
Copy file name to clipboard
-1.63 KB
diff --git a/Collapse file
‎compiler/samples/fields.js‎ ‎samples/fields.js‎compiler/samples/fields.js renamed to samples/fields.js
Copy file name to clipboard b/Collapse file
‎compiler/samples/fields.js‎ ‎samples/fields.js‎compiler/samples/fields.js renamed to samples/fields.js
Copy file name to clipboard
diff --git a/Collapse file
‎compiler/samples/light-dimmer.js‎ ‎samples/light-dimmer.js‎compiler/samples/light-dimmer.js renamed to samples/light-dimmer.js
Copy file name to clipboard b/Collapse file
‎compiler/samples/light-dimmer.js‎ ‎samples/light-dimmer.js‎compiler/samples/light-dimmer.js renamed to samples/light-dimmer.js
Copy file name to clipboard
@@ -90,7 +90,7 @@ comp: compiler/node_modules/typescript
 	cd compiler && node build.js --fast
 
 test-c: all
-	./built/jdcli samples/ex-test.jacs
+	node run -c compiler/run-tests/basic.js
 
 test-em: em comp
 	node run test
 
@@ -1,12 +1,14 @@
 const jacsFactory = require("./vm")
 const fs = require("fs")
 const path = require("path")
+const child_process = require("child_process")
 
 const ctest = "compiler/compiler-tests"
-const samples = "compiler/samples"
+const samples = "samples"
 const rtest = "compiler/run-tests"
 const distPath = "built"
 let verbose = false
+let useC = false
 
 let jacsHost
 async function getHost() {
@@ -31,6 +33,8 @@ async function getHost() {
 async function compile(buf) {
     const jacscript = require("./compiler")
     const res = jacscript.compile(await getHost(), buf.toString("utf8"))
+    if (!res.success)
+        throw new Error("compilation failed")
     return res.binary
 }
 
@@ -85,6 +89,15 @@ async function runTest(fn) {
 }
 
 async function runServer(fn) {
+    if (useC) {
+        const prog = await readCompiled(fn)
+        const compfn = distPath + "/compiled.jacs"
+        fs.writeFileSync(compfn, prog)
+        child_process.spawn(distPath + "/jdcli", ["8082", compfn], {
+            stdio: "inherit"
+        })
+        return
+    }
     const inst = await jacsFactory()
     await inst.setupNodeTcpSocketTransport(require, "localhost", 8082)
     inst.jacsStart()
@@ -104,9 +117,19 @@ function readdir(folder) {
 
 async function main() {
     const args = process.argv.slice(2)
-    if (args[0] == "-v") {
-        args.shift()
-        verbose = true
+
+    while (true) {
+        if (args[0] == "-v") {
+            args.shift()
+            verbose = true
+            continue
+        }
+        if (args[0] == "-c") {
+            args.shift()
+            useC = true
+            continue
+        }
+        break
     }
 
     let testMode = false