subexprs = ['operand1', 'operand2']
def infer_type(self, env):
- if (self.operand1.infer_type(env).is_pyobject or
- self.operand2.infer_type(env).is_pyobject):
- return py_object_type
- else:
- return PyrexTypes.c_bint_type
+ type1 = self.operand1.infer_type(env)
+ type2 = self.operand2.infer_type(env)
+ return PyrexTypes.spanning_type(type1, type2)
def calculate_constant_result(self):
if self.operator == 'and':
def analyse_types(self, env):
self.operand1.analyse_types(env)
self.operand2.analyse_types(env)
- if self.operand1.type.is_pyobject or \
- self.operand2.type.is_pyobject:
- self.operand1 = self.operand1.coerce_to_pyobject(env)
- self.operand2 = self.operand2.coerce_to_pyobject(env)
- self.type = py_object_type
- else:
- self.operand1 = self.operand1.coerce_to_boolean(env)
- self.operand2 = self.operand2.coerce_to_boolean(env)
- self.type = PyrexTypes.c_bint_type
-
- # Below disabled for
+ self.type = PyrexTypes.spanning_type(self.operand1.type, self.operand2.type)
+ self.operand1 = self.operand1.coerce_to(self.type, env)
+ self.operand2 = self.operand2.coerce_to(self.type, env)
# For what we're about to do, it's vital that
# both operands be temp nodes.
-# self.operand1 = self.operand1.coerce_to_temp(env) #CTT
-# self.operand2 = self.operand2.coerce_to_temp(env)
+ self.operand1 = self.operand1.coerce_to_temp(env)
+ self.operand2 = self.operand2.coerce_to_temp(env)
self.is_temp = 1
gil_message = "Truth-testing Python object"
self.operand1.check_const()
self.operand2.check_const()
- def calculate_result_code(self):
- return "(%s %s %s)" % (
- self.operand1.result(),
- self.py_to_c_op[self.operator],
- self.operand2.result())
-
- py_to_c_op = {'and': "&&", 'or': "||"}
-
def generate_evaluation_code(self, code):
code.mark_pos(self.pos)
self.operand1.generate_evaluation_code(code)
39: 9: Constructing Python tuple not allowed without gil
40: 8: Constructing Python list not allowed without gil
41: 8: Constructing Python dict not allowed without gil
+42:12: Creating temporary Python reference not allowed without gil
42:12: Truth-testing Python object not allowed without gil
+42:17: Creating temporary Python reference not allowed without gil
43:13: Python type test not allowed without gil
45:10: Operation not allowed without gil
46:8: Operation not allowed without gil
__doc__ = u"""
>>> foo(True, False, 23, 'test', 1)
- (0, 1, False, False)
+ (0.0, 1.0, False, False)
"""
def foo(obj1, obj2, obj3, obj4, obj5):
- cdef int bool1, bool2, bool3, bool4
- cdef char *ptr
+ cdef int bool1, bool2
+ cdef float bool3, bool4
+ cdef char *ptr1, *ptr2, *ptr0
cdef float f
bool1 = 1
bool2 = 0
- ptr = NULL
+ ptr1 = ptr2 = NULL
f = 0.0
bool3 = bool1 and bool2
bool3 = bool1 or bool2
bool3 = obj1 and obj2
- bool3 = bool1 and ptr
+ ptr0 = ptr1 and ptr2
bool3 = bool1 and f
bool4 = bool1 and bool2 and bool3
bool4 = bool1 or bool2 and bool3