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...@@ -2475,7 +2475,7 @@ fn transPredefinedExpr(c: *Context, scope: *Scope, expr: *const clang.Predefined
24752475
2476fn transCreateCharLitNode(c: *Context, narrow: bool, val: u32) TransError!Node {2476fn transCreateCharLitNode(c: *Context, narrow: bool, val: u32) TransError!Node {
2477 return Tag.char_literal.create(c.arena, if (narrow)2477 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)})})
2479 else2479 else
2480 try std.fmt.allocPrint(c.arena, "'\\u{{{x}}}'", .{val}));2480 try std.fmt.allocPrint(c.arena, "'\\u{{{x}}}'", .{val}));
2481}2481}
src/translate_c/ast.zig+3-3
...@@ -995,7 +995,7 @@ fn renderNode(c: *Context, node: Node) Allocator.Error!NodeIndex {...@@ -995,7 +995,7 @@ fn renderNode(c: *Context, node: Node) Allocator.Error!NodeIndex {
995995
996 const compile_error_tok = try c.addToken(.builtin, "@compileError");996 const compile_error_tok = try c.addToken(.builtin, "@compileError");
997 _ = try c.addToken(.l_paren, "(");997 _ = 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)});
999 const err_msg = try c.addNode(.{999 const err_msg = try c.addNode(.{
1000 .tag = .string_literal,1000 .tag = .string_literal,
1001 .main_token = err_msg_tok,1001 .main_token = err_msg_tok,
...@@ -2265,7 +2265,7 @@ fn renderVar(c: *Context, node: Node) !NodeIndex {...@@ -2265,7 +2265,7 @@ fn renderVar(c: *Context, node: Node) !NodeIndex {
2265 _ = try c.addToken(.l_paren, "(");2265 _ = try c.addToken(.l_paren, "(");
2266 const res = try c.addNode(.{2266 const res = try c.addNode(.{
2267 .tag = .string_literal,2267 .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)}),
2269 .data = undefined,2269 .data = undefined,
2270 });2270 });
2271 _ = try c.addToken(.r_paren, ")");2271 _ = try c.addToken(.r_paren, ")");
...@@ -2347,7 +2347,7 @@ fn renderFunc(c: *Context, node: Node) !NodeIndex {...@@ -2347,7 +2347,7 @@ fn renderFunc(c: *Context, node: Node) !NodeIndex {
2347 _ = try c.addToken(.l_paren, "(");2347 _ = try c.addToken(.l_paren, "(");
2348 const res = try c.addNode(.{2348 const res = try c.addNode(.{
2349 .tag = .string_literal,2349 .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)}),
2351 .data = undefined,2351 .data = undefined,
2352 });2352 });
2353 _ = try c.addToken(.r_paren, ")");2353 _ = try c.addToken(.r_paren, ")");