From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Fri, 23 Jul 2010 04:06:52 +0000 (-0700)
Subject: Merge closures into main development branch.
X-Git-Tag: 0.13.beta0~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7148a1a78010395a816cb2d77eb62b8d2f782dc8;p=cython.git

Merge closures into main development branch.
---

7148a1a78010395a816cb2d77eb62b8d2f782dc8
diff --cc Cython/Compiler/Parsing.pxd
index 13997378,3fa7ccb5..24ba31a1
--- a/Cython/Compiler/Parsing.pxd
+++ b/Cython/Compiler/Parsing.pxd
@@@ -130,8 -138,8 +138,8 @@@ cpdef p_cdef_statement(PyrexScanner s, 
  cpdef p_cdef_block(PyrexScanner s, ctx)
  cpdef p_cdef_extern_block(PyrexScanner s, pos, ctx)
  cpdef p_c_enum_definition(PyrexScanner s, pos, ctx)
- cpdef p_c_enum_line(PyrexScanner s, ctx, items)
- cpdef p_c_enum_item(PyrexScanner s, ctx, items)
 -cpdef p_c_enum_line(PyrexScanner s, list items)
 -cpdef p_c_enum_item(PyrexScanner s, list items)
++cpdef p_c_enum_line(PyrexScanner s, ctx, list items)
++cpdef p_c_enum_item(PyrexScanner s, ctx, list items)
  cpdef p_c_struct_or_union_definition(PyrexScanner s, pos, ctx)
  cpdef p_visibility(PyrexScanner s, prev_visibility)
  cpdef p_c_modifiers(PyrexScanner s)
diff --cc tests/bugs.txt
index 4f100755,e7eac680..5c9a777d
--- a/tests/bugs.txt
+++ b/tests/bugs.txt
@@@ -11,8 -11,9 +11,10 @@@ cascaded_list_unpacking_T46
  compile.cpp_operators
  cpp_templated_ctypedef
  cpp_structs
+ genexpr_T491
  with_statement_module_level_T536
 +function_as_method_T494
+ closure_inside_cdef_T554
  
  # CPython regression tests that don't current work:
  pyregr.test_threadsignals