emoji direct array access

2 files changed, 6 insertions, 15 deletions

diff --git a/codegen/emoji.zig b/codegen/emoji.zig
index acad0ca..6dbb74f 100644
--- a/codegen/emoji.zig
+++ b/codegen/emoji.zig
@@ -66,28 +66,17 @@ pub fn main() !void {
     var out_buf = std.io.bufferedWriter(out_file.writer());
     const writer = out_buf.writer();
 
-    try writer.print("const stage_1 = [{}]u16{{", .{stage1.items.len});
+    try writer.print("pub const stage_1 = [{}]u16{{", .{stage1.items.len});
     for (stage1.items) |v| {
         _ = try writer.print("{},", .{v});
     }
     try writer.writeAll("};\n");
 
-    try writer.print("const stage_2 = [{}]bool{{", .{stage2.items.len});
+    try writer.print("pub const stage_2 = [{}]bool{{", .{stage2.items.len});
     for (stage2.items) |v| {
         _ = try writer.print("{},", .{v});
     }
     try writer.writeAll("};\n");
 
-    const code =
-        \\pub inline fn isExtendedPictographic(cp: u21) bool {
-        \\    const stage_1_index = cp >> 8;
-        \\    const stage_2_index = stage_1[stage_1_index] + (cp & 0xff);
-        \\    return stage_2[stage_2_index];
-        \\}
-        \\
-    ;
-
-    try writer.writeAll(code);
-
     try out_buf.flush();
 }
diff --git a/src/Grapheme.zig b/src/Grapheme.zig
index 56eecbe..9c87364 100644
--- a/src/Grapheme.zig
+++ b/src/Grapheme.zig
@@ -171,7 +171,9 @@ pub fn graphemeBreak(
     state: *u3,
 ) bool {
     // GB11: Emoji Extend* ZWJ x Emoji
-    if (!hasXpic(state) and emoji.isExtendedPictographic(cp1)) setXpic(state);
+    const cp1_is_emoji = emoji.stage_2[emoji.stage_1[cp1 >> 8] + (cp1 & 0xff)];
+    const cp2_is_emoji = emoji.stage_2[emoji.stage_1[cp2 >> 8] + (cp2 & 0xff)];
+    if (!hasXpic(state) and cp1_is_emoji) setXpic(state);
     // GB9c: Indic Conjunct Break
     const cp1_indic_prop = indic.stage_3[indic.stage_2[indic.stage_1[cp1 >> 8] + (cp1 & 0xff)]];
     const cp2_indic_prop = indic.stage_3[indic.stage_2[indic.stage_1[cp2 >> 8] + (cp2 & 0xff)]];
@@ -227,7 +229,7 @@ pub fn graphemeBreak(
     // GB11: Emoji Extend* ZWJ x Emoji
     if (hasXpic(state) and
         cp1_gbp_prop == .zwj and
-        emoji.isExtendedPictographic(cp2))
+        cp2_is_emoji)
     {
         unsetXpic(state);
         return false;