From 340004b5077097539a333afbdb2864d75348f9b1 Mon Sep 17 00:00:00 2001 From: Jose Colon Rodriguez Date: Fri, 1 Mar 2024 20:53:07 -0400 Subject: Normalizer back to 300k in Safe --- src/main.zig | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/main.zig b/src/main.zig index f9ce28e..0b40b66 100644 --- a/src/main.zig +++ b/src/main.zig @@ -19,7 +19,7 @@ const std = @import("std"); // const Normalizer = @import("ziglyph").Normalizer; const Normalizer = @import("Normalizer"); -const Caser = @import("Caser"); +// const Caser = @import("Caser"); // const GenCatData = @import("GenCatData"); @@ -44,9 +44,9 @@ pub fn main() !void { // var gencat_data = try GenCatData.init(allocator); // defer gencat_data.deinit(); - var fold_data = try Caser.FoldData.init(allocator); - defer fold_data.deinit(); - var caser = Caser{ .fold_data = &fold_data }; + // var fold_data = try Caser.FoldData.init(allocator); + // defer fold_data.deinit(); + // var caser = Caser{ .fold_data = &fold_data }; // var iter = GraphemeIterator.init(input, &data); // defer iter.deinit(); @@ -54,28 +54,28 @@ pub fn main() !void { var iter = std.mem.splitScalar(u8, input, '\n'); var result: usize = 0; - var prev_line: []const u8 = ""; + // var prev_line: []const u8 = ""; // var result: isize = 0; var timer = try std.time.Timer.start(); // while (iter.next()) |cp| result += codePointWidth(@intCast(cp.code)); // while (iter.next()) |_| result += 1; // while (iter.next()) |line| result += strWidth(line, &data); - // while (iter.next()) |line| { - // const nfc = try n.nfkc(allocator, line); - // result += nfc.slice.len; - // // nfc.deinit(); - // } + while (iter.next()) |line| { + const nfc = try norm.nfc(allocator, line); + result += nfc.slice.len; + // nfc.deinit(); + } // while (iter.next()) |cp| { // if (cp.code == 'É') std.debug.print("`{u}` Gc: {s}\n", .{ cp.code, @tagName(gencat_data.gc(cp.code)) }); // result += 1; // } - while (iter.next()) |line| { - if (try caser.canonCaselessMatch(allocator, &norm, prev_line, line)) { - result += line.len; - } - prev_line = line; - } + // while (iter.next()) |line| { + // if (try caser.canonCaselessMatch(allocator, &norm, prev_line, line)) { + // result += line.len; + // } + // prev_line = line; + // } std.debug.print("result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms }); } -- cgit v1.2.3