Commit cc65c48a authored by Stefan Behnel's avatar Stefan Behnel

merge

parents 40f1624b f3d13916
...@@ -4002,12 +4002,28 @@ class ForFromStatNode(LoopNode, StatNode): ...@@ -4002,12 +4002,28 @@ class ForFromStatNode(LoopNode, StatNode):
self.body.generate_execution_code(code) self.body.generate_execution_code(code)
code.put_label(code.continue_label) code.put_label(code.continue_label)
if self.py_loopvar_node: if self.py_loopvar_node:
# Reassign py variable to loop var here. # This mess is to make for..from loops with python targets behave
# (For consistancy, should rarely come up in practice.) # exactly like those with C targets with regards to re-assignment
# of the loop variable.
import ExprNodes import ExprNodes
from_py_node = ExprNodes.CoerceFromPyTypeNode(self.loopvar_node.type, self.target, None) if self.target.entry.is_pyglobal:
# We know target is a NameNode, this is the only ugly case.
target_node = ExprNodes.PyTempNode(self.target.pos, None)
target_node.result_code = code.funcstate.allocate_temp(py_object_type, False)
code.putln("%s = __Pyx_GetName(%s, %s); %s" % (
target_node.result_code,
Naming.module_cname,
self.target.entry.interned_cname,
code.error_goto_if_null(target_node.result_code, self.target.pos)))
code.put_gotref(target_node.result_code)
else:
target_node = self.target
from_py_node = ExprNodes.CoerceFromPyTypeNode(self.loopvar_node.type, target_node, None)
from_py_node.temp_code = loopvar_name from_py_node.temp_code = loopvar_name
from_py_node.generate_result_code(code) from_py_node.generate_result_code(code)
if self.target.entry.is_pyglobal:
code.put_decref_clear(target_node.result_code, py_object_type)
code.funcstate.release_temp(target_node.result_code)
code.putln("}") code.putln("}")
if self.py_loopvar_node: if self.py_loopvar_node:
# This is potentially wasteful, but we don't want the semantics to # This is potentially wasteful, but we don't want the semantics to
......
...@@ -730,7 +730,7 @@ property NAME: ...@@ -730,7 +730,7 @@ property NAME:
if node.name in self.seen_vars_stack[-1]: if node.name in self.seen_vars_stack[-1]:
entry = self.env_stack[-1].lookup(node.name) entry = self.env_stack[-1].lookup(node.name)
if entry is None or entry.visibility != 'extern': if entry is None or entry.visibility != 'extern':
error(node.pos, "cdef variable '%s' declared after it is used" % node.name) warning(node.pos, "cdef variable '%s' declared after it is used" % node.name, 2)
self.visitchildren(node) self.visitchildren(node)
return node return node
......
...@@ -46,6 +46,12 @@ at 1 ...@@ -46,6 +46,12 @@ at 1
at 3 at 3
at 7 at 7
15 15
>>> for_from_py_global_target_reassignment(10, 2)
at 0
at 1
at 3
at 7
15
>>> for_in_target_reassignment(10, 2) >>> for_in_target_reassignment(10, 2)
at 0 at 0
at 1 at 1
...@@ -112,6 +118,13 @@ def for_from_py_target_reassignment(int bound, int factor): ...@@ -112,6 +118,13 @@ def for_from_py_target_reassignment(int bound, int factor):
i *= factor i *= factor
return i return i
def for_from_py_global_target_reassignment(int bound, int factor):
global g_var
for g_var from 0 <= g_var < bound:
print "at", g_var
g_var *= factor
return g_var
def for_in_target_reassignment(int bound, int factor): def for_in_target_reassignment(int bound, int factor):
cdef int i = 100 cdef int i = 100
for i in range(bound): for i in range(bound):
......
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