Rename some files and functions.

1 files changed, 19 insertions, 19 deletions

diff --git a/src/test/parse.zig b/src/test/parse.zig
index 8c44454..af807b4 100644
--- a/src/test/parse.zig
+++ b/src/test/parse.zig
@@ -12,7 +12,7 @@ pub const Value = value.Value;
 
 fn parse(str: []const u8) Value {
     var fbs = std.Io.Reader.fixed(str);
-    return io.parser.parse(&fbs);
+    return io.parse.fromReader(&fbs);
 }
 
 test "parse empty" {
@@ -115,62 +115,62 @@ test "parse4" {
     try testing.expectEqualStrings("bar", f.slice());
 }
 
-test "unparse" {
+test "print" {
     var buf: [32]u8 = undefined;
     var w = std.Io.Writer.fixed(&buf);
     const v = parse("#foo");
-    try io.unparser.unparse(&w, v);
+    try io.print.toWriter(&w, v);
     try testing.expectEqualStrings("#foo", buf[0..w.end]);
 }
 
-test "unparse2" {
+test "print2" {
     var buf: [128]u8 = undefined;
     var w = std.Io.Writer.fixed(&buf);
     const v = parse("#{foo bar['x]}");
-    try io.unparser.unparse(&w, v);
+    try io.print.toWriter(&w, v);
     try testing.expectEqualStrings(
         "(#HASH #BRACE foo (#JOIN bar #SQUARE (#QUOTE & x)))",
         buf[0..w.end],
     );
 }
 
-fn writeParseResult(str: []const u8) !void {
+fn parseAndPrint(str: []const u8) !void {
     var buf: [64]u8 = undefined;
     var fw = std.Io.File.stderr().writer(gstIo, &buf);
     const w = &fw.interface;
 
     const v = parse(str);
-    try io.unparser.unparse(w, v);
+    try io.print.toWriter(w, v);
     try w.writeByte('\n');
     try w.flush();
 }
 
-test "unparse3" {
-    try writeParseResult("#{foo bar['x](y)(z)}");
+test "print3" {
+    try parseAndPrint("#{foo bar['x](y)(z)}");
 }
 
-test "unparse4" {
-    try writeParseResult("(foo ;~bar)");
+test "print4" {
+    try parseAndPrint("(foo ;~bar)");
 }
 
-test "unparse5" {
-    try writeParseResult("(;~foo foo ;~bar & ;~bar bar ;~bar)");
+test "print5" {
+    try parseAndPrint("(;~foo foo ;~bar & ;~bar bar ;~bar)");
 }
 
-test "unparse6" {
-    try writeParseResult("(foo bar ... baz bat.(qux))");
+test "print6" {
+    try parseAndPrint("(foo bar ... baz bat.(qux))");
 }
 
-test "unparse7" {
-    try writeParseResult("#`(#,(->keyword (syntax->datum #'sym)) & in)");
+test "print7" {
+    try parseAndPrint("#`(#,(->keyword (syntax->datum #'sym)) & in)");
 }
 
 fn parseBench(path: []const u8, iters: usize) !void {
     const file = try std.Io.Dir.cwd().openFile(gstIo, path, .{});
     defer file.close(gstIo);
 
-    var sfa = io.parser.DefaultSfa.init(std.heap.smp_allocator);
-    var parser = try io.parser.initSfa(&sfa);
+    var sfa = io.parse.DefaultSfa.init(std.heap.smp_allocator);
+    var parser = try io.parse.initSfa(&sfa);
     defer parser.deinit();
 
     var timer = try std.time.Timer.start();