mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 09:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Use Py_Repr{Enter,Leave} to display recursive dictionaries in finite space.

Browse source 
(Jeremy will hardly recognize his patch :-)
This commit is contained in:
Guido van Rossum 1998-04-10 22:47:14 +00:00
parent 8661036cb8
commit 255443b720
1 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Objects/dictobject.c
View file

@ -301,8 +301,9 @@ dictresize(mp, minused)
insertdict(mp,ep->me_key,ep->me_hash,ep->me_value); insertdict(mp,ep->me_key,ep->me_hash,ep->me_value);
} }
for (i = 0, ep = oldtable; i < oldsize; i++, ep++) { for (i = 0, ep = oldtable; i < oldsize; i++, ep++) {
if (ep->me_value == NULL) if (ep->me_value == NULL) {
Py_XDECREF(ep->me_key); Py_XDECREF(ep->me_key);
}
} }
PyMem_XDEL(oldtable); PyMem_XDEL(oldtable);
@ -483,10 +484,12 @@ dict_dealloc(mp)
register int i; register int i;
register dictentry *ep; register dictentry *ep;
for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) { for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) {
if (ep->me_key != NULL) if (ep->me_key != NULL) {
Py_DECREF(ep->me_key); Py_DECREF(ep->me_key);
if (ep->me_value != NULL) }
if (ep->me_value != NULL) {
Py_DECREF(ep->me_value); Py_DECREF(ep->me_value);
}
} }
PyMem_XDEL(mp->ma_table); PyMem_XDEL(mp->ma_table);
PyMem_DEL(mp); PyMem_DEL(mp);
@ -501,20 +504,34 @@ dict_print(mp, fp, flags)
register int i; register int i;
register int any; register int any;
register dictentry *ep; register dictentry *ep;
i = Py_ReprEnter((PyObject*)mp);
if (i != 0) {
if (i < 0)
return i;
fprintf(fp, "{...}");
return 0;
}
fprintf(fp, "{"); fprintf(fp, "{");
any = 0; any = 0;
for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) { for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) {
if (ep->me_value != NULL) { if (ep->me_value != NULL) {
if (any++ > 0) if (any++ > 0)
fprintf(fp, ", "); fprintf(fp, ", ");
if (PyObject_Print((PyObject *)ep->me_key, fp, 0) != 0) if (PyObject_Print((PyObject *)ep->me_key, fp, 0)!=0) {
Py_ReprLeave((PyObject*)mp);
return -1; return -1;
}
fprintf(fp, ": "); fprintf(fp, ": ");
if (PyObject_Print(ep->me_value, fp, 0) != 0) if (PyObject_Print(ep->me_value, fp, 0) != 0) {
Py_ReprLeave((PyObject*)mp);
return -1; return -1;
}
} }
} }
fprintf(fp, "}"); fprintf(fp, "}");
Py_ReprLeave((PyObject*)mp);
return 0; return 0;
} }
@ -527,6 +544,14 @@ dict_repr(mp)
register int i; register int i;
register int any; register int any;
register dictentry *ep; register dictentry *ep;
i = Py_ReprEnter((PyObject*)mp);
if (i != 0) {
if (i > 0)
return PyString_FromString("{...}");
return NULL;
}
v = PyString_FromString("{"); v = PyString_FromString("{");
sepa = PyString_FromString(", "); sepa = PyString_FromString(", ");
colon = PyString_FromString(": "); colon = PyString_FromString(": ");
@ -541,6 +566,7 @@ dict_repr(mp)
} }
} }
PyString_ConcatAndDel(&v, PyString_FromString("}")); PyString_ConcatAndDel(&v, PyString_FromString("}"));
Py_ReprLeave((PyObject*)mp);
Py_XDECREF(sepa); Py_XDECREF(sepa);
Py_XDECREF(colon); Py_XDECREF(colon);
return v; return v;