From: Dag Sverre Seljebotn <dagss@student.matnat.uio.no>
Date: Sun, 29 Mar 2009 16:00:15 +0000 (+0200)
Subject: CondExprNode over to new temps
X-Git-Tag: 0.12.alpha0~346^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=857ff5f8a8a093d00d4cffc204adfb6e013fc36f;p=cython.git

CondExprNode over to new temps
---

diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
index 077b7a28..d182db9e 100644
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@ -4505,7 +4505,7 @@ class BoolBinopNode(NewTempExprNode):
         return (test_result, self.type.is_pyobject)
 
 
-class CondExprNode(ExprNode):
+class CondExprNode(NewTempExprNode):
     #  Short-circuiting conditional expression.
     #
     #  test        ExprNode
@@ -4570,7 +4570,7 @@ class CondExprNode(ExprNode):
         # subexpr allocation strategy than the default, so override evaluation_code.
         
         code.mark_pos(self.pos)
-        #self.allocate_temp_result(code) # uncomment this when we switch to new temps
+        self.allocate_temp_result(code)
         self.test.generate_evaluation_code(code)
         code.putln("if (%s) {" % self.test.result() )
         self.eval_and_get(code, self.true_val)