authorgravatar for thejoshwolfe@gmail.comJosh Wolfe <thejoshwolfe@gmail.com> 2017-09-20 21:37:56-07:00
committergravatar for thejoshwolfe@gmail.comJosh Wolfe <thejoshwolfe@gmail.com> 2017-09-20 21:37:56-07:00
log4c8443d96db4a441b393ea0c3c8d76a7493f46d0
treec608163493a3329e1e8b82e0e1b83c2fcb76e610
parent05c1a8b3cc09860052c7dba2a795ada5f7e00811

logical and, logical or

3 files changed, 22 insertions(+), 8 deletions(-)

src/ast_render.cpp+2-2
...@@ -14,8 +14,8 @@...@@ -14,8 +14,8 @@
14static const char *bin_op_str(BinOpType bin_op) {14static const char *bin_op_str(BinOpType bin_op) {
15 switch (bin_op) {15 switch (bin_op) {
16 case BinOpTypeInvalid: return "(invalid)";16 case BinOpTypeInvalid: return "(invalid)";
17 case BinOpTypeBoolOr: return "||";17 case BinOpTypeBoolOr: return "or";
18 case BinOpTypeBoolAnd: return "&&";18 case BinOpTypeBoolAnd: return "and";
19 case BinOpTypeCmpEq: return "==";19 case BinOpTypeCmpEq: return "==";
20 case BinOpTypeCmpNotEq: return "!=";20 case BinOpTypeCmpNotEq: return "!=";
21 case BinOpTypeCmpLessThan: return "<";21 case BinOpTypeCmpLessThan: return "<";
src/parsec.cpp+4-6
...@@ -976,8 +976,7 @@ static AstNode *trans_binary_operator(Context *c, bool result_used, AstNode *blo...@@ -976,8 +976,7 @@ static AstNode *trans_binary_operator(Context *c, bool result_used, AstNode *blo
976 case BO_GE:976 case BO_GE:
977 return trans_create_bin_op(c, block, stmt->getLHS(), BinOpTypeCmpGreaterOrEq, stmt->getRHS());977 return trans_create_bin_op(c, block, stmt->getLHS(), BinOpTypeCmpGreaterOrEq, stmt->getRHS());
978 case BO_EQ:978 case BO_EQ:
979 emit_warning(c, stmt->getLocStart(), "TODO handle more C binary operators: BO_EQ");979 return trans_create_bin_op(c, block, stmt->getLHS(), BinOpTypeCmpEq, stmt->getRHS());
980 return nullptr;
981 case BO_NE:980 case BO_NE:
982 emit_warning(c, stmt->getLocStart(), "TODO handle more C binary operators: BO_NE");981 emit_warning(c, stmt->getLocStart(), "TODO handle more C binary operators: BO_NE");
983 return nullptr;982 return nullptr;
...@@ -991,11 +990,10 @@ static AstNode *trans_binary_operator(Context *c, bool result_used, AstNode *blo...@@ -991,11 +990,10 @@ static AstNode *trans_binary_operator(Context *c, bool result_used, AstNode *blo
991 emit_warning(c, stmt->getLocStart(), "TODO handle more C binary operators: BO_Or");990 emit_warning(c, stmt->getLocStart(), "TODO handle more C binary operators: BO_Or");
992 return nullptr;991 return nullptr;
993 case BO_LAnd:992 case BO_LAnd:
994 emit_warning(c, stmt->getLocStart(), "TODO handle more C binary operators: BO_LAnd");993 return trans_create_bin_op(c, block, stmt->getLHS(), BinOpTypeBoolAnd, stmt->getRHS());
995 return nullptr;
996 case BO_LOr:994 case BO_LOr:
997 emit_warning(c, stmt->getLocStart(), "TODO handle more C binary operators: BO_LOr");995 // TODO: int vs bool
998 return nullptr;996 return trans_create_bin_op(c, block, stmt->getLHS(), BinOpTypeBoolOr, stmt->getRHS());
999 case BO_Assign:997 case BO_Assign:
1000 (void)result_used;998 (void)result_used;
1001 emit_warning(c, stmt->getLocStart(), "TODO handle more C binary operators: BO_Assign");999 emit_warning(c, stmt->getLocStart(), "TODO handle more C binary operators: BO_Assign");
test/parsec.zig+16
...@@ -373,6 +373,22 @@ pub fn addCases(cases: &tests.ParseCContext) {...@@ -373,6 +373,22 @@ pub fn addCases(cases: &tests.ParseCContext) {
373 \\}373 \\}
374 );374 );
375375
376 cases.add("logical and, logical or",
377 \\int max(int a, int b) {
378 \\ if (a < b || a == b)
379 \\ return b;
380 \\ if (a >= b && a == b)
381 \\ return a;
382 \\ return a;
383 \\}
384 ,
385 \\export fn max(a: c_int, b: c_int) -> c_int {
386 \\ if ((a < b) or (a == b)) return b;
387 \\ if ((a >= b) and (a == b)) return a;
388 \\ return a;
389 \\}
390 );
391
376 cases.add("shift right assign with a fixed size type",392 cases.add("shift right assign with a fixed size type",
377 \\#include <stdint.h>393 \\#include <stdint.h>
378 \\int log2(uint32_t a) {394 \\int log2(uint32_t a) {