authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-08-25 00:24:36 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-08-25 00:24:36 -07:00
logd259477fa8d3aa2dfbeca252d3d8667f48881811
tree6b0be7052f59d13229122960daa49bbc30680a6c
parent310002b87289c3f9c8a0c1178dcafcb32132ebe5

cmd/fetch- allow `.` in pacakge names, fixes #22

sorry for the merge conflict @digitalcreature

1 files changed, 12 insertions(+), 6 deletions(-)

src/cmd/fetch.zig+12-6
......@@ -344,9 +344,8 @@ fn print_pkgs(w: std.fs.File.Writer, m: u.Module) !void {
344344 if (d.main.len == 0) {
345345 continue;
346346 }
347 const r1 = try std.mem.replaceOwned(u8, gpa, d.name, "-", "_");
348 const r2 = try std.mem.replaceOwned(u8, gpa, r1, "/", "_");
349 try w.print(" pub const {s} = package_data._{s};\n", .{ r2, d.id[0..12] });
347 const ident = try zig_name_from_pkg_name(d.name);
348 try w.print(" pub const {s} = package_data._{s};\n", .{ ident, d.id[0..12] });
350349 }
351350 try w.writeAll("}");
352351}
......@@ -356,8 +355,15 @@ fn print_imports(w: std.fs.File.Writer, m: u.Module, path: string) !void {
356355 if (d.main.len == 0) {
357356 continue;
358357 }
359 const r1 = try std.mem.replaceOwned(u8, gpa, d.name, "-", "_");
360 const r2 = try std.mem.replaceOwned(u8, gpa, r1, "/", "_");
361 try w.print(" pub const {s} = @import(\"{}/{}/{s}\");\n", .{ r2, std.zig.fmtEscapes(path), std.zig.fmtEscapes(d.clean_path), d.main });
358 const ident = try zig_name_from_pkg_name(d.name);
359 try w.print(" pub const {s} = @import(\"{}/{}/{s}\");\n", .{ ident, std.zig.fmtEscapes(path), std.zig.fmtEscapes(d.clean_path), d.main });
362360 }
363361}
362
363fn zig_name_from_pkg_name(name: []const u8) ![]const u8 {
364 var legal = name;
365 legal = try std.mem.replaceOwned(u8, gpa, legal, "-", "_");
366 legal = try std.mem.replaceOwned(u8, gpa, legal, "/", "_");
367 legal = try std.mem.replaceOwned(u8, gpa, legal, ".", "_");
368 return legal;
369}