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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gwenaël Samain
cython
Commits
82b78729
Commit
82b78729
authored
Jul 16, 2008
by
Robert Bradshaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Propagate exceptions by default for cdef functions.
There should be a way to disable this...
parent
3a3a60e7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
10 deletions
+32
-10
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+18
-7
Cython/Compiler/ModuleNode.py
Cython/Compiler/ModuleNode.py
+3
-0
Cython/Compiler/Naming.py
Cython/Compiler/Naming.py
+1
-0
Cython/Compiler/Nodes.py
Cython/Compiler/Nodes.py
+10
-3
No files found.
Cython/Compiler/ExprNodes.py
View file @
82b78729
...
@@ -1668,6 +1668,17 @@ class SimpleCallNode(CallNode):
...
@@ -1668,6 +1668,17 @@ class SimpleCallNode(CallNode):
if
func_type
.
is_ptr
:
if
func_type
.
is_ptr
:
func_type
=
func_type
.
base_type
func_type
=
func_type
.
base_type
return
func_type
return
func_type
def
exception_checks
(
self
):
func_type
=
self
.
function
.
type
exc_val
=
func_type
.
exception_value
exc_check
=
func_type
.
exception_check
if
exc_val
is
None
and
self
.
function
.
entry
.
visibility
!=
'extern'
:
return_type
=
func_type
.
return_type
if
not
return_type
.
is_struct_or_union
and
not
return_type
.
is_void
:
exc_val
=
return_type
.
cast_code
(
Naming
.
default_error
)
exc_check
=
1
return
exc_val
,
exc_check
def
analyse_c_function_call
(
self
,
env
):
def
analyse_c_function_call
(
self
,
env
):
func_type
=
self
.
function_type
()
func_type
=
self
.
function_type
()
...
@@ -1710,12 +1721,13 @@ class SimpleCallNode(CallNode):
...
@@ -1710,12 +1721,13 @@ class SimpleCallNode(CallNode):
"Python object cannot be passed as a varargs parameter"
)
"Python object cannot be passed as a varargs parameter"
)
# Calc result type and code fragment
# Calc result type and code fragment
self
.
type
=
func_type
.
return_type
self
.
type
=
func_type
.
return_type
if
self
.
type
.
is_pyobject
\
if
self
.
type
.
is_pyobject
:
or
func_type
.
exception_value
is
not
None
\
self
.
is_temp
=
1
or
func_type
.
exception_check
:
self
.
result_ctype
=
py_object_type
else
:
exc_val
,
exc_check
=
self
.
exception_checks
()
if
self
.
type
.
is_pyobject
or
exc_val
is
not
None
or
exc_check
:
self
.
is_temp
=
1
self
.
is_temp
=
1
if
self
.
type
.
is_pyobject
:
self
.
result_ctype
=
py_object_type
# C++ exception handler
# C++ exception handler
if
func_type
.
exception_check
==
'+'
:
if
func_type
.
exception_check
==
'+'
:
if
func_type
.
exception_value
is
None
:
if
func_type
.
exception_value
is
None
:
...
@@ -1780,8 +1792,7 @@ class SimpleCallNode(CallNode):
...
@@ -1780,8 +1792,7 @@ class SimpleCallNode(CallNode):
if
self
.
type
.
is_pyobject
:
if
self
.
type
.
is_pyobject
:
exc_checks
.
append
(
"!%s"
%
self
.
result_code
)
exc_checks
.
append
(
"!%s"
%
self
.
result_code
)
else
:
else
:
exc_val
=
func_type
.
exception_value
exc_val
,
exc_check
=
self
.
exception_checks
()
exc_check
=
func_type
.
exception_check
if
exc_val
is
not
None
:
if
exc_val
is
not
None
:
exc_checks
.
append
(
"%s == %s"
%
(
self
.
result_code
,
exc_val
))
exc_checks
.
append
(
"%s == %s"
%
(
self
.
result_code
,
exc_val
))
if
exc_check
:
if
exc_check
:
...
...
Cython/Compiler/ModuleNode.py
View file @
82b78729
...
@@ -487,6 +487,9 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
...
@@ -487,6 +487,9 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
code
.
putln
(
"#ifndef __cdecl"
)
code
.
putln
(
"#ifndef __cdecl"
)
code
.
putln
(
" #define __cdecl"
)
code
.
putln
(
" #define __cdecl"
)
code
.
putln
(
"#endif"
)
code
.
putln
(
"#endif"
)
code
.
putln
(
''
);
code
.
putln
(
'#define %s 0xB0000000B000B0BBLL'
%
Naming
.
default_error
);
code
.
putln
(
''
);
self
.
generate_extern_c_macro_definition
(
code
)
self
.
generate_extern_c_macro_definition
(
code
)
code
.
putln
(
"#include <math.h>"
)
code
.
putln
(
"#include <math.h>"
)
code
.
putln
(
"#define %s"
%
Naming
.
api_guard_prefix
+
self
.
api_name
(
env
))
code
.
putln
(
"#define %s"
%
Naming
.
api_guard_prefix
+
self
.
api_name
(
env
))
...
...
Cython/Compiler/Naming.py
View file @
82b78729
...
@@ -74,6 +74,7 @@ import_star = pyrex_prefix + "import_star"
...
@@ -74,6 +74,7 @@ import_star = pyrex_prefix + "import_star"
import_star_set
=
pyrex_prefix
+
"import_star_set"
import_star_set
=
pyrex_prefix
+
"import_star_set"
cur_scope_cname
=
pyrex_prefix
+
"cur_scope"
cur_scope_cname
=
pyrex_prefix
+
"cur_scope"
enc_scope_cname
=
pyrex_prefix
+
"enc_scope"
enc_scope_cname
=
pyrex_prefix
+
"enc_scope"
default_error
=
pyrex_prefix
+
"ERROR"
line_c_macro
=
"__LINE__"
line_c_macro
=
"__LINE__"
...
...
Cython/Compiler/Nodes.py
View file @
82b78729
...
@@ -1207,11 +1207,18 @@ class CFuncDefNode(FuncDefNode):
...
@@ -1207,11 +1207,18 @@ class CFuncDefNode(FuncDefNode):
if
self
.
return_type
.
is_pyobject
:
if
self
.
return_type
.
is_pyobject
:
return
"0"
return
"0"
else
:
else
:
#return None
if
self
.
entry
.
type
.
exception_value
is
not
None
:
return
self
.
entry
.
type
.
exception_value
return
self
.
entry
.
type
.
exception_value
elif
self
.
return_type
.
is_struct_or_union
or
self
.
return_type
.
is_void
:
return
None
else
:
return
self
.
return_type
.
cast_code
(
Naming
.
default_error
)
def
caller_will_check_exceptions
(
self
):
def
caller_will_check_exceptions
(
self
):
return
self
.
entry
.
type
.
exception_check
if
self
.
entry
.
type
.
exception_value
is
None
:
return
1
else
:
return
self
.
entry
.
type
.
exception_check
def
generate_optarg_wrapper_function
(
self
,
env
,
code
):
def
generate_optarg_wrapper_function
(
self
,
env
,
code
):
if
self
.
type
.
optional_arg_count
and
\
if
self
.
type
.
optional_arg_count
and
\
...
...
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