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
Boxiang Sun
cython
Commits
1275882b
Commit
1275882b
authored
Aug 30, 2014
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reduce code duplication in inlined utility function
parent
93ab8309
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
12 deletions
+17
-12
Cython/Utility/TypeConversion.c
Cython/Utility/TypeConversion.c
+17
-12
No files found.
Cython/Utility/TypeConversion.c
View file @
1275882b
...
...
@@ -483,17 +483,17 @@ static CYTHON_INLINE PyObject* {{TO_PY_FUNCTION}}({{TYPE}} value) {
/////////////// CIntFromPyVerify ///////////////
// see CIntFromPy
#define __PYX_VERIFY_RETURN_INT(target_type, func_type, func_value) \
{ \
func_type value = func_value; \
if (sizeof(target_type) < sizeof(func_type)) { \
if (unlikely(value != (func_type) (target_type) value)) { \
func_type zero = 0; \
PyErr_SetString(PyExc_OverflowError, \
(is_unsigned && unlikely(value < zero)) ? \
"can't convert negative value to " #target_type : \
"value too large to convert to " #target_type); \
return (target_type) -1; \
if (is_unsigned && unlikely(value < zero)) \
goto raise_neg_overflow; \
else \
goto raise_overflow; \
} \
} \
return (target_type) value; \
...
...
@@ -527,9 +527,7 @@ static CYTHON_INLINE {{TYPE}} {{FROM_PY_FUNCTION}}(PyObject *x) {
}
else
{
long
val
=
PyInt_AS_LONG
(
x
);
if
(
is_unsigned
&&
unlikely
(
val
<
0
))
{
PyErr_SetString
(
PyExc_OverflowError
,
"can't convert negative value to {{TYPE}}"
);
return
({{
TYPE
}})
-
1
;
goto
raise_neg_overflow
;
}
return
({{
TYPE
}})
val
;
}
...
...
@@ -546,9 +544,7 @@ static CYTHON_INLINE {{TYPE}} {{FROM_PY_FUNCTION}}(PyObject *x) {
#endif
#endif
if
(
unlikely
(
Py_SIZE
(
x
)
<
0
))
{
PyErr_SetString
(
PyExc_OverflowError
,
"can't convert negative value to {{TYPE}}"
);
return
({{
TYPE
}})
-
1
;
goto
raise_neg_overflow
;
}
if
(
sizeof
({{
TYPE
}})
<=
sizeof
(
unsigned
long
))
{
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
unsigned
long
,
PyLong_AsUnsignedLong
(
x
))
...
...
@@ -606,5 +602,14 @@ static CYTHON_INLINE {{TYPE}} {{FROM_PY_FUNCTION}}(PyObject *x) {
Py_DECREF
(
tmp
);
return
val
;
}
}
raise_overflow:
PyErr_SetString
(
PyExc_OverflowError
,
"value too large to convert to {{TYPE}}"
);
return
({{
TYPE
}})
-
1
;
raise_neg_overflow:
PyErr_SetString
(
PyExc_OverflowError
,
"can't convert negative value to {{TYPE}}"
);
return
({{
TYPE
}})
-
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