Add ziglyph and normalize input

natecraddock · Jan 31, 2023 · 3e70696 · 3e70696
1 parent 6a3e7eb
commit 3e70696
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib/ziglyph"]
+	path = lib/ziglyph
+	url = https://github.com/jecolon/ziglyph
diff --git a/build.zig b/build.zig
@@ -14,6 +14,7 @@ pub fn build(b: *std.build.Builder) void {
     const mode = b.standardReleaseOptions();
 
     const exe = b.addExecutable("zf", "src/main.zig");
+    exe.addPackagePath("ziglyph", "lib/ziglyph/src/ziglyph.zig");
     exe.setTarget(target);
     exe.setBuildMode(mode);
     exe.install();
@@ -28,6 +29,7 @@ pub fn build(b: *std.build.Builder) void {
     run_step.dependOn(&run_cmd.step);
 
     var exe_tests = b.addTest("src/main.zig");
+    exe_tests.addPackagePath("ziglyph", "libs/ziglyph/src/ziglyph.zig");
     exe_tests.setBuildMode(mode);
 
     const tests = b.step("test", "Run tests");

diff --git a/lib/ziglyph b/lib/ziglyph
diff --git a/src/main.zig b/src/main.zig
@@ -3,8 +3,10 @@ const heap = std.heap;
 const io = std.io;
 const std = @import("std");
 const testing = std.testing;
+const ziglyph = @import("ziglyph");
 
 const ArrayList = std.ArrayList;
+const Normalizer = ziglyph.Normalizer;
 const SGRAttribute = ui.SGRAttribute;
 
 const filter = @import("filter.zig");
@@ -213,9 +215,15 @@ pub fn main() anyerror!void {
         std.process.exit(0);
     }
 
+    var normalizer = try Normalizer.init(allocator);
+    defer normalizer.deinit();
+
     // read all lines or exit on out of memory
-    var stdin = io.getStdIn().reader();
-    const buf = try readAll(allocator, &stdin);
+    const buf = blk: {
+        var stdin = io.getStdIn().reader();
+        const buf = try readAll(allocator, &stdin);
+        break :blk (try normalizer.nfd(allocator, buf)).slice;
+    };
 
     const delimiter = '\n';
     var candidates = try filter.collectCandidates(allocator, buf, delimiter);