From 703a824c1bb7fc41535c9515c5a2209d04899d19 Mon Sep 17 00:00:00 2001 From: Jose Colon Rodriguez Date: Wed, 14 Feb 2024 12:02:02 -0400 Subject: Code reorg; Added UCD --- src/Grapheme.zig | 40 ++++++++--- src/emoji_gen.zig | 93 ------------------------ src/gbp_gen.zig | 206 ------------------------------------------------------ src/main.zig | 9 +-- 4 files changed, 34 insertions(+), 314 deletions(-) delete mode 100644 src/emoji_gen.zig delete mode 100644 src/gbp_gen.zig (limited to 'src') diff --git a/src/Grapheme.zig b/src/Grapheme.zig index d739159..9f09255 100644 --- a/src/Grapheme.zig +++ b/src/Grapheme.zig @@ -308,29 +308,36 @@ test "Segmentation ZWJ and ZWSP emoji sequences" { } // Grapheme break state. -fn hasXpic(state: *const u3) bool { +// Extended Pictographic (emoji) +inline fn hasXpic(state: *const u3) bool { return state.* & 1 == 1; } - -fn setXpic(state: *u3) void { +inline fn setXpic(state: *u3) void { state.* |= 1; } - -fn unsetXpic(state: *u3) void { +inline fn unsetXpic(state: *u3) void { state.* ^= 1; } - -fn hasRegional(state: *const u3) bool { +// Regional Indicatior (flags) +inline fn hasRegional(state: *const u3) bool { return state.* & 2 == 2; } - -fn setRegional(state: *u3) void { +inline fn setRegional(state: *u3) void { state.* |= 2; } - -fn unsetRegional(state: *u3) void { +inline fn unsetRegional(state: *u3) void { state.* ^= 2; } +// Indic Conjunct +inline fn hasIndic(state: *const u3) bool { + return state.* & 2 == 4; +} +inline fn setIndic(state: *u3) void { + state.* |= 4; +} +inline fn unsetIndic(state: *u3) void { + state.* ^= 4; +} /// `graphemeBreak` returns true only if a grapheme break point is required /// between `cp1` and `cp2`. `state` should start out as 0. If calling @@ -345,6 +352,8 @@ pub fn graphemeBreak( ) bool { // GB11: Emoji Extend* ZWJ x Emoji if (!hasXpic(state) and emoji.isExtendedPictographic(cp1)) setXpic(state); + // GB9c: Indic Conjunct Break + // if (!hasIndic(state) and indic.isConsonant(cp1)) setIndic(state); // GB3: CR x LF if (cp1 == '\r' and cp2 == '\n') return false; @@ -400,6 +409,15 @@ pub fn graphemeBreak( return false; } + // GB9c: Indic Conjunct Break + // if (hasIndic(state) and + // indic.isLinker(cp1) and + // indic.isConsonant(cp2)) + // { + // unsetIndic(state); + // return false; + // } + return true; } diff --git a/src/emoji_gen.zig b/src/emoji_gen.zig deleted file mode 100644 index acad0ca..0000000 --- a/src/emoji_gen.zig +++ /dev/null @@ -1,93 +0,0 @@ -const std = @import("std"); - -const emoji = @import("ziglyph").emoji; - -const block_size = 256; -const Block = [block_size]bool; - -const BlockMap = std.HashMap( - Block, - u16, - struct { - pub fn hash(_: @This(), k: Block) u64 { - var hasher = std.hash.Wyhash.init(0); - std.hash.autoHashStrat(&hasher, k, .DeepRecursive); - return hasher.final(); - } - - pub fn eql(_: @This(), a: Block, b: Block) bool { - return std.mem.eql(bool, &a, &b); - } - }, - std.hash_map.default_max_load_percentage, -); - -pub fn main() !void { - var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); - defer arena.deinit(); - const allocator = arena.allocator(); - - var blocks_map = BlockMap.init(allocator); - defer blocks_map.deinit(); - - var stage1 = std.ArrayList(u16).init(allocator); - defer stage1.deinit(); - - var stage2 = std.ArrayList(bool).init(allocator); - defer stage2.deinit(); - - var block: Block = [_]bool{false} ** block_size; - var block_len: u16 = 0; - - for (0..0x10ffff + 1) |cp| { - const isEmoji = emoji.isExtendedPictographic(@intCast(cp)); - - block[block_len] = isEmoji; - block_len += 1; - - if (block_len < block_size and cp != 0x10ffff) continue; - - const gop = try blocks_map.getOrPut(block); - if (!gop.found_existing) { - gop.value_ptr.* = @intCast(stage2.items.len); - try stage2.appendSlice(&block); - } - - try stage1.append(gop.value_ptr.*); - block_len = 0; - } - - var args_iter = std.process.args(); - _ = args_iter.skip(); - const output_path = args_iter.next() orelse @panic("No output file arg!"); - - 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.print("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}); - 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/gbp_gen.zig b/src/gbp_gen.zig deleted file mode 100644 index ace875c..0000000 --- a/src/gbp_gen.zig +++ /dev/null @@ -1,206 +0,0 @@ -const std = @import("std"); - -const gbp = @import("ziglyph").grapheme_break; - -const Prop = enum { - none, - - control, - extend, - hangul_l, - hangul_lv, - hangul_lvt, - hangul_v, - hangul_t, - prepend, - regional, - spacing, - zwj, - - fn forCodePoint(cp: u21) Prop { - if (gbp.isControl(cp)) return .control; - if (gbp.isExtend(cp)) return .extend; - if (gbp.isL(cp)) return .hangul_l; - if (gbp.isLv(cp)) return .hangul_lv; - if (gbp.isLvt(cp)) return .hangul_lvt; - if (gbp.isT(cp)) return .hangul_t; - if (gbp.isV(cp)) return .hangul_v; - if (gbp.isPrepend(cp)) return .prepend; - if (gbp.isRegionalIndicator(cp)) return .regional; - if (gbp.isSpacingmark(cp)) return .spacing; - if (gbp.isZwj(cp)) return .zwj; - - return .none; - } -}; - -const block_size = 256; -const Block = [block_size]u4; - -const BlockMap = std.HashMap( - Block, - u16, - struct { - pub fn hash(_: @This(), k: Block) u64 { - var hasher = std.hash.Wyhash.init(0); - std.hash.autoHashStrat(&hasher, k, .DeepRecursive); - return hasher.final(); - } - - pub fn eql(_: @This(), a: Block, b: Block) bool { - return std.mem.eql(u4, &a, &b); - } - }, - std.hash_map.default_max_load_percentage, -); - -pub fn main() !void { - var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); - defer arena.deinit(); - const allocator = arena.allocator(); - - var blocks_map = BlockMap.init(allocator); - defer blocks_map.deinit(); - - var stage1 = std.ArrayList(u16).init(allocator); - defer stage1.deinit(); - - var stage2 = std.ArrayList(u4).init(allocator); - defer stage2.deinit(); - - var stage3 = std.ArrayList(Prop).init(allocator); - defer stage3.deinit(); - - var block: Block = [_]u4{0} ** block_size; - var block_len: u16 = 0; - - for (0..0x10ffff + 1) |cp| { - const prop = Prop.forCodePoint(@intCast(cp)); - - const block_idx = blk: { - for (stage3.items, 0..) |item, i| { - if (item == prop) break :blk i; - } - - const idx = stage3.items.len; - try stage3.append(prop); - break :blk idx; - }; - - block[block_len] = @intCast(block_idx); - block_len += 1; - - if (block_len < block_size and cp != 0x10ffff) continue; - - const gop = try blocks_map.getOrPut(block); - if (!gop.found_existing) { - gop.value_ptr.* = @intCast(stage2.items.len); - try stage2.appendSlice(&block); - } - - try stage1.append(gop.value_ptr.*); - block_len = 0; - } - - var args_iter = std.process.args(); - _ = args_iter.skip(); - const output_path = args_iter.next() orelse @panic("No output file arg!"); - - 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 Prop = enum { - \\ none, - \\ - \\ control, - \\ extend, - \\ hangul_l, - \\ hangul_lv, - \\ hangul_lvt, - \\ hangul_v, - \\ hangul_t, - \\ prepend, - \\ regional, - \\ spacing, - \\ zwj, - \\}; - \\ - ; - - try writer.writeAll(prop_code); - - try writer.print("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 = [{}]u4{{", .{stage2.items.len}); - for (stage2.items) |v| { - _ = try writer.print("{},", .{v}); - } - try writer.writeAll("};\n"); - - try writer.print("const stage_3 = [{}]Prop{{", .{stage3.items.len}); - for (stage3.items) |v| { - _ = try writer.print(".{s},", .{@tagName(v)}); - } - try writer.writeAll("};\n"); - - const code = - \\inline fn getProp(cp: u21) Prop { - \\ const stage_1_index = cp >> 8; - \\ const stage_2_index = stage_1[stage_1_index] + (cp & 0xff); - \\ const stage_3_index = stage_2[stage_2_index]; - \\ return stage_3[stage_3_index]; - \\} - \\ - \\pub inline fn isControl(cp: u21) bool { - \\ return getProp(cp) == .control; - \\} - \\ - \\pub inline fn isExtend(cp: u21) bool { - \\ return getProp(cp) == .extend; - \\} - \\ - \\pub inline fn isL(cp: u21) bool { - \\ return getProp(cp) == .hangul_l; - \\} - \\pub inline fn isLv(cp: u21) bool { - \\ return getProp(cp) == .hangul_lv; - \\} - \\pub inline fn isLvt(cp: u21) bool { - \\ return getProp(cp) == .hangul_lvt; - \\} - \\pub inline fn isV(cp: u21) bool { - \\ return getProp(cp) == .hangul_v; - \\} - \\pub inline fn isT(cp: u21) bool { - \\ return getProp(cp) == .hangul_t; - \\} - \\ - \\pub inline fn isPrepend(cp: u21) bool { - \\ return getProp(cp) == .prepend; - \\} - \\ - \\pub inline fn isRegionalIndicator(cp: u21) bool { - \\ return getProp(cp) == .regional; - \\} - \\ - \\pub inline fn isSpacingmark(cp: u21) bool { - \\ return getProp(cp) == .spacing; - \\} - \\ - \\pub inline fn isZwj(cp: u21) bool { - \\ return getProp(cp) == .zwj; - \\} - \\ - ; - - try writer.writeAll(code); - - try out_buf.flush(); -} diff --git a/src/main.zig b/src/main.zig index 8335530..a78c1dc 100644 --- a/src/main.zig +++ b/src/main.zig @@ -16,14 +16,15 @@ pub fn main() !void { var timer = try std.time.Timer.start(); - for (0..50) |_| { - while (iter.next()) |_| result += 1; - iter.cp_iter.i = 0; - } + // for (0..50) |_| { + while (iter.next()) |_| result += 1; + iter.cp_iter.i = 0; + // } std.debug.print("result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms }); } test { + _ = @import("CodePoint.zig"); _ = @import("Grapheme.zig"); } -- cgit v1.2.3