1 files changed, 4 insertions, 51 deletions

diff --git a/src/test/values.zig b/src/test/values.zig
index a276b2e..32af6cb 100644
--- a/src/test/values.zig
+++ b/src/test/values.zig
@@ -9,7 +9,7 @@ pub const lib = @import("../zisp/lib.zig");
 pub const value = @import("../zisp/value.zig");
 
 pub const Zptr = value.Zptr;
-pub const PtrTag = value.PtrTag;
+pub const HeapType = value.HeapType;
 pub const Value = value.Value;
 
 test "double" {
@@ -68,37 +68,15 @@ test "snan" {
 test "ptr" {
     const ptr = value.ptr;
 
+    const tag = HeapType.array;
     const val: Zptr = @ptrFromInt(256);
-    const tag = PtrTag.pair;
 
     const p = ptr.pack(tag, @ptrCast(val));
     try testing.expect(ptr.check(p));
 
-    const pv, const pt = ptr.unpack(p);
-    try testing.expectEqual(val, pv);
+    const pt, const pv = ptr.unpack(p);
     try testing.expectEqual(tag, pt);
-
-    var w = ptr.makeWeak(p);
-    try testing.expect(ptr.check(w));
-    try testing.expect(ptr.checkWeak(w));
-    try testing.expect(value.t.eq(ptr.predWeak(w)));
-    try testing.expect(value.f.eq(ptr.predWeakNull(w)));
-
-    const wv, const wt = ptr.unpack(w);
-    try testing.expectEqual(val, wv);
-    try testing.expectEqual(tag, wt);
-
-    const wv2, const wt2 = ptr.unpack(ptr.getWeak(w));
-    try testing.expectEqual(val, wv2);
-    try testing.expectEqual(tag, wt2);
-
-    ptr.setWeakNull(&w);
-    try testing.expect(ptr.check(w));
-    try testing.expect(ptr.checkWeak(w));
-    try testing.expect(ptr.isWeakNull(w));
-    try testing.expect(value.t.eq(ptr.predWeak(w)));
-    try testing.expect(value.t.eq(ptr.predWeakNull(w)));
-    try testing.expect(value.f.eq(ptr.getWeak(w)));
+    try testing.expectEqual(val, pv);
 }
 
 test "rune" {
@@ -224,28 +202,3 @@ test "misc" {
     const eof = value.eof;
     try testing.expect(value.boole.unpack(value.misc.isEof(eof)));
 }
-
-test "pair" {
-    const v1 = value.fixnum.pack(1);
-    const v2 = value.fixnum.pack(2);
-
-    const v3 = value.fixnum.pack(3);
-    const v4 = value.fixnum.pack(4);
-
-    const p = value.pair.cons(v1, v2);
-    try testing.expect(value.pair.check(p) != null);
-    try testing.expect(value.boole.unpack(value.pair.pred(p)));
-
-    const car = value.pair.getCar(p);
-    const cdr = value.pair.getCdr(p);
-    try testing.expectEqual(1, value.fixnum.unpack(car));
-    try testing.expectEqual(2, value.fixnum.unpack(cdr));
-
-    value.pair.setCar(p, v3);
-    value.pair.setCdr(p, v4);
-
-    const car2 = value.pair.getCar(p);
-    const cdr2 = value.pair.getCdr(p);
-    try testing.expectEqual(3, value.fixnum.unpack(car2));
-    try testing.expectEqual(4, value.fixnum.unpack(cdr2));
-}