Merge pull request #618 from namannimmo10/logical_binop

Add test for binop on booleans

Author: namannimmo10

integration_tests/CMakeLists.txt

@@ -167,6 +167,7 @@ RUN(NAME test_max_min        LABELS cpython llvm)
 RUN(NAME test_integer_bitnot LABELS cpython llvm)
 RUN(NAME test_unary_minus    LABELS cpython llvm)
 RUN(NAME test_unary_plus     LABELS cpython llvm)
+RUN(NAME test_bool_binop     LABELS cpython llvm)
 RUN(NAME test_issue_518      LABELS cpython llvm)
 RUN(NAME structs_01          LABELS cpython llvm)
 

integration_tests/test_bool_binop.py

@@ -0,0 +1,29 @@
+from ltypes import i32, f64
+
+def f():
+    i: i32
+    i = True + True
+    assert i == 2
+
+    i = True - False
+    assert i == 1
+
+    i = False * True
+    assert i == 0
+
+    i = True // True
+    assert i == 1
+
+    i = False // True
+    assert i == 0
+
+    i = True ** True
+    assert i == 1
+
+    f: f64
+    b1: bool = False
+    b2: bool = True
+    f = b1/b2
+    assert f == 0.0
+
+f()

src/lpython/semantics/python_ast_to_asr.cpp

@@ -1224,8 +1224,6 @@ class CommonVisitor : public AST::BaseVisitor<Derived> {
             );
             throw SemanticAbort();
         }
