grapheme now Graphemes, Data files gone

4 files changed, 4 insertions, 193 deletions

diff --git a/src/GraphemeData.zig b/src/GraphemeData.zig
deleted file mode 100644
index df025cb..0000000
--- a/src/GraphemeData.zig
+++ /dev/null
@@ -1,87 +0,0 @@
-const std = @import("std");
-const builtin = @import("builtin");
-const compress = std.compress;
-const mem = std.mem;
-
-/// Indic syllable type.
-pub const Indic = enum {
-    none,
-
-    Consonant,
-    Extend,
-    Linker,
-};
-
-/// Grapheme break property.
-pub const Gbp = enum {
-    none,
-    Control,
-    CR,
-    Extend,
-    L,
-    LF,
-    LV,
-    LVT,
-    Prepend,
-    Regional_Indicator,
-    SpacingMark,
-    T,
-    V,
-    ZWJ,
-};
-
-s1: []u16 = undefined,
-s2: []u16 = undefined,
-s3: []u8 = undefined,
-
-const Self = @This();
-
-pub inline fn init(allocator: mem.Allocator) mem.Allocator.Error!Self {
-    const decompressor = compress.flate.inflate.decompressor;
-    const in_bytes = @embedFile("gbp");
-    var in_fbs = std.io.fixedBufferStream(in_bytes);
-    var in_decomp = decompressor(.raw, in_fbs.reader());
-    var reader = in_decomp.reader();
-
-    const endian = builtin.cpu.arch.endian();
-
-    var self = Self{};
-
-    const s1_len: u16 = reader.readInt(u16, endian) catch unreachable;
-    self.s1 = try allocator.alloc(u16, s1_len);
-    errdefer allocator.free(self.s1);
-    for (0..s1_len) |i| self.s1[i] = reader.readInt(u16, endian) catch unreachable;
-
-    const s2_len: u16 = reader.readInt(u16, endian) catch unreachable;
-    self.s2 = try allocator.alloc(u16, s2_len);
-    errdefer allocator.free(self.s2);
-    for (0..s2_len) |i| self.s2[i] = reader.readInt(u16, endian) catch unreachable;
-
-    const s3_len: u16 = reader.readInt(u16, endian) catch unreachable;
-    self.s3 = try allocator.alloc(u8, s3_len);
-    errdefer allocator.free(self.s3);
-    _ = reader.readAll(self.s3) catch unreachable;
-
-    return self;
-}
-
-pub inline fn deinit(self: *const Self, allocator: mem.Allocator) void {
-    allocator.free(self.s1);
-    allocator.free(self.s2);
-    allocator.free(self.s3);
-}
-
-/// Lookup the grapheme break property for a code point.
-pub inline fn gbp(self: Self, cp: u21) Gbp {
-    return @enumFromInt(self.s3[self.s2[self.s1[cp >> 8] + (cp & 0xff)]] >> 4);
-}
-
-/// Lookup the indic syllable type for a code point.
-pub inline fn indic(self: Self, cp: u21) Indic {
-    return @enumFromInt((self.s3[self.s2[self.s1[cp >> 8] + (cp & 0xff)]] >> 1) & 0x7);
-}
-
-/// Lookup the emoji property for a code point.
-pub inline fn isEmoji(self: Self, cp: u21) bool {
-    return self.s3[self.s2[self.s1[cp >> 8] + (cp & 0xff)]] & 1 == 1;
-}
diff --git a/src/grapheme.zig b/src/Graphemes.zig
index 79cd2c6..79cd2c6 100644
--- a/src/grapheme.zig
+++ b/src/Graphemes.zig
diff --git a/src/WidthData.zig b/src/WidthData.zig
deleted file mode 100644
index ca7eaf0..0000000
--- a/src/WidthData.zig
+++ /dev/null
@@ -1,102 +0,0 @@
-const std = @import("std");
-const builtin = @import("builtin");
-const compress = std.compress;
-const mem = std.mem;
-const testing = std.testing;
-
-const Graphemes = @import("Graphemes");
-
-g_data: Graphemes,
-s1: []u16 = undefined,
-s2: []i4 = undefined,
-owns_gdata: bool,
-
-const Self = @This();
-
-pub fn init(allocator: mem.Allocator) mem.Allocator.Error!Self {
-    var self: Self = try Self.setup(allocator);
-    errdefer {
-        allocator.free(self.s1);
-        allocator.free(self.s2);
-    }
-    self.owns_gdata = true;
-    self.g_data = try Graphemes.init(allocator);
-    errdefer self.g_data.deinit(allocator);
-    return self;
-}
-
-pub fn initWithGraphemeData(allocator: mem.Allocator, g_data: Graphemes) mem.Allocator.Error!Self {
-    var self = try Self.setup(allocator);
-    self.g_data = g_data;
-    self.owns_gdata = false;
-    return self;
-}
-
-// Sets up the DisplayWidthData, leaving the GraphemeData undefined.
-fn setup(allocator: mem.Allocator) mem.Allocator.Error!Self {
-    const decompressor = compress.flate.inflate.decompressor;
-    const in_bytes = @embedFile("dwp");
-    var in_fbs = std.io.fixedBufferStream(in_bytes);
-    var in_decomp = decompressor(.raw, in_fbs.reader());
-    var reader = in_decomp.reader();
-
-    const endian = builtin.cpu.arch.endian();
-
-    var self: Self = undefined;
-
-    const stage_1_len: u16 = reader.readInt(u16, endian) catch unreachable;
-    self.s1 = try allocator.alloc(u16, stage_1_len);
-    errdefer allocator.free(self.s1);
-    for (0..stage_1_len) |i| self.s1[i] = reader.readInt(u16, endian) catch unreachable;
-
-    const stage_2_len: u16 = reader.readInt(u16, endian) catch unreachable;
-    self.s2 = try allocator.alloc(i4, stage_2_len);
-    errdefer allocator.free(self.s2);
-    for (0..stage_2_len) |i| self.s2[i] = @intCast(reader.readInt(i8, endian) catch unreachable);
-
-    return self;
-}
-
-pub fn deinit(self: *const Self, allocator: mem.Allocator) void {
-    allocator.free(self.s1);
-    allocator.free(self.s2);
-    if (self.owns_gdata) self.g_data.deinit(allocator);
-}
-
-/// codePointWidth returns the number of cells `cp` requires when rendered
-/// in a fixed-pitch font (i.e. a terminal screen). This can range from -1 to
-/// 3, where BACKSPACE and DELETE return -1 and 3-em-dash returns 3. C0/C1
-/// control codes return 0. If `cjk` is true, ambiguous code points return 2,
-/// otherwise they return 1.
-pub fn codePointWidth(self: Self, cp: u21) i4 {
-    return self.s2[self.s1[cp >> 8] + (cp & 0xff)];
-}
-
-test "codePointWidth" {
-    const wd = try Self.init(std.testing.allocator);
-    defer wd.deinit(std.testing.allocator);
-    try testing.expectEqual(@as(i4, 0), wd.codePointWidth(0x0000)); // null
-    try testing.expectEqual(@as(i4, -1), wd.codePointWidth(0x8)); // \b
-    try testing.expectEqual(@as(i4, -1), wd.codePointWidth(0x7f)); // DEL
-    try testing.expectEqual(@as(i4, 0), wd.codePointWidth(0x0005)); // Cf
-    try testing.expectEqual(@as(i4, 0), wd.codePointWidth(0x0007)); // \a BEL
-    try testing.expectEqual(@as(i4, 0), wd.codePointWidth(0x000A)); // \n LF
-    try testing.expectEqual(@as(i4, 0), wd.codePointWidth(0x000B)); // \v VT
-    try testing.expectEqual(@as(i4, 0), wd.codePointWidth(0x000C)); // \f FF
-    try testing.expectEqual(@as(i4, 0), wd.codePointWidth(0x000D)); // \r CR
-    try testing.expectEqual(@as(i4, 0), wd.codePointWidth(0x000E)); // SQ
-    try testing.expectEqual(@as(i4, 0), wd.codePointWidth(0x000F)); // SI
-
-    try testing.expectEqual(@as(i4, 0), wd.codePointWidth(0x070F)); // Cf
-    try testing.expectEqual(@as(i4, 1), wd.codePointWidth(0x0603)); // Cf Arabic
-
-    try testing.expectEqual(@as(i4, 1), wd.codePointWidth(0x00AD)); // soft-hyphen
-    try testing.expectEqual(@as(i4, 2), wd.codePointWidth(0x2E3A)); // two-em dash
-    try testing.expectEqual(@as(i4, 3), wd.codePointWidth(0x2E3B)); // three-em dash
-
-    try testing.expectEqual(@as(i4, 1), wd.codePointWidth(0x00BD)); // ambiguous halfwidth
-
-    try testing.expectEqual(@as(i4, 1), wd.codePointWidth('é'));
-    try testing.expectEqual(@as(i4, 2), wd.codePointWidth('😊'));
-    try testing.expectEqual(@as(i4, 2), wd.codePointWidth('统'));
-}
diff --git a/src/unicode_tests.zig b/src/unicode_tests.zig
index de1b9ec..3cb5df5 100644
--- a/src/unicode_tests.zig
+++ b/src/unicode_tests.zig
@@ -7,10 +7,10 @@ const mem = std.mem;
 const testing = std.testing;
 const unicode = std.unicode;
 
-const grapheme = @import("grapheme");
-const Grapheme = @import("grapheme").Grapheme;
-const Graphemes = @import("grapheme");
-const GraphemeIterator = @import("grapheme").Iterator;
+const grapheme = @import("Graphemes");
+const Grapheme = @import("Graphemes").Grapheme;
+const Graphemes = @import("Graphemes");
+const GraphemeIterator = @import("Graphemes").Iterator;
 const Normalize = @import("Normalize");
 
 comptime {