authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-16 17:58:06-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-16 17:58:06-07:00
log741569d5a70026ada754d0f2809a40d00c9a41ca
treeb881ad69bb05a7a051bda0dc2c007a41d91f784e
parent70f514f1ba961f05813fbe869a942a33113edf4c

std.Ast.Render: fix conflicts with master branch

1 files changed, 15 insertions(+), 15 deletions(-)

lib/std/zig/Ast/Render.zig+15-15
......@@ -2399,24 +2399,24 @@ fn renderAsmLegacy(
23992399 try renderToken(r, first_clobber - 2, .none);
24002400 try renderToken(r, first_clobber - 1, .space);
24012401
2402 try ais.writer().writeAll(".{ ");
2402 try ais.writeAll(".{ ");
24032403
24042404 var tok_i = first_clobber;
24052405 while (true) : (tok_i += 1) {
2406 try ais.writer().writeByte('.');
2406 try ais.writeByte('.');
24072407 _ = try writeStringLiteralAsIdentifier(r, tok_i);
2408 try ais.writer().writeAll(" = true");
2408 try ais.writeAll(" = true");
24092409
24102410 tok_i += 1;
24112411 switch (tree.tokenTag(tok_i)) {
24122412 .r_paren => {
2413 try ais.writer().writeAll(" }");
2413 try ais.writeAll(" }");
24142414 ais.popIndent();
24152415 return renderToken(r, tok_i, space);
24162416 },
24172417 .comma => {
24182418 if (tree.tokenTag(tok_i + 1) == .r_paren) {
2419 try ais.writer().writeAll(" }");
2419 try ais.writeAll(" }");
24202420 ais.popIndent();
24212421 return renderToken(r, tok_i + 1, space);
24222422 } else {
......@@ -2511,16 +2511,16 @@ fn renderAsmLegacy(
25112511 };
25122512
25132513 try renderToken(r, colon3, .space); // :
2514 try ais.writer().writeAll(".{ ");
2514 try ais.writeAll(".{ ");
25152515 const first_clobber = asm_node.first_clobber.?;
25162516 var tok_i = first_clobber;
25172517 while (true) {
25182518 switch (tree.tokenTag(tok_i + 1)) {
25192519 .r_paren => {
25202520 ais.setIndentDelta(indent_delta);
2521 try ais.writer().writeByte('.');
2521 try ais.writeByte('.');
25222522 const lexeme_len = try writeStringLiteralAsIdentifier(r, tok_i);
2523 try ais.writer().writeAll(" = true }");
2523 try ais.writeAll(" = true }");
25242524 try renderSpace(r, tok_i, lexeme_len, .newline);
25252525 ais.popIndent();
25262526 return renderToken(r, tok_i + 1, space);
......@@ -2529,17 +2529,17 @@ fn renderAsmLegacy(
25292529 switch (tree.tokenTag(tok_i + 2)) {
25302530 .r_paren => {
25312531 ais.setIndentDelta(indent_delta);
2532 try ais.writer().writeByte('.');
2532 try ais.writeByte('.');
25332533 const lexeme_len = try writeStringLiteralAsIdentifier(r, tok_i);
2534 try ais.writer().writeAll(" = true }");
2534 try ais.writeAll(" = true }");
25352535 try renderSpace(r, tok_i, lexeme_len, .newline);
25362536 ais.popIndent();
25372537 return renderToken(r, tok_i + 2, space);
25382538 },
25392539 else => {
2540 try ais.writer().writeByte('.');
2540 try ais.writeByte('.');
25412541 _ = try writeStringLiteralAsIdentifier(r, tok_i);
2542 try ais.writer().writeAll(" = true");
2542 try ais.writeAll(" = true");
25432543 try renderToken(r, tok_i + 1, .space);
25442544 tok_i += 2;
25452545 },
......@@ -3242,11 +3242,11 @@ fn writeStringLiteralAsIdentifier(r: *Render, token_index: Ast.TokenIndex) !usiz
32423242 const lexeme = tokenSliceForRender(tree, token_index);
32433243 const unquoted = lexeme[1..][0 .. lexeme.len - 2];
32443244 if (std.zig.isValidId(unquoted)) {
3245 try ais.writer().writeAll(unquoted);
3245 try ais.writeAll(unquoted);
32463246 return unquoted.len;
32473247 } else {
3248 try ais.writer().writeByte('@');
3249 try ais.writer().writeAll(lexeme);
3248 try ais.writeByte('@');
3249 try ais.writeAll(lexeme);
32503250 return lexeme.len + 1;
32513251 }
32523252}