Merge branch 'fifteen-two'

Close #90
Close #87
Close #83

Thanks everyone.

1 files changed, 13 insertions, 14 deletions

diff --git a/codegen/canon.zig b/codegen/canon.zig
index 28b7f28..d95a905 100644
--- a/codegen/canon.zig
+++ b/codegen/canon.zig
@@ -1,32 +1,27 @@
 const std = @import("std");
 const builtin = @import("builtin");
 
-pub fn main() !void {
+pub fn main() anyerror!void {
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = arena.allocator();
 
+    var write_buf: [4096]u8 = undefined;
     // Process UnicodeData.txt
-    var in_file = try std.fs.cwd().openFile("data/unicode/UnicodeData.txt", .{});
-    defer in_file.close();
-    var in_buf = std.io.bufferedReader(in_file.reader());
-    const in_reader = in_buf.reader();
-
+    var in_reader = std.io.Reader.fixed(@embedFile("UnicodeData.txt"));
     var args_iter = try std.process.argsWithAllocator(allocator);
     defer args_iter.deinit();
     _ = args_iter.skip();
     const output_path = args_iter.next() orelse @panic("No output file arg!");
 
-    const compressor = std.compress.flate.deflate.compressor;
     var out_file = try std.fs.cwd().createFile(output_path, .{});
     defer out_file.close();
-    var out_comp = try compressor(.raw, out_file.writer(), .{ .level = .best });
-    const writer = out_comp.writer();
-
+    var file_writer = out_file.writer(&write_buf);
+    var writer = &file_writer.interface;
     const endian = builtin.cpu.arch.endian();
-    var line_buf: [4096]u8 = undefined;
 
-    lines: while (try in_reader.readUntilDelimiterOrEof(&line_buf, '\n')) |line| {
+    lines: while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0) continue;
 
         var field_iter = std.mem.splitScalar(u8, line, ';');
@@ -60,8 +55,12 @@ pub fn main() !void {
 
         try writer.writeInt(u8, @intCast(len), endian);
         for (cps[0..len]) |cp| try writer.writeInt(u24, cp, endian);
+    } else |err| switch (err) {
+        error.EndOfStream => {},
+        else => {
+            return err;
+        },
     }
-
     try writer.writeInt(u16, 0, endian);
-    try out_comp.flush();
+    try writer.flush();
 }