Commit 8b80cb3072536069d745d6f0bee03ed3ea0e523a | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-03-08 03:52:52-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-03-08 03:52:52-04:00
log	8b80cb3072536069d745d6f0bee03ed3ea0e523a
tree	d1a1d937ceed5e20bc9c509b110f6eb14b6eaea9
parent	cf38ce970155512577cfb0cc281d1a308af7e7e9
signature	Commit is signed but in an unrecognized format.

Revert "translate-c remove redundant grouping, fix nested loops without blocks."

This reverts commit abe7305e169be2047d65f96e6525d3828684f058.

2 files changed, 32 insertions(+), 30 deletions(-)

src-self-hosted
- translate_c.zig
test
- translate_c.zig

src-self-hosted/translate_c.zig+28-11

 @@ -2237,7 +2237,6 @@ fn transWhileLoop(
         .id = .Loop,
     };
     while_node.body = try transStmt(rp, &loop_scope, ZigClangWhileStmt_getBody(stmt), .unused, .r_value);
-    _ = try appendToken(rp.c, .Semicolon, ";");
     return &while_node.base;
 }
 @@ -2347,10 +2346,8 @@ fn transForLoop(
         try block_scope.?.block_node.statements.push(&while_node.base);
         block_scope.?.block_node.rbrace = try appendToken(rp.c, .RBrace, "}");
         return &block_scope.?.block_node.base;
-    } else {
+    } else
-        _ = try appendToken(rp.c, .Semicolon, ";");
         return &while_node.base;
-    }
 }
 fn transSwitch(
 @@ -5579,7 +5576,14 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
                     );
                     return error.ParseError;
                 }
-                const deref = try transCreateNodePtrDeref(c, node);
+                // deref is often used together with casts so we group the lhs expression
+                const group = try c.a().create(ast.Node.GroupedExpression);
+                group.* = .{
+                    .lparen = try appendToken(c, .LParen, "("),
+                    .expr = node,
+                    .rparen = try appendToken(c, .RParen, ")"),
+                };
+                const deref = try transCreateNodePtrDeref(c, &group.base);
                 node = try transCreateNodeFieldAccess(c, deref, source[name_tok.start..name_tok.end]);
                 continue;
             },
 @@ -5623,7 +5627,7 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
             },
             .Ampersand => {
                 op_token = try appendToken(c, .Ampersand, "&");
-                op_id = .BitAnd;
+                op_id .BitAnd;
             },
             .Plus => {
                 op_token = try appendToken(c, .Plus, "+");
 @@ -5631,7 +5635,7 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
             },
             .Minus => {
                 op_token = try appendToken(c, .Minus, "-");
-                op_id = .Sub;
+                op_id .Sub;
             },
             .AmpersandAmpersand => {
                 op_token = try appendToken(c, .Keyword_and, "and");
 @@ -5703,7 +5707,7 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
             },
             .BangEqual => {
                 op_token = try appendToken(c, .BangEqual, "!=");
-                op_id = .BangEqual;
+                op_id =  .BangEqual;
             },
             .EqualEqual => {
                 op_token = try appendToken(c, .EqualEqual, "==");
 @@ -5756,12 +5760,25 @@ fn parseCPrefixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
             return &node.base;
         },
         .Asterisk => {
-            const node = try parseCPrefixOpExpr(c, it, source, source_loc, scope);
+            // deref is often used together with casts so we group the lhs expression
-            return try transCreateNodePtrDeref(c, node);
+            const group = try c.a().create(ast.Node.GroupedExpression);
+            group.* = .{
+                .lparen = try appendToken(c, .LParen, "("),
+                .expr = try parseCPrefixOpExpr(c, it, source, source_loc, scope),
+                .rparen = try appendToken(c, .RParen, ")"),
+            };
+            return try transCreateNodePtrDeref(c, &group.base);
         },
         .Ampersand => {
+            // address of is often used together with casts so we group the rhs expression
             const node = try transCreateNodePrefixOp(c, .AddressOf, .Ampersand, "&");
-            node.rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope);
+            const group = try c.a().create(ast.Node.GroupedExpression);
+            group.* = .{
+                .lparen = try appendToken(c, .LParen, "("),
+                .expr = try parseCPrefixOpExpr(c, it, source, source_loc, scope),
+                .rparen = try appendToken(c, .RParen, ")"),
+            };
+            node.rhs = &group.base;
             return &node.base;
         },
         else => {

test/translate_c.zig+4-19

 @@ -3,22 +3,6 @@ const std = @import("std");
 const CrossTarget = std.zig.CrossTarget;
 pub fn addCases(cases: *tests.TranslateCContext) void {
-    cases.add("nested loops without blocks",
-        \\void foo() {
-        \\    while (0) while (0) {}
-        \\    for (;;) while (0);
-        \\    for (;;) do {} while (0);
-        \\}
-    , &[_][]const u8{
-        \\pub export fn foo() void {
-        \\    while (@as(c_int, 0) != 0) while (@as(c_int, 0) != 0) {};
-        \\    while (true) while (@as(c_int, 0) != 0) {};
-        \\    while (true) while (true) {
-        \\        if (!(@as(c_int, 0) != 0)) break;
-        \\    };
-        \\}
-    });
     cases.add("macro comma operator",
         \\#define foo (foo, bar)
         \\#define bar(x) (&x, +3, 4 == 4, 5 * 6, baz(1, 2), 2 % 2, baz(1,2))
 @@ -30,7 +14,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
     ,
         \\pub inline fn bar(x: var) @TypeOf(baz(1, 2)) {
         \\    return blk: {
-        \\        _ = &x;
+        \\        _ = &(x);
         \\        _ = 3;
         \\        _ = 4 == 4;
         \\        _ = 5 * 6;
 @@ -2009,7 +1993,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
     ,
         \\pub const DOT = a.b;
     ,
-        \\pub const ARROW = a.*.b;
+        \\pub const ARROW = (a).*.b;
     });
     cases.add("array access",
 @@ -2778,11 +2762,12 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
         \\}
         \\*_XPrivDisplay;
         \\typedef struct _XDisplay Display;
-        \\#define DefaultScreen(dpy) (((_XPrivDisplay)(dpy))->default_screen)
+        \\#define DefaultScreen(dpy) 	(((_XPrivDisplay)(dpy))->default_screen)
         \\
     , &[_][]const u8{
         \\pub inline fn DefaultScreen(dpy: var) @TypeOf((if (@typeInfo(@TypeOf(dpy)) == .Pointer) @ptrCast(_XPrivDisplay, @alignCast(@alignOf(_XPrivDisplay.Child), dpy)) else if (@typeInfo(@TypeOf(dpy)) == .Int) @intToPtr(_XPrivDisplay, dpy) else @as(_XPrivDisplay, dpy)).*.default_screen) {
         \\    return (if (@typeInfo(@TypeOf(dpy)) == .Pointer) @ptrCast(_XPrivDisplay, @alignCast(@alignOf(_XPrivDisplay.Child), dpy)) else if (@typeInfo(@TypeOf(dpy)) == .Int) @intToPtr(_XPrivDisplay, dpy) else @as(_XPrivDisplay, dpy)).*.default_screen;
         \\}
     });
 }