3 files changed, 40 insertions, 76 deletions

diff --git a/codegen/normp.zig b/codegen/ccc.zig
index 25af65c..93da6a0 100644
--- a/codegen/normp.zig
+++ b/codegen/ccc.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
-
-const options = @import("options");
+const builtin = @import("builtin");
 
 const block_size = 256;
 const Block = [block_size]u8;
@@ -108,21 +107,19 @@ pub fn main() !void {
     _ = args_iter.skip();
     const output_path = args_iter.next() orelse @panic("No output file arg!");
 
+    const compressor = std.compress.deflate.compressor;
     var out_file = try std.fs.cwd().createFile(output_path, .{});
     defer out_file.close();
-    var out_buf = std.io.bufferedWriter(out_file.writer());
-    const writer = out_buf.writer();
-
-    try writer.writeAll("const std = @import(\"std\");\n");
+    var out_comp = try compressor(allocator, out_file.writer(), .{ .level = .best_compression });
+    defer out_comp.deinit();
+    const writer = out_comp.writer();
 
-    try writer.print("const Stage2Int = std.math.IntFittingRange(0, {});\n", .{stage2.items.len});
-    try writer.print("pub const stage_1 = [{}]Stage2Int{{", .{stage1.items.len});
-    for (stage1.items) |v| try writer.print("{},", .{v});
-    try writer.writeAll("};\n");
+    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.print("pub const stage_2 = [{}]u8{{", .{stage2.items.len});
-    for (stage2.items) |v| try writer.print("{},", .{v});
-    try writer.writeAll("};\n");
+    try writer.writeInt(u16, @intCast(stage2.items.len), endian);
+    try writer.writeAll(stage2.items);
 
-    try out_buf.flush();
+    try out_comp.flush();
 }
diff --git a/codegen/dwp.zig b/codegen/dwp.zig
index 9e387c6..76a14d3 100644
--- a/codegen/dwp.zig
+++ b/codegen/dwp.zig
@@ -1,4 +1,5 @@
 const std = @import("std");
+const builtin = @import("builtin");
 
 const options = @import("options");
 
@@ -229,21 +230,19 @@ pub fn main() !void {
     _ = args_iter.skip();
     const output_path = args_iter.next() orelse @panic("No output file arg!");
 
+    const compressor = std.compress.deflate.compressor;
     var out_file = try std.fs.cwd().createFile(output_path, .{});
     defer out_file.close();
-    var out_buf = std.io.bufferedWriter(out_file.writer());
-    const writer = out_buf.writer();
+    var out_comp = try compressor(allocator, out_file.writer(), .{ .level = .best_compression });
+    defer out_comp.deinit();
+    const writer = out_comp.writer();
 
-    try writer.writeAll("const std = @import(\"std\");\n");
+    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.print("const Stage2Int = std.math.IntFittingRange(0, {});\n", .{stage2.items.len});
-    try writer.print("pub const stage_1 = [{}]Stage2Int{{", .{stage1.items.len});
-    for (stage1.items) |v| try writer.print("{},", .{v});
-    try writer.writeAll("};\n");
+    try writer.writeInt(u16, @intCast(stage2.items.len), endian);
+    for (stage2.items) |i| try writer.writeInt(i8, i, endian);
 
-    try writer.print("pub const stage_2 = [{}]i3{{", .{stage2.items.len});
-    for (stage2.items) |v| try writer.print("{},", .{v});
-    try writer.writeAll("};\n");
-
-    try out_buf.flush();
+    try out_comp.flush();
 }
diff --git a/codegen/gbp.zig b/codegen/gbp.zig
index 3bd9a4d..39e0da3 100644
--- a/codegen/gbp.zig
+++ b/codegen/gbp.zig
@@ -1,4 +1,5 @@
 const std = @import("std");
+const builtin = @import("builtin");
 
 const Indic = enum {
     none,
@@ -226,56 +227,23 @@ pub fn main() !void {
     _ = args_iter.skip();
     const output_path = args_iter.next() orelse @panic("No output file arg!");
 
+    const compressor = std.compress.deflate.compressor;
     var out_file = try std.fs.cwd().createFile(output_path, .{});
     defer out_file.close();
-    var out_buf = std.io.bufferedWriter(out_file.writer());
-    const writer = out_buf.writer();
-
-    const prop_code =
-        \\const std = @import("std");
-        \\
-        \\pub const Indic = enum {
-        \\    none,
-        \\
-        \\    Consonant,
-        \\    Extend,
-        \\    Linker,
-        \\};
-        \\
-        \\pub const Gbp = enum {
-        \\    none,
-        \\    Control,
-        \\    CR,
-        \\    Extend,
-        \\    L,
-        \\    LF,
-        \\    LV,
-        \\    LVT,
-        \\    Prepend,
-        \\    Regional_Indicator,
-        \\    SpacingMark,
-        \\    T,
-        \\    V,
-        \\    ZWJ,
-        \\};
-        \\
-    ;
-
-    try writer.writeAll(prop_code);
-
-    try writer.print("const Stage2Int = std.math.IntFittingRange(0, {});\n", .{stage2.items.len});
-    try writer.print("pub const stage_1 = [{}]Stage2Int{{", .{stage1.items.len});
-    for (stage1.items) |v| try writer.print("{},", .{v});
-    try writer.writeAll("};\n");
-
-    try writer.print("const Stage3Int = std.math.IntFittingRange(0, {});\n", .{stage3_len});
-    try writer.print("pub const stage_2 = [{}]Stage3Int{{", .{stage2.items.len});
-    for (stage2.items) |v| try writer.print("{},", .{v});
-    try writer.writeAll("};\n");
-
-    try writer.print("pub const stage_3 = [{}]u8{{", .{stage3_len});
-    for (stage3.keys()) |v| try writer.print("{},", .{v});
-    try writer.writeAll("};\n");
-
-    try out_buf.flush();
+    var out_comp = try compressor(allocator, out_file.writer(), .{ .level = .best_compression });
+    defer out_comp.deinit();
+    const writer = out_comp.writer();
+
+    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.writeInt(u16, @intCast(stage2.items.len), endian);
+    for (stage2.items) |i| try writer.writeInt(u16, i, endian);
+
+    const props_bytes = stage3.keys();
+    try writer.writeInt(u16, @intCast(props_bytes.len), endian);
+    try writer.writeAll(props_bytes);
+
+    try out_comp.flush();
 }