Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

translate-c: fix for loops with var init and empty body

Browse Source
This commit is contained in:
Andrew Kelley 2018-08-05 18:40:14 -04:00
parent 387fab60a6
commit 63a23e848a
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/translate_c.cpp
View File

@ -2783,7 +2783,12 @@ static AstNode *trans_for_loop(Context *c, TransScope *parent_scope, const ForSt
TransScope *body_scope = trans_stmt(c, &while_scope->base, stmt->getBody(), &body_statement); TransScope *body_scope = trans_stmt(c, &while_scope->base, stmt->getBody(), &body_statement);
if (body_scope == nullptr) if (body_scope == nullptr)
return nullptr; return nullptr;
while_scope->node->data.while_expr.body = body_statement;
if (body_statement == nullptr) {
while_scope->node->data.while_expr.body = trans_create_node(c, NodeTypeBlock);
} else {
while_scope->node->data.while_expr.body = body_statement;
}
return loop_block_node; return loop_block_node;
} }
@ -3020,6 +3025,7 @@ static int trans_stmt_extra(Context *c, TransScope *scope, const Stmt *stmt,
return trans_local_declaration(c, scope, (const DeclStmt *)stmt, out_node, out_child_scope); return trans_local_declaration(c, scope, (const DeclStmt *)stmt, out_node, out_child_scope);
case Stmt::WhileStmtClass: { case Stmt::WhileStmtClass: {
AstNode *while_node = trans_while_loop(c, scope, (const WhileStmt *)stmt); AstNode *while_node = trans_while_loop(c, scope, (const WhileStmt *)stmt);
assert(while_node->type == NodeTypeWhileExpr);
if (while_node->data.while_expr.body == nullptr) { if (while_node->data.while_expr.body == nullptr) {
while_node->data.while_expr.body = trans_create_node(c, NodeTypeBlock); while_node->data.while_expr.body = trans_create_node(c, NodeTypeBlock);
} }
@ -3049,17 +3055,15 @@ static int trans_stmt_extra(Context *c, TransScope *scope, const Stmt *stmt,
trans_unary_expr_or_type_trait_expr(c, scope, (const UnaryExprOrTypeTraitExpr *)stmt)); trans_unary_expr_or_type_trait_expr(c, scope, (const UnaryExprOrTypeTraitExpr *)stmt));
case Stmt::DoStmtClass: { case Stmt::DoStmtClass: {
AstNode *while_node = trans_do_loop(c, scope, (const DoStmt *)stmt); AstNode *while_node = trans_do_loop(c, scope, (const DoStmt *)stmt);
assert(while_node->type == NodeTypeWhileExpr);
if (while_node->data.while_expr.body == nullptr) { if (while_node->data.while_expr.body == nullptr) {
while_node->data.while_expr.body = trans_create_node(c, NodeTypeBlock); while_node->data.while_expr.body = trans_create_node(c, NodeTypeBlock);
} }
return wrap_stmt(out_node, out_child_scope, scope, while_node); return wrap_stmt(out_node, out_child_scope, scope, while_node);
} }
case Stmt::ForStmtClass: { case Stmt::ForStmtClass: {
AstNode *while_node = trans_for_loop(c, scope, (const ForStmt *)stmt); AstNode *node = trans_for_loop(c, scope, (const ForStmt *)stmt);
if (while_node->data.while_expr.body == nullptr) { return wrap_stmt(out_node, out_child_scope, scope, node);
while_node->data.while_expr.body = trans_create_node(c, NodeTypeBlock);
}
return wrap_stmt(out_node, out_child_scope, scope, while_node);
} }
case Stmt::StringLiteralClass: case Stmt::StringLiteralClass:
return wrap_stmt(out_node, out_child_scope, scope, return wrap_stmt(out_node, out_child_scope, scope,

13
test/translate_c.zig
View File

@ -1,6 +1,19 @@
const tests = @import("tests.zig"); const tests = @import("tests.zig");
pub fn addCases(cases: *tests.TranslateCContext) void { pub fn addCases(cases: *tests.TranslateCContext) void {
cases.add("for loop with var init but empty body",
\\void foo(void) {
\\ for (int x = 0; x < 10; x++);
\\}
,
\\pub fn foo() void {
\\ {
\\ var x: c_int = 0;
\\ while (x < 10) : (x += 1) {}
\\ }
\\}
);
cases.add("do while with empty body", cases.add("do while with empty body",
\\void foo(void) { \\void foo(void) {
\\ do ; while (1); \\ do ; while (1);