From a3b5e884b12fdaa341010ef41bb9382fa0cd89f8 Mon Sep 17 00:00:00 2001
From: Michael Chaten
Date: Sat, 13 Sep 2025 08:38:24 -0700
Subject: Update codebase to Zig 0.15.1.

Removes compression support
---
 codegen/upper.zig | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'codegen/upper.zig')

diff --git a/codegen/upper.zig b/codegen/upper.zig
index 5848911..7d96a0e 100644
--- a/codegen/upper.zig
+++ b/codegen/upper.zig
@@ -1,32 +1,29 @@
 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 line_buf: [4096]u8 = undefined;
+    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 = in_file.reader(&line_buf);
 
     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);
     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.interface.takeDelimiterExclusive('\n')) |line| {
         if (line.len == 0) continue;
 
         var field_iter = std.mem.splitScalar(u8, line, ';');
@@ -42,16 +39,24 @@ pub fn main() !void {
                 12 => {
                     // Simple uppercase mapping
                     if (field.len == 0) continue :lines;
-                    try writer.writeInt(i24, cp, endian);
+                    try file_writer.interface.writeInt(i24, cp, endian);
                     const mapping = try std.fmt.parseInt(i24, field, 16);
-                    try writer.writeInt(i24, mapping - cp, endian);
+                    try file_writer.interface.writeInt(i24, mapping - cp, endian);
                 },
 
                 else => {},
             }
         }
+    } else |err| switch (err) {
+        error.ReadFailed => {
+            return in_reader.err orelse err;
+        },
+        error.EndOfStream => {},
+        else => {
+            return err;
+        },
     }
 
-    try writer.writeInt(u24, 0, endian);
-    try out_comp.flush();
+    try file_writer.interface.writeInt(u24, 0, endian);
+    try file_writer.interface.flush();
 }
-- 
cgit v1.2.3


From 749197a3f9d25e211615960c02380a3d659b20f9 Mon Sep 17 00:00:00 2001
From: Michael Chaten
Date: Sun, 14 Sep 2025 04:11:09 -0700
Subject: Embed data files in scripts rather than relying on filesystem access
 for easier packaging

---
 codegen/upper.zig | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'codegen/upper.zig')

diff --git a/codegen/upper.zig b/codegen/upper.zig
index 7d96a0e..108fdbd 100644
--- a/codegen/upper.zig
+++ b/codegen/upper.zig
@@ -6,13 +6,9 @@ pub fn main() anyerror!void {
     defer arena.deinit();
     const allocator = arena.allocator();
 
-    var line_buf: [4096]u8 = undefined;
     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_reader = in_file.reader(&line_buf);
-
+    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();
@@ -23,7 +19,7 @@ pub fn main() anyerror!void {
     var file_writer = out_file.writer(&write_buf);
     const endian = builtin.cpu.arch.endian();
 
-    lines: while (in_reader.interface.takeDelimiterExclusive('\n')) |line| {
+    lines: while (in_reader.takeDelimiterExclusive('\n')) |line| {
         if (line.len == 0) continue;
 
         var field_iter = std.mem.splitScalar(u8, line, ';');
@@ -48,9 +44,6 @@ pub fn main() anyerror!void {
             }
         }
     } else |err| switch (err) {
-        error.ReadFailed => {
-            return in_reader.err orelse err;
-        },
         error.EndOfStream => {},
         else => {
             return err;
-- 
cgit v1.2.3


From 2f02c3b16c073d0bd3d9368a66ce272a574f75a3 Mon Sep 17 00:00:00 2001
From: Jay
Date: Sat, 8 Nov 2025 19:59:08 +1100
Subject: Use takeDelimiterInclusive to support Zig 0.15.2

---
 codegen/upper.zig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'codegen/upper.zig')

diff --git a/codegen/upper.zig b/codegen/upper.zig
index 108fdbd..5eb29e7 100644
--- a/codegen/upper.zig
+++ b/codegen/upper.zig
@@ -19,7 +19,8 @@ pub fn main() anyerror!void {
     var file_writer = out_file.writer(&write_buf);
     const endian = builtin.cpu.arch.endian();
 
-    lines: while (in_reader.takeDelimiterExclusive('\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, ';');
-- 
cgit v1.2.3