Commit 0f4f337b97136536157fd06be77eb61dfb870aba | zigmod

author	Meghan Denny <hello@nektro.net> 2021-10-28 03:35:09 -07:00
committer	Meghan Denny <hello@nektro.net> 2021-10-28 03:35:09 -07:00
log	0f4f337b97136536157fd06be77eb61dfb870aba
tree	d45818c71845862cefb489aa67228275315c1774
parent	5eeb1f37ad0f488b2c9b615b9590650ef4fd0f82

4 files changed, 8 insertions(+), 7 deletions(-)

src/common.zig+1-1

...	...	@@ -174,7 +174,7 @@ pub fn get_modpath(cachepath: string, d: zigmod.Dep, options: *CollectOptions) !
174	174	if (try u.does_folder_exist(pv)) {
175	175	return pv;
176	176	}
177		const file_name = try u.last(try u.split(d.path, "/"));
	177	const file_name = try u.last(try u.split(gpa, d.path, "/"));
178	178	if (d.version.len > 0) {
179	179	if (try u.does_folder_exist(pv)) {
180	180	return pv;

src/util/funcs.zig+4-3

...	...	@@ -38,9 +38,10 @@ pub fn try_index(comptime T: type, array: []T, n: usize, def: T) T {
38	38	return array[n];
39	39	}
40	40
41		pub fn split(in: string, delim: string) ![]string {
42		var list = std.ArrayList(string).init(gpa);
	41	pub fn split(alloc: *std.mem.Allocator, in: string, delim: string) ![]string {
	42	var list = std.ArrayList(string).init(alloc);
43	43	defer list.deinit();
	44
44	45	var iter = std.mem.split(u8, in, delim);
45	46	while (iter.next()) \|str\| {
46	47	try list.append(str);
...	...	@@ -267,7 +268,7 @@ pub fn detect_pkgname(override: string, dir: string) !string {
267	268	return error.NoBuildZig;
268	269	}
269	270	const dpath = try std.fs.realpathAlloc(gpa, try std.mem.concat(gpa, u8, &.{ dir, "build.zig" }));
270		const splitP = try split(dpath, std.fs.path.sep_str);
	271	const splitP = try split(gpa, dpath, std.fs.path.sep_str);
271	272	var name = splitP[splitP.len - 2];
272	273	name = trim_prefix(name, "zig-");
273	274	assert(name.len > 0, "package name must not be an empty string", .{});

src/util/modfile.zig+2-2

...	...	@@ -118,8 +118,8 @@ pub const ModFile = struct {
118	118	.c_include_dirs = try item.mapping.get_string_array(alloc, "c_include_dirs"),
119	119	.c_source_flags = try item.mapping.get_string_array(alloc, "c_source_flags"),
120	120	.c_source_files = try item.mapping.get_string_array(alloc, "c_source_files"),
121		.only_os = try u.list_remove(try u.split(item.mapping.get_string("only_os"), ","), ""),
122		.except_os = try u.list_remove(try u.split(item.mapping.get_string("except_os"), ","), ""),
	121	.only_os = try u.list_remove(try u.split(alloc, item.mapping.get_string("only_os"), ","), ""),
	122	.except_os = try u.list_remove(try u.split(alloc, item.mapping.get_string("except_os"), ","), ""),
123	123	.yaml = item.mapping,
124	124	.deps = try dep_list_by_name(alloc, item.mapping, "dependencies"),
125	125	});

src/util/yaml.zig+1-1

...	...	@@ -150,7 +150,7 @@ pub fn parse(alloc: *std.mem.Allocator, input: string) !Document {
150	150	_ = c.yaml_parser_initialize(&parser);
151	151	defer c.yaml_parser_delete(&parser);
152	152
153		const lines = try u.split(input, "\n");
	153	const lines = try u.split(alloc, input, "\n");
154	154
155	155	_ = c.yaml_parser_set_input_string(&parser, input.ptr, input.len);
156	156