authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-04 22:09:59-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-04 22:09:59-07:00
logb268e3de04f30e4468c699b77898e5a5c48fe2a2
treec62fd04d2b7d6946da99395e3c8db38bd5e809c4
parente1ff201d60e6eb28c7e5ca5110b27b1e35194b82

fix binary operators incorrectly assuming i32

1 files changed, 0 insertions(+), 12 deletions(-)

src/analyze.cpp-12
...@@ -1382,20 +1382,8 @@ static TypeTableEntry *analyze_bin_op_expr(CodeGen *g, ImportTableEntry *import,...@@ -1382,20 +1382,8 @@ static TypeTableEntry *analyze_bin_op_expr(CodeGen *g, ImportTableEntry *import,
1382 case BinOpTypeBinOr:1382 case BinOpTypeBinOr:
1383 case BinOpTypeBinXor:1383 case BinOpTypeBinXor:
1384 case BinOpTypeBinAnd:1384 case BinOpTypeBinAnd:
1385 {
1386 // TODO: don't require i32
1387 analyze_expression(g, import, context, g->builtin_types.entry_i32, node->data.bin_op_expr.op1);
1388 analyze_expression(g, import, context, g->builtin_types.entry_i32, node->data.bin_op_expr.op2);
1389 return g->builtin_types.entry_i32;
1390 }
1391 case BinOpTypeBitShiftLeft:1385 case BinOpTypeBitShiftLeft:
1392 case BinOpTypeBitShiftRight:1386 case BinOpTypeBitShiftRight:
1393 {
1394 // TODO: don't require i32
1395 analyze_expression(g, import, context, g->builtin_types.entry_i32, node->data.bin_op_expr.op1);
1396 analyze_expression(g, import, context, g->builtin_types.entry_i32, node->data.bin_op_expr.op2);
1397 return g->builtin_types.entry_i32;
1398 }
1399 case BinOpTypeAdd:1387 case BinOpTypeAdd:
1400 case BinOpTypeSub:1388 case BinOpTypeSub:
1401 case BinOpTypeMult:1389 case BinOpTypeMult: