Refactoring for ergonomics.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/main.zig b/src/main.zig
index 55fecdf..a01daa9 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -2,20 +2,20 @@ const std = @import("std");
 
 const zisp = @import("zisp");
 
-const alloc = std.heap.smp_allocator;
-const gstio = std.Io.Threaded.global_single_threaded.io();
-
 pub fn main() !u8 {
+    const alloc = std.heap.smp_allocator;
+    const io = std.Io.Threaded.global_single_threaded.io();
+
     var stdin_buffer: [4096]u8 = undefined;
-    var stdin_reader = std.Io.File.stdin().reader(gstio, &stdin_buffer);
+    var stdin_reader = std.Io.File.stdin().reader(io, &stdin_buffer);
     const reader = &stdin_reader.interface;
 
     var stdout_buffer: [4096]u8 = undefined;
-    var stdout_writer = std.Io.File.stdout().writer(gstio, &stdout_buffer);
+    var stdout_writer = std.Io.File.stdout().writer(io, &stdout_buffer);
     const writer = &stdout_writer.interface;
 
-    var sfa = zisp.io.Parser.DefaultSfa.withFallback(alloc);
-    var p = try zisp.io.Parser.initWithSfa(&sfa, gstio);
+    var p, const sfa = try zisp.io.Parser.init(alloc, io);
+    defer p.deinit(sfa);
     while (true) {
         const datum = p.run(reader) catch {
             const format = "Parse error: {s}, pos: {d}, unread_char: {s}\n";