Fix tests etc.

1 files changed, 13 insertions, 19 deletions

diff --git a/src/test/parse.zig b/src/test/parse.zig
index ba29333..1c930a6 100644
--- a/src/test/parse.zig
+++ b/src/test/parse.zig
@@ -70,14 +70,14 @@ test "parse" {
 test "parse2" {
     const val = parse(
         \\ ;; Testing some crazy datum comments
-        \\ ;~"bar"([x #"y"]{##`,'z}) #"foo"
+        \\ ;~"bar"([x #"y"]{##`,'z}) #\foo
         \\ ;; end
     );
 
-    const r = value.rune.unpack(&value.pair.getCar(val));
+    const r = value.rune.unpack(&value.list.getValPtr(val)[0]);
     try testing.expectEqualStrings("HASH", r);
 
-    const s = value.pair.getCdr(value.pair.getCdr(val));
+    const s = value.list.getValPtr(val)[1];
     try testing.expect(value.sstr.check(s));
 
     const f = value.sstr.unpack(&s);
@@ -89,27 +89,24 @@ test "parse3" {
         \\(foo ;~x ;~(x y) ;~x #bar [#x #"baz"] 'bat)
     );
 
-    const car = value.pair.getCar;
-    const cdr = value.pair.getCdr;
-
-    const e1 = car(val);
-    const e2 = car(cdr(val));
-    const e3 = car(cdr(cdr(val)));
-    const e4 = car(cdr(cdr(cdr(val))));
+    const e1 = value.list.getValPtr(val)[0];
+    const e2 = value.list.getValPtr(val)[1];
+    const e3 = value.list.getValPtr(val)[2];
+    const e4 = value.list.getValPtr(val)[3];
 
     try testing.expect(value.sstr.check(e1));
     try testing.expect(value.rune.check(e2));
-    try testing.expect(value.pair.check(e3) != null);
-    try testing.expect(value.pair.check(e4) != null);
+    try testing.expect(value.list.check(e3));
+    try testing.expect(value.list.check(e4));
 }
 
 test "parse4" {
-    const val = parse("(foo & ;~x bar ;~y)");
+    const val = parse("(foo ;~x bar ;~y)");
 
-    const s = value.sstr.unpack(&value.pair.getCar(val));
+    const s = value.sstr.unpack(&value.list.getValPtr(val)[0]);
     try testing.expectEqualStrings("foo", s);
 
-    const f = value.sstr.unpack(&value.pair.getCdr(val));
+    const f = value.sstr.unpack(&value.list.getValPtr(val)[1]);
     try testing.expectEqualStrings("bar", f);
 }
 
@@ -126,10 +123,7 @@ test "print2" {
     var w = std.Io.Writer.fixed(&buf);
     const v = parse("#{foo bar['x]}");
     try zisp.io.print(&w, v);
-    try testing.expectEqualStrings(
-        "(#HASH #BRACE foo (#JOIN bar #SQUARE (#QUOTE & x)))",
-        buf[0..w.end],
-    );
+    try testing.expectEqualStrings("#{foo bar['x]}", buf[0..w.end]);
 }
 
 fn parseAndPrint(str: []const u8) !void {