diff options
| author | 2025-09-13 08:38:24 -0700 | |
|---|---|---|
| committer | 2025-09-14 01:48:41 -0700 | |
| commit | a3b5e884b12fdaa341010ef41bb9382fa0cd89f8 (patch) | |
| tree | 8bdd22c1c54da0b56ef6b9fe0dc4c2ca667b71a3 /codegen/case_prop.zig | |
| parent | Update build to 0.15.0 (diff) | |
| download | zg-a3b5e884b12fdaa341010ef41bb9382fa0cd89f8.tar.gz zg-a3b5e884b12fdaa341010ef41bb9382fa0cd89f8.tar.xz zg-a3b5e884b12fdaa341010ef41bb9382fa0cd89f8.zip | |
Update codebase to Zig 0.15.1.
Removes compression support
Diffstat (limited to 'codegen/case_prop.zig')
| -rw-r--r-- | codegen/case_prop.zig | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/codegen/case_prop.zig b/codegen/case_prop.zig index 6c912a8..66eb62c 100644 --- a/codegen/case_prop.zig +++ b/codegen/case_prop.zig | |||
| @@ -22,7 +22,7 @@ const BlockMap = std.HashMap( | |||
| 22 | std.hash_map.default_max_load_percentage, | 22 | std.hash_map.default_max_load_percentage, |
| 23 | ); | 23 | ); |
| 24 | 24 | ||
| 25 | pub fn main() !void { | 25 | pub fn main() anyerror!void { |
| 26 | var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); | 26 | var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); |
| 27 | defer arena.deinit(); | 27 | defer arena.deinit(); |
| 28 | const allocator = arena.allocator(); | 28 | const allocator = arena.allocator(); |
| @@ -35,10 +35,9 @@ pub fn main() !void { | |||
| 35 | // Process DerivedCoreProperties.txt | 35 | // Process DerivedCoreProperties.txt |
| 36 | var in_file = try std.fs.cwd().openFile("data/unicode/DerivedCoreProperties.txt", .{}); | 36 | var in_file = try std.fs.cwd().openFile("data/unicode/DerivedCoreProperties.txt", .{}); |
| 37 | defer in_file.close(); | 37 | defer in_file.close(); |
| 38 | var in_buf = std.io.bufferedReader(in_file.reader()); | 38 | var in_reader = in_file.reader(&line_buf); |
| 39 | const in_reader = in_buf.reader(); | ||
| 40 | 39 | ||
| 41 | while (try in_reader.readUntilDelimiterOrEof(&line_buf, '\n')) |line| { | 40 | while (in_reader.interface.takeDelimiterExclusive('\n')) |line| { |
| 42 | if (line.len == 0 or line[0] == '#') continue; | 41 | if (line.len == 0 or line[0] == '#') continue; |
| 43 | const no_comment = if (mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line; | 42 | const no_comment = if (mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line; |
| 44 | 43 | ||
| @@ -79,15 +78,20 @@ pub fn main() !void { | |||
| 79 | else => {}, | 78 | else => {}, |
| 80 | } | 79 | } |
| 81 | } | 80 | } |
| 81 | } else |err| switch (err) { | ||
| 82 | error.EndOfStream => {}, | ||
| 83 | else => { | ||
| 84 | return err; | ||
| 85 | }, | ||
| 82 | } | 86 | } |
| 83 | 87 | ||
| 84 | var blocks_map = BlockMap.init(allocator); | 88 | var blocks_map = BlockMap.init(allocator); |
| 85 | defer blocks_map.deinit(); | 89 | defer blocks_map.deinit(); |
| 86 | 90 | ||
| 87 | var stage1 = std.ArrayList(u16).init(allocator); | 91 | var stage1 = std.array_list.Managed(u16).init(allocator); |
| 88 | defer stage1.deinit(); | 92 | defer stage1.deinit(); |
| 89 | 93 | ||
| 90 | var stage2 = std.ArrayList(u8).init(allocator); | 94 | var stage2 = std.array_list.Managed(u8).init(allocator); |
| 91 | defer stage2.deinit(); | 95 | defer stage2.deinit(); |
| 92 | 96 | ||
| 93 | var block: Block = [_]u8{0} ** block_size; | 97 | var block: Block = [_]u8{0} ** block_size; |
| @@ -118,18 +122,17 @@ pub fn main() !void { | |||
| 118 | _ = args_iter.skip(); | 122 | _ = args_iter.skip(); |
| 119 | const output_path = args_iter.next() orelse @panic("No output file arg!"); | 123 | const output_path = args_iter.next() orelse @panic("No output file arg!"); |
| 120 | 124 | ||
| 121 | const compressor = std.compress.flate.deflate.compressor; | 125 | var write_buf: [4096]u8 = undefined; |
| 122 | var out_file = try std.fs.cwd().createFile(output_path, .{}); | 126 | var out_file = try std.fs.cwd().createFile(output_path, .{}); |
| 123 | defer out_file.close(); | 127 | defer out_file.close(); |
| 124 | var out_comp = try compressor(.raw, out_file.writer(), .{ .level = .best }); | 128 | var writer = out_file.writer(&write_buf); |
| 125 | const writer = out_comp.writer(); | ||
| 126 | 129 | ||
| 127 | const endian = builtin.cpu.arch.endian(); | 130 | const endian = builtin.cpu.arch.endian(); |
| 128 | try writer.writeInt(u16, @intCast(stage1.items.len), endian); | 131 | try writer.interface.writeInt(u16, @intCast(stage1.items.len), endian); |
| 129 | for (stage1.items) |i| try writer.writeInt(u16, i, endian); | 132 | for (stage1.items) |i| try writer.interface.writeInt(u16, i, endian); |
| 130 | 133 | ||
| 131 | try writer.writeInt(u16, @intCast(stage2.items.len), endian); | 134 | try writer.interface.writeInt(u16, @intCast(stage2.items.len), endian); |
| 132 | try writer.writeAll(stage2.items); | 135 | try writer.interface.writeAll(stage2.items); |
| 133 | 136 | ||
| 134 | try out_comp.flush(); | 137 | try writer.interface.flush(); |
| 135 | } | 138 | } |