diff --git a/scripts/ArabicShaping.zig b/scripts/ArabicShaping.zig index af7f6d6e71f8ce497e2c00425e5a53d967c60c61..01ea6420f80e4c4037288dc16b88ed076192e668 100644 --- a/scripts/ArabicShaping.zig +++ b/scripts/ArabicShaping.zig @@ -143,7 +143,7 @@ pub usingnamespace common.Main(struct { ; pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { - var it = std.mem.split(u8, line, ";"); + var it = std.mem.splitScalar(u8, line, ';'); const c = std.mem.trim(u8, it.next().?, " "); const n = std.mem.trim(u8, it.next().?, " "); const t = std.mem.trim(u8, it.next().?, " "); diff --git a/scripts/BidiBrackets.zig b/scripts/BidiBrackets.zig index 2edf133d28b8a46e44908561ba2bcb4100e770f4..377f06127efc86fc8831cc8208048fbae178f5ee 100644 --- a/scripts/BidiBrackets.zig +++ b/scripts/BidiBrackets.zig @@ -31,7 +31,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.split(u8, line, ";"); + var it = std.mem.splitScalar(u8, line, ';'); const a = std.mem.trim(u8, it.next().?, " "); const b = std.mem.trim(u8, it.next().?, " "); const c = std.mem.trim(u8, it.next().?, " "); diff --git a/scripts/BidiMirroring.zig b/scripts/BidiMirroring.zig index d29e607a366a7ab7be90ec63d1ad265e2748cb7d..175a01e272d0436ca9d432c41e8b3aaa8213dfb9 100644 --- a/scripts/BidiMirroring.zig +++ b/scripts/BidiMirroring.zig @@ -23,7 +23,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.tokenize(u8, line, "; #"); + var it = std.mem.tokenizeAny(u8, line, "; #"); const c = it.next().?; const m = it.next().?; diff --git a/scripts/Blocks.zig b/scripts/Blocks.zig index 8f9afa68ee2a78b8556c6fc79164307d0139fa14..c95e03661ccb82dfcaaff7b334bceee362cbf566 100644 --- a/scripts/Blocks.zig +++ b/scripts/Blocks.zig @@ -25,8 +25,8 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it1 = std.mem.split(u8, line, "; "); - var it2 = std.mem.split(u8, it1.next().?, ".."); + var it1 = std.mem.splitSequence(u8, line, "; "); + var it2 = std.mem.splitSequence(u8, it1.next().?, ".."); const from = it2.next().?; const to = it2.next().?; const name = it1.next().?; diff --git a/scripts/CaseFolding.zig b/scripts/CaseFolding.zig index e56e04bb8b1a56c95917d4e956f5e54d22faa4a7..a474584275a71fe5cb209b5e2bb6ae92fa1d5fc3 100644 --- a/scripts/CaseFolding.zig +++ b/scripts/CaseFolding.zig @@ -38,7 +38,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.split(u8, line, "; "); + var it = std.mem.splitSequence(u8, line, "; "); const code = it.next().?; const status = it.next().?; try writer.print(" .{{ .code = 0x{s}, .status = .{s}, .mapping = .{{ .{s} =", .{ code, status, status }); @@ -50,7 +50,7 @@ pub usingnamespace common.Main(struct { }, .F => { const mapping = it.next().?; - var jt = std.mem.split(u8, mapping, " "); + var jt = std.mem.splitScalar(u8, mapping, ' '); try writer.writeAll(" &[_]u21{"); while (jt.next()) |jtem| { try writer.print("0x{s},", .{jtem}); diff --git a/scripts/CompositionExclusions.zig b/scripts/CompositionExclusions.zig index c15932f3d70bf9e4c3915d8098f48fd5ff9f92d0..8ab2cd6d675e7c7e2516badb99e0ce026357a4e9 100644 --- a/scripts/CompositionExclusions.zig +++ b/scripts/CompositionExclusions.zig @@ -19,7 +19,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.split(u8, line, " "); + var it = std.mem.splitScalar(u8, line, ' '); try writer.print(" 0x{s},\n", .{it.next().?}); } }); diff --git a/scripts/DerivedAge.zig b/scripts/DerivedAge.zig index 95b59231d8c02a9d32cb93b9706f587ab6cb9e01..0aefc8bb9b3fba420b7696bfb9d14dc31f24ccad 100644 --- a/scripts/DerivedAge.zig +++ b/scripts/DerivedAge.zig @@ -24,7 +24,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.tokenize(u8, line, "; "); + var it = std.mem.tokenizeAny(u8, line, "; "); { const range = it.next().?; @@ -36,7 +36,7 @@ pub usingnamespace common.Main(struct { } { const added = it.next().?; - var jt = std.mem.split(u8, added, "."); + var jt = std.mem.splitScalar(u8, added, '.'); const major = jt.next().?; const minor = jt.next().?; try writer.print(" .since = .{{ {s},{s} }} }},\n", .{ major, minor }); diff --git a/scripts/DerivedCoreProperties.zig b/scripts/DerivedCoreProperties.zig index c9fcc969a3862c1240b40765332f4f00c396525f..40ff06cdc45875128d4da693215f7adf52857e97 100644 --- a/scripts/DerivedCoreProperties.zig +++ b/scripts/DerivedCoreProperties.zig @@ -47,7 +47,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.tokenize(u8, line, "; "); + var it = std.mem.tokenizeAny(u8, line, "; "); { const range = it.next().?; diff --git a/scripts/EastAsianWidth.zig b/scripts/EastAsianWidth.zig index 19629fc89dd1be32083955163d7c7511fccc8219..87ba6815c2dbfc5bda38624bb7bc7b92f39f0ce1 100644 --- a/scripts/EastAsianWidth.zig +++ b/scripts/EastAsianWidth.zig @@ -26,7 +26,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.tokenize(u8, line, "; "); + var it = std.mem.tokenizeAny(u8, line, "; "); { const range = it.next().?; diff --git a/scripts/EmojiSources.zig b/scripts/EmojiSources.zig index 9715985ef1a3b52899beba67214390189b0e1a1c..54cb1189ec4dafa3e6c94f600d8dfc77a41ff5cf 100644 --- a/scripts/EmojiSources.zig +++ b/scripts/EmojiSources.zig @@ -26,7 +26,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; if (std.mem.count(u8, line, " ") > 0) return; - var it = std.mem.split(u8, line, ";"); + var it = std.mem.splitScalar(u8, line, ';'); const code = it.next().?; // FIXME remove @as and temp vars after switch off stage1 const docomo = common.nullify(it.next().?) orelse @as([]const u8, "0"); diff --git a/scripts/EquivalentUnifiedIdeograph.zig b/scripts/EquivalentUnifiedIdeograph.zig index 44e503db3ebcd09dcde0b45ef5f3e1797423d60b..d11da48b735b562700567eeff2cd08542c862524 100644 --- a/scripts/EquivalentUnifiedIdeograph.zig +++ b/scripts/EquivalentUnifiedIdeograph.zig @@ -18,7 +18,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.tokenize(u8, line, "; "); + var it = std.mem.tokenizeAny(u8, line, "; "); const first = it.next().?; const next = it.next().?; diff --git a/scripts/HangulSyllableType.zig b/scripts/HangulSyllableType.zig index f259da27d2eed0659b1cf2e32aa750a17afa2022..c3460a3f50c08ea166cc44b7fdd2bec1f24cdaee 100644 --- a/scripts/HangulSyllableType.zig +++ b/scripts/HangulSyllableType.zig @@ -26,7 +26,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.tokenize(u8, line, "; "); + var it = std.mem.tokenizeAny(u8, line, "; "); { const range = it.next().?; diff --git a/scripts/IndicPositionalCategory.zig b/scripts/IndicPositionalCategory.zig index 5e1e22dd82bb02f08aa55c2149a036f3e2564c41..e1edd3221b8513450282e478c3871080bbaeab94 100644 --- a/scripts/IndicPositionalCategory.zig +++ b/scripts/IndicPositionalCategory.zig @@ -25,7 +25,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.tokenize(u8, line, "; "); + var it = std.mem.tokenizeAny(u8, line, "; "); const first = it.next().?; const next = it.next().?; diff --git a/scripts/IndicSyllabicCategory.zig b/scripts/IndicSyllabicCategory.zig index 1c6cdd30b950b3117dee3eea980bb749682c04b1..d00df0baff2cc3c9aa174905efddfdbaab074a12 100644 --- a/scripts/IndicSyllabicCategory.zig +++ b/scripts/IndicSyllabicCategory.zig @@ -25,7 +25,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.tokenize(u8, line, "; "); + var it = std.mem.tokenizeAny(u8, line, "; "); const first = it.next().?; const next = it.next().?; diff --git a/scripts/Jamo.zig b/scripts/Jamo.zig index 9bf8de7906169178db5e1e72fc9a5d7cc2380462..077dd311e05d4bf3ddbb0a6477be87ad4ec97b51 100644 --- a/scripts/Jamo.zig +++ b/scripts/Jamo.zig @@ -23,7 +23,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.tokenize(u8, line, "; "); + var it = std.mem.tokenizeAny(u8, line, "; "); const first = it.next().?; const next = it.next().?; diff --git a/scripts/NameAliases.zig b/scripts/NameAliases.zig index 7b845d154e9606f250ac778d58522a00b1af0017..42ea579e60fae85c01203b6c3da3cfadf7130eca 100644 --- a/scripts/NameAliases.zig +++ b/scripts/NameAliases.zig @@ -32,7 +32,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.split(u8, line, ";"); + var it = std.mem.splitScalar(u8, line, ';'); try writer.print(" .{{ .code = 0x{s}, .alias = \"{}\", .type = .{s} }},\n", .{ it.next().?, diff --git a/scripts/NamedSequences.zig b/scripts/NamedSequences.zig index 8840719d4bd1312896826f4a0b56e6c406d323a4..b321586a66241dc6820819fefa8899d0c735a489 100644 --- a/scripts/NamedSequences.zig +++ b/scripts/NamedSequences.zig @@ -23,11 +23,11 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.split(u8, line, ";"); + var it = std.mem.splitScalar(u8, line, ';'); try writer.print(" .{{ .name = \"{}\", .sequence = &[_]u21{{", .{std.zig.fmtEscapes(it.next().?)}); - var jt = std.mem.tokenize(u8, it.next().?, " "); + var jt = std.mem.tokenizeScalar(u8, it.next().?, ' '); while (jt.next()) |jtem| { try writer.print(" 0x{s},", .{jtem}); } diff --git a/scripts/NamedSequencesProv.zig b/scripts/NamedSequencesProv.zig index 873c2967376d29d15f0b0e1939a63d4ee75d5099..2bc157a26852cb7cf8956bf195a4b2c37e6c6bf2 100644 --- a/scripts/NamedSequencesProv.zig +++ b/scripts/NamedSequencesProv.zig @@ -23,11 +23,11 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.split(u8, line, ";"); + var it = std.mem.splitScalar(u8, line, ';'); try writer.print(" .{{ .name = \"{}\", .sequence = &[_]u21{{", .{std.zig.fmtEscapes(it.next().?)}); - var jt = std.mem.tokenize(u8, it.next().?, " "); + var jt = std.mem.tokenizeScalar(u8, it.next().?, ' '); while (jt.next()) |jtem| { try writer.print(" 0x{s},", .{jtem}); } diff --git a/scripts/PropertyAliases.zig b/scripts/PropertyAliases.zig index 99f71a003b94e4b89f55ca22f4af1f3dc5571038..ac3a55e1194deb992fd6b781e7549c5dd130063f 100644 --- a/scripts/PropertyAliases.zig +++ b/scripts/PropertyAliases.zig @@ -20,7 +20,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; const end = std.mem.indexOfScalar(u8, line, '#') orelse line.len; - var it = std.mem.tokenize(u8, line[0..end], "; "); + var it = std.mem.tokenizeAny(u8, line[0..end], "; "); const short = it.next().?; const long = it.next().?; diff --git a/scripts/PropertyValueAliases.zig b/scripts/PropertyValueAliases.zig index 0213001017eaa4370abf7e1339fb72a34d2cc437..e348aaed06441c961308455c537c5aa86f45bfea 100644 --- a/scripts/PropertyValueAliases.zig +++ b/scripts/PropertyValueAliases.zig @@ -21,7 +21,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; const end = std.mem.indexOfScalar(u8, line, '#') orelse line.len; - var it = std.mem.tokenize(u8, line[0..end], "; "); + var it = std.mem.tokenizeAny(u8, line[0..end], "; "); var vals = [_][]const u8{ it.next().?, diff --git a/scripts/ScriptExtensions.zig b/scripts/ScriptExtensions.zig index 8df0a9aff5884efd82d090104080579d289cafd9..4358865b2a4c5842d5d2d7a15b1c82fc3c6c237f 100644 --- a/scripts/ScriptExtensions.zig +++ b/scripts/ScriptExtensions.zig @@ -25,7 +25,7 @@ pub usingnamespace common.Main(struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.tokenize(u8, line, "; "); + var it = std.mem.tokenizeAny(u8, line, "; "); const first = it.next().?; @@ -54,7 +54,7 @@ fn formatScripts(bytes: []const u8, comptime fmt: []const u8, options: std.fmt.F _ = fmt; _ = options; try writer.writeAll("&.{"); - var it = std.mem.split(u8, bytes, " "); + var it = std.mem.splitScalar(u8, bytes, ' '); while (it.next()) |item| { if (item.len == 0) continue; try writer.print(" .{s},", .{item}); diff --git a/scripts/_common.zig b/scripts/_common.zig index 544e73aab72364d09f453d938d57d55bd040ea8f..276a3b74e9c905c8749dd186391c5cec24a85c23 100644 --- a/scripts/_common.zig +++ b/scripts/_common.zig @@ -91,7 +91,7 @@ pub fn RangeEnum(comptime prop: []const u8) type { return struct { pub fn exec(alloc: std.mem.Allocator, line: []const u8, writer: anytype) !void { _ = alloc; - var it = std.mem.tokenize(u8, line, "; "); + var it = std.mem.tokenizeAny(u8, line, "; "); const first = it.next().?; const next = std.mem.trimRight(u8, it.next().?, "#"); @@ -112,7 +112,7 @@ pub fn printCodepoint(writer: anytype, input: []const u8) !void { } pub fn printSeq(writer: anytype, input: []const u8) !void { - var jt = std.mem.tokenize(u8, input, " "); + var jt = std.mem.tokenizeScalar(u8, input, ' '); try writer.writeAll(" &.{"); while (jt.next()) |jtem| { try printCodepoint(writer, jtem);