Cleaned up directory structure

2 files changed, 7 insertions, 11 deletions

diff --git a/src/grapheme.zig b/src/grapheme.zig
index f013aba..3fdf10b 100644
--- a/src/grapheme.zig
+++ b/src/grapheme.zig
@@ -235,7 +235,7 @@ pub fn graphemeBreak(
 
 test "Segmentation GraphemeIterator" {
     const allocator = std.testing.allocator;
-    var file = try std.fs.cwd().openFile("GraphemeBreakTest.txt", .{});
+    var file = try std.fs.cwd().openFile("data/unicode/auxiliary/GraphemeBreakTest.txt", .{});
     defer file.close();
     var buf_reader = std.io.bufferedReader(file.reader());
     var input_stream = buf_reader.reader();
diff --git a/src/main.zig b/src/main.zig
index 7acb9ac..019076a 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -5,34 +5,30 @@ const std = @import("std");
 // const codePointWidth = @import("ziglyph").display_width.codePointWidth;
 // const codePointWidth = @import("display_width").codePointWidth;
 // const strWidth = @import("ziglyph").display_width.strWidth;
-// const strWidth = @import("display_width").strWidth;
+const strWidth = @import("display_width").strWidth;
 // const CodePointIterator = @import("CodePoint").CodePointIterator;
 // const ascii = @import("ascii");
-const ascii = std.ascii;
+// const ascii = std.ascii;
 
 pub fn main() !void {
     var gpa = std.heap.GeneralPurposeAllocator(.{}){};
     defer _ = gpa.deinit();
     const allocator = gpa.allocator();
 
-    const input = try std.fs.cwd().readFileAlloc(allocator, "lang_mix.txt", std.math.maxInt(u32));
+    const input = try std.fs.cwd().readFileAlloc(allocator, "data/lang_mix.txt", std.math.maxInt(u32));
     defer allocator.free(input);
 
     // var iter = GraphemeIterator.init(input);
     // var iter = CodePointIterator{ .bytes = input };
-    // var iter = std.mem.splitScalar(u8, input, '\n');
+    var iter = std.mem.splitScalar(u8, input, '\n');
 
-    var buf: [1024 * 1024 * 5]u8 = undefined;
     var result: usize = 0;
     // 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);
-    const out = ascii.upperString(&buf, input);
-    result += out.len;
+    while (iter.next()) |line| result += strWidth(line);
 
-    // std.debug.print("result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
-    std.debug.print("result: {}, took: {}, s: {s}\n", .{ result, timer.lap(), out[0..16] });
+    std.debug.print("result: {}, took: {}\n", .{ result, timer.lap() / std.time.ns_per_ms });
 }