3 files changed, 22 insertions, 23 deletions

diff --git a/src/test/parse.zig b/src/test/parse.zig
index 53de21d..26d54bd 100644
--- a/src/test/parse.zig
+++ b/src/test/parse.zig
@@ -13,7 +13,7 @@ pub const Value = zisp.Value;
 
 fn parse(str: []const u8) Value {
     var fbs = std.Io.Reader.fixed(str);
-    return zisp.io.parse.fromReaderNoError(alloc, io, &fbs);
+    return zisp.io.parse.fromReaderNoError(alloc, &fbs);
 }
 
 test "parse empty" {
@@ -49,14 +49,13 @@ test "parse short bare string" {
 }
 
 test "parse long bare string" {
-    const str = value.istr.intern;
-    try expect(parse("foobarbaz").eq(str("foobarbaz")));
-    try expect(parse(".foo.bar.baz").eq(str(".foo.bar.baz")));
-    try expect(parse(":foo:bar:baz").eq(str(":foo:bar:baz")));
-    try expect(parse("+foo.bar.baz").eq(str("+foo.bar.baz")));
-    try expect(parse("-foo.bar.baz").eq(str("-foo.bar.baz")));
-    try expect(parse("0foo.bar.baz").eq(str("0foo.bar.baz")));
-    try expect(parse("!$%*+-/<=>?^_~").eq(str("!$%*+-/<=>?^_~")));
+    try expect(parse("foobarbaz").eq(parse("foobarbaz")));
+    try expect(parse(".foo.bar.baz").eq(parse(".foo.bar.baz")));
+    try expect(parse(":foo:bar:baz").eq(parse(":foo:bar:baz")));
+    try expect(parse("+foo.bar.baz").eq(parse("+foo.bar.baz")));
+    try expect(parse("-foo.bar.baz").eq(parse("-foo.bar.baz")));
+    try expect(parse("0foo.bar.baz").eq(parse("0foo.bar.baz")));
+    try expect(parse("!$%*+-/<=>?^_~").eq(parse("!$%*+-/<=>?^_~")));
 }
 
 test "parse" {
@@ -75,10 +74,10 @@ test "parse2" {
         \\ ;; end
     );
 
-    const r = value.rune.unpack(&value.pair.car(val));
+    const r = value.rune.unpack(&value.pair.getCar(val));
     try testing.expectEqualStrings("HASH", r);
 
-    const s = value.pair.cdr(value.pair.cdr(val));
+    const s = value.pair.getCdr(value.pair.getCdr(val));
     try testing.expect(value.sstr.check(s));
 
     const f = value.sstr.unpack(&s);
@@ -90,8 +89,8 @@ test "parse3" {
         \\(foo ;~x ;~(x y) ;~x #bar [#x #"baz"] 'bat)
     );
 
-    const car = value.pair.car;
-    const cdr = value.pair.cdr;
+    const car = value.pair.getCar;
+    const cdr = value.pair.getCdr;
 
     const e1 = car(val);
     const e2 = car(cdr(val));
@@ -107,10 +106,10 @@ test "parse3" {
 test "parse4" {
     const val = parse("(foo & ;~x bar ;~y)");
 
-    const s = value.sstr.unpack(&value.pair.car(val));
+    const s = value.sstr.unpack(&value.pair.getCar(val));
     try testing.expectEqualStrings("foo", s);
 
-    const f = value.sstr.unpack(&value.pair.cdr(val));
+    const f = value.sstr.unpack(&value.pair.getCdr(val));
     try testing.expectEqualStrings("bar", f);
 }
 
@@ -175,7 +174,7 @@ fn parseBench(path: []const u8, iters: usize) !void {
         var file_reader = file.reader(io, &buf);
         const reader = &file_reader.interface;
         while (true) {
-            const v = zisp.io.parse.fromReaderNoError(alloc, io, reader);
+            const v = zisp.io.parse.fromReaderNoError(alloc, reader);
             if (value.eof.eq(v)) break;
         }
     }
diff --git a/src/test/strings.zig b/src/test/strings.zig
index b8db320..3039615 100644
--- a/src/test/strings.zig
+++ b/src/test/strings.zig
@@ -11,13 +11,13 @@ const fx = value.fixnum;
 
 test "istr" {
     const s1 = "foo bar baz";
-    const v1 = istr.intern(s1);
+    const v1 = try istr.intern(s1);
     const v1_len: usize = @intCast(fx.unpack(istr.len(v1)));
     try testing.expectEqualStrings(s1, istr.assert(v1).str());
     try testing.expectEqual(s1.len, v1_len);
 
     const s2 = @embedFile("data/string.txt");
-    const v2 = istr.intern(s2);
+    const v2 = try istr.intern(s2);
     const v2_len: usize = @intCast(fx.unpack(istr.len(v2)));
     try testing.expectEqualStrings(s2, istr.assert(v2).str());
     try testing.expectEqual(s2.len, v2_len);
@@ -25,7 +25,7 @@ test "istr" {
     // Check that modifying a slice doesn't affect the string.
 
     var s3 = "test".*;
-    const v3 = istr.intern(&s3);
+    const v3 = try istr.intern(&s3);
     s3[0] = 'x';
     try testing.expectEqualStrings("test", istr.assert(v3).str());
 }
diff --git a/src/test/values.zig b/src/test/values.zig
index 153b53f..e628b33 100644
--- a/src/test/values.zig
+++ b/src/test/values.zig
@@ -213,16 +213,16 @@ test "pair" {
     try testing.expect(value.pair.check(p) != null);
     try testing.expect(value.boole.unpack(value.pair.pred(p)));
 
-    const car = value.pair.car(p);
-    const cdr = value.pair.cdr(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.car(p);
-    const cdr2 = value.pair.cdr(p);
+    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));
 }