Commit a2c3ebb75615ea47052eeb5a99b9b6881bc71d11 | zig

author	Ian Simonson <ian.simonson@protonmail.com> 2020-04-30 19:10:10+10:00
committer	Ian Simonson <ian.simonson@protonmail.com> 2020-04-30 19:10:10+10:00
log	a2c3ebb75615ea47052eeb5a99b9b6881bc71d11
tree	5d74614660ed996a3059297fbb6cd019f3d0e0d6
parent	e6fa0beb335ad8ecff005fef924c2a39ed748c56

1 files changed, 3 insertions(+), 18 deletions(-)

src-self-hosted/translate_c.zig+3-18

 @@ -1294,36 +1294,21 @@ fn transBinaryOperator(
     const rhs_node = try transExpr(rp, scope, ZigClangBinaryOperator_getRHS(stmt), .used, .r_value);
-    const is_lhs_bool = isBoolRes(lhs_node);
+    const lhs = if (isBoolRes(lhs_node)) init: {
-    const is_rhs_bool = isBoolRes(rhs_node);
-    if (!is_lhs_bool and !is_rhs_bool) {
-        return transCreateNodeInfixOp(rp, scope, lhs_node, op_id, op_token, rhs_node, result_used, true);
-    }
-    const lhs = if (is_lhs_bool) init: {
         const cast_node = try transCreateNodeBuiltinFnCall(rp.c, "@boolToInt");
         try cast_node.params.push(lhs_node);
         cast_node.rparen_token = try appendToken(rp.c, .RParen, ")");
         break :init &cast_node.base;
     } else lhs_node;
-    const rhs = if (is_rhs_bool) init: {
+    const rhs = if (isBoolRes(rhs_node)) init: {
         const cast_node = try transCreateNodeBuiltinFnCall(rp.c, "@boolToInt");
         try cast_node.params.push(rhs_node);
         cast_node.rparen_token = try appendToken(rp.c, .RParen, ")");
         break :init &cast_node.base;
     } else rhs_node;
-    const node = try rp.c.a().create(ast.Node.InfixOp);
+    return transCreateNodeInfixOp(rp, scope, lhs, op_id, op_token, rhs, result_used, true);
-    node.* = .{
-        .op_token = op_token,
-        .lhs = lhs,
-        .op = op_id,
-        .rhs = rhs,
-    };
-    return maybeSuppressResult(rp, scope, result_used, &node.base);
 }
 fn transCompoundStmtInline(