Commit cc2981edfc4c0e36d3ce6d564f7a36caae9b61b7 | zig

author	Travis <tssund93@gmail.com> 2020-11-10 17:15:08-06:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-01-11 11:15:34-08:00
log	cc2981edfc4c0e36d3ce6d564f7a36caae9b61b7
tree	c64b16c3b3e139c08c3cd1ee39640b4e779ba6fb
parent	1295525a7afe76d0ac384b3f74927ac22b27ec09

update path.join to recognize any separators that isSep does

1 files changed, 22 insertions(+), 17 deletions(-)

lib
- std
  - fs
    path.zig

lib/std/fs/path.zig+22-17

...	...	@@ -39,7 +39,7 @@ pub fn isSep(byte: u8) bool {
39	39
40	40	/// This is different from mem.join in that the separator will not be repeated if
41	41	/// it is found at the end or beginning of a pair of consecutive paths.
42		fn joinSep(allocator: *Allocator, separator: u8, paths: []const []const u8) ![]u8 {
	42	fn joinSep(allocator: *Allocator, separator: u8, sepPredicate: fn (u8) bool, paths: []const []const u8) ![]u8 {
43	43	if (paths.len == 0) return &[0]u8{};
44	44
45	45	const total_len = blk: {
...	...	@@ -48,8 +48,8 @@ fn joinSep(allocator: *Allocator, separator: u8, paths: []const []const u8) ![]u
48	48	while (i < paths.len) : (i += 1) {
49	49	const prev_path = paths[i - 1];
50	50	const this_path = paths[i];
51		const prev_sep = (prev_path.len != 0 and prev_path[prev_path.len - 1] == separator);
52		const this_sep = (this_path.len != 0 and this_path[0] == separator);
	51	const prev_sep = (prev_path.len != 0 and sepPredicate(prev_path[prev_path.len - 1]));
	52	const this_sep = (this_path.len != 0 and sepPredicate(this_path[0]));
53	53	sum += @boolToInt(!prev_sep and !this_sep);
54	54	sum += if (prev_sep and this_sep) this_path.len - 1 else this_path.len;
55	55	}
...	...	@@ -65,8 +65,8 @@ fn joinSep(allocator: *Allocator, separator: u8, paths: []const []const u8) ![]u
65	65	while (i < paths.len) : (i += 1) {
66	66	const prev_path = paths[i - 1];
67	67	const this_path = paths[i];
68		const prev_sep = (prev_path.len != 0 and prev_path[prev_path.len - 1] == separator);
69		const this_sep = (this_path.len != 0 and this_path[0] == separator);
	68	const prev_sep = (prev_path.len != 0 and sepPredicate(prev_path[prev_path.len - 1]));
	69	const this_sep = (this_path.len != 0 and sepPredicate(this_path[0]));
70	70	if (!prev_sep and !this_sep) {
71	71	buf[buf_index] = separator;
72	72	buf_index += 1;
...	...	@@ -80,28 +80,30 @@ fn joinSep(allocator: *Allocator, separator: u8, paths: []const []const u8) ![]u
80	80	return buf;
81	81	}
82	82
83		pub const join = if (builtin.os.tag == .windows) joinWindows else joinPosix;
84
85		/// Naively combines a series of paths with the native path seperator.
86		/// Allocates memory for the result, which must be freed by the caller.
87		pub fn joinWindows(allocator: *Allocator, paths: []const []const u8) ![]u8 {
88		return joinSep(allocator, sep_windows, paths);
89		}
90
91	83	/// Naively combines a series of paths with the native path seperator.
92	84	/// Allocates memory for the result, which must be freed by the caller.
93		pub fn joinPosix(allocator: *Allocator, paths: []const []const u8) ![]u8 {
94		return joinSep(allocator, sep_posix, paths);
	85	pub fn join(allocator: *Allocator, paths: []const []const u8) ![]u8 {
	86	return joinSep(allocator, sep, isSep, paths);
95	87	}
96	88
97	89	fn testJoinWindows(paths: []const []const u8, expected: []const u8) void {
98		const actual = joinWindows(testing.allocator, paths) catch @panic("fail");
	90	const windowsIsSep = struct {
	91	fn isSep(byte: u8) bool {
	92	return byte == '/' or byte == '\\';
	93	}
	94	}.isSep;
	95	const actual = joinSep(testing.allocator, sep_windows, windowsIsSep, paths) catch @panic("fail");
99	96	defer testing.allocator.free(actual);
100	97	testing.expectEqualSlices(u8, expected, actual);
101	98	}
102	99
103	100	fn testJoinPosix(paths: []const []const u8, expected: []const u8) void {
104		const actual = joinPosix(testing.allocator, paths) catch @panic("fail");
	101	const posixIsSep = struct {
	102	fn isSep(byte: u8) bool {
	103	return byte == '/';
	104	}
	105	}.isSep;
	106	const actual = joinSep(testing.allocator, sep_posix, posixIsSep, paths) catch @panic("fail");
105	107	defer testing.allocator.free(actual);
106	108	testing.expectEqualSlices(u8, expected, actual);
107	109	}
...	...	@@ -119,6 +121,9 @@ test "join" {
119	121	"c:\\home\\andy\\dev\\zig\\build\\lib\\zig\\std\\io.zig",
120	122	);
121	123
	124	testJoinWindows(&[_][]const u8{ "c:\\", "a", "b/", "c" }, "c:\\a\\b/c");
	125	testJoinWindows(&[_][]const u8{ "c:\\a/", "b\\", "/c" }, "c:\\a/b\\c");
	126
122	127	testJoinPosix(&[_][]const u8{ "/a/b", "c" }, "/a/b/c");
123	128	testJoinPosix(&[_][]const u8{ "/a/b/", "c" }, "/a/b/c");
124	129