From 5e9a06c217fbd09aa8cf95da139852560f3da7d0 Mon Sep 17 00:00:00 2001 From: Jose Colon Rodriguez Date: Mon, 26 Feb 2024 18:29:59 -0400 Subject: Using NormData and CanonData in Normalizer --- src/main.zig | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/main.zig') diff --git a/src/main.zig b/src/main.zig index 57db05b..d1a0bb3 100644 --- a/src/main.zig +++ b/src/main.zig @@ -17,7 +17,7 @@ const std = @import("std"); // const ascii = std.ascii; // const norm = @import("ziglyph").Normalizer; -const Data = @import("Normalizer").Data; +const NormData = @import("Normalizer").NormData; const norm = @import("Normalizer"); pub fn main() !void { @@ -32,10 +32,9 @@ pub fn main() !void { const input = try std.fs.cwd().readFileAlloc(allocator, in_path, std.math.maxInt(u32)); defer allocator.free(input); - var data = try Data.init(allocator); - defer data.deinit(); - - var n = try norm.init(allocator, &data); + var norm_data = try NormData.init(allocator); + defer norm_data.deinit(); + var n = try norm.init(allocator, &norm_data); defer n.deinit(); // var n = try norm.init(allocator); // defer n.deinit(); @@ -53,7 +52,7 @@ pub fn main() !void { // while (iter.next()) |_| result += 1; // while (iter.next()) |line| result += strWidth(line, &data); while (iter.next()) |line| { - var nfc = try n.nfc(allocator, line); + var nfc = try n.nfd(allocator, line); result += nfc.slice.len; nfc.deinit(); } -- cgit v1.2.3