Commit 578b96a4 authored by Stefan Behnel's avatar Stefan Behnel

implementation of PEP 380 (yield from)

parent 131ab175
...@@ -6501,10 +6501,12 @@ class YieldExprNode(ExprNode): ...@@ -6501,10 +6501,12 @@ class YieldExprNode(ExprNode):
# arg ExprNode the value to return from the generator # arg ExprNode the value to return from the generator
# label_name string name of the C label used for this yield # label_name string name of the C label used for this yield
# label_num integer yield label number # label_num integer yield label number
# is_yield_from boolean is a YieldFromExprNode to delegate to another generator
subexprs = ['arg'] subexprs = ['arg']
type = py_object_type type = py_object_type
label_num = 0 label_num = 0
is_yield_from = False
def analyse_types(self, env): def analyse_types(self, env):
if not self.label_num: if not self.label_num:
...@@ -6513,11 +6515,12 @@ class YieldExprNode(ExprNode): ...@@ -6513,11 +6515,12 @@ class YieldExprNode(ExprNode):
if self.arg is not None: if self.arg is not None:
self.arg.analyse_types(env) self.arg.analyse_types(env)
if not self.arg.type.is_pyobject: if not self.arg.type.is_pyobject:
self.arg = self.arg.coerce_to_pyobject(env) self.coerce_yield_argument(env)
def coerce_yield_argument(self, env):
self.arg = self.arg.coerce_to_pyobject(env)
def generate_evaluation_code(self, code): def generate_evaluation_code(self, code):
self.label_name = code.new_label('resume_from_yield')
code.use_label(self.label_name)
if self.arg: if self.arg:
self.arg.generate_evaluation_code(code) self.arg.generate_evaluation_code(code)
self.arg.make_owned_reference(code) self.arg.make_owned_reference(code)
...@@ -6526,10 +6529,19 @@ class YieldExprNode(ExprNode): ...@@ -6526,10 +6529,19 @@ class YieldExprNode(ExprNode):
Naming.retval_cname, Naming.retval_cname,
self.arg.result_as(py_object_type))) self.arg.result_as(py_object_type)))
self.arg.generate_post_assignment_code(code) self.arg.generate_post_assignment_code(code)
#self.arg.generate_disposal_code(code)
self.arg.free_temps(code) self.arg.free_temps(code)
else: else:
code.put_init_to_py_none(Naming.retval_cname, py_object_type) code.put_init_to_py_none(Naming.retval_cname, py_object_type)
self.generate_yield_code(code)
def generate_yield_code(self, code):
"""
Generate the code to return the argument in 'Naming.retval_cname'
and to continue at the yield label.
"""
self.label_name = code.new_label('resume_from_yield')
code.use_label(self.label_name)
saved = [] saved = []
code.funcstate.closure_temps.reset() code.funcstate.closure_temps.reset()
for cname, type, manage_ref in code.funcstate.temps_in_use(): for cname, type, manage_ref in code.funcstate.temps_in_use():
...@@ -6545,6 +6557,7 @@ class YieldExprNode(ExprNode): ...@@ -6545,6 +6557,7 @@ class YieldExprNode(ExprNode):
code.putln("%s->resume_label = %d;" % ( code.putln("%s->resume_label = %d;" % (
Naming.generator_cname, self.label_num)) Naming.generator_cname, self.label_num))
code.putln("return %s;" % Naming.retval_cname); code.putln("return %s;" % Naming.retval_cname);
code.put_label(self.label_name) code.put_label(self.label_name)
for cname, save_cname, type in saved: for cname, save_cname, type in saved:
code.putln('%s = %s->%s;' % (cname, Naming.cur_scope_cname, save_cname)) code.putln('%s = %s->%s;' % (cname, Naming.cur_scope_cname, save_cname))
...@@ -6562,6 +6575,48 @@ class YieldExprNode(ExprNode): ...@@ -6562,6 +6575,48 @@ class YieldExprNode(ExprNode):
code.putln(code.error_goto_if_null(Naming.sent_value_cname, self.pos)) code.putln(code.error_goto_if_null(Naming.sent_value_cname, self.pos))
class YieldFromExprNode(YieldExprNode):
# "yield from GEN" expression
is_yield_from = True
def coerce_yield_argument(self, env):
if not self.arg.type.is_string:
# FIXME: support C arrays and C++ iterators?
error(self.pos, "yielding from non-Python object not supported")
self.arg = self.arg.coerce_to_pyobject(env)
def generate_evaluation_code(self, code):
code.globalstate.use_utility_code(UtilityCode.load_cached("YieldFrom", "Generator.c"))
self.arg.generate_evaluation_code(code)
self.arg.make_owned_reference(code)
code.put_xgiveref(self.arg.result())
code.putln("%s = __Pyx_Generator_Yield_From(%s, %s);" % (
Naming.retval_cname,
Naming.generator_cname,
self.arg.result_as(py_object_type)))
self.arg.generate_post_assignment_code(code) # reference was stolen
self.arg.free_temps(code)
code.put_xgotref(Naming.retval_cname)
code.putln("if (likely(%s)) {" % Naming.retval_cname)
self.generate_yield_code(code)
code.putln("} else {")
# either error or sub-generator has normally terminated: return value => node result
if self.result_is_used:
# YieldExprNode has allocated the result temp for us
code.putln("if (__Pyx_PyGen_FetchStopIterationValue(&%s) < 0) %s" % (
self.result(),
code.error_goto(self.pos)))
else:
code.putln("PyObject* exc_type = PyErr_Occurred();")
code.putln("if (exc_type) {")
code.putln("if (!PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration)) %s" %
code.error_goto(self.pos))
code.putln("PyErr_Clear();")
code.putln("}")
code.putln("}")
class GlobalsExprNode(AtomicExprNode): class GlobalsExprNode(AtomicExprNode):
type = dict_type type = dict_type
is_temp = 1 is_temp = 1
......
...@@ -5297,9 +5297,11 @@ class ReturnStatNode(StatNode): ...@@ -5297,9 +5297,11 @@ class ReturnStatNode(StatNode):
# #
# value ExprNode or None # value ExprNode or None
# return_type PyrexType # return_type PyrexType
# in_generator return inside of generator => raise StopIteration
child_attrs = ["value"] child_attrs = ["value"]
is_terminator = True is_terminator = True
in_generator = False
# Whether we are in a parallel section # Whether we are in a parallel section
in_parallel = False in_parallel = False
...@@ -5349,6 +5351,13 @@ class ReturnStatNode(StatNode): ...@@ -5349,6 +5351,13 @@ class ReturnStatNode(StatNode):
rhs=self.value, rhs=self.value,
code=code, code=code,
have_gil=self.in_nogil_context) have_gil=self.in_nogil_context)
elif self.in_generator:
# return value == raise StopIteration(value), but uncatchable
code.putln(
"%s = NULL; PyErr_SetObject(PyExc_StopIteration, %s);" % (
Naming.retval_cname,
self.value.result_as(self.return_type)))
self.value.generate_disposal_code(code)
else: else:
self.value.make_owned_reference(code) self.value.make_owned_reference(code)
code.putln( code.putln(
......
...@@ -2025,16 +2025,12 @@ class YieldNodeCollector(TreeVisitor): ...@@ -2025,16 +2025,12 @@ class YieldNodeCollector(TreeVisitor):
return self.visitchildren(node) return self.visitchildren(node)
def visit_YieldExprNode(self, node): def visit_YieldExprNode(self, node):
if self.has_return_value:
error(node.pos, "'yield' outside function")
self.yields.append(node) self.yields.append(node)
self.visitchildren(node) self.visitchildren(node)
def visit_ReturnStatNode(self, node): def visit_ReturnStatNode(self, node):
if node.value: if node.value:
self.has_return_value = True self.has_return_value = True
if self.yields:
error(node.pos, "'return' with argument inside generator")
self.returns.append(node) self.returns.append(node)
def visit_ClassDefNode(self, node): def visit_ClassDefNode(self, node):
...@@ -2071,6 +2067,8 @@ class MarkClosureVisitor(CythonTransform): ...@@ -2071,6 +2067,8 @@ class MarkClosureVisitor(CythonTransform):
return node return node
for i, yield_expr in enumerate(collector.yields): for i, yield_expr in enumerate(collector.yields):
yield_expr.label_num = i + 1 yield_expr.label_num = i + 1
for retnode in collector.returns:
retnode.in_generator = True
gbody = Nodes.GeneratorBodyDefNode( gbody = Nodes.GeneratorBodyDefNode(
pos=node.pos, name=node.name, body=node.body) pos=node.pos, name=node.name, body=node.body)
......
...@@ -340,11 +340,20 @@ def p_yield_expression(s): ...@@ -340,11 +340,20 @@ def p_yield_expression(s):
# s.sy == "yield" # s.sy == "yield"
pos = s.position() pos = s.position()
s.next() s.next()
is_yield_from = False
if s.sy == 'from':
is_yield_from = True
s.next()
if s.sy != ')' and s.sy not in statement_terminators: if s.sy != ')' and s.sy not in statement_terminators:
arg = p_testlist(s) arg = p_testlist(s)
else: else:
if is_yield_from:
s.error("'yield from' requires a source argument", pos=pos)
arg = None arg = None
return ExprNodes.YieldExprNode(pos, arg=arg) if is_yield_from:
return ExprNodes.YieldFromExprNode(pos, arg=arg)
else:
return ExprNodes.YieldExprNode(pos, arg=arg)
def p_yield_statement(s): def p_yield_statement(s):
# s.sy == "yield" # s.sy == "yield"
......
This diff is collapsed.
...@@ -166,6 +166,7 @@ VER_DEP_MODULES = { ...@@ -166,6 +166,7 @@ VER_DEP_MODULES = {
]), ]),
(2,5) : (operator.lt, lambda x: x in ['run.any', (2,5) : (operator.lt, lambda x: x in ['run.any',
'run.all', 'run.all',
'run.yield_from_pep380', # GeneratorExit
'run.relativeimport_T542', 'run.relativeimport_T542',
'run.relativeimport_star_T542', 'run.relativeimport_star_T542',
]), ]),
......
...@@ -14,8 +14,8 @@ class Foo: ...@@ -14,8 +14,8 @@ class Foo:
yield yield
_ERRORS = u""" _ERRORS = u"""
5:4: 'return' with argument inside generator #5:4: 'return' with argument inside generator
9:4: 'yield' outside function #9:4: 'yield' outside function
11:0: 'yield' not supported here 11:0: 'yield' not supported here
14:4: 'yield' not supported here 14:4: 'yield' not supported here
""" """
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment