Kaydet (Commit) 2aa2b3b4 authored tarafından Ezio Melotti's avatar Ezio Melotti

Clean up a few tabs that went in with PEP393.

üst 48a2f8fd
...@@ -141,7 +141,7 @@ PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name); ...@@ -141,7 +141,7 @@ PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name);
#endif #endif
/* Argument must be a char or an int in [-128, 127] or [0, 255]. */ /* Argument must be a char or an int in [-128, 127] or [0, 255]. */
#define Py_CHARMASK(c) ((unsigned char)((c) & 0xff)) #define Py_CHARMASK(c) ((unsigned char)((c) & 0xff))
#include "pyfpe.h" #include "pyfpe.h"
......
...@@ -27,12 +27,12 @@ PyAPI_DATA(PyTypeObject) PyFloat_Type; ...@@ -27,12 +27,12 @@ PyAPI_DATA(PyTypeObject) PyFloat_Type;
#define Py_RETURN_NAN return PyFloat_FromDouble(Py_NAN) #define Py_RETURN_NAN return PyFloat_FromDouble(Py_NAN)
#endif #endif
#define Py_RETURN_INF(sign) do \ #define Py_RETURN_INF(sign) do \
if (copysign(1., sign) == 1.) { \ if (copysign(1., sign) == 1.) { \
return PyFloat_FromDouble(Py_HUGE_VAL); \ return PyFloat_FromDouble(Py_HUGE_VAL); \
} else { \ } else { \
return PyFloat_FromDouble(-Py_HUGE_VAL); \ return PyFloat_FromDouble(-Py_HUGE_VAL); \
} while(0) } while(0)
PyAPI_FUNC(double) PyFloat_GetMax(void); PyAPI_FUNC(double) PyFloat_GetMax(void);
PyAPI_FUNC(double) PyFloat_GetMin(void); PyAPI_FUNC(double) PyFloat_GetMin(void);
...@@ -113,9 +113,9 @@ PyAPI_FUNC(int) PyFloat_ClearFreeList(void); ...@@ -113,9 +113,9 @@ PyAPI_FUNC(int) PyFloat_ClearFreeList(void);
/* Format the object based on the format_spec, as defined in PEP 3101 /* Format the object based on the format_spec, as defined in PEP 3101
(Advanced String Formatting). */ (Advanced String Formatting). */
PyAPI_FUNC(PyObject *) _PyFloat_FormatAdvanced(PyObject *obj, PyAPI_FUNC(PyObject *) _PyFloat_FormatAdvanced(PyObject *obj,
PyObject *format_spec, PyObject *format_spec,
Py_ssize_t start, Py_ssize_t start,
Py_ssize_t end); Py_ssize_t end);
#endif /* Py_LIMITED_API */ #endif /* Py_LIMITED_API */
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -12,7 +12,7 @@ typedef struct _longobject PyLongObject; /* Revealed in longintrepr.h */ ...@@ -12,7 +12,7 @@ typedef struct _longobject PyLongObject; /* Revealed in longintrepr.h */
PyAPI_DATA(PyTypeObject) PyLong_Type; PyAPI_DATA(PyTypeObject) PyLong_Type;
#define PyLong_Check(op) \ #define PyLong_Check(op) \
PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LONG_SUBCLASS) PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LONG_SUBCLASS)
#define PyLong_CheckExact(op) (Py_TYPE(op) == &PyLong_Type) #define PyLong_CheckExact(op) (Py_TYPE(op) == &PyLong_Type)
PyAPI_FUNC(PyObject *) PyLong_FromLong(long); PyAPI_FUNC(PyObject *) PyLong_FromLong(long);
...@@ -122,8 +122,8 @@ PyAPI_FUNC(PyObject *) _PyLong_DivmodNear(PyObject *, PyObject *); ...@@ -122,8 +122,8 @@ PyAPI_FUNC(PyObject *) _PyLong_DivmodNear(PyObject *, PyObject *);
enough memory to create the Python long. enough memory to create the Python long.
*/ */
PyAPI_FUNC(PyObject *) _PyLong_FromByteArray( PyAPI_FUNC(PyObject *) _PyLong_FromByteArray(
const unsigned char* bytes, size_t n, const unsigned char* bytes, size_t n,
int little_endian, int is_signed); int little_endian, int is_signed);
/* _PyLong_AsByteArray: Convert the least-significant 8*n bits of long /* _PyLong_AsByteArray: Convert the least-significant 8*n bits of long
v to a base-256 integer, stored in array bytes. Normally return 0, v to a base-256 integer, stored in array bytes. Normally return 0,
...@@ -145,8 +145,8 @@ PyAPI_FUNC(PyObject *) _PyLong_FromByteArray( ...@@ -145,8 +145,8 @@ PyAPI_FUNC(PyObject *) _PyLong_FromByteArray(
case, but bytes holds the least-signficant n bytes of the true value. case, but bytes holds the least-signficant n bytes of the true value.
*/ */
PyAPI_FUNC(int) _PyLong_AsByteArray(PyLongObject* v, PyAPI_FUNC(int) _PyLong_AsByteArray(PyLongObject* v,
unsigned char* bytes, size_t n, unsigned char* bytes, size_t n,
int little_endian, int is_signed); int little_endian, int is_signed);
/* _PyLong_Format: Convert the long to a string object with given base, /* _PyLong_Format: Convert the long to a string object with given base,
...@@ -156,9 +156,9 @@ PyAPI_FUNC(PyObject *) _PyLong_Format(PyObject *aa, int base); ...@@ -156,9 +156,9 @@ PyAPI_FUNC(PyObject *) _PyLong_Format(PyObject *aa, int base);
/* Format the object based on the format_spec, as defined in PEP 3101 /* Format the object based on the format_spec, as defined in PEP 3101
(Advanced String Formatting). */ (Advanced String Formatting). */
PyAPI_FUNC(PyObject *) _PyLong_FormatAdvanced(PyObject *obj, PyAPI_FUNC(PyObject *) _PyLong_FormatAdvanced(PyObject *obj,
PyObject *format_spec, PyObject *format_spec,
Py_ssize_t start, Py_ssize_t start,
Py_ssize_t end); Py_ssize_t end);
#endif /* Py_LIMITED_API */ #endif /* Py_LIMITED_API */
/* These aren't really part of the long object, but they're handy. The /* These aren't really part of the long object, but they're handy. The
......
This diff is collapsed.
...@@ -2345,21 +2345,21 @@ PyObject* PyType_FromSpec(PyType_Spec *spec) ...@@ -2345,21 +2345,21 @@ PyObject* PyType_FromSpec(PyType_Spec *spec)
return NULL; return NULL;
res->ht_name = PyUnicode_FromString(spec->name); res->ht_name = PyUnicode_FromString(spec->name);
if (!res->ht_name) if (!res->ht_name)
goto fail; goto fail;
res->ht_type.tp_name = _PyUnicode_AsString(res->ht_name); res->ht_type.tp_name = _PyUnicode_AsString(res->ht_name);
if (!res->ht_type.tp_name) if (!res->ht_type.tp_name)
goto fail; goto fail;
res->ht_type.tp_basicsize = spec->basicsize; res->ht_type.tp_basicsize = spec->basicsize;
res->ht_type.tp_itemsize = spec->itemsize; res->ht_type.tp_itemsize = spec->itemsize;
res->ht_type.tp_flags = spec->flags | Py_TPFLAGS_HEAPTYPE; res->ht_type.tp_flags = spec->flags | Py_TPFLAGS_HEAPTYPE;
for (slot = spec->slots; slot->slot; slot++) { for (slot = spec->slots; slot->slot; slot++) {
if (slot->slot >= sizeof(slotoffsets)/sizeof(slotoffsets[0])) { if (slot->slot >= sizeof(slotoffsets)/sizeof(slotoffsets[0])) {
PyErr_SetString(PyExc_RuntimeError, "invalid slot offset"); PyErr_SetString(PyExc_RuntimeError, "invalid slot offset");
goto fail; goto fail;
} }
*(void**)(res_start + slotoffsets[slot->slot]) = slot->pfunc; *(void**)(res_start + slotoffsets[slot->slot]) = slot->pfunc;
/* need to make a copy of the docstring slot, which usually /* need to make a copy of the docstring slot, which usually
points to a static string literal */ points to a static string literal */
...@@ -2367,7 +2367,7 @@ PyObject* PyType_FromSpec(PyType_Spec *spec) ...@@ -2367,7 +2367,7 @@ PyObject* PyType_FromSpec(PyType_Spec *spec)
ssize_t len = strlen(slot->pfunc)+1; ssize_t len = strlen(slot->pfunc)+1;
char *tp_doc = PyObject_MALLOC(len); char *tp_doc = PyObject_MALLOC(len);
if (tp_doc == NULL) if (tp_doc == NULL)
goto fail; goto fail;
memcpy(tp_doc, slot->pfunc, len); memcpy(tp_doc, slot->pfunc, len);
res->ht_type.tp_doc = tp_doc; res->ht_type.tp_doc = tp_doc;
} }
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment