From: Stefan Behnel <scoder@users.berlios.de>
Date: Tue, 14 Dec 2010 08:04:35 +0000 (+0100)
Subject: merge
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7d1a5f548a8d150f07efd478f9fa54f75129cf05;p=cython.git

merge
---

7d1a5f548a8d150f07efd478f9fa54f75129cf05
diff --cc Cython/Compiler/ExprNodes.py
index 7b7160d4,bd45bae1..4bcee405
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@@ -5006,9 -5010,10 +5010,9 @@@ class YieldExprNode(ExprNode)
          else:
              code.put_init_to_py_none(Naming.retval_cname, py_object_type)
          saved = []
-         code.temp_allocator.reset()
+         code.funcstate.closure_temps.reset()
 -        code.putln('/* Save temporary variables */')
          for cname, type, manage_ref in code.funcstate.temps_in_use():
-             save_cname = code.temp_allocator.allocate_temp(type)
+             save_cname = code.funcstate.closure_temps.allocate_temp(type)
              saved.append((cname, save_cname, type))
              if type.is_pyobject:
                  code.put_xgiveref(cname)