authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-11-04 18:06:11-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-11-04 18:06:11-07:00
log88acdb9aa6cdb8ea20e02c4d0f85be81f696897c
treececbbdac819892394ae318bce3ed87583c618802
parent212aa717d73866863c593033a1c8bd3c853150ed

zig reduce: delete statements from blocks

2 files changed, 11 insertions(+), 3 deletions(-)

lib/std/zig/render.zig+6-1
...@@ -2043,7 +2043,12 @@ fn finishRenderBlock(...@@ -2043,7 +2043,12 @@ fn finishRenderBlock(
2043 .simple_var_decl,2043 .simple_var_decl,
2044 .aligned_var_decl,2044 .aligned_var_decl,
2045 => try renderVarDecl(r, tree.fullVarDecl(stmt).?, false, .semicolon),2045 => try renderVarDecl(r, tree.fullVarDecl(stmt).?, false, .semicolon),
2046 else => try renderExpression(r, stmt, .semicolon),2046
2047 else => {
2048 if (!r.fixups.omit_nodes.contains(stmt)) {
2049 try renderExpression(r, stmt, .semicolon);
2050 }
2051 },
2047 }2052 }
2048 }2053 }
2049 ais.popIndent();2054 ais.popIndent();
src/reduce/Walk.zig+5-2
...@@ -134,8 +134,8 @@ fn walkMember(w: *Walk, decl: Ast.Node.Index) Error!void {...@@ -134,8 +134,8 @@ fn walkMember(w: *Walk, decl: Ast.Node.Index) Error!void {
134 const body_node = datas[decl].rhs;134 const body_node = datas[decl].rhs;
135 if (!isFnBodyGutted(ast, body_node)) {135 if (!isFnBodyGutted(ast, body_node)) {
136 try w.transformations.append(.{ .gut_function = decl });136 try w.transformations.append(.{ .gut_function = decl });
137 try walkExpression(w, body_node);
137 }138 }
138 try walkExpression(w, body_node);
139 },139 },
140 .fn_proto_simple,140 .fn_proto_simple,
141 .fn_proto_multi,141 .fn_proto_multi,
...@@ -648,7 +648,10 @@ fn walkBlock(...@@ -648,7 +648,10 @@ fn walkBlock(
648 .aligned_var_decl,648 .aligned_var_decl,
649 => try walkLocalVarDecl(w, ast.fullVarDecl(stmt).?),649 => try walkLocalVarDecl(w, ast.fullVarDecl(stmt).?),
650650
651 else => try walkExpression(w, stmt),651 else => {
652 try w.transformations.append(.{ .delete_node = stmt });
653 try walkExpression(w, stmt);
654 },
652 }655 }
653 }656 }
654}657}