Merge branch 'fifteen-two'

Close #90
Close #87
Close #83

Thanks everyone.

1 files changed, 20 insertions, 21 deletions

diff --git a/codegen/gencat.zig b/codegen/gencat.zig
index fe06bd7..9800f1d 100644
--- a/codegen/gencat.zig
+++ b/codegen/gencat.zig
@@ -62,15 +62,10 @@ pub fn main() !void {
     var flat_map = std.AutoHashMap(u21, u5).init(allocator);
     defer flat_map.deinit();
 
-    var line_buf: [4096]u8 = undefined;
-
     // Process DerivedGeneralCategory.txt
-    var in_file = try std.fs.cwd().openFile("data/unicode/extracted/DerivedGeneralCategory.txt", .{});
-    defer in_file.close();
-    var in_buf = std.io.bufferedReader(in_file.reader());
-    const in_reader = in_buf.reader();
-
-    while (try in_reader.readUntilDelimiterOrEof(&line_buf, '\n')) |line| {
+    var in_reader = std.io.Reader.fixed(@embedFile("DerivedGeneralCategory.txt"));
+    while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
 
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
@@ -101,18 +96,23 @@ pub fn main() !void {
                 else => {},
             }
         }
+    } else |err| switch (err) {
+        error.EndOfStream => {},
+        else => {
+            return err;
+        },
     }
 
     var blocks_map = BlockMap.init(allocator);
     defer blocks_map.deinit();
 
-    var stage1 = std.ArrayList(u16).init(allocator);
+    var stage1 = std.array_list.Managed(u16).init(allocator);
     defer stage1.deinit();
 
-    var stage2 = std.ArrayList(u5).init(allocator);
+    var stage2 = std.array_list.Managed(u5).init(allocator);
     defer stage2.deinit();
 
-    var stage3 = std.ArrayList(u5).init(allocator);
+    var stage3 = std.array_list.Managed(u5).init(allocator);
     defer stage3.deinit();
 
     var block: Block = [_]u5{0} ** block_size;
@@ -151,21 +151,20 @@ pub fn main() !void {
     _ = args_iter.skip();
     const output_path = args_iter.next() orelse @panic("No output file arg!");
 
-    const compressor = std.compress.flate.deflate.compressor;
+    var write_buf: [4096]u8 = undefined;
     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 writer = out_file.writer(&write_buf);
 
     const endian = builtin.cpu.arch.endian();
-    try writer.writeInt(u16, @intCast(stage1.items.len), endian);
-    for (stage1.items) |i| try writer.writeInt(u16, i, endian);
+    try writer.interface.writeInt(u16, @intCast(stage1.items.len), endian);
+    for (stage1.items) |i| try writer.interface.writeInt(u16, i, endian);
 
-    try writer.writeInt(u16, @intCast(stage2.items.len), endian);
-    for (stage2.items) |i| try writer.writeInt(u8, i, endian);
+    try writer.interface.writeInt(u16, @intCast(stage2.items.len), endian);
+    for (stage2.items) |i| try writer.interface.writeInt(u8, i, endian);
 
-    try writer.writeInt(u8, @intCast(stage3.items.len), endian);
-    for (stage3.items) |i| try writer.writeInt(u8, i, endian);
+    try writer.interface.writeInt(u8, @intCast(stage3.items.len), endian);
+    for (stage3.items) |i| try writer.interface.writeInt(u8, i, endian);
 
-    try out_comp.flush();
+    try writer.interface.flush();
 }