streamline __Pyx_PyInt_AsSize_t() a bit

f913f4d3 · Stefan Behnel · e6b4ffbd · f913f4d3
Commit f913f4d3 authored Mar 09, 2013 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

Cython/Utility/TypeConversion.c Cython/Utility/TypeConversion.c +4 -5

No files found.
--- a/Cython/Utility/TypeConversion.c
+++ b/Cython/Utility/TypeConversion.c
@@ -280,11 +280,10 @@ static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t ival) {
 static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject* x) {
   unsigned PY_LONG_LONG val = __Pyx_PyInt_AsUnsignedLongLong(x);
-   if (unlikely(val == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred())) {
+   if (unlikely(val != (unsigned PY_LONG_LONG)(size_t)val)) {
-       return (size_t)-1;
+       if ((val != (unsigned PY_LONG_LONG)-1) || !PyErr_Occurred())
-   } else if (unlikely(val != (unsigned PY_LONG_LONG)(size_t)val)) {
+           PyErr_SetString(PyExc_OverflowError,
-       PyErr_SetString(PyExc_OverflowError,
+                           "value too large to convert to size_t");
-                       "value too large to convert to size_t");
       return (size_t)-1;
   }
   return (size_t)val;