Use takeDelimiterInclusive to support Zig 0.15.2

17 files changed, 42 insertions, 21 deletions

diff --git a/codegen/canon.zig b/codegen/canon.zig
index 34e720f..d95a905 100644
--- a/codegen/canon.zig
+++ b/codegen/canon.zig
@@ -20,7 +20,8 @@ pub fn main() anyerror!void {
     var writer = &file_writer.interface;
     const endian = builtin.cpu.arch.endian();
 
-    lines: while (in_reader.takeDelimiterInclusive('\n')) |line| {
+    lines: while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0) continue;
 
         var field_iter = std.mem.splitScalar(u8, line, ';');
diff --git a/codegen/case_prop.zig b/codegen/case_prop.zig
index 46b8e65..613f7f6 100644
--- a/codegen/case_prop.zig
+++ b/codegen/case_prop.zig
@@ -32,7 +32,8 @@ pub fn main() anyerror!void {
 
     // Process DerivedCoreProperties.txt
     var in_reader = std.io.Reader.fixed(@embedFile("DerivedCoreProperties.txt"));
-    while (in_reader.takeDelimiterExclusive('\n')) |line| {
+    while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
         const no_comment = if (mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
 
diff --git a/codegen/ccc.zig b/codegen/ccc.zig
index 48d3a9d..4e470ae 100644
--- a/codegen/ccc.zig
+++ b/codegen/ccc.zig
@@ -31,7 +31,8 @@ pub fn main() anyerror!void {
 
     // Process DerivedCombiningClass.txt
     var cc_reader = std.io.Reader.fixed(@embedFile("DerivedCombiningClass.txt"));
-    while (cc_reader.takeDelimiterExclusive('\n')) |line| {
+    while (cc_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
 
diff --git a/codegen/compat.zig b/codegen/compat.zig
index 0a06c44..debb83d 100644
--- a/codegen/compat.zig
+++ b/codegen/compat.zig
@@ -21,7 +21,8 @@ pub fn main() anyerror!void {
 
     const endian = builtin.cpu.arch.endian();
 
-    lines: while (in_reader.takeDelimiterExclusive('\n')) |line| {
+    lines: while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0) continue;
 
         var field_iter = std.mem.splitScalar(u8, line, ';');
diff --git a/codegen/core_props.zig b/codegen/core_props.zig
index d59a77e..6ffdf91 100644
--- a/codegen/core_props.zig
+++ b/codegen/core_props.zig
@@ -32,7 +32,8 @@ pub fn main() anyerror!void {
 
     // Process DerivedCoreProperties.txt
     var in_reader = std.io.Reader.fixed(@embedFile("DerivedCoreProperties.txt"));
-    while (in_reader.takeDelimiterExclusive('\n')) |line| {
+    while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
         const no_comment = if (mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
 
diff --git a/codegen/dwp.zig b/codegen/dwp.zig
index 8189ad8..75ac68e 100644
--- a/codegen/dwp.zig
+++ b/codegen/dwp.zig
@@ -34,7 +34,8 @@ pub fn main() anyerror!void {
     // Process DerivedEastAsianWidth.txt
     var deaw_reader = std.io.Reader.fixed(@embedFile("DerivedEastAsianWidth.txt"));
 
-    while (deaw_reader.takeDelimiterExclusive('\n')) |line| {
+    while (deaw_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0) continue;
 
         // @missing ranges
@@ -92,7 +93,8 @@ pub fn main() anyerror!void {
     // Process DerivedGeneralCategory.txt
     var dgc_reader = std.io.Reader.fixed(@embedFile("DerivedGeneralCategory.txt"));
 
-    while (dgc_reader.takeDelimiterExclusive('\n')) |line| {
+    while (dgc_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
 
diff --git a/codegen/fold.zig b/codegen/fold.zig
index d927795..366ed79 100644
--- a/codegen/fold.zig
+++ b/codegen/fold.zig
@@ -13,7 +13,8 @@ pub fn main() anyerror!void {
     var props_map = std.AutoHashMap(u21, void).init(allocator);
     defer props_map.deinit();
 
-    props_lines: while (props_reader.takeDelimiterExclusive('\n')) |line| {
+    props_lines: while (props_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
 
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
@@ -56,7 +57,8 @@ pub fn main() anyerror!void {
     // Process CaseFolding.txt
 
     var cp_reader = std.io.Reader.fixed(@embedFile("CaseFolding.txt"));
-    while (cp_reader.takeDelimiterExclusive('\n')) |line| {
+    while (cp_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
 
         var field_it = std.mem.splitScalar(u8, line, ';');
diff --git a/codegen/gbp.zig b/codegen/gbp.zig
index 895aa7a..1d06e9a 100644
--- a/codegen/gbp.zig
+++ b/codegen/gbp.zig
@@ -65,7 +65,8 @@ pub fn main() anyerror!void {
     const indic_file = @embedFile("DerivedCoreProperties.txt");
     var indic_reader = std.io.Reader.fixed(indic_file);
 
-    while (indic_reader.takeDelimiterExclusive('\n')) |line| {
+    while (indic_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
         if (std.mem.indexOf(u8, line, "InCB") == null) continue;
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
@@ -106,7 +107,8 @@ pub fn main() anyerror!void {
 
     var gbp_reader = std.io.Reader.fixed(@embedFile("GraphemeBreakProperty.txt"));
 
-    while (gbp_reader.takeDelimiterExclusive('\n')) |line| {
+    while (gbp_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
 
@@ -146,7 +148,8 @@ pub fn main() anyerror!void {
 
     var emoji_reader = std.io.Reader.fixed(@embedFile("emoji-data.txt"));
 
-    while (emoji_reader.takeDelimiterExclusive('\n')) |line| {
+    while (emoji_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
         if (std.mem.indexOf(u8, line, "Extended_Pictographic") == null) continue;
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
diff --git a/codegen/gencat.zig b/codegen/gencat.zig
index 79fa072..9800f1d 100644
--- a/codegen/gencat.zig
+++ b/codegen/gencat.zig
@@ -64,7 +64,8 @@ pub fn main() !void {
 
     // Process DerivedGeneralCategory.txt
     var in_reader = std.io.Reader.fixed(@embedFile("DerivedGeneralCategory.txt"));
-    while (in_reader.takeDelimiterExclusive('\n')) |line| {
+    while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
 
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
diff --git a/codegen/hangul.zig b/codegen/hangul.zig
index 64ab11c..2e4c175 100644
--- a/codegen/hangul.zig
+++ b/codegen/hangul.zig
@@ -40,7 +40,8 @@ pub fn main() anyerror!void {
 
     // Process HangulSyllableType.txt
     var in_reader = std.io.Reader.fixed(@embedFile("HangulSyllableType.txt"));
-    while (in_reader.takeDelimiterExclusive('\n')) |line| {
+    while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
 
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
diff --git a/codegen/lower.zig b/codegen/lower.zig
index 987f004..91f3ef2 100644
--- a/codegen/lower.zig
+++ b/codegen/lower.zig
@@ -20,7 +20,8 @@ pub fn main() !void {
 
     const endian = builtin.cpu.arch.endian();
 
-    lines: while (in_reader.takeDelimiterExclusive('\n')) |line| {
+    lines: while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0) continue;
 
         var field_iter = std.mem.splitScalar(u8, line, ';');
diff --git a/codegen/normp.zig b/codegen/normp.zig
index 3cdd770..eaf6989 100644
--- a/codegen/normp.zig
+++ b/codegen/normp.zig
@@ -31,7 +31,8 @@ pub fn main() anyerror!void {
 
     // Process DerivedNormalizationProps.txt
     var in_reader = std.io.Reader.fixed(@embedFile("DerivedNormalizationProps.txt"));
-    while (in_reader.takeDelimiterExclusive('\n')) |line| {
+    while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
 
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
diff --git a/codegen/numeric.zig b/codegen/numeric.zig
index d6b3165..b304349 100644
--- a/codegen/numeric.zig
+++ b/codegen/numeric.zig
@@ -32,7 +32,8 @@ pub fn main() anyerror!void {
 
     // Process DerivedNumericType.txt
     var in_reader = std.io.Reader.fixed(@embedFile("DerivedNumericType.txt"));
-    while (in_reader.takeDelimiterExclusive('\n')) |line| {
+    while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
         const no_comment = if (mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
 
diff --git a/codegen/props.zig b/codegen/props.zig
index ca42987..35c7dfb 100644
--- a/codegen/props.zig
+++ b/codegen/props.zig
@@ -32,7 +32,8 @@ pub fn main() anyerror!void {
 
     // Process PropList.txt
     var in_reader = std.io.Reader.fixed(@embedFile("PropList.txt"));
-    while (in_reader.takeDelimiterExclusive('\n')) |line| {
+    while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
         const no_comment = if (mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
 
diff --git a/codegen/scripts.zig b/codegen/scripts.zig
index 81511cc..0f0194c 100644
--- a/codegen/scripts.zig
+++ b/codegen/scripts.zig
@@ -205,7 +205,8 @@ pub fn main() anyerror!void {
 
     // Process Scripts.txt
     var in_reader = std.io.Reader.fixed(@embedFile("Scripts.txt"));
-    while (in_reader.takeDelimiterExclusive('\n')) |line| {
+    while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
 
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;
diff --git a/codegen/upper.zig b/codegen/upper.zig
index 108fdbd..5eb29e7 100644
--- a/codegen/upper.zig
+++ b/codegen/upper.zig
@@ -19,7 +19,8 @@ pub fn main() anyerror!void {
     var file_writer = out_file.writer(&write_buf);
     const endian = builtin.cpu.arch.endian();
 
-    lines: while (in_reader.takeDelimiterExclusive('\n')) |line| {
+    lines: while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0) continue;
 
         var field_iter = std.mem.splitScalar(u8, line, ';');
diff --git a/codegen/wbp.zig b/codegen/wbp.zig
index dfdc32e..33eeea5 100644
--- a/codegen/wbp.zig
+++ b/codegen/wbp.zig
@@ -54,7 +54,8 @@ pub fn main() anyerror!void {
     // Process HangulSyllableType.txt
     const in_file = @embedFile("WordBreakProperty.txt");
     var in_reader = std.io.Reader.fixed(in_file);
-    while (in_reader.takeDelimiterExclusive('\n')) |line| {
+    while (in_reader.takeDelimiterInclusive('\n')) |took| {
+        const line = std.mem.trimRight(u8, took, "\n");
         if (line.len == 0 or line[0] == '#') continue;
 
         const no_comment = if (std.mem.indexOfScalar(u8, line, '#')) |octo| line[0..octo] else line;