mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-26 08:03:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

make Package.Path support string escape formatting

Browse Source
This commit is contained in:
Andrew Kelley 2023-10-06 23:59:26 -07:00
parent cbb9b5d9f0
commit 9eb21541ec
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/zig.zig
View File

@ -1,6 +1,6 @@
const std = @import("std.zig"); const std = @import("std.zig");
const tokenizer = @import("zig/tokenizer.zig"); const tokenizer = @import("zig/tokenizer.zig");
const fmt = @import("zig/fmt.zig"); pub const fmt = @import("zig/fmt.zig");
const assert = std.debug.assert; const assert = std.debug.assert;
pub const ErrorBundle = @import("zig/ErrorBundle.zig"); pub const ErrorBundle = @import("zig/ErrorBundle.zig");

6
lib/std/zig/fmt.zig
View File

@ -13,7 +13,7 @@ fn formatId(
return writer.writeAll(bytes); return writer.writeAll(bytes);
} }
try writer.writeAll("@\""); try writer.writeAll("@\"");
try formatEscapes(bytes, "", options, writer); try stringEscape(bytes, "", options, writer);
try writer.writeByte('"'); try writer.writeByte('"');
} }
@ -47,7 +47,7 @@ test "isValidId" {
/// Print the string as escaped contents of a double quoted or single-quoted string. /// Print the string as escaped contents of a double quoted or single-quoted string.
/// Format `{}` treats contents as a double-quoted string. /// Format `{}` treats contents as a double-quoted string.
/// Format `{'}` treats contents as a single-quoted string. /// Format `{'}` treats contents as a single-quoted string.
fn formatEscapes( pub fn stringEscape(
bytes: []const u8, bytes: []const u8,
comptime fmt: []const u8, comptime fmt: []const u8,
options: std.fmt.FormatOptions, options: std.fmt.FormatOptions,
@ -90,7 +90,7 @@ fn formatEscapes(
/// The format specifier must be one of: /// The format specifier must be one of:
/// * `{}` treats contents as a double-quoted string. /// * `{}` treats contents as a double-quoted string.
/// * `{'}` treats contents as a single-quoted string. /// * `{'}` treats contents as a single-quoted string.
pub fn fmtEscapes(bytes: []const u8) std.fmt.Formatter(formatEscapes) { pub fn fmtEscapes(bytes: []const u8) std.fmt.Formatter(stringEscape) {
return .{ .data = bytes }; return .{ .data = bytes };
} }

18
src/Package.zig
View File

@ -89,7 +89,23 @@ pub const Path = struct {
options: std.fmt.FormatOptions, options: std.fmt.FormatOptions,
writer: anytype, writer: anytype,
) !void { ) !void {
_ = options; if (fmt_string.len == 1) {
// Quote-escape the string.
const stringEscape = std.zig.fmt.stringEscape;
const f = switch (fmt_string[0]) {
'q' => "",
'\'' => '\'',
else => @compileError("unsupported format string: " ++ fmt_string),
};
if (self.root_dir.path) |p| {
try stringEscape(p, f, options, writer);
if (self.sub_path.len > 0) try writer.writeAll(fs.path.sep_str);
}
if (self.sub_path.len > 0) {
try stringEscape(self.sub_path, f, options, writer);
}
return;
}
if (fmt_string.len > 0) if (fmt_string.len > 0)
std.fmt.invalidFmtError(fmt_string, self); std.fmt.invalidFmtError(fmt_string, self);
if (self.root_dir.path) |p| { if (self.root_dir.path) |p| {