From: Stefan Behnel <scoder@users.berlios.de>
Date: Sat, 6 Mar 2010 15:13:38 +0000 (+0100)
Subject: minor fix for double inference
X-Git-Tag: 0.13.beta0~2^2~99^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=390ed7be982d6037c33369ea8e023ac44e48ab3a;p=cython.git

minor fix for double inference
---

diff --git a/Cython/Compiler/TypeInference.py b/Cython/Compiler/TypeInference.py
index 8c10bcd3..5c792db8 100644
--- a/Cython/Compiler/TypeInference.py
+++ b/Cython/Compiler/TypeInference.py
@@ -262,12 +262,13 @@ class SimpleAssignmentTypeInferer:
 
 def find_spanning_type(type1, type2):
     if type1 is type2:
-        return type1
+        result_type = type1
     elif type1 is PyrexTypes.c_bint_type or type2 is PyrexTypes.c_bint_type:
         # type inference can break the coercion back to a Python bool
         # if it returns an arbitrary int type here
         return py_object_type
-    result_type = PyrexTypes.spanning_type(type1, type2)
+    else:
+        result_type = PyrexTypes.spanning_type(type1, type2)
     if result_type in (PyrexTypes.c_double_type, PyrexTypes.c_float_type, Builtin.float_type):
         # Python's float type is just a C double, so it's safe to
         # use the C type instead