1 files changed, 21 insertions, 17 deletions

diff --git a/tests/programs/generics.zc b/tests/programs/generics.zc
index e841b19..3623031 100644
--- a/tests/programs/generics.zc
+++ b/tests/programs/generics.zc
@@ -1,3 +1,6 @@
+namespace;
+include rt, run;
+
 // generics are compiled per set of type arguments: T can be any size, new(T)
 // stamps the real type, and a struct can take several parameters
 struct pt { int x, y; };
@@ -7,10 +10,11 @@ struct box<T> { int n; T* items; };
 K rkey<K, V>(record<K, V>* r) { return r.key; }
 V* rval<K, V>(record<K, V>* r) { return &r.val; }
 int tsize<T>() { return sizeof(T); }
-T*.u make<T>(int n) { T* p = new(T, n) as T*; return u*p; }
+T*.u make<T>(int n) { T* p = rt.new(T, n) as T*; return u*p; }
 record<K, V>*.u mkrec<K, V>(K k) {
-	record<K, V>* r = new(record<K, V>);
-	r.key = k;
+	record<K, V>* r = rt.new(record<K, V>);
+	// copied references are shared so the record does not consume its input.
+	r.key = run.share_value(k);
 	return u*r;
 }
 T pick<T>(T* a, int i) { return a[i]; }
@@ -19,7 +23,7 @@ int sumn<T>(T* a, int n) {
 	for (int i = 0; i < n; i++) s += a[i];
 	return s;
 }
-fn nameof<T>() { return tname(typeof(T)); }
+fn nameof<T>() { return run.tname(typeof(T)); }
 o3 int osum<T>(T* a, int n) {
 	int s = 0;
 	for (int i = 0; i < n; i++) s += a[i].x + a[i].y;
@@ -32,23 +36,23 @@ int depth<T>(int n) {
 int main() {
 	record<int, pt>* a = mkrec<int, pt>(9);
 	a.val.x = 5; a.val.y = 6;
-	put_n(rkey<int, pt>(a)); put_c(' ');
-	put_n(rval<int, pt>(a).y); put_c(' ');
-	put_n(sizeof(record<int, pt>)); put_c(' ');
-	put_n(tsize<int>()); put_c(' ');
-	put_n(tsize<pt>()); put_c(' ');
-	put_n(tsize<record<int, pt>>()); put_c(' ');
-	put_n(depth<pt>(5)); put_c(10);
+	rt.put_n(rkey<int, pt>(a)); rt.put_c(' ');
+	rt.put_n(rval<int, pt>(a).y); rt.put_c(' ');
+	rt.put_n(sizeof(record<int, pt>)); rt.put_c(' ');
+	rt.put_n(tsize<int>()); rt.put_c(' ');
+	rt.put_n(tsize<pt>()); rt.put_c(' ');
+	rt.put_n(tsize<record<int, pt>>()); rt.put_c(' ');
+	rt.put_n(depth<pt>(5)); rt.put_c(10);
 	pt* ps = make<pt>(3);
 	ps[2].x = 40; ps[2].y = 2;
-	put_n(pick<pt>(ps, 2).x + ps[2].y); put_c(' ');
-	put_s(nameof<pt>()); put_c(' '); put_s(nameof<int>()); put_c(' ');
-	put_n(osum<pt>(ps, 3)); put_c(' ');
+	rt.put_n(pick<pt>(ps, 2).x + ps[2].y); rt.put_c(' ');
+	rt.put_s(nameof<pt>()); rt.put_c(' '); rt.put_s(nameof<int>()); rt.put_c(' ');
+	rt.put_n(osum<pt>(ps, 3)); rt.put_c(' ');
 	int* is = make<int>(4);
 	is[0] = 1; is[1] = 2; is[2] = 3; is[3] = 4;
-	put_n(sumn<int>(is, 4)); put_c(' ');
+	rt.put_n(sumn<int>(is, 4)); rt.put_c(' ');
 	record<pt*, int>* b = mkrec<pt*, int>(ps);
-	put_n(b.key == ps); put_c(10);
-	free(d*a); free(d*b); free(d*ps); free(d*is);
+	rt.put_n(b.key == ps); rt.put_c(10);
+	rt.free(d*a); rt.free(d*b); rt.free(d*ps); rt.free(d*is);
 	return 0;
 }