Commit 6f6568b1fdb30fc8574b3047470510b798307717 | zig

author	Veikka Tuominen <git@vexu.eu> 2021-02-19 20:48:06+02:00
committer	Veikka Tuominen <git@vexu.eu> 2021-02-19 20:48:06+02:00
log	6f6568b1fdb30fc8574b3047470510b798307717
tree	df0dda484bb618ee097207d0eb3de726b5385e0f
parent	d672c20b8a8d93ba200160b3698c5edab531e091
signature	Commit is signed but in an unrecognized format.

translate-c: correctly add semicolon to if statements

2 files changed, 7 insertions(+), 16 deletions(-)

src
- translate_c
  - ast.zig
test
- translate_c.zig

src/translate_c/ast.zig+5-16

 @@ -1902,36 +1902,25 @@ fn addSemicolonIfNeeded(c: *Context, node: Node) !void {
         .var_decl, .var_simple, .arg_redecl, .alias, .enum_redecl, .block, .empty_block, .block_single, .@"switch" => {},
         .while_true => {
             const payload = node.castTag(.while_true).?.data;
-            return addSemicolonIfNotBlock(c, payload, .yes_if);
+            return addSemicolonIfNotBlock(c, payload);
         },
         .@"while" => {
             const payload = node.castTag(.@"while").?.data;
-            return addSemicolonIfNotBlock(c, payload.body, .yes_if);
+            return addSemicolonIfNotBlock(c, payload.body);
         },
         .@"if" => {
             const payload = node.castTag(.@"if").?.data;
             if (payload.@"else") |some|
-                return addSemicolonIfNotBlock(c, some, .no_if);
+                return addSemicolonIfNeeded(c, some);
-            return addSemicolonIfNotBlock(c, payload.then, .no_if);
+            return addSemicolonIfNotBlock(c, payload.then);
         },
         else => _ = try c.addToken(.semicolon, ";"),
     }
 }
-fn addSemicolonIfNotBlock(c: *Context, node: Node, if_needs_semicolon: enum{ yes_if, no_if}) !void {
+fn addSemicolonIfNotBlock(c: *Context, node: Node) !void {
     switch (node.tag()) {
         .block, .empty_block, .block_single => {},
-        .@"if" => {
-            if (if_needs_semicolon == .yes_if) {
-                _ = try c.addToken(.semicolon, ";");
-                return;
-            }
-            const payload = node.castTag(.@"if").?.data;
-            if (payload.@"else") |some|
-                return addSemicolonIfNotBlock(c, some, .no_if);
-            return addSemicolonIfNotBlock(c, payload.then, .no_if);
-        },
         else => _ = try c.addToken(.semicolon, ";"),
     }
 }

test/translate_c.zig+2

...	@@ -10,6 +10,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {	...	@@ -10,6 +10,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
10	\\ } else {	10	\\ } else {
11	\\ int b = 2;	11	\\ int b = 2;
12	\\ }	12	\\ }
		13	\\ if (1) if (1) {}
13	\\}	14	\\}
14	, &[_][]const u8{	15	, &[_][]const u8{
15	\\pub export fn foo() void {	16	\\pub export fn foo() void {
...	@@ -18,6 +19,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {	...	@@ -18,6 +19,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
18	\\ } else {	19	\\ } else {
19	\\ var b: c_int = 2;	20	\\ var b: c_int = 2;
20	\\ };	21	\\ };
		22	\\ if (true) if (true) {};
21	\\}	23	\\}
22	});	24	});
23		25