[pypy-svn] r58358 - in pypy/branch/2.5-features/pypy/interpreter: pyparser test

[fijal at codespeak.net]

Author: fijal
Date: Tue Sep 23 01:16:11 2008
New Revision: 58358

Modified:
   pypy/branch/2.5-features/pypy/interpreter/pyparser/astbuilder.py
   pypy/branch/2.5-features/pypy/interpreter/test/test_generator.py
Log:
Minor fix for yield expressions


Modified: pypy/branch/2.5-features/pypy/interpreter/pyparser/astbuilder.py
==============================================================================
--- pypy/branch/2.5-features/pypy/interpreter/pyparser/astbuilder.py	(original)
+++ pypy/branch/2.5-features/pypy/interpreter/pyparser/astbuilder.py	Tue Sep 23 01:16:11 2008
@@ -906,7 +906,10 @@
 
 def build_yield_expr(builder, nb):
     atoms = get_atoms(builder, nb)
-    builder.push(ast.Yield(atoms[1], atoms[0].lineno))
+    if len(atoms) == 1:
+        builder.push(ast.Yield(ast.Const(builder.wrap_none()), atoms[0].lineno))
+    else:
+        builder.push(ast.Yield(atoms[1], atoms[0].lineno))
 
 def build_continue_stmt(builder, nb):
     atoms = get_atoms(builder, nb)

Modified: pypy/branch/2.5-features/pypy/interpreter/test/test_generator.py
==============================================================================
--- pypy/branch/2.5-features/pypy/interpreter/test/test_generator.py	(original)
+++ pypy/branch/2.5-features/pypy/interpreter/test/test_generator.py	Tue Sep 23 01:16:11 2008
@@ -35,7 +35,7 @@
         g = f()
         g.next()
         """ in d
-        d = d['g']
+        g = d['g']
         assert g.send(42) == 42
 
     def test_throw1(self):