From: Craig Citro <craigcitro@gmail.com>
Date: Mon, 1 Feb 2010 20:58:23 +0000 (-0800)
Subject: Merge closure tests and fixes.
X-Git-Tag: 0.13.beta0~2^2~104
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=24b146a06435a00d0353d54354aed0db2ea67a1f;p=cython.git

Merge closure tests and fixes.
---

24b146a06435a00d0353d54354aed0db2ea67a1f
diff --cc Cython/Compiler/Nodes.py
index c0816ee4,67f795e3..204975d7
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@@ -1100,13 -1095,10 +1104,12 @@@ class FuncDefNode(StatNode, BlockNode)
                  init = " = NULL"
              code.putln(
                  "%s%s;" % 
-                     (self.return_type.declaration_code(
-                         Naming.retval_cname),
-                     init))
+                     (self.return_type.declaration_code(Naming.retval_cname),
+                      init))
          tempvardecl_code = code.insertion_point()
          self.generate_keyword_list(code)
 +        if profile:
 +            code.put_trace_declarations()
          # ----- Extern library function declarations
          lenv.generate_library_function_declarations(code)
          # ----- GIL acquisition
@@@ -1619,11 -1612,12 +1628,13 @@@ class PyArgDeclNode(Node)
      # Argument which must be a Python object (used
      # for * and ** arguments).
      #
 -    # name   string
 -    # entry  Symtab.Entry
 +    # name        string
 +    # entry       Symtab.Entry
 +    # annotation  ExprNode or None   Py3 argument annotation
      child_attrs = []
-     
+ 
+     def generate_function_definitions(self, env, code):
+         self.entry.generate_function_definitions(env, code)
  
  class DecoratorNode(Node):
      # A decorator