1 files changed, 26 insertions, 23 deletions

diff --git a/examples/lang.zc b/examples/lang.zc
index 6e992b4..dc814d1 100644
--- a/examples/lang.zc
+++ b/examples/lang.zc
@@ -1,49 +1,52 @@
+namespace;
+include rt, run;
+
 // growing the language from inside a program, while it compiles
 
 // x |> f calls f(x). on a stack machine that's just "call": the value is
 // already on the stack, under f's address.
-immediate fn pipe_op() { next(); add_binop("|>", 1, "c"); return 0; }
+immediate fn pipe_op() { run.next(); run.add_binop("|>", 1, "c"); return 0; }
 pipe_op
 
 // unless (c) stmt
 immediate fn unless() {
 	let a;
-	next(); expect(intern("(")); plainuse(expr()); rval(); expect(intern(")"));
-	emitseq(useq[0], ulen[0]);		// not
-	a = hole(); op(O_JZ);
-	substmt();
-	setlit(a, here);
+	run.next(); run.expect(run.intern("(")); run.plainuse(run.expr()); run.rval(); run.expect(run.intern(")"));
+	run.emitseq(run.useq[0], run.ulen[0]);		// not
+	a = run.hole(); run.op(run.O_JZ);
+	run.substmt();
+	run.setlit(a, run.here);
 	return 0;
 }
 // assert (c): the failure message carries the line it was written on
-fn assert_fail(int line) { put_s("assertion failed on line "); put_n(line); put_c(10); halt(); return 0; }
+void assert_fail(int line) { rt.put_s("assertion failed on line "); rt.put_n(line); rt.put_c(10); rt.halt(); return; }
 immediate fn assert() {
-	let a, l = tline;
-	next(); expect(intern("(")); plainuse(expr()); rval(); expect(intern(")"));
-	emitseq(useq[0], ulen[0]);		// not: the jump below skips the failure when it holds
-	a = hole(); op(O_JZ);
-	lit(l); callname(intern("assert_fail")); op(O_DROP);
-	setlit(a, here);
+	let a, l = run.tline;
+	run.next(); run.expect(run.intern("(")); run.plainuse(run.expr()); run.rval(); run.expect(run.intern(")"));
+	run.emitseq(run.useq[0], run.ulen[0]);		// not: the jump below skips the failure when it holds
+	a = run.hole(); run.op(run.O_JZ);
+	run.lit(l); run.callname(run.intern("assert_fail")); run.op(run.O_DROP);
+	run.setlit(a, run.here);
 	return 0;
 }
 // times N { body }: the body pasted N times, at compile time
 immediate fn times() {
 	let n, b, i = 0;
-	next(); n = tv; next();
-	b = grab();
-	while (i < n) { feed(qdup(b)); i++; }
-	free(d*b);
+	run.next(); n = run.tv; run.next();
+	b = run.grab();
+	while (i < n) { run.feed(run.qdup(b)); i++; }
+	rt.free(b);
 	return 0;
 }
 
 fn double(x) { return x * 2; }
 fn inc(x) { return x + 1; }
-fn main() {
-	put_n(5 |> double |> inc |> double); put_c(10);
-	unless (1 > 2) put_s("one isn't bigger than two\n");
-	times 3 { put_c('*'); }
-	put_c(10);
+void main() {
+	rt.put_n(5 |> double |> inc |> double); rt.put_c(10);
+	unless (1 > 2) rt.put_s("one isn't bigger than two\n");
+	times 3 { rt.put_c('*'); }
+	rt.put_c(10);
 	assert(double(4) == 8);
 	assert(inc(1) == 3);
-	return 0;
+	return;
 }