authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-02-27 01:20:19-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-02-27 01:20:19-07:00
log4a548002afcff3850ab117a263f20ef34259c884
treeffe3ebfab364de610aebccd7953385e7feae3602
parent3f844cba0b601186bb20efa6090e944b9267f538

translate-c: upgrade to new std.zig.fmtEscapes API

fixes regressions from previous commit

2 files changed, 4 insertions(+), 4 deletions(-)

src/translate_c.zig+1-1
......@@ -2475,7 +2475,7 @@ fn transPredefinedExpr(c: *Context, scope: *Scope, expr: *const clang.Predefined
24752475
24762476fn transCreateCharLitNode(c: *Context, narrow: bool, val: u32) TransError!Node {
24772477 return Tag.char_literal.create(c.arena, if (narrow)
2478 try std.fmt.allocPrint(c.arena, "'{s}'", .{std.zig.fmtEscapes(&.{@intCast(u8, val)})})
2478 try std.fmt.allocPrint(c.arena, "'{'}'", .{std.zig.fmtEscapes(&.{@intCast(u8, val)})})
24792479 else
24802480 try std.fmt.allocPrint(c.arena, "'\\u{{{x}}}'", .{val}));
24812481}
src/translate_c/ast.zig+3-3
......@@ -995,7 +995,7 @@ fn renderNode(c: *Context, node: Node) Allocator.Error!NodeIndex {
995995
996996 const compile_error_tok = try c.addToken(.builtin, "@compileError");
997997 _ = try c.addToken(.l_paren, "(");
998 const err_msg_tok = try c.addTokenFmt(.string_literal, "\"{s}\"", .{std.zig.fmtEscapes(payload.mangled)});
998 const err_msg_tok = try c.addTokenFmt(.string_literal, "\"{}\"", .{std.zig.fmtEscapes(payload.mangled)});
999999 const err_msg = try c.addNode(.{
10001000 .tag = .string_literal,
10011001 .main_token = err_msg_tok,
......@@ -2265,7 +2265,7 @@ fn renderVar(c: *Context, node: Node) !NodeIndex {
22652265 _ = try c.addToken(.l_paren, "(");
22662266 const res = try c.addNode(.{
22672267 .tag = .string_literal,
2268 .main_token = try c.addTokenFmt(.string_literal, "\"{s}\"", .{std.zig.fmtEscapes(some)}),
2268 .main_token = try c.addTokenFmt(.string_literal, "\"{}\"", .{std.zig.fmtEscapes(some)}),
22692269 .data = undefined,
22702270 });
22712271 _ = try c.addToken(.r_paren, ")");
......@@ -2347,7 +2347,7 @@ fn renderFunc(c: *Context, node: Node) !NodeIndex {
23472347 _ = try c.addToken(.l_paren, "(");
23482348 const res = try c.addNode(.{
23492349 .tag = .string_literal,
2350 .main_token = try c.addTokenFmt(.string_literal, "\"{s}\"", .{std.zig.fmtEscapes(some)}),
2350 .main_token = try c.addTokenFmt(.string_literal, "\"{}\"", .{std.zig.fmtEscapes(some)}),
23512351 .data = undefined,
23522352 });
23532353 _ = try c.addToken(.r_paren, ")");