Fix boolean add/mult

Author: lshaw8317

numexpr/expressions.py

@@ -531,6 +531,9 @@ class OpNode(ExpressionNode):
     def __init__(self, opcode=None, args=None, kind=None):
         if (kind is None) and (args is not None):
             kind = commonKind(args)
+        if kind=='bool': # handle bool*bool and bool+bool cases
+            opcode = 'and' if opcode=='mul' else opcode
+            opcode = 'or' if opcode=='add' else opcode
         ExpressionNode.__init__(self, value=opcode, kind=kind, children=args)
 
 

numexpr/tests/test_numexpr.py

@@ -490,6 +490,12 @@ def test_maximum_minimum(self):
             assert_array_equal(evaluate("maximum(x,y)"), maximum(x,y))
             assert_array_equal(evaluate("minimum(x,y)"), minimum(x,y))
 
+    def test_addmult_booleans(self):
+        x = np.asarray([0, 1, 0, 0, 1], dtype=bool)
+        y = x[::-1]
+        assert_array_equal(evaluate("x * y"), x * y)
+        assert_array_equal(evaluate("x + y"), x + y)
+
     def test_sign_round(self):
         for dtype in [float, double, np.int32, np.int64, complex]:
             x = arange(10, dtype=dtype)