Skip to content

Commit fe68bef

Browse files
committed
move samples one level up
1 parent d9ce4af commit fe68bef

17 files changed

Lines changed: 28 additions & 5 deletions

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ comp: compiler/node_modules/typescript
9090
cd compiler && node build.js --fast
9191

9292
test-c: all
93-
./built/jdcli samples/ex-test.jacs
93+
node run -c compiler/run-tests/basic.js
9494

9595
test-em: em comp
9696
node run test

run.js

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
const jacsFactory = require("./vm")
22
const fs = require("fs")
33
const path = require("path")
4+
const child_process = require("child_process")
45

56
const ctest = "compiler/compiler-tests"
6-
const samples = "compiler/samples"
7+
const samples = "samples"
78
const rtest = "compiler/run-tests"
89
const distPath = "built"
910
let verbose = false
11+
let useC = false
1012

1113
let jacsHost
1214
async function getHost() {
@@ -31,6 +33,8 @@ async function getHost() {
3133
async function compile(buf) {
3234
const jacscript = require("./compiler")
3335
const res = jacscript.compile(await getHost(), buf.toString("utf8"))
36+
if (!res.success)
37+
throw new Error("compilation failed")
3438
return res.binary
3539
}
3640

@@ -85,6 +89,15 @@ async function runTest(fn) {
8589
}
8690

8791
async function runServer(fn) {
92+
if (useC) {
93+
const prog = await readCompiled(fn)
94+
const compfn = distPath + "/compiled.jacs"
95+
fs.writeFileSync(compfn, prog)
96+
child_process.spawn(distPath + "/jdcli", ["8082", compfn], {
97+
stdio: "inherit"
98+
})
99+
return
100+
}
88101
const inst = await jacsFactory()
89102
await inst.setupNodeTcpSocketTransport(require, "localhost", 8082)
90103
inst.jacsStart()
@@ -104,9 +117,19 @@ function readdir(folder) {
104117

105118
async function main() {
106119
const args = process.argv.slice(2)
107-
if (args[0] == "-v") {
108-
args.shift()
109-
verbose = true
120+
121+
while (true) {
122+
if (args[0] == "-v") {
123+
args.shift()
124+
verbose = true
125+
continue
126+
}
127+
if (args[0] == "-c") {
128+
args.shift()
129+
useC = true
130+
continue
131+
}
132+
break
110133
}
111134

112135
let testMode = false

samples/ex-test.jacs

-1.63 KB
Binary file not shown.

0 commit comments

Comments
 (0)