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
072b05eb
Commit
072b05eb
authored
Apr 02, 2008
by
Robert Bradshaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
C++ error handling
parent
14ec6047
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
8 deletions
+56
-8
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+39
-4
Cython/Compiler/Nodes.py
Cython/Compiler/Nodes.py
+13
-4
Cython/Compiler/Parsing.py
Cython/Compiler/Parsing.py
+4
-0
No files found.
Cython/Compiler/ExprNodes.py
View file @
072b05eb
...
@@ -889,7 +889,7 @@ class NameNode(AtomicExprNode):
...
@@ -889,7 +889,7 @@ class NameNode(AtomicExprNode):
def
check_const
(
self
):
def
check_const
(
self
):
entry
=
self
.
entry
entry
=
self
.
entry
if
not
(
entry
.
is_const
or
entry
.
is_cfunction
or
entry
.
is_builtin
):
if
entry
is
not
None
and
not
(
entry
.
is_const
or
entry
.
is_cfunction
or
entry
.
is_builtin
):
self
.
not_const
()
self
.
not_const
()
def
check_const_addr
(
self
):
def
check_const_addr
(
self
):
...
@@ -1604,6 +1604,10 @@ class SimpleCallNode(ExprNode):
...
@@ -1604,6 +1604,10 @@ class SimpleCallNode(ExprNode):
self
.
is_temp
=
1
self
.
is_temp
=
1
if
self
.
type
.
is_pyobject
:
if
self
.
type
.
is_pyobject
:
self
.
result_ctype
=
py_object_type
self
.
result_ctype
=
py_object_type
# C++ exception handler
if
func_type
.
exception_check
==
'+'
:
if
func_type
.
exception_value
is
None
:
env
.
use_utility_code
(
cpp_exception_utility_code
)
def
calculate_result_code
(
self
):
def
calculate_result_code
(
self
):
return
self
.
c_call_code
()
return
self
.
c_call_code
()
...
@@ -1678,12 +1682,18 @@ class SimpleCallNode(ExprNode):
...
@@ -1678,12 +1682,18 @@ class SimpleCallNode(ExprNode):
rhs
=
typecast
(
py_object_type
,
self
.
type
,
rhs
)
rhs
=
typecast
(
py_object_type
,
self
.
type
,
rhs
)
else
:
else
:
lhs
=
""
lhs
=
""
# <fsw> added for generating C++ try/catch block
if
func_type
.
exception_check
==
'+'
:
if
func_type
.
exception_check
==
'+'
:
if
func_type
.
exception_value
is
None
:
raise_py_exception
=
"__Pyx_CppExn2PyErr()"
elif
func_type
.
exception_value
.
type
.
is_pyobject
:
raise_py_exception
=
'PyErr_SetString(%s, "")'
%
func_type
.
exception_value
.
entry
.
cname
else
:
raise_py_exception
=
'%s(); if (!PyErr_Occurred()) PyErr_SetString(PyExc_RuntimeError , "Error converting c++ exception.")'
%
func_type
.
exception_value
.
entry
.
cname
code
.
putln
(
code
.
putln
(
"try {%s%s;} catch(...) {
CppExn2PyErr()
; %s}"
%
(
"try {%s%s;} catch(...) {
%s
; %s}"
%
(
lhs
,
lhs
,
rhs
,
rhs
,
raise_py_exception
,
code
.
error_goto
(
self
.
pos
)))
code
.
error_goto
(
self
.
pos
)))
return
return
code
.
putln
(
code
.
putln
(
...
@@ -4036,3 +4046,28 @@ bad:
...
@@ -4036,3 +4046,28 @@ bad:
"""
]
"""
]
#------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------
cpp_exception_utility_code
=
[
"""
static int __Pyx_CppExn2PyErr(); /*proto*/
"""
,
"""
void __Pyx_CppExn2PyErr() {
try {
if (PyErr_Occurred())
; // let the latest Python exn pass through and ignore the current one
else
throw;
} catch (const std::out_of_range& exn) {
// catch out_of_range explicitly so the proper Python exn may be raised
PyErr_SetString(PyExc_IndexError, exn.what());
} catch (const std::exception& exn) {
PyErr_SetString(PyExc_RuntimeError, exn.what());
}
catch (...)
{
PyErr_SetString(PyExc_RuntimeError, "Unknown exception");
}
}
"""
]
#------------------------------------------------------------------------------------
Cython/Compiler/Nodes.py
View file @
072b05eb
...
@@ -483,6 +483,15 @@ class CFuncDeclaratorNode(CDeclaratorNode):
...
@@ -483,6 +483,15 @@ class CFuncDeclaratorNode(CDeclaratorNode):
else
:
else
:
if
self
.
exception_value
:
if
self
.
exception_value
:
self
.
exception_value
.
analyse_const_expression
(
env
)
self
.
exception_value
.
analyse_const_expression
(
env
)
if
self
.
exception_check
==
'+'
:
exc_val_type
=
self
.
exception_value
.
type
if
not
exc_val_type
.
is_error
and
\
not
exc_val_type
.
is_pyobject
and
\
not
(
exc_val_type
.
is_cfunction
and
not
exc_val_type
.
return_type
.
is_pyobject
and
len
(
exc_val_type
.
args
)
==
0
):
error
(
self
.
exception_value
.
pos
,
"Exception value must be a Python exception or cdef function with no arguments."
)
exc_val
=
self
.
exception_value
else
:
exc_val
=
self
.
exception_value
.
result_code
exc_val
=
self
.
exception_value
.
result_code
if
not
return_type
.
assignable_from
(
self
.
exception_value
.
type
):
if
not
return_type
.
assignable_from
(
self
.
exception_value
.
type
):
error
(
self
.
exception_value
.
pos
,
error
(
self
.
exception_value
.
pos
,
...
...
Cython/Compiler/Parsing.py
View file @
072b05eb
...
@@ -1648,6 +1648,10 @@ def p_exception_value_clause(s):
...
@@ -1648,6 +1648,10 @@ def p_exception_value_clause(s):
elif
s
.
sy
==
'+'
:
elif
s
.
sy
==
'+'
:
exc_check
=
'+'
exc_check
=
'+'
s
.
next
()
s
.
next
()
if
s
.
sy
==
'IDENT'
:
name
=
s
.
systring
s
.
next
()
exc_val
=
p_name
(
s
,
name
)
else
:
else
:
if
s
.
sy
==
'?'
:
if
s
.
sy
==
'?'
:
exc_check
=
1
exc_check
=
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