Merged NumericData into PropsData

3 files changed, 46 insertions, 77 deletions

diff --git a/build.zig b/build.zig
index a24181a..5f5680c 100644
--- a/build.zig
+++ b/build.zig
@@ -295,14 +295,6 @@ pub fn build(b: *std.Build) void {
     case_fold.addImport("FoldData", fold_data);
     case_fold.addImport("Normalize", norm);
 
-    // Numeric type
-    const num_data = b.createModule(.{
-        .root_source_file = .{ .path = "src/NumericData.zig" },
-        .target = target,
-        .optimize = optimize,
-    });
-    num_data.addAnonymousImport("numeric", .{ .root_source_file = num_gen_out });
-
     // Letter case
     const case_data = b.addModule("CaseData", .{
         .root_source_file = .{ .path = "src/CaseData.zig" },
@@ -330,6 +322,7 @@ pub fn build(b: *std.Build) void {
     });
     props_data.addAnonymousImport("core_props", .{ .root_source_file = core_gen_out });
     props_data.addAnonymousImport("props", .{ .root_source_file = props_gen_out });
+    props_data.addAnonymousImport("numeric", .{ .root_source_file = num_gen_out });
 
     // Tests
     const exe_unit_tests = b.addTest(.{
@@ -354,6 +347,7 @@ pub fn build(b: *std.Build) void {
     // exe_unit_tests.root_module.addAnonymousImport("scripts", .{ .root_source_file = scripts_gen_out });
     exe_unit_tests.root_module.addAnonymousImport("core_props", .{ .root_source_file = core_gen_out });
     exe_unit_tests.root_module.addAnonymousImport("props", .{ .root_source_file = props_gen_out });
+    exe_unit_tests.root_module.addAnonymousImport("numeric", .{ .root_source_file = num_gen_out });
     // exe_unit_tests.filter = "nfd !ASCII";
 
     const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests);
diff --git a/src/NumericData.zig b/src/NumericData.zig
deleted file mode 100644
index 28e8206..0000000
--- a/src/NumericData.zig
+++ /dev/null
@@ -1,69 +0,0 @@
-const std = @import("std");
-const builtin = @import("builtin");
-const compress = std.compress;
-const mem = std.mem;
-const testing = std.testing;
-
-allocator: mem.Allocator,
-s1: []u16 = undefined,
-s2: []u8 = undefined,
-
-const Self = @This();
-
-pub fn init(allocator: mem.Allocator) !Self {
-    const decompressor = compress.deflate.decompressor;
-    const in_bytes = @embedFile("numeric");
-    var in_fbs = std.io.fixedBufferStream(in_bytes);
-    var in_decomp = try decompressor(allocator, in_fbs.reader(), null);
-    defer in_decomp.deinit();
-    var reader = in_decomp.reader();
-
-    const endian = builtin.cpu.arch.endian();
-
-    var self = Self{ .allocator = allocator };
-
-    const stage_1_len: u16 = try reader.readInt(u16, endian);
-    self.s1 = try allocator.alloc(u16, stage_1_len);
-    errdefer allocator.free(self.s1);
-    for (0..stage_1_len) |i| self.s1[i] = try reader.readInt(u16, endian);
-
-    const stage_2_len: u16 = try reader.readInt(u16, endian);
-    self.s2 = try allocator.alloc(u8, stage_2_len);
-    errdefer allocator.free(self.s2);
-    _ = try reader.readAll(self.s2);
-
-    return self;
-}
-
-pub fn deinit(self: *const Self) void {
-    self.allocator.free(self.s1);
-    self.allocator.free(self.s2);
-}
-
-/// True if `cp` is numeric.
-pub inline fn isNumeric(self: Self, cp: u21) bool {
-    return self.s2[self.s1[cp >> 8] + (cp & 0xff)] & 1 == 1;
-}
-
-/// True if `cp` is a digit.
-pub inline fn isDigit(self: Self, cp: u21) bool {
-    return self.s2[self.s1[cp >> 8] + (cp & 0xff)] & 2 == 2;
-}
-
-/// True if `cp` is decimal.
-pub inline fn isDecimal(self: Self, cp: u21) bool {
-    return self.s2[self.s1[cp >> 8] + (cp & 0xff)] & 4 == 4;
-}
-
-test "isDecimal" {
-    const self = try init(testing.allocator);
-    defer self.deinit();
-
-    try testing.expect(self.isNumeric('\u{277f}'));
-    try testing.expect(self.isDigit('\u{2070}'));
-    try testing.expect(self.isDecimal('3'));
-
-    try testing.expect(!self.isNumeric('1'));
-    try testing.expect(!self.isDigit('2'));
-    try testing.expect(!self.isDecimal('g'));
-}
diff --git a/src/PropsData.zig b/src/PropsData.zig
index 252462e..9d24e68 100644
--- a/src/PropsData.zig
+++ b/src/PropsData.zig
@@ -9,6 +9,8 @@ core_s1: []u16 = undefined,
 core_s2: []u8 = undefined,
 props_s1: []u16 = undefined,
 props_s2: []u8 = undefined,
+num_s1: []u16 = undefined,
+num_s2: []u8 = undefined,
 
 const Self = @This();
 
@@ -52,6 +54,23 @@ pub fn init(allocator: mem.Allocator) !Self {
     errdefer allocator.free(self.props_s2);
     _ = try props_reader.readAll(self.props_s2);
 
+    // Process DerivedNumericType.txt
+    const num_bytes = @embedFile("numeric");
+    var num_fbs = std.io.fixedBufferStream(num_bytes);
+    var num_decomp = try decompressor(allocator, num_fbs.reader(), null);
+    defer num_decomp.deinit();
+    var num_reader = num_decomp.reader();
+
+    const num_stage_1_len: u16 = try num_reader.readInt(u16, endian);
+    self.num_s1 = try allocator.alloc(u16, num_stage_1_len);
+    errdefer allocator.free(self.num_s1);
+    for (0..num_stage_1_len) |i| self.num_s1[i] = try num_reader.readInt(u16, endian);
+
+    const num_stage_2_len: u16 = try num_reader.readInt(u16, endian);
+    self.num_s2 = try allocator.alloc(u8, num_stage_2_len);
+    errdefer allocator.free(self.num_s2);
+    _ = try num_reader.readAll(self.num_s2);
+
     return self;
 }
 
@@ -60,6 +79,8 @@ pub fn deinit(self: *const Self) void {
     self.allocator.free(self.core_s2);
     self.allocator.free(self.props_s1);
     self.allocator.free(self.props_s2);
+    self.allocator.free(self.num_s1);
+    self.allocator.free(self.num_s2);
 }
 
 /// True if `cp` is a mathematical symbol.
@@ -107,6 +128,21 @@ pub inline fn isDiacritic(self: Self, cp: u21) bool {
     return self.props_s2[self.props_s1[cp >> 8] + (cp & 0xff)] & 4 == 4;
 }
 
+/// True if `cp` is numeric.
+pub inline fn isNumeric(self: Self, cp: u21) bool {
+    return self.num_s2[self.num_s1[cp >> 8] + (cp & 0xff)] & 1 == 1;
+}
+
+/// True if `cp` is a digit.
+pub inline fn isDigit(self: Self, cp: u21) bool {
+    return self.num_s2[self.num_s1[cp >> 8] + (cp & 0xff)] & 2 == 2;
+}
+
+/// True if `cp` is decimal.
+pub inline fn isDecimal(self: Self, cp: u21) bool {
+    return self.num_s2[self.num_s1[cp >> 8] + (cp & 0xff)] & 4 == 4;
+}
+
 test "Props" {
     const self = try init(testing.allocator);
     defer self.deinit();
@@ -120,4 +156,12 @@ test "Props" {
     try testing.expect(self.isAlphabetic('A'));
     try testing.expect(!self.isAlphabetic('3'));
     try testing.expect(self.isMath('+'));
+
+    try testing.expect(self.isNumeric('\u{277f}'));
+    try testing.expect(self.isDigit('\u{2070}'));
+    try testing.expect(self.isDecimal('3'));
+
+    try testing.expect(!self.isNumeric('1'));
+    try testing.expect(!self.isDigit('2'));
+    try testing.expect(!self.isDecimal('g'));
 }