diff --git a/scripts/BidiMirroring.zig b/scripts/BidiMirroring.zig index 6474a4b96588a126746d537497660fed13aecfae..52ce42e95bec8db043235fd0cbda3a06553bd8f5 100644 --- a/scripts/BidiMirroring.zig +++ b/scripts/BidiMirroring.zig @@ -2,7 +2,7 @@ const std = @import("std"); const common = @import("./_common.zig"); pub usingnamespace common.Main(struct { - pub const source_url = "https://unicode.org/Public/" ++ common.version ++ "/ucd/BidiMirroring.txt"; + pub const source_file = "BidiMirroring"; pub const dest_file = "src/bidi_mirroring.zig"; diff --git a/scripts/CJKRadicals.zig b/scripts/CJKRadicals.zig index 1c44b1e850e615f61bdfb63f127fbc7fb6495061..7682d27fd4846c0959a8486db381af3f225558d7 100644 --- a/scripts/CJKRadicals.zig +++ b/scripts/CJKRadicals.zig @@ -2,7 +2,7 @@ const std = @import("std"); const common = @import("./_common.zig"); pub usingnamespace common.Main(struct { - pub const source_url = "https://unicode.org/Public/" ++ common.version ++ "/ucd/CJKRadicals.txt"; + pub const source_file = "CJKRadicals"; pub const dest_file = "src/cjk_radicals.zig"; diff --git a/scripts/CaseFolding.zig b/scripts/CaseFolding.zig index 3a2bec422d505dba13996688e0214bf3075e42f3..cf76c780e231566a82abf811d7d64fcaec2233a5 100644 --- a/scripts/CaseFolding.zig +++ b/scripts/CaseFolding.zig @@ -2,7 +2,7 @@ const std = @import("std"); const common = @import("./_common.zig"); pub usingnamespace common.Main(struct { - pub const source_url = "https://unicode.org/Public/" ++ common.version ++ "/ucd/CaseFolding.txt"; + pub const source_file = "CaseFolding"; pub const dest_file = "src/case_folding.zig"; diff --git a/scripts/_common.zig b/scripts/_common.zig index 3d6ee120fc590638e902688781426c46df358bce..09bf915896e6a080ac9697eaea57df84ceeb411a 100644 --- a/scripts/_common.zig +++ b/scripts/_common.zig @@ -6,7 +6,7 @@ const ansi = @import("ansi"); pub const version = "13.0.0"; pub fn Main(comptime T: type) type { - comptime std.debug.assert(@hasDecl(T, "source_url")); + comptime std.debug.assert(@hasDecl(T, "source_file")); comptime std.debug.assert(@hasDecl(T, "dest_file")); comptime std.debug.assert(@hasDecl(T, "dest_header")); comptime std.debug.assert(@hasDecl(T, "dest_footer")); @@ -18,6 +18,7 @@ pub fn Main(comptime T: type) type { defer _ = gpa.deinit(); const max_size = std.math.maxInt(usize); + const source_url = "https://unicode.org/Public/" ++ version ++ "/ucd/" ++ T.source_file ++ ".txt"; // std.log.info("{s}", .{T.dest_file}); @@ -39,10 +40,10 @@ pub fn Main(comptime T: type) type { \\// zig fmt: off \\ \\ - , .{T.source_url}); + , .{source_url}); try w.writeAll(T.dest_header); - const req = try zfetch.Request.init(alloc, T.source_url, null); + const req = try zfetch.Request.init(alloc, source_url, null); defer req.deinit(); try req.do(.GET, null, null); const r = req.reader(); diff --git a/scripts/arabic_shaping.zig b/scripts/arabic_shaping.zig index 4b1c083d00e02eb7e79c3202fa3f37848f8f55b2..657e3c9644f69a059b32a8ec2aa2e011a4b73625 100644 --- a/scripts/arabic_shaping.zig +++ b/scripts/arabic_shaping.zig @@ -2,7 +2,7 @@ const std = @import("std"); const common = @import("./_common.zig"); pub usingnamespace common.Main(struct { - pub const source_url = "https://unicode.org/Public/" ++ common.version ++ "/ucd/ArabicShaping.txt"; + pub const source_file = "ArabicShaping"; pub const dest_file = "src/arabic_shaping.zig"; diff --git a/scripts/bidi_brackets.zig b/scripts/bidi_brackets.zig index 3bb562b59910fb3f941a0193fee97a0d18cfc6fe..fc3ed3e24688cd66cb4fe4f1f0b8923862e21da1 100644 --- a/scripts/bidi_brackets.zig +++ b/scripts/bidi_brackets.zig @@ -2,7 +2,7 @@ const std = @import("std"); const common = @import("./_common.zig"); pub usingnamespace common.Main(struct { - pub const source_url = "https://unicode.org/Public/" ++ common.version ++ "/ucd/BidiBrackets.txt"; + pub const source_file = "BidiBrackets"; pub const dest_file = "src/bidi_brackets.zig"; diff --git a/scripts/blocks.zig b/scripts/blocks.zig index f35fe5df9a6745e2cc83acf2d794f425f409982b..cf505c90bcfacbb31c901320a65e1a0b64f3e52c 100644 --- a/scripts/blocks.zig +++ b/scripts/blocks.zig @@ -2,7 +2,7 @@ const std = @import("std"); const common = @import("./_common.zig"); pub usingnamespace common.Main(struct { - pub const source_url = "https://unicode.org/Public/" ++ common.version ++ "/ucd/Blocks.txt"; + pub const source_file = "Blocks"; pub const dest_file = "src/blocks.zig";