Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
5df0ac1a
Commit
5df0ac1a
authored
Dec 18, 2013
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
3a338a9c
a1238e2b
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
172 additions
and
42 deletions
+172
-42
CHANGES.rst
CHANGES.rst
+2
-0
Cython/Compiler/Code.py
Cython/Compiler/Code.py
+9
-0
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+4
-5
Cython/Compiler/Nodes.py
Cython/Compiler/Nodes.py
+69
-37
tests/run/tryfinally.pyx
tests/run/tryfinally.pyx
+88
-0
No files found.
CHANGES.rst
View file @
5df0ac1a
...
...
@@ -8,6 +8,8 @@ Cython Changelog
Features added
--------------
* ``yield`` is supported in ``finally`` clauses.
* The C code generated for finally blocks is duplicated for each exit
case to allow for better optimisations by the C compiler.
...
...
Cython/Compiler/Code.py
View file @
5df0ac1a
...
...
@@ -505,6 +505,7 @@ class FunctionState(object):
self.new_error_label()
self.continue_label = None
self.break_label = None
self.yield_labels = []
self.in_try_finally = 0
self.exc_vars = None
...
...
@@ -537,6 +538,12 @@ class FunctionState(object):
label += '_' + name
return label
def new_yield_label(self):
label = self.new_label('resume_from_yield')
num_and_label = (len(self.yield_labels) + 1, label)
self.yield_labels.append(num_and_label)
return num_and_label
def new_error_label(self):
old_err_lbl = self.error_label
self.error_label = self.new_label('error')
...
...
@@ -1474,10 +1481,12 @@ class CCodeWriter(object):
continue_label
=
funccontext_property
(
"continue_label"
)
break_label
=
funccontext_property
(
"break_label"
)
return_from_error_cleanup_label
=
funccontext_property
(
"return_from_error_cleanup_label"
)
yield_labels
=
funccontext_property
(
"yield_labels"
)
# Functions delegated to function scope
def
new_label
(
self
,
name
=
None
):
return
self
.
funcstate
.
new_label
(
name
)
def
new_error_label
(
self
):
return
self
.
funcstate
.
new_error_label
()
def
new_yield_label
(
self
):
return
self
.
funcstate
.
new_yield_label
()
def
get_loop_labels
(
self
):
return
self
.
funcstate
.
get_loop_labels
()
def
set_loop_labels
(
self
,
labels
):
return
self
.
funcstate
.
set_loop_labels
(
labels
)
def
new_loop_labels
(
self
):
return
self
.
funcstate
.
new_loop_labels
()
...
...
Cython/Compiler/ExprNodes.py
View file @
5df0ac1a
...
...
@@ -7750,7 +7750,6 @@ class YieldExprNode(ExprNode):
# Yield expression node
#
# arg ExprNode the value to return from the generator
# label_name string name of the C label used for this yield
# label_num integer yield label number
# is_yield_from boolean is a YieldFromExprNode to delegate to another generator
...
...
@@ -7791,8 +7790,8 @@ class YieldExprNode(ExprNode):
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
)
label_num
,
label_name
=
code
.
new_yield_label
(
)
code
.
use_label
(
label_name
)
saved
=
[]
code
.
funcstate
.
closure_temps
.
reset
()
...
...
@@ -7807,10 +7806,10 @@ class YieldExprNode(ExprNode):
code
.
put_finish_refcount_context
()
code
.
putln
(
"/* return from generator, yielding value */"
)
code
.
putln
(
"%s->resume_label = %d;"
%
(
Naming
.
generator_cname
,
self
.
label_num
))
Naming
.
generator_cname
,
label_num
))
code
.
putln
(
"return %s;"
%
Naming
.
retval_cname
)
code
.
put_label
(
self
.
label_name
)
code
.
put_label
(
label_name
)
for
cname
,
save_cname
,
type
in
saved
:
code
.
putln
(
'%s = %s->%s;'
%
(
cname
,
Naming
.
cur_scope_cname
,
save_cname
))
if
type
.
is_pyobject
:
...
...
Cython/Compiler/Nodes.py
View file @
5df0ac1a
...
...
@@ -3828,12 +3828,8 @@ class GeneratorBodyDefNode(DefNode):
Naming
.
generator_cname
))
resume_code
.
putln
(
"case 0: goto %s;"
%
first_run_label
)
from
ParseTreeTransforms
import
YieldNodeCollector
collector
=
YieldNodeCollector
()
collector
.
visitchildren
(
self
)
for
yield_expr
in
collector
.
yields
:
resume_code
.
putln
(
"case %d: goto %s;"
%
(
yield_expr
.
label_num
,
yield_expr
.
label_name
))
for
i
,
label
in
code
.
yield_labels
:
resume_code
.
putln
(
"case %d: goto %s;"
%
(
i
,
label
))
resume_code
.
putln
(
"default: /* CPython raises the right error here */"
)
resume_code
.
put_finish_refcount_context
()
resume_code
.
putln
(
"return NULL;"
)
...
...
@@ -6352,6 +6348,7 @@ class TryFinallyStatNode(StatNode):
def
analyse_expressions
(
self
,
env
):
self
.
body
=
self
.
body
.
analyse_expressions
(
env
)
self
.
finally_clause
=
self
.
finally_clause
.
analyse_expressions
(
env
)
self
.
func_return_type
=
env
.
return_type
return
self
nogil_check
=
Node
.
gil_error
...
...
@@ -6400,20 +6397,8 @@ class TryFinallyStatNode(StatNode):
if
self
.
is_try_finally_in_nogil
:
code
.
declare_gilstate
()
code
.
putln
(
"PyObject *%s, *%s, *%s;"
%
Naming
.
exc_vars
)
if
needs_success_cleanup
:
code
.
putln
(
"int %s;"
%
Naming
.
exc_lineno_name
)
exc_var_init_zero
=
''
.
join
(
[
"%s = 0; "
%
var
for
var
in
Naming
.
exc_vars
])
if
needs_success_cleanup
:
exc_var_init_zero
+=
'%s = 0;'
%
Naming
.
exc_lineno_name
else
:
exc_var_init_zero
=
None
if
not
self
.
body
.
is_terminator
:
code
.
putln
(
'/*normal exit:*/{'
)
if
exc_var_init_zero
:
code
.
putln
(
exc_var_init_zero
)
fresh_finally_clause
().
generate_execution_code
(
code
)
if
not
self
.
finally_clause
.
is_terminator
:
code
.
put_goto
(
catch_label
)
...
...
@@ -6421,10 +6406,22 @@ class TryFinallyStatNode(StatNode):
if
preserve_error
:
code
.
putln
(
'/*exception exit:*/{'
)
code
.
put
(
'%s: '
%
new_error_label
)
code
.
putln
(
exc_var_init_zero
)
if
needs_success_cleanup
:
exc_lineno_cnames
=
tuple
([
code
.
funcstate
.
allocate_temp
(
PyrexTypes
.
c_int_type
,
manage_ref
=
False
)
for
_
in
range
(
2
)])
exc_filename_cname
=
code
.
funcstate
.
allocate_temp
(
PyrexTypes
.
CPtrType
(
PyrexTypes
.
c_const_type
(
PyrexTypes
.
c_char_type
)),
manage_ref
=
False
)
else
:
exc_lineno_cnames
=
exc_filename_cname
=
None
exc_vars
=
tuple
([
code
.
funcstate
.
allocate_temp
(
py_object_type
,
manage_ref
=
False
)
for
_
in
range
(
3
)])
code
.
put_label
(
new_error_label
)
code
.
putln
(
"%s = 0; %s = 0; %s = 0;"
%
exc_vars
)
self
.
put_error_catcher
(
code
,
temps_to_clean_up
,
include_lineno
=
needs_success_cleanup
)
code
,
temps_to_clean_up
,
exc_vars
,
exc_lineno_cnames
,
exc_filename_cname
)
finally_old_labels
=
code
.
all_new_labels
()
code
.
putln
(
'{'
)
...
...
@@ -6432,18 +6429,27 @@ class TryFinallyStatNode(StatNode):
code
.
putln
(
'}'
)
if
needs_success_cleanup
:
self
.
put_error_uncatcher
(
code
)
self
.
put_error_uncatcher
(
code
,
exc_vars
,
exc_lineno_cnames
,
exc_filename_cname
)
if
exc_lineno_cnames
:
for
cname
in
exc_lineno_cnames
:
code
.
funcstate
.
release_temp
(
cname
)
if
exc_filename_cname
:
code
.
funcstate
.
release_temp
(
exc_filename_cname
)
code
.
put_goto
(
old_error_label
)
for
new_label
,
old_label
in
zip
(
code
.
get_all_labels
(),
finally_old_labels
):
if
not
code
.
label_used
(
new_label
):
continue
code
.
put_label
(
new_label
)
self
.
put_error_cleaner
(
code
)
self
.
put_error_cleaner
(
code
,
exc_vars
)
code
.
put_goto
(
old_label
)
for
cname
in
exc_vars
:
code
.
funcstate
.
release_temp
(
cname
)
code
.
putln
(
'}'
)
code
.
set_all_labels
(
old_labels
)
return_label
=
code
.
return_label
for
i
,
(
new_label
,
old_label
)
in
enumerate
(
zip
(
new_labels
,
old_labels
)):
if
not
code
.
label_used
(
new_label
):
continue
...
...
@@ -6451,10 +6457,25 @@ class TryFinallyStatNode(StatNode):
continue
# handled above
code
.
put
(
'%s: '
%
new_label
)
if
exc_var_init_zero
:
code
.
putln
(
exc_var_init_zero
)
code
.
putln
(
'{'
)
ret_temp
=
None
if
old_label
==
return_label
and
not
self
.
finally_clause
.
is_terminator
:
# store away return value for later reuse
if
self
.
func_return_type
:
# pure safety check, func_return_type should
# always be set when return label is used
ret_temp
=
code
.
funcstate
.
allocate_temp
(
self
.
func_return_type
,
manage_ref
=
False
)
code
.
putln
(
"%s = %s;"
%
(
ret_temp
,
Naming
.
retval_cname
))
if
self
.
func_return_type
.
is_pyobject
:
code
.
putln
(
"%s = 0;"
%
Naming
.
retval_cname
)
fresh_finally_clause
().
generate_execution_code
(
code
)
if
ret_temp
:
code
.
putln
(
"%s = %s;"
%
(
Naming
.
retval_cname
,
ret_temp
))
if
self
.
func_return_type
.
is_pyobject
:
code
.
putln
(
"%s = 0;"
%
ret_temp
)
code
.
funcstate
.
release_temp
(
ret_temp
)
ret_temp
=
None
if
not
self
.
finally_clause
.
is_terminator
:
code
.
put_goto
(
old_label
)
code
.
putln
(
'}'
)
...
...
@@ -6468,7 +6489,8 @@ class TryFinallyStatNode(StatNode):
self
.
body
.
generate_function_definitions
(
env
,
code
)
self
.
finally_clause
.
generate_function_definitions
(
env
,
code
)
def
put_error_catcher
(
self
,
code
,
temps_to_clean_up
,
include_lineno
):
def
put_error_catcher
(
self
,
code
,
temps_to_clean_up
,
exc_vars
,
exc_lineno_cnames
,
exc_filename_cname
):
code
.
globalstate
.
use_utility_code
(
restore_exception_utility_code
)
if
self
.
is_try_finally_in_nogil
:
...
...
@@ -6477,33 +6499,43 @@ class TryFinallyStatNode(StatNode):
for
temp_name
,
type
in
temps_to_clean_up
:
code
.
put_xdecref_clear
(
temp_name
,
type
)
code
.
putln
(
"__Pyx_ErrFetch(&%s, &%s, &%s);"
%
Naming
.
exc_vars
)
if
include_lineno
:
code
.
putln
(
"%s = %s;"
%
(
Naming
.
exc_lineno_name
,
Naming
.
lineno_cname
))
code
.
putln
(
"__Pyx_ErrFetch(&%s, &%s, &%s);"
%
exc_vars
)
for
var
in
exc_vars
:
code
.
put_xgotref
(
var
)
if
exc_lineno_cnames
:
code
.
putln
(
"%s = %s; %s = %s; %s = %s;"
%
(
exc_lineno_cnames
[
0
],
Naming
.
lineno_cname
,
exc_lineno_cnames
[
1
],
Naming
.
clineno_cname
,
exc_filename_cname
,
Naming
.
filename_cname
))
if
self
.
is_try_finally_in_nogil
:
code
.
put_release_ensured_gil
()
def
put_error_uncatcher
(
self
,
code
):
def
put_error_uncatcher
(
self
,
code
,
exc_vars
,
exc_lineno_cnames
,
exc_filename_cname
):
code
.
globalstate
.
use_utility_code
(
restore_exception_utility_code
)
if
self
.
is_try_finally_in_nogil
:
code
.
put_ensure_gil
(
declare_gilstate
=
False
)
code
.
putln
(
"__Pyx_ErrRestore(%s, %s, %s);"
%
Naming
.
exc_vars
)
code
.
putln
(
"%s = %s;"
%
(
Naming
.
lineno_cname
,
Naming
.
exc_lineno_name
))
for
var
in
exc_vars
:
code
.
put_xgiveref
(
var
)
code
.
putln
(
"__Pyx_ErrRestore(%s, %s, %s);"
%
exc_vars
)
if
self
.
is_try_finally_in_nogil
:
code
.
put_release_ensured_gil
()
for
var
in
Naming
.
exc_vars
:
code
.
putln
(
"%s = 0;"
%
var
)
code
.
putln
(
"%s = 0; %s = 0; %s = 0;"
%
exc_vars
)
if
exc_lineno_cnames
:
code
.
putln
(
"%s = %s; %s = %s; %s = %s;"
%
(
Naming
.
lineno_cname
,
exc_lineno_cnames
[
0
],
Naming
.
clineno_cname
,
exc_lineno_cnames
[
1
],
Naming
.
filename_cname
,
exc_filename_cname
))
def
put_error_cleaner
(
self
,
code
):
def
put_error_cleaner
(
self
,
code
,
exc_vars
):
if
self
.
is_try_finally_in_nogil
:
code
.
put_ensure_gil
(
declare_gilstate
=
False
)
for
var
in
Naming
.
exc_vars
:
code
.
put
ln
(
"Py_XDECREF(%s);"
%
var
)
for
var
in
exc_vars
:
code
.
put
_xdecref_clear
(
var
,
py_object_type
)
if
self
.
is_try_finally_in_nogil
:
code
.
put_release_ensured_gil
()
...
...
tests/run/tryfinally.pyx
View file @
5df0ac1a
...
...
@@ -3,6 +3,12 @@
cimport
cython
try
:
next
except
NameError
:
def
next
(
it
):
return
it
.
next
()
def
finally_except
():
"""
>>> try:
...
...
@@ -161,3 +167,85 @@ def empty_try_in_except_raise(raise_in_finally):
if
raise_in_finally
:
raise
TypeError
(
'OLA'
)
raise
def
try_all_cases
(
x
):
"""
>>> try_all_cases(None)
2
>>> try_all_cases('break')
4
>>> try_all_cases('raise')
Traceback (most recent call last):
ValueError
>>> try_all_cases('return')
3
>>> try_all_cases('tryraise')
Traceback (most recent call last):
TypeError
>>> try_all_cases('trybreak')
4
"""
for
i
in
range
(
3
):
try
:
if
i
==
0
:
pass
elif
i
==
1
:
continue
elif
x
==
'trybreak'
:
break
elif
x
==
'tryraise'
:
raise
TypeError
()
else
:
return
2
finally
:
if
x
==
'raise'
:
raise
ValueError
()
elif
x
==
'break'
:
break
elif
x
==
'return'
:
return
3
return
4
def
finally_yield
(
x
):
"""
>>> g = finally_yield(None)
>>> next(g) # 1
1
>>> next(g) # 2
1
>>> next(g) # 3
Traceback (most recent call last):
StopIteration
>>> g = finally_yield('raise')
>>> next(g) # raise 1
1
>>> next(g) # raise 2
1
>>> next(g) # raise 3
Traceback (most recent call last):
TypeError
>>> g = finally_yield('break')
>>> next(g) # break 1
1
>>> next(g) # break 2
1
>>> next(g) # break 3
Traceback (most recent call last):
StopIteration
"""
for
i
in
range
(
3
):
try
:
if
i
==
0
:
continue
elif
x
==
'raise'
:
raise
TypeError
()
elif
x
==
'break'
:
break
else
:
return
finally
:
yield
1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment