mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-27 16:43:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression in char printing

Browse Source 
Closes #4014
This commit is contained in:
LemonBoy 2020-01-15 23:08:02 +01:00 committed by Andrew Kelley
parent 0267afa9c0
commit 7e5e767ba0
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/std/fmt.zig
View File

@ -585,9 +585,7 @@ pub fn formatAsciiChar(
comptime Errors: type, comptime Errors: type,
output: fn (@TypeOf(context), []const u8) Errors!void, output: fn (@TypeOf(context), []const u8) Errors!void,
) Errors!void { ) Errors!void {
if (std.ascii.isPrint(c)) return output(context, @as(*const [1]u8, &c)[0..]);
return output(context, @as(*const [1]u8, &c)[0..]);
return format(context, Errors, output, "\\x{x:0<2}", .{c});
} }
pub fn formatBuf( pub fn formatBuf(

9
src-self-hosted/translate_c.zig
View File

@ -1708,7 +1708,14 @@ fn escapeChar(c: u8, char_buf: *[4]u8) []const u8 {
'\n' => "\\n"[0..], '\n' => "\\n"[0..],
'\r' => "\\r"[0..], '\r' => "\\r"[0..],
'\t' => "\\t"[0..], '\t' => "\\t"[0..],
else => std.fmt.bufPrint(char_buf[0..], "{c}", .{c}) catch unreachable, else => {
// Handle the remaining escapes Zig doesn't support by turning them
// into their respective hex representation
if (std.ascii.isCntrl(c))
return std.fmt.bufPrint(char_buf[0..], "\\x{x:0<2}", .{c}) catch unreachable
else
return std.fmt.bufPrint(char_buf[0..], "{c}", .{c}) catch unreachable;
},
}; };
} }