display_width with table

1 files changed, 9 insertions, 5 deletions

diff --git a/src/main.zig b/src/main.zig
index fe49300..3e65c7b 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1,7 +1,10 @@
 const std = @import("std");
 
 // const GraphemeIterator = @import("ziglyph").GraphemeIterator;
-const GraphemeIterator = @import("Grapheme").GraphemeIterator;
+// const GraphemeIterator = @import("Grapheme").GraphemeIterator;
+// const codePointWidth = @import("ziglyph").display_width.codePointWidth;
+const codePointWidth = @import("display_width").codePointWidth;
+const CodePointIterator = @import("CodePoint").CodePointIterator;
 
 pub fn main() !void {
     var gpa = std.heap.GeneralPurposeAllocator(.{}){};
@@ -11,14 +14,15 @@ pub fn main() !void {
     const input = try std.fs.cwd().readFileAlloc(allocator, "lang_mix.txt", std.math.maxInt(u32));
     defer allocator.free(input);
 
-    var result: usize = 0;
-    var iter = GraphemeIterator.init(input);
+    var result: isize = 0;
+    // var iter = GraphemeIterator.init(input);
+    var iter = CodePointIterator{ .bytes = input };
 
     var timer = try std.time.Timer.start();
 
     // for (0..50) |_| {
-    while (iter.next()) |_| result += 1;
-    iter.cp_iter.i = 0;
+    while (iter.next()) |cp| result += codePointWidth(@intCast(cp.code));
+    // iter.cp_iter.i = 0;
     // }
 
     std.debug.print("result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });