1 files changed, 13 insertions, 10 deletions

diff --git a/tests/programs/joins.zc b/tests/programs/joins.zc
index 98275ad..ec3f862 100644
--- a/tests/programs/joins.zc
+++ b/tests/programs/joins.zc
@@ -1,31 +1,34 @@
+namespace;
+include rt;
+
 // joins: something given away on one path is dead afterwards, and the paths
 // that still own it free it on the way in. nothing here leaks.
 fn take(.d p) { return p[0]; }
 fn later(.d p);	// not needed any more, but still allowed
-int*.u mk(int v) { int* p = new(int); *p = v; return u*p; }
+int*.u mk(int v) { int* p = rt.new(int); *p = v; return u*p; }
 fn count(int n) { let s = 0; switch (n % 4) { case 0: s = 10; case 1, 2: s = 20; break; default: s = 30; } return s; }
 fn main() {
-	let base = live_objects(), i = 0, hits = 0, k;
+	let base = rt.live_objects(), i = 0, hits = 0, k;
 	while (i < 50) {
 		let x = mk(i);
 		if (i % 3 == 0) take(d*x);	// else: freed here by the fixup
 		i++;
 	}
-	put_n(live_objects() - base); put_c(' ');
+	rt.put_n(rt.live_objects() - base); rt.put_c(' ');
 	// give away and break: fine now; the normal exit frees it
 	i = 0;
 	let y = mk(7);
 	while (i < 10) { if (i == 4) { take(d*y); break; } i++; }
-	put_n(live_objects() - base); put_c(' ');
+	rt.put_n(rt.live_objects() - base); rt.put_c(' ');
 	let z = mk(5);
 	while (1) { if (z[0] == 5) { hits = take(d*z); break; } }
-	put_n(hits); put_c(' ');
-	put_n(count(0) + count(1) + count(2) + count(3)); put_c(' ');
+	rt.put_n(hits); rt.put_c(' ');
+	rt.put_n(count(0) + count(1) + count(2) + count(3)); rt.put_c(' ');
 	k = i > 3 ? i * 2 : 0 - 1;
-	put_n(k); put_c(' ');
-	put_n(forward(new(int))); put_c(' ');	// tagged and defined below: the prescan knows .d
-	int** pp; int* q = new(int); *q = 9; pp = &q; put_n(**pp); free(d*q); put_c(' ');
-	put_n(live_objects() - base); put_c(10);
+	rt.put_n(k); rt.put_c(' ');
+	rt.put_n(forward(rt.new(int))); rt.put_c(' ');	// tagged and defined below: the prescan knows .d
+	int** pp; int* q = rt.new(int); *q = 9; pp = &q; rt.put_n(**pp); rt.free(d*q); rt.put_c(' ');
+	rt.put_n(rt.live_objects() - base); rt.put_c(10);
 	return 0;
 }
 fn forward(int*.d p) { return 3 + *p; }