authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-08 03:52:52-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-08 03:52:52-04:00
log8b80cb3072536069d745d6f0bee03ed3ea0e523a
treed1a1d937ceed5e20bc9c509b110f6eb14b6eaea9
parentcf38ce970155512577cfb0cc281d1a308af7e7e9
signaturelock-open 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+28-11
......@@ -2237,7 +2237,6 @@ fn transWhileLoop(
22372237 .id = .Loop,
22382238 };
22392239 while_node.body = try transStmt(rp, &loop_scope, ZigClangWhileStmt_getBody(stmt), .unused, .r_value);
2240 _ = try appendToken(rp.c, .Semicolon, ";");
22412240 return &while_node.base;
22422241}
22432242
......@@ -2347,10 +2346,8 @@ fn transForLoop(
23472346 try block_scope.?.block_node.statements.push(&while_node.base);
23482347 block_scope.?.block_node.rbrace = try appendToken(rp.c, .RBrace, "}");
23492348 return &block_scope.?.block_node.base;
2350 } else {
2351 _ = try appendToken(rp.c, .Semicolon, ";");
2349 } else
23522350 return &while_node.base;
2353 }
23542351}
23552352
23562353fn transSwitch(
......@@ -5579,7 +5576,14 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
55795576 );
55805577 return error.ParseError;
55815578 }
5582 const deref = try transCreateNodePtrDeref(c, node);
5579 // deref is often used together with casts so we group the lhs expression
5580 const group = try c.a().create(ast.Node.GroupedExpression);
5581 group.* = .{
5582 .lparen = try appendToken(c, .LParen, "("),
5583 .expr = node,
5584 .rparen = try appendToken(c, .RParen, ")"),
5585 };
5586 const deref = try transCreateNodePtrDeref(c, &group.base);
55835587 node = try transCreateNodeFieldAccess(c, deref, source[name_tok.start..name_tok.end]);
55845588 continue;
55855589 },
......@@ -5623,7 +5627,7 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
56235627 },
56245628 .Ampersand => {
56255629 op_token = try appendToken(c, .Ampersand, "&");
5626 op_id = .BitAnd;
5630 op_id .BitAnd;
56275631 },
56285632 .Plus => {
56295633 op_token = try appendToken(c, .Plus, "+");
......@@ -5631,7 +5635,7 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
56315635 },
56325636 .Minus => {
56335637 op_token = try appendToken(c, .Minus, "-");
5634 op_id = .Sub;
5638 op_id .Sub;
56355639 },
56365640 .AmpersandAmpersand => {
56375641 op_token = try appendToken(c, .Keyword_and, "and");
......@@ -5703,7 +5707,7 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
57035707 },
57045708 .BangEqual => {
57055709 op_token = try appendToken(c, .BangEqual, "!=");
5706 op_id = .BangEqual;
5710 op_id = .BangEqual;
57075711 },
57085712 .EqualEqual => {
57095713 op_token = try appendToken(c, .EqualEqual, "==");
......@@ -5756,12 +5760,25 @@ fn parseCPrefixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
57565760 return &node.base;
57575761 },
57585762 .Asterisk => {
5759 const node = try parseCPrefixOpExpr(c, it, source, source_loc, scope);
5760 return try transCreateNodePtrDeref(c, node);
5763 // deref is often used together with casts so we group the lhs expression
5764 const group = try c.a().create(ast.Node.GroupedExpression);
5765 group.* = .{
5766 .lparen = try appendToken(c, .LParen, "("),
5767 .expr = try parseCPrefixOpExpr(c, it, source, source_loc, scope),
5768 .rparen = try appendToken(c, .RParen, ")"),
5769 };
5770 return try transCreateNodePtrDeref(c, &group.base);
57615771 },
57625772 .Ampersand => {
5773 // address of is often used together with casts so we group the rhs expression
57635774 const node = try transCreateNodePrefixOp(c, .AddressOf, .Ampersand, "&");
5764 node.rhs = try parseCPrefixOpExpr(c, it, source, source_loc, scope);
5775 const group = try c.a().create(ast.Node.GroupedExpression);
5776 group.* = .{
5777 .lparen = try appendToken(c, .LParen, "("),
5778 .expr = try parseCPrefixOpExpr(c, it, source, source_loc, scope),
5779 .rparen = try appendToken(c, .RParen, ")"),
5780 };
5781 node.rhs = &group.base;
57655782 return &node.base;
57665783 },
57675784 else => {
test/translate_c.zig+4-19
......@@ -3,22 +3,6 @@ const std = @import("std");
33const CrossTarget = std.zig.CrossTarget;
44
55pub fn addCases(cases: *tests.TranslateCContext) void {
6 cases.add("nested loops without blocks",
7 \\void foo() {
8 \\ while (0) while (0) {}
9 \\ for (;;) while (0);
10 \\ for (;;) do {} while (0);
11 \\}
12 , &[_][]const u8{
13 \\pub export fn foo() void {
14 \\ while (@as(c_int, 0) != 0) while (@as(c_int, 0) != 0) {};
15 \\ while (true) while (@as(c_int, 0) != 0) {};
16 \\ while (true) while (true) {
17 \\ if (!(@as(c_int, 0) != 0)) break;
18 \\ };
19 \\}
20 });
21
226 cases.add("macro comma operator",
237 \\#define foo (foo, bar)
248 \\#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 {
3014 ,
3115 \\pub inline fn bar(x: var) @TypeOf(baz(1, 2)) {
3216 \\ return blk: {
33 \\ _ = &x;
17 \\ _ = &(x);
3418 \\ _ = 3;
3519 \\ _ = 4 == 4;
3620 \\ _ = 5 * 6;
......@@ -2009,7 +1993,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
20091993 ,
20101994 \\pub const DOT = a.b;
20111995 ,
2012 \\pub const ARROW = a.*.b;
1996 \\pub const ARROW = (a).*.b;
20131997 });
20141998
20151999 cases.add("array access",
......@@ -2778,11 +2762,12 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
27782762 \\}
27792763 \\*_XPrivDisplay;
27802764 \\typedef struct _XDisplay Display;
2781 \\#define DefaultScreen(dpy) (((_XPrivDisplay)(dpy))->default_screen)
2765 \\#define DefaultScreen(dpy) (((_XPrivDisplay)(dpy))->default_screen)
27822766 \\
27832767 , &[_][]const u8{
27842768 \\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) {
27852769 \\ 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;
27862770 \\}
27872771 });
2772
27882773}