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(...@@ -2399,24 +2399,24 @@ fn renderAsmLegacy(
2399 try renderToken(r, first_clobber - 2, .none);2399 try renderToken(r, first_clobber - 2, .none);
2400 try renderToken(r, first_clobber - 1, .space);2400 try renderToken(r, first_clobber - 1, .space);
24012401
2402 try ais.writer().writeAll(".{ ");2402 try ais.writeAll(".{ ");
24032403
2404 var tok_i = first_clobber;2404 var tok_i = first_clobber;
2405 while (true) : (tok_i += 1) {2405 while (true) : (tok_i += 1) {
2406 try ais.writer().writeByte('.');2406 try ais.writeByte('.');
2407 _ = try writeStringLiteralAsIdentifier(r, tok_i);2407 _ = try writeStringLiteralAsIdentifier(r, tok_i);
2408 try ais.writer().writeAll(" = true");2408 try ais.writeAll(" = true");
24092409
2410 tok_i += 1;2410 tok_i += 1;
2411 switch (tree.tokenTag(tok_i)) {2411 switch (tree.tokenTag(tok_i)) {
2412 .r_paren => {2412 .r_paren => {
2413 try ais.writer().writeAll(" }");2413 try ais.writeAll(" }");
2414 ais.popIndent();2414 ais.popIndent();
2415 return renderToken(r, tok_i, space);2415 return renderToken(r, tok_i, space);
2416 },2416 },
2417 .comma => {2417 .comma => {
2418 if (tree.tokenTag(tok_i + 1) == .r_paren) {2418 if (tree.tokenTag(tok_i + 1) == .r_paren) {
2419 try ais.writer().writeAll(" }");2419 try ais.writeAll(" }");
2420 ais.popIndent();2420 ais.popIndent();
2421 return renderToken(r, tok_i + 1, space);2421 return renderToken(r, tok_i + 1, space);
2422 } else {2422 } else {
...@@ -2511,16 +2511,16 @@ fn renderAsmLegacy(...@@ -2511,16 +2511,16 @@ fn renderAsmLegacy(
2511 };2511 };
25122512
2513 try renderToken(r, colon3, .space); // :2513 try renderToken(r, colon3, .space); // :
2514 try ais.writer().writeAll(".{ ");2514 try ais.writeAll(".{ ");
2515 const first_clobber = asm_node.first_clobber.?;2515 const first_clobber = asm_node.first_clobber.?;
2516 var tok_i = first_clobber;2516 var tok_i = first_clobber;
2517 while (true) {2517 while (true) {
2518 switch (tree.tokenTag(tok_i + 1)) {2518 switch (tree.tokenTag(tok_i + 1)) {
2519 .r_paren => {2519 .r_paren => {
2520 ais.setIndentDelta(indent_delta);2520 ais.setIndentDelta(indent_delta);
2521 try ais.writer().writeByte('.');2521 try ais.writeByte('.');
2522 const lexeme_len = try writeStringLiteralAsIdentifier(r, tok_i);2522 const lexeme_len = try writeStringLiteralAsIdentifier(r, tok_i);
2523 try ais.writer().writeAll(" = true }");2523 try ais.writeAll(" = true }");
2524 try renderSpace(r, tok_i, lexeme_len, .newline);2524 try renderSpace(r, tok_i, lexeme_len, .newline);
2525 ais.popIndent();2525 ais.popIndent();
2526 return renderToken(r, tok_i + 1, space);2526 return renderToken(r, tok_i + 1, space);
...@@ -2529,17 +2529,17 @@ fn renderAsmLegacy(...@@ -2529,17 +2529,17 @@ fn renderAsmLegacy(
2529 switch (tree.tokenTag(tok_i + 2)) {2529 switch (tree.tokenTag(tok_i + 2)) {
2530 .r_paren => {2530 .r_paren => {
2531 ais.setIndentDelta(indent_delta);2531 ais.setIndentDelta(indent_delta);
2532 try ais.writer().writeByte('.');2532 try ais.writeByte('.');
2533 const lexeme_len = try writeStringLiteralAsIdentifier(r, tok_i);2533 const lexeme_len = try writeStringLiteralAsIdentifier(r, tok_i);
2534 try ais.writer().writeAll(" = true }");2534 try ais.writeAll(" = true }");
2535 try renderSpace(r, tok_i, lexeme_len, .newline);2535 try renderSpace(r, tok_i, lexeme_len, .newline);
2536 ais.popIndent();2536 ais.popIndent();
2537 return renderToken(r, tok_i + 2, space);2537 return renderToken(r, tok_i + 2, space);
2538 },2538 },
2539 else => {2539 else => {
2540 try ais.writer().writeByte('.');2540 try ais.writeByte('.');
2541 _ = try writeStringLiteralAsIdentifier(r, tok_i);2541 _ = try writeStringLiteralAsIdentifier(r, tok_i);
2542 try ais.writer().writeAll(" = true");2542 try ais.writeAll(" = true");
2543 try renderToken(r, tok_i + 1, .space);2543 try renderToken(r, tok_i + 1, .space);
2544 tok_i += 2;2544 tok_i += 2;
2545 },2545 },
...@@ -3242,11 +3242,11 @@ fn writeStringLiteralAsIdentifier(r: *Render, token_index: Ast.TokenIndex) !usiz...@@ -3242,11 +3242,11 @@ fn writeStringLiteralAsIdentifier(r: *Render, token_index: Ast.TokenIndex) !usiz
3242 const lexeme = tokenSliceForRender(tree, token_index);3242 const lexeme = tokenSliceForRender(tree, token_index);
3243 const unquoted = lexeme[1..][0 .. lexeme.len - 2];3243 const unquoted = lexeme[1..][0 .. lexeme.len - 2];
3244 if (std.zig.isValidId(unquoted)) {3244 if (std.zig.isValidId(unquoted)) {
3245 try ais.writer().writeAll(unquoted);3245 try ais.writeAll(unquoted);
3246 return unquoted.len;3246 return unquoted.len;
3247 } else {3247 } else {
3248 try ais.writer().writeByte('@');3248 try ais.writeByte('@');
3249 try ais.writer().writeAll(lexeme);3249 try ais.writeAll(lexeme);
3250 return lexeme.len + 1;3250 return lexeme.len + 1;
3251 }3251 }
3252}3252}