mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 22:24:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available.

Browse source
This commit is contained in:
Christian Heimes 2007-12-19 02:37:44 +00:00
parent d586559c31
commit e93237dfcc
108 changed files with 916 additions and 908 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Objects/floatobject.c
View file

@ -42,8 +42,8 @@ fill_free_list(void)
p = &((PyFloatBlock *)p)->objects[0];
q = p + N_FLOATOBJECTS;
while (--q > p)
Py_Type(q) = (struct _typeobject *)(q-1);
Py_Type(q) = NULL;
Py_TYPE(q) = (struct _typeobject *)(q-1);
Py_TYPE(q) = NULL;
return p + N_FLOATOBJECTS - 1;
}
@ -103,7 +103,7 @@ PyFloat_FromDouble(double fval)
}
/* Inline PyObject_New */
op = free_list;
free_list = (PyFloatObject *)Py_Type(op);
free_list = (PyFloatObject *)Py_TYPE(op);
PyObject_INIT(op, &PyFloat_Type);
op->ob_fval = fval;
return (PyObject *) op;
@ -242,11 +242,11 @@ static void
float_dealloc(PyFloatObject *op)
{
if (PyFloat_CheckExact(op)) {
Py_Type(op) = (struct _typeobject *)free_list;
Py_TYPE(op) = (struct _typeobject *)free_list;
free_list = op;
}
else
Py_Type(op)->tp_free((PyObject *)op);
Py_TYPE(op)->tp_free((PyObject *)op);
}
double
@ -264,7 +264,7 @@ PyFloat_AsDouble(PyObject *op)
return -1;
}
if ((nb = Py_Type(op)->tp_as_number) == NULL || nb->nb_float == NULL) {
if ((nb = Py_TYPE(op)->tp_as_number) == NULL || nb->nb_float == NULL) {
PyErr_SetString(PyExc_TypeError, "a float is required");
return -1;
}
@ -1193,7 +1193,7 @@ float_getformat(PyTypeObject *v, PyObject* arg)
if (!PyString_Check(arg)) {
PyErr_Format(PyExc_TypeError,
"__getformat__() argument must be string, not %.500s",
Py_Type(arg)->tp_name);
Py_TYPE(arg)->tp_name);
return NULL;
}
s = PyString_AS_STRING(arg);
@ -1476,7 +1476,7 @@ PyFloat_Fini(void)
for (i = 0, p = &list->objects[0];
i < N_FLOATOBJECTS;
i++, p++) {
if (PyFloat_CheckExact(p) && Py_Refcnt(p) != 0)
if (PyFloat_CheckExact(p) && Py_REFCNT(p) != 0)
frem++;
}
next = list->next;
@ -1487,8 +1487,8 @@ PyFloat_Fini(void)
i < N_FLOATOBJECTS;
i++, p++) {
if (!PyFloat_CheckExact(p) ||
Py_Refcnt(p) == 0) {
Py_Type(p) = (struct _typeobject *)
Py_REFCNT(p) == 0) {
Py_TYPE(p) = (struct _typeobject *)
free_list;
free_list = p;
}
@ -1520,7 +1520,7 @@ PyFloat_Fini(void)
i < N_FLOATOBJECTS;
i++, p++) {
if (PyFloat_CheckExact(p) &&
Py_Refcnt(p) != 0) {
Py_REFCNT(p) != 0) {
char buf[100];
PyFloat_AsString(buf, p);
/* XXX(twouters) cast refcount to
@ -1529,7 +1529,7 @@ PyFloat_Fini(void)
*/
fprintf(stderr,
"# <float at %p, refcnt=%ld, val=%s>\n",
p, (long)Py_Refcnt(p), buf);
p, (long)Py_REFCNT(p), buf);
}
}
list = list->next;