/*----- Conversions -------------------------------------------------------*/
-#define GETU_(n) \
- PyObject *getu##n(uint##n w) \
- { \
- if (w <= MASK##n) \
- return (PyInt_FromLong(w)); \
- else \
- return (PyLong_FromUnsignedLong(w)); \
- }
-DOUINTSZ(GETU_)
+PyObject *getulong(unsigned long w)
+{
+ if (w <= LONG_MAX)
+ return (PyInt_FromLong(w));
+ else
+ return (PyLong_FromUnsignedLong(w));
+}
PyObject *getbool(int b)
{
if (PyInt_Check(o)) {
i = PyInt_AS_LONG(o);
- if (i < 0) TYERR("must be nonnegative");
+ if (i < 0) VALERR("must be nonnegative");
*p = i;
} else {
if ((t = PyNumber_Long(o)) == 0) goto end;
uint##n *p = pp; \
\
if (!convulong(o, &u)) goto end; \
- if (u > MASK##n) TYERR("out of range"); \
+ if (u > MASK##n) VALERR("out of range"); \
*p = u; \
return (1); \
end: \
unsigned *p = pp;
if (!convulong(o, &u)) goto end;
- if (u > UINT_MAX) TYERR("out of range");
+ if (u > UINT_MAX) VALERR("out of range");
*p = u;
return (1);
end:
unsigned *p = pp;
if (!convulong(o, &u)) goto end;
- if (u > MPW_MAX) TYERR("out of range");
+ if (u > MPW_MAX) VALERR("out of range");
*p = u;
return (1);
end:
size_t *p = pp;
if (!convulong(o, &u)) goto end;
- if (u > ~(size_t)0) TYERR("out of range");
+ if (u > ~(size_t)0) VALERR("out of range");
*p = u;
return (1);
end: