Merge branch 'fifteen-two'

Close #90
Close #87
Close #83

Thanks everyone.

1 files changed, 39 insertions, 32 deletions

diff --git a/codegen/gbp.zig b/codegen/gbp.zig
index 3fc4461..1d06e9a 100644
--- a/codegen/gbp.zig
+++ b/codegen/gbp.zig
@@ -47,7 +47,7 @@ const BlockMap = std.HashMap(
     std.hash_map.default_max_load_percentage,
 );
 
-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();
@@ -61,15 +61,12 @@ pub fn main() !void {
     var emoji_set = std.AutoHashMap(u21, void).init(allocator);
     defer emoji_set.deinit();
 
-    var line_buf: [4096]u8 = undefined;
-
     // Process Indic
-    var indic_file = try std.fs.cwd().openFile("data/unicode/DerivedCoreProperties.txt", .{});
-    defer indic_file.close();
-    var indic_buf = std.io.bufferedReader(indic_file.reader());
-    const indic_reader = indic_buf.reader();
+    const indic_file = @embedFile("DerivedCoreProperties.txt");
+    var indic_reader = std.io.Reader.fixed(indic_file);
 
-    while (try indic_reader.readUntilDelimiterOrEof(&line_buf, '\n')) |line| {
+    while (indic_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
         if (std.mem.indexOf(u8, line, "InCB") == null) continue;
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
@@ -100,15 +97,18 @@ pub fn main() !void {
                 else => {},
             }
         }
+    } else |err| switch (err) {
+        error.EndOfStream => {},
+        else => {
+            return err;
+        },
     }
-
     // Process GBP
-    var gbp_file = try std.fs.cwd().openFile("data/unicode/auxiliary/GraphemeBreakProperty.txt", .{});
-    defer gbp_file.close();
-    var gbp_buf = std.io.bufferedReader(gbp_file.reader());
-    const gbp_reader = gbp_buf.reader();
 
-    while (try gbp_reader.readUntilDelimiterOrEof(&line_buf, '\n')) |line| {
+    var gbp_reader = std.io.Reader.fixed(@embedFile("GraphemeBreakProperty.txt"));
+
+    while (gbp_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;
 
@@ -138,15 +138,18 @@ pub fn main() !void {
                 else => {},
             }
         }
+    } else |err| switch (err) {
+        error.EndOfStream => {},
+        else => {
+            return err;
+        },
     }
-
     // Process Emoji
-    var emoji_file = try std.fs.cwd().openFile("data/unicode/emoji/emoji-data.txt", .{});
-    defer emoji_file.close();
-    var emoji_buf = std.io.bufferedReader(emoji_file.reader());
-    const emoji_reader = emoji_buf.reader();
 
-    while (try emoji_reader.readUntilDelimiterOrEof(&line_buf, '\n')) |line| {
+    var emoji_reader = std.io.Reader.fixed(@embedFile("emoji-data.txt"));
+
+    while (emoji_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
         if (std.mem.indexOf(u8, line, "Extended_Pictographic") == null) continue;
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
@@ -170,15 +173,20 @@ 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(u16).init(allocator);
+    var stage2 = std.array_list.Managed(u16).init(allocator);
     defer stage2.deinit();
 
     var stage3 = std.AutoArrayHashMap(u8, u16).init(allocator);
@@ -227,22 +235,21 @@ 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(u16, i, endian);
+    try writer.interface.writeInt(u16, @intCast(stage2.items.len), endian);
+    for (stage2.items) |i| try writer.interface.writeInt(u16, i, endian);
 
     const props_bytes = stage3.keys();
-    try writer.writeInt(u16, @intCast(props_bytes.len), endian);
-    try writer.writeAll(props_bytes);
+    try writer.interface.writeInt(u16, @intCast(props_bytes.len), endian);
+    try writer.interface.writeAll(props_bytes);
 
-    try out_comp.flush();
+    try writer.interface.flush();
 }