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
7f8df733
Commit
7f8df733
authored
Aug 01, 2017
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reduce amount of casts in helper code
parent
edef846d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
Cython/Utility/ModuleSetupCode.c
Cython/Utility/ModuleSetupCode.c
+10
-10
No files found.
Cython/Utility/ModuleSetupCode.c
View file @
7f8df733
...
@@ -582,7 +582,7 @@ static CYTHON_INLINE int __Pyx_IsSubtype(PyTypeObject *a, PyTypeObject *b) {
...
@@ -582,7 +582,7 @@ static CYTHON_INLINE int __Pyx_IsSubtype(PyTypeObject *a, PyTypeObject *b) {
#if PY_MAJOR_VERSION == 2
#if PY_MAJOR_VERSION == 2
static
int
__Pyx_inner_PyErr_GivenExceptionMatches2
(
Py
TypeObject
*
err
,
PyTypeObject
*
exc_type1
,
PyType
Object
*
exc_type2
)
{
static
int
__Pyx_inner_PyErr_GivenExceptionMatches2
(
Py
Object
*
err
,
PyObject
*
exc_type1
,
Py
Object
*
exc_type2
)
{
// PyObject_IsSubclass() can recurse and therefore is not safe
// PyObject_IsSubclass() can recurse and therefore is not safe
PyObject
*
exception
,
*
value
,
*
tb
;
PyObject
*
exception
,
*
value
,
*
tb
;
int
res
;
int
res
;
...
@@ -590,18 +590,18 @@ static int __Pyx_inner_PyErr_GivenExceptionMatches2(PyTypeObject *err, PyTypeObj
...
@@ -590,18 +590,18 @@ static int __Pyx_inner_PyErr_GivenExceptionMatches2(PyTypeObject *err, PyTypeObj
__Pyx_PyThreadState_assign
__Pyx_PyThreadState_assign
__Pyx_ErrFetch
(
&
exception
,
&
value
,
&
tb
);
__Pyx_ErrFetch
(
&
exception
,
&
value
,
&
tb
);
res
=
exc_type1
?
PyObject_IsSubclass
(
(
PyObject
*
)
err
,
(
PyObject
*
)
exc_type1
)
:
0
;
res
=
exc_type1
?
PyObject_IsSubclass
(
err
,
exc_type1
)
:
0
;
// This function must not fail, so print the error here
// This function must not fail, so print the error here
if
(
unlikely
(
res
==
-
1
))
{
if
(
unlikely
(
res
==
-
1
))
{
PyErr_WriteUnraisable
(
(
PyObject
*
)
err
);
PyErr_WriteUnraisable
(
err
);
res
=
0
;
res
=
0
;
}
}
if
(
!
res
)
{
if
(
!
res
)
{
__Pyx_ErrRestore
(
exception
,
value
,
tb
);
__Pyx_ErrRestore
(
exception
,
value
,
tb
);
res
=
PyObject_IsSubclass
(
(
PyObject
*
)
err
,
(
PyObject
*
)
exc_type2
);
res
=
PyObject_IsSubclass
(
err
,
exc_type2
);
// This function must not fail, so print the error here
// This function must not fail, so print the error here
if
(
unlikely
(
res
==
-
1
))
{
if
(
unlikely
(
res
==
-
1
))
{
PyErr_WriteUnraisable
(
(
PyObject
*
)
err
);
PyErr_WriteUnraisable
(
err
);
res
=
0
;
res
=
0
;
}
}
}
}
...
@@ -610,10 +610,10 @@ static int __Pyx_inner_PyErr_GivenExceptionMatches2(PyTypeObject *err, PyTypeObj
...
@@ -610,10 +610,10 @@ static int __Pyx_inner_PyErr_GivenExceptionMatches2(PyTypeObject *err, PyTypeObj
return
res
;
return
res
;
}
}
#else
#else
static
CYTHON_INLINE
int
__Pyx_inner_PyErr_GivenExceptionMatches2
(
Py
TypeObject
*
err
,
PyTypeObject
*
exc_type1
,
PyTypeObject
*
exc_type2
)
{
static
CYTHON_INLINE
int
__Pyx_inner_PyErr_GivenExceptionMatches2
(
Py
Object
*
err
,
PyObject
*
exc_type1
,
PyObject
*
exc_type2
)
{
int
res
=
exc_type1
?
__Pyx_IsSubtype
(
err
,
exc_type1
)
:
0
;
int
res
=
exc_type1
?
__Pyx_IsSubtype
(
(
PyTypeObject
*
)
err
,
(
PyTypeObject
*
)
exc_type1
)
:
0
;
if
(
!
res
)
{
if
(
!
res
)
{
res
=
__Pyx_IsSubtype
(
err
,
exc_type2
);
res
=
__Pyx_IsSubtype
(
(
PyTypeObject
*
)
err
,
(
PyTypeObject
*
)
exc_type2
);
}
}
return
res
;
return
res
;
}
}
...
@@ -625,7 +625,7 @@ static CYTHON_INLINE int __Pyx_inner_PyErr_GivenExceptionMatches2(PyTypeObject *
...
@@ -625,7 +625,7 @@ static CYTHON_INLINE int __Pyx_inner_PyErr_GivenExceptionMatches2(PyTypeObject *
static
CYTHON_INLINE
int
__Pyx_PyErr_GivenExceptionMatches
(
PyObject
*
err
,
PyObject
*
exc_type
)
{
static
CYTHON_INLINE
int
__Pyx_PyErr_GivenExceptionMatches
(
PyObject
*
err
,
PyObject
*
exc_type
)
{
if
(
likely
(
err
==
exc_type
))
return
1
;
if
(
likely
(
err
==
exc_type
))
return
1
;
if
(
likely
(
PyExceptionClass_Check
(
err
)))
{
if
(
likely
(
PyExceptionClass_Check
(
err
)))
{
return
__Pyx_inner_PyErr_GivenExceptionMatches2
(
(
PyTypeObject
*
)
err
,
NULL
,
(
PyTypeObject
*
)
exc_type
);
return
__Pyx_inner_PyErr_GivenExceptionMatches2
(
err
,
NULL
,
exc_type
);
}
}
return
PyErr_GivenExceptionMatches
(
err
,
exc_type
);
return
PyErr_GivenExceptionMatches
(
err
,
exc_type
);
}
}
...
@@ -633,7 +633,7 @@ static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches(PyObject *err, PyObje
...
@@ -633,7 +633,7 @@ static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches(PyObject *err, PyObje
static
CYTHON_INLINE
int
__Pyx_PyErr_GivenExceptionMatches2
(
PyObject
*
err
,
PyObject
*
exc_type1
,
PyObject
*
exc_type2
)
{
static
CYTHON_INLINE
int
__Pyx_PyErr_GivenExceptionMatches2
(
PyObject
*
err
,
PyObject
*
exc_type1
,
PyObject
*
exc_type2
)
{
if
(
likely
(
err
==
exc_type1
||
err
==
exc_type2
))
return
1
;
if
(
likely
(
err
==
exc_type1
||
err
==
exc_type2
))
return
1
;
if
(
likely
(
PyExceptionClass_Check
(
err
)))
{
if
(
likely
(
PyExceptionClass_Check
(
err
)))
{
return
__Pyx_inner_PyErr_GivenExceptionMatches2
(
(
PyTypeObject
*
)
err
,
(
PyTypeObject
*
)
exc_type1
,
(
PyTypeObject
*
)
exc_type2
);
return
__Pyx_inner_PyErr_GivenExceptionMatches2
(
err
,
exc_type1
,
exc_type2
);
}
}
return
(
PyErr_GivenExceptionMatches
(
err
,
exc_type1
)
||
PyErr_GivenExceptionMatches
(
err
,
exc_type2
));
return
(
PyErr_GivenExceptionMatches
(
err
,
exc_type1
)
||
PyErr_GivenExceptionMatches
(
err
,
exc_type2
));
}
}
...
...
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