authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2021-02-10 22:30:19+02:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2021-02-16 16:40:05+02:00
log66dd64ec15d787bb43cb0ab1169e8bac6cfe762e
tree81c258e64b5c9052a88ccdf279e8e1d7fe69ff48
parentd8b9fca0b1c8929be99b6dff8f961afbe2fe2e3c
signature Commit is signed but in an unrecognized format.

translate-c: convert most control flow

2 files changed, 56 insertions(+), 74 deletions(-)

src/translate_c.zig+49-74
......@@ -107,6 +107,7 @@ const Scope = struct {
107107 // do while, we want to put `if (cond) break;` at the end.
108108 const alloc_len = self.statements.items.len + @boolToInt(self.base.parent.?.id == .Loop);
109109 const stmts = try c.arena.alloc(Node, alloc_len);
110 stmts.len -= 1;
110111 mem.copy(Node, stmts, self.statements.items);
111112 return Node.block.create(c.arena, .{
112113 .lable = self.label,
......@@ -1748,7 +1749,7 @@ fn transCCast(
17481749 if (dst_type.eq(src_type)) return expr;
17491750 if (qualTypeIsPtr(dst_type) and qualTypeIsPtr(src_type))
17501751 return transCPtrCast(c, loc, dst_type, src_type, expr);
1751
1752
17521753 const dst_node = try transQualType(c, dst_type, loc);
17531754 if (cIsInteger(dst_type) and (cIsInteger(src_type) or cIsEnum(src_type))) {
17541755 // 1. If src_type is an enum, determine the underlying signed int type
......@@ -1931,7 +1932,7 @@ fn transInitListExprArray(
19311932 if (all_count == 0) {
19321933 return Node.empty_array.create(c.arena, try transQualType(c, child_qt, source_loc));
19331934 }
1934
1935
19351936 const ty_node = try transType(ty);
19361937 const init_node = if (init_count != 0) blk: {
19371938 const init_list = try c.arena.alloc(Node, init_count);
......@@ -2058,14 +2059,12 @@ fn transImplicitValueInitExpr(
20582059}
20592060
20602061fn transIfStmt(
2061 rp: RestorePoint,
2062 c: *Context,
20622063 scope: *Scope,
20632064 stmt: *const clang.IfStmt,
2064) TransError!*ast.Node {
2065) TransError!Node {
20652066 // if (c) t
20662067 // if (c) t else e
2067 const if_node = try transCreateNodeIf(rp.c);
2068
20692068 var cond_scope = Scope.Condition{
20702069 .base = .{
20712070 .parent = scope,
......@@ -2074,26 +2073,21 @@ fn transIfStmt(
20742073 };
20752074 defer cond_scope.deinit();
20762075 const cond_expr = @ptrCast(*const clang.Expr, stmt.getCond());
2077 if_node.condition = try transBoolExpr(rp, &cond_scope.base, cond_expr, .used, .r_value, false);
2078 _ = try appendToken(rp.c, .RParen, ")");
2079
2080 if_node.body = try transStmt(rp, scope, stmt.getThen(), .unused, .r_value);
2076 const cond = try transBoolExpr(c, &cond_scope.base, cond_expr, .used, .r_value);
20812077
2082 if (stmt.getElse()) |expr| {
2083 if_node.@"else" = try transCreateNodeElse(rp.c);
2084 if_node.@"else".?.body = try transStmt(rp, scope, expr, .unused, .r_value);
2085 }
2086 _ = try appendToken(rp.c, .Semicolon, ";");
2087 return &if_node.base;
2078 const then_body = try transStmt(c, scope, stmt.getThen(), .unused, .r_value);
2079 const else_body = if (stmt.getElse()) |expr|
2080 try transStmt(c, scope, expr, .unused, .r_value)
2081 else
2082 null;
2083 return Node.@"if".create(c.arena, .{ .cond = cond, .then = then_body, .@"else" = else_body });
20882084}
20892085
20902086fn transWhileLoop(
2091 rp: RestorePoint,
2087 c: *Context,
20922088 scope: *Scope,
20932089 stmt: *const clang.WhileStmt,
2094) TransError!*ast.Node {
2095 const while_node = try transCreateNodeWhile(rp.c);
2096
2090) TransError!Node {
20972091 var cond_scope = Scope.Condition{
20982092 .base = .{
20992093 .parent = scope,
......@@ -2102,35 +2096,28 @@ fn transWhileLoop(
21022096 };
21032097 defer cond_scope.deinit();
21042098 const cond_expr = @ptrCast(*const clang.Expr, stmt.getCond());
2105 while_node.condition = try transBoolExpr(rp, &cond_scope.base, cond_expr, .used, .r_value, false);
2106 _ = try appendToken(rp.c, .RParen, ")");
2099 const cond = try transBoolExpr(c, &cond_scope.base, cond_expr, .used, .r_value);
21072100
21082101 var loop_scope = Scope{
21092102 .parent = scope,
21102103 .id = .Loop,
21112104 };
2112 while_node.body = try transStmt(rp, &loop_scope, stmt.getBody(), .unused, .r_value);
2113 _ = try appendToken(rp.c, .Semicolon, ";");
2114 return &while_node.base;
2105 const body = try transStmt(c, &loop_scope, stmt.getBody(), .unused, .r_value);
2106 return Node.@"while".create(c.arena, .{ .cond = cond, .body = body, .cont_expr = null });
21152107}
21162108
21172109fn transDoWhileLoop(
2118 rp: RestorePoint,
2110 c: *Context,
21192111 scope: *Scope,
21202112 stmt: *const clang.DoStmt,
2121) TransError!*ast.Node {
2122 const while_node = try transCreateNodeWhile(rp.c);
2123
2124 while_node.condition = try transCreateNodeBoolLiteral(rp.c, true);
2125 _ = try appendToken(rp.c, .RParen, ")");
2126 var new = false;
2113) TransError!Node {
21272114 var loop_scope = Scope{
21282115 .parent = scope,
21292116 .id = .Loop,
21302117 };
21312118
21322119 // if (!cond) break;
2133 const if_node = try transCreateNodeIf(rp.c);
2120 const if_node = try transCreateNodeIf(c);
21342121 var cond_scope = Scope.Condition{
21352122 .base = .{
21362123 .parent = scope,
......@@ -2138,12 +2125,8 @@ fn transDoWhileLoop(
21382125 },
21392126 };
21402127 defer cond_scope.deinit();
2141 const prefix_op = try transCreateNodeSimplePrefixOp(rp.c, .BoolNot, .Bang, "!");
2142 prefix_op.rhs = try transBoolExpr(rp, &cond_scope.base, @ptrCast(*const clang.Expr, stmt.getCond()), .used, .r_value, true);
2143 _ = try appendToken(rp.c, .RParen, ")");
2144 if_node.condition = &prefix_op.base;
2145 if_node.body = &(try transCreateNodeBreak(rp.c, null, null)).base;
2146 _ = try appendToken(rp.c, .Semicolon, ";");
2128 const cond = try transBoolExpr(c, &cond_scope.base, @ptrCast(*const clang.Expr, stmt.getCond()), .used, .r_value);
2129 const if_not_break = try Node.if_not_break.create(c.arena, cond);
21472130
21482131 const body_node = if (stmt.getBody().getStmtClass() == .CompoundStmtClass) blk: {
21492132 // there's already a block in C, so we'll append our condition to it.
......@@ -2156,8 +2139,12 @@ fn transDoWhileLoop(
21562139 // zig: b;
21572140 // zig: if (!cond) break;
21582141 // zig: }
2159 const node = try transStmt(rp, &loop_scope, stmt.getBody(), .unused, .r_value);
2160 break :blk node.castTag(.Block).?;
2142 const node = try transStmt(c, &loop_scope, stmt.getBody(), .unused, .r_value);
2143 const block = node.castTag(.block);
2144 block.data.stmts.len += 1; // This is safe since we reserve one extra space in Scope.Block.complete.
2145 block.data.stmts[block.data.stmts.len - 1] = if_not_break;
2146 break :blk node;
2147
21612148 } else blk: {
21622149 // the C statement is without a block, so we need to create a block to contain it.
21632150 // c: do
......@@ -2167,27 +2154,19 @@ fn transDoWhileLoop(
21672154 // zig: a;
21682155 // zig: if (!cond) break;
21692156 // zig: }
2170 new = true;
2171 const block = try rp.c.createBlock(2);
2172 block.statements_len = 1; // over-allocated so we can add another below
2173 block.statements()[0] = try transStmt(rp, &loop_scope, stmt.getBody(), .unused, .r_value);
2174 break :blk block;
2157 const statements = try c.arena.create(Node, 2);
2158 statements[0] = try transStmt(c, &loop_scope, stmt.getBody(), .unused, .r_value);
2159 statements[1] = if_not_break;
2160 break :blk try Node.block.create(c.arena, .{ .label = null, .stmts = statements });
21752161 };
2176
2177 // In both cases above, we reserved 1 extra statement.
2178 body_node.statements_len += 1;
2179 body_node.statements()[body_node.statements_len - 1] = &if_node.base;
2180 if (new)
2181 body_node.rbrace = try appendToken(rp.c, .RBrace, "}");
2182 while_node.body = &body_node.base;
2183 return &while_node.base;
2162 return Node.while_true.create(c.arena, body_node);
21842163}
21852164
21862165fn transForLoop(
2187 rp: RestorePoint,
2166 c: *Context,
21882167 scope: *Scope,
21892168 stmt: *const clang.ForStmt,
2190) TransError!*ast.Node {
2169) TransError!Node {
21912170 var loop_scope = Scope{
21922171 .parent = scope,
21932172 .id = .Loop,
......@@ -2197,9 +2176,9 @@ fn transForLoop(
21972176 defer if (block_scope) |*bs| bs.deinit();
21982177
21992178 if (stmt.getInit()) |init| {
2200 block_scope = try Scope.Block.init(rp.c, scope, false);
2179 block_scope = try Scope.Block.init(c, scope, false);
22012180 loop_scope.parent = &block_scope.?.base;
2202 const init_node = try transStmt(rp, &block_scope.?.base, init, .unused, .r_value);
2181 const init_node = try transStmt(c, &block_scope.?.base, init, .unused, .r_value);
22032182 try block_scope.?.statements.append(init_node);
22042183 }
22052184 var cond_scope = Scope.Condition{
......@@ -2210,27 +2189,23 @@ fn transForLoop(
22102189 };
22112190 defer cond_scope.deinit();
22122191
2213 const while_node = try transCreateNodeWhile(rp.c);
2214 while_node.condition = if (stmt.getCond()) |cond|
2215 try transBoolExpr(rp, &cond_scope.base, cond, .used, .r_value, false)
2192 const cond = if (stmt.getCond()) |cond|
2193 try transBoolExpr(c, &cond_scope.base, cond, .used, .r_value)
22162194 else
2217 try transCreateNodeBoolLiteral(rp.c, true);
2218 _ = try appendToken(rp.c, .RParen, ")");
2195 Node.true_literal.init();
22192196
2220 if (stmt.getInc()) |incr| {
2221 _ = try appendToken(rp.c, .Colon, ":");
2222 _ = try appendToken(rp.c, .LParen, "(");
2223 while_node.continue_expr = try transExpr(rp, &cond_scope.base, incr, .unused, .r_value);
2224 _ = try appendToken(rp.c, .RParen, ")");
2225 }
2197 const cont_expr = if (stmt.getInc()) |incr|
2198 try transExpr(c, &cond_scope.base, incr, .unused, .r_value)
2199 else
2200 null;
22262201
2227 while_node.body = try transStmt(rp, &loop_scope, stmt.getBody(), .unused, .r_value);
2202 const body = try transStmt(c, &loop_scope, stmt.getBody(), .unused, .r_value);
2203 const while_node = try Node.@"while".create(c.arena, .{ .cond = cond, .body = body, .cont_expr = cont_expr });
22282204 if (block_scope) |*bs| {
2229 try bs.statements.append(&while_node.base);
2230 return try bs.complete(rp.c);
2205 try bs.statements.append(while_node);
2206 return try bs.complete(c);
22312207 } else {
2232 _ = try appendToken(rp.c, .Semicolon, ";");
2233 return &while_node.base;
2208 return while_node;
22342209 }
22352210}
22362211
src/translate_c/ast.zig+7
......@@ -29,7 +29,11 @@ pub const Node = extern union {
2929 char_literal,
3030 identifier,
3131 @"if",
32 /// if (!operand) break;
33 if_not_break,
3234 @"while",
35 /// while (true) operand
36 while_true,
3337 @"switch",
3438 @"continue",
3539 @"break",
......@@ -211,6 +215,8 @@ pub const Node = extern union {
211215 .ptr_to_int,
212216 .enum_to_int,
213217 .empty_array,
218 .while_true,
219 .if_not_break,
214220 => Payload.UnOp,
215221
216222 .add,
......@@ -399,6 +405,7 @@ pub const Payload = struct {
399405 data: struct {
400406 cond: Node,
401407 body: Node,
408 cont_expr: ?Node
402409 },
403410 };
404411