-        ASR::ttype_t* int_type = ASRUtils::TYPE(ASR::make_Integer_t(al, loc, 4, nullptr, 0));
-        value = nullptr;
 
         if (ASRUtils::is_integer(*dest_type)) {
 
@@ -1295,35 +1293,6 @@ class CommonVisitor : public AST::BaseVisitor<Derived> {
 
             tmp = ASR::make_ComplexBinOp_t(al, loc, left, op, right, dest_type, value);
 
-        } else if (ASRUtils::is_logical(*dest_type)) {
-
-            if (ASRUtils::expr_value(left) != nullptr && ASRUtils::expr_value(right) != nullptr) {
-                int8_t left_value = ASR::down_cast<ASR::LogicalConstant_t>(
-                                                    ASRUtils::expr_value(left))->m_value;
-                int8_t right_value = ASR::down_cast<ASR::LogicalConstant_t>(
-                                                    ASRUtils::expr_value(right))->m_value;
-                int8_t result;
-                switch (op) {
-                    case (ASR::binopType::Add): { result = left_value + right_value; break; }
-                    case (ASR::binopType::Sub): { result = left_value - right_value; break; }
-                    case (ASR::binopType::Mul): { result = left_value * right_value; break; }
-                    case (ASR::binopType::Pow): { result = std::pow(left_value, right_value); break; }
-                    case (ASR::binopType::Div): { } // TODO: Handle division of logicals
-                    default: { LFORTRAN_ASSERT(false); } // should never happen
-                }
-                value = ASR::down_cast<ASR::expr_t>(ASR::make_IntegerConstant_t(
-                    al, loc, result, int_type));
-            }
-
-            // True + True -> (1 + 1)
-            left = ASR::down_cast<ASR::expr_t>(ASR::make_Cast_t(
-                        al, loc, left, ASR::cast_kindType::LogicalToInteger, int_type, nullptr));
-            right = ASR::down_cast<ASR::expr_t>(ASR::make_Cast_t(
-                        al, loc, right, ASR::cast_kindType::LogicalToInteger, int_type, nullptr));
-
-            // now that Logical is casted to Integer, do the binary operation on it.
-            tmp = ASR::make_IntegerBinOp_t(al, loc, left, op, right, int_type, value);
-
         }
 
         if (overloaded != nullptr) {

tests/reference/asr-test_bool_binop-f856ef0.json

@@ -0,0 +1,13 @@
+{
+    "basename": "asr-test_bool_binop-f856ef0",
+    "cmd": "lpython --show-asr --no-color {infile} -o {outfile}",
+    "infile": "tests/../integration_tests/test_bool_binop.py",
+    "infile_hash": "6f578959884e05dde74f07328d3f32cb7cdf13349cc49c1e7d4d8972",
+    "outfile": null,
+    "outfile_hash": null,
+    "stdout": "asr-test_bool_binop-f856ef0.stdout",
+    "stdout_hash": "da20c06dbc29523b9010516d6c1fc79748f7a5bab368b3d74c648f3a",
+    "stderr": null,
+    "stderr_hash": null,
+    "returncode": 0
+}

tests/reference/asr-test_bool_binop-f856ef0.stdout

@@ -0,0 +1 @@
+(TranslationUnit (SymbolTable 1 {_lpython_floordiv@__lpython_overloaded_2___lpython_floordiv: (ExternalSymbol 1 _lpython_floordiv@__lpython_overloaded_2___lpython_floordiv 4 __lpython_overloaded_2___lpython_floordiv lpython_builtin [] __lpython_overloaded_2___lpython_floordiv Public), _lpython_main_program: (Subroutine (SymbolTable 100 {}) _lpython_main_program [] [(SubroutineCall 1 f () [] ())] Source Public Implementation () .false. .false.), f: (Subroutine (SymbolTable 2 {_lpython_floordiv: (ExternalSymbol 2 _lpython_floordiv 4 _lpython_floordiv lpython_builtin [] _lpython_floordiv Private), b1: (Variable 2 b1 Local (LogicalConstant .false. (Logical 4 [])) (LogicalConstant .false. (Logical 4 [])) Default (Logical 4 []) Source Public Required .false.), b2: (Variable 2 b2 Local (LogicalConstant .true. (Logical 4 [])) (LogicalConstant .true. (Logical 4 [])) Default (Logical 4 []) Source Public Required .false.), f: (Variable 2 f Local () () Default (Real 8 []) Source Public Required .false.), i: (Variable 2 i Local () () Default (Integer 4 []) Source Public Required .false.)}) f [] [(= (Var 2 i) (IntegerBinOp (Cast (LogicalConstant .true. (Logical 4 [])) LogicalToInteger (Integer 4 []) ()) Add (Cast (LogicalConstant .true. (Logical 4 [])) LogicalToInteger (Integer 4 []) ()) (Integer 4 []) ()) ()) (Assert (Compare (Var 2 i) Eq (IntegerConstant 2 (Integer 4 [])) (Logical 4 []) () ()) ()) (= (Var 2 i) (IntegerBinOp (Cast (LogicalConstant .true. (Logical 4 [])) LogicalToInteger (Integer 4 []) ()) Sub (Cast (LogicalConstant .false. (Logical 4 [])) LogicalToInteger (Integer 4 []) ()) (Integer 4 []) ()) ()) (Assert (Compare (Var 2 i) Eq (IntegerConstant 1 (Integer 4 [])) (Logical 4 []) () ()) ()) (= (Var 2 i) (IntegerBinOp (Cast (LogicalConstant .false. (Logical 4 [])) LogicalToInteger (Integer 4 []) ()) Mul (Cast (LogicalConstant .true. (Logical 4 [])) LogicalToInteger (Integer 4 []) ()) (Integer 4 []) ()) ()) (Assert (Compare (Var 2 i) Eq (IntegerConstant 0 (Integer 4 [])) (Logical 4 []) () ()) ()) (= (Var 2 i) (FunctionCall 1 _lpython_floordiv@__lpython_overloaded_2___lpython_floordiv 2 _lpython_floordiv [((Cast (LogicalConstant .true. (Logical 4 [])) LogicalToInteger (Integer 4 []) ())) ((Cast (LogicalConstant .true. (Logical 4 [])) LogicalToInteger (Integer 4 []) ()))] (Integer 4 []) () ()) ()) (Assert (Compare (Var 2 i) Eq (IntegerConstant 1 (Integer 4 [])) (Logical 4 []) () ()) ()) (= (Var 2 i) (FunctionCall 1 _lpython_floordiv@__lpython_overloaded_2___lpython_floordiv 2 _lpython_floordiv [((Cast (LogicalConstant .false. (Logical 4 [])) LogicalToInteger (Integer 4 []) ())) ((Cast (LogicalConstant .true. (Logical 4 [])) LogicalToInteger (Integer 4 []) ()))] (Integer 4 []) () ()) ()) (Assert (Compare (Var 2 i) Eq (IntegerConstant 0 (Integer 4 [])) (Logical 4 []) () ()) ()) (= (Var 2 i) (IntegerBinOp (Cast (LogicalConstant .true. (Logical 4 [])) LogicalToInteger (Integer 4 []) ()) Pow (Cast (LogicalConstant .true. (Logical 4 [])) LogicalToInteger (Integer 4 []) ()) (Integer 4 []) ()) ()) (Assert (Compare (Var 2 i) Eq (IntegerConstant 1 (Integer 4 [])) (Logical 4 []) () ()) ()) (= (Var 2 f) (RealBinOp (Cast (Cast (Var 2 b1) LogicalToInteger (Integer 4 []) ()) IntegerToReal (Real 8 []) ()) Div (Cast (Cast (Var 2 b2) LogicalToInteger (Integer 4 []) ()) IntegerToReal (Real 8 []) ()) (Real 8 []) ()) ()) (Assert (Compare (Var 2 f) Eq (RealConstant   0.00000000000000000e+00 (Real 8 [])) (Logical 4 []) () ()) ())] Source Public Implementation () .false. .false.), lpython_builtin: (IntrinsicModule lpython_builtin), main_program: (Program (SymbolTable 99 {}) main_program [] [(SubroutineCall 1 _lpython_main_program () [] ())])}) [])

tests/tests.toml

@@ -270,6 +270,10 @@ asr = true
 llvm = true
 cpp = true
 
+[[test]]
+filename = "../integration_tests/test_bool_binop.py"
+asr = true
+
 [[test]]
 filename = "../integration_tests/test_issue_518.py"
 llvm = true