From: Dag Sverre Seljebotn <dagss@student.matnat.uio.no>
Date: Tue, 5 Aug 2008 09:48:11 +0000 (+0200)
Subject: merge
X-Git-Tag: 0.9.8.1~49^2~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d2f592da0ac08af7ff10e0494ae4e5ff554c7b56;p=cython.git

merge
---

d2f592da0ac08af7ff10e0494ae4e5ff554c7b56
diff --cc Cython/Compiler/Code.py
index 7d4d3d0d,f87039bc..803d0c85
--- a/Cython/Compiler/Code.py
+++ b/Cython/Compiler/Code.py
@@@ -474,19 -219,19 +477,19 @@@ class CCodeWriter(object)
      labels_used = funccontext_property("labels_used")
      continue_label = funccontext_property("continue_label")
      break_label = funccontext_property("break_label")
 -
 +    return_from_error_cleanup_label = funccontext_property("return_from_error_cleanup_label")
  
      # Functions delegated to function scope
-     def new_label(self):               return self.funcstate.new_label()
 -    def new_label(self, name=None):    return self.func.new_label(name)
 -    def new_error_label(self):         return self.func.new_error_label()
 -    def get_loop_labels(self):         return self.func.get_loop_labels()
 -    def set_loop_labels(self, labels): return self.func.set_loop_labels(labels)
 -    def new_loop_labels(self):         return self.func.new_loop_labels()
 -    def get_all_labels(self):          return self.func.get_all_labels()
 -    def set_all_labels(self, labels):  return self.func.set_all_labels(labels)
 -    def all_new_labels(self):          return self.func.all_new_labels()
 -    def use_label(self, lbl):          return self.func.use_label(lbl)
 -    def label_used(self, lbl):         return self.func.label_used(lbl)
++    def new_label(self, name=None):    return self.funcstate.new_label(name)
 +    def new_error_label(self):         return self.funcstate.new_error_label()
 +    def get_loop_labels(self):         return self.funcstate.get_loop_labels()
 +    def set_loop_labels(self, labels): return self.funcstate.set_loop_labels(labels)
 +    def new_loop_labels(self):         return self.funcstate.new_loop_labels()
 +    def get_all_labels(self):          return self.funcstate.get_all_labels()
 +    def set_all_labels(self, labels):  return self.funcstate.set_all_labels(labels)
 +    def all_new_labels(self):          return self.funcstate.all_new_labels()
 +    def use_label(self, lbl):          return self.funcstate.use_label(lbl)
 +    def label_used(self, lbl):         return self.funcstate.label_used(lbl)
  
  
      def enter_cfunc_scope(self):