split module doctest into function doctests, enable now working test

diff --git a/tests/run/closures_T82.pyx b/tests/run/closures_T82.pyx
index 0bbb7db13cde3543d8a34a35f259b5af3dd2f7b0..de634856759f726c25dedd75c4024b509558ba42 100644 (file)
--- a/tests/run/closures_T82.pyx
+++ b/tests/run/closures_T82.pyx
@@ -1,72 +1,23 @@
-__doc__ = u"""
->>> f = add_n(3)
->>> f(2)
-5
-
->>> f = add_n(1000000)
->>> f(1000000), f(-1000000)
-(2000000, 0)
-
->>> a(5)()
-8
-
->>> local_x(1)(2)(4)
-4 2 1
-15
-
-# this currently crashes Cython due to redefinition
-#>>> x(1)(2)(4)
-#15
-
->>> x2(1)(2)(4)
-4 2 1
-15
-
->>> inner_override(2,4)()
-5
-
->>> reassign(4)(2)
-3
-
->>> reassign_int(4)(2)
-3
-
->>> reassign_int_int(4)(2)
-3
-
->>> def py_twofuncs(x):
-...    def f(a):
-...        return g(x) + a
-...    def g(b):
-...        return x + b
-...    return f
-
->>> py_twofuncs(1)(2) == cy_twofuncs(1)(2)
-True
->>> py_twofuncs(3)(5) == cy_twofuncs(3)(5)
-True
-
->>> inner_funcs = more_inner_funcs(1)(2,4,8)
->>> inner_funcs[0](16), inner_funcs[1](32), inner_funcs[2](64)
-(19, 37, 73)
-
->>> switch_funcs([1,2,3], [4,5,6], 0)([10])
-[1, 2, 3, 10]
->>> switch_funcs([1,2,3], [4,5,6], 1)([10])
-[4, 5, 6, 10]
->>> switch_funcs([1,2,3], [4,5,6], 2) is None
-True
-
->>> call_ignore_func()
-
-"""
 
 def add_n(int n):
+    """
+    >>> f = add_n(3)
+    >>> f(2)
+    5
+
+    >>> f = add_n(1000000)
+    >>> f(1000000), f(-1000000)
+    (2000000, 0)
+    """
     def f(int x):
         return x+n
     return f
 
 def a(int x):
+    """
+    >>> a(5)()
+    8
+    """
     def b():
         def c():
             return 3+x
@@ -74,6 +25,11 @@ def a(int x):
     return b
 
 def local_x(int arg_x):
+    """
+    >>> local_x(1)(2)(4)
+    4 2 1
+    15
+    """
     cdef int local_x = arg_x
     def y(arg_y):
         y = arg_y
@@ -84,15 +40,23 @@ def local_x(int arg_x):
         return z
     return y
 
-# currently crashes Cython due to name redefinitions (see local_x())
-## def x(int x):
-##     def y(y):
-##         def z(long z):
-##             return 8+z+y+x
-##         return z
-##     return y
+def x(int x):
+    """
+    >>> x(1)(2)(4)
+    15
+    """
+    def y(y):
+        def z(long z):
+            return 8+z+y+x
+        return z
+    return y
 
 def x2(int x2):
+    """
+    >>> x2(1)(2)(4)
+    4 2 1
+    15
+    """
     def y2(y2):
         def z2(long z2):
             print z2, y2, x2
@@ -102,6 +66,10 @@ def x2(int x2):
 
 
 def inner_override(a,b):
+    """
+    >>> inner_override(2,4)()
+    5
+    """
     def f():
         a = 1
         return a+b
@@ -109,18 +77,30 @@ def inner_override(a,b):
 
 
 def reassign(x):
+    """
+    >>> reassign(4)(2)
+    3
+    """
     def f(a):
         return a+x
     x = 1
     return f
 
 def reassign_int(x):
+    """
+    >>> reassign_int(4)(2)
+    3
+    """
     def f(int a):
         return a+x
     x = 1
     return f
 
 def reassign_int_int(int x):
+    """
+    >>> reassign_int_int(4)(2)
+    3
+    """
     def f(int a):
         return a+x
     x = 1
@@ -128,6 +108,19 @@ def reassign_int_int(int x):
 
 
 def cy_twofuncs(x):
+    """
+    >>> def py_twofuncs(x):
+    ...    def f(a):
+    ...        return g(x) + a
+    ...    def g(b):
+    ...        return x + b
+    ...    return f
+
+    >>> py_twofuncs(1)(2) == cy_twofuncs(1)(2)
+    True
+    >>> py_twofuncs(3)(5) == cy_twofuncs(3)(5)
+    True
+    """
     def f(a):
         return g(x) + a
     def g(b):
@@ -135,6 +128,14 @@ def cy_twofuncs(x):
     return f
 
 def switch_funcs(a, b, int ix):
+    """
+    >>> switch_funcs([1,2,3], [4,5,6], 0)([10])
+    [1, 2, 3, 10]
+    >>> switch_funcs([1,2,3], [4,5,6], 1)([10])
+    [4, 5, 6, 10]
+    >>> switch_funcs([1,2,3], [4,5,6], 2) is None
+    True
+    """
     def f(x):
         return a + x
     def g(x):
@@ -152,9 +153,17 @@ def ignore_func(x):
     return None
 
 def call_ignore_func():
+    """
+    >>> call_ignore_func()
+    """
     ignore_func((1,2,3))
 
 def more_inner_funcs(x):
+    """
+    >>> inner_funcs = more_inner_funcs(1)(2,4,8)
+    >>> inner_funcs[0](16), inner_funcs[1](32), inner_funcs[2](64)
+    (19, 37, 73)
+    """
     # called with x==1
     def f(a):
         def g(b):