[Python-checkins] python/dist/src/Objects setobject.c,1.52,1.53
rhettinger@users.sourceforge.net
rhettinger at users.sourceforge.net
Wed Aug 17 02:27:53 CEST 2005
Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10656
Modified Files:
setobject.c
Log Message:
Results of a line-by-line comparison back to dictobject.c.
* set_merge() cannot assume that the table doesn't resize during iteration.
* convert some unnecessary tests to asserts -- they were necessary in
dictobject.c because PyDict_Next() is a public function. The same is
not true for set_next().
* re-arrange the order of functions to more closely match the order
in dictobject.c. This makes it must easier to compare the two
and ought to simplify any issues of maintaining both.
Index: setobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/setobject.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- setobject.c 16 Aug 2005 10:44:15 -0000 1.52
+++ setobject.c 17 Aug 2005 00:27:42 -0000 1.53
@@ -492,8 +492,7 @@
assert (PyAnySet_Check(so));
i = *pos_ptr;
- if (i < 0)
- return 0;
+ assert(i >= 0);
table = so->table;
mask = so->mask;
while (i <= mask && (table[i].key == NULL || table[i].key == dummy))
@@ -501,18 +500,86 @@
*pos_ptr = i+1;
if (i > mask)
return 0;
- if (table[i].key)
- *entry_ptr = &table[i];
+ assert(table[i].key != NULL);
+ *entry_ptr = &table[i];
return 1;
}
+static void
+set_dealloc(PySetObject *so)
+{
+ register setentry *entry;
+ int fill = so->fill;
+ PyObject_GC_UnTrack(so);
+ Py_TRASHCAN_SAFE_BEGIN(so)
+ if (so->weakreflist != NULL)
+ PyObject_ClearWeakRefs((PyObject *) so);
+
+ for (entry = so->table; fill > 0; entry++) {
+ if (entry->key) {
+ --fill;
+ Py_DECREF(entry->key);
+ }
+ }
+ if (so->table != so->smalltable)
+ PyMem_DEL(so->table);
+ if (num_free_sets < MAXFREESETS && PyAnySet_CheckExact(so))
+ free_sets[num_free_sets++] = so;
+ else
+ so->ob_type->tp_free(so);
+ Py_TRASHCAN_SAFE_END(so)
+}
+
+static int
+set_tp_print(PySetObject *so, FILE *fp, int flags)
+{
+ setentry *entry;
+ int pos=0;
+ char *emit = ""; /* No separator emitted on first pass */
+ char *separator = ", ";
+
+ fprintf(fp, "%s([", so->ob_type->tp_name);
+ while (set_next(so, &pos, &entry)) {
+ fputs(emit, fp);
+ emit = separator;
+ if (PyObject_Print(entry->key, fp, 0) != 0)
+ return -1;
+ }
+ fputs("])", fp);
+ return 0;
+}
+
+static PyObject *
+set_repr(PySetObject *so)
+{
+ PyObject *keys, *result, *listrepr;
+
+ keys = PySequence_List((PyObject *)so);
+ if (keys == NULL)
+ return NULL;
+ listrepr = PyObject_Repr(keys);
+ Py_DECREF(keys);
+ if (listrepr == NULL)
+ return NULL;
+
+ result = PyString_FromFormat("%s(%s)", so->ob_type->tp_name,
+ PyString_AS_STRING(listrepr));
+ Py_DECREF(listrepr);
+ return result;
+}
+
+static int
+set_len(PyObject *so)
+{
+ return ((PySetObject *)so)->used;
+}
+
static int
set_merge(PySetObject *so, PyObject *otherset)
{
PySetObject *other;
register int i;
- register setentry *entry, *othertable;
- register int othermask;
+ register setentry *entry;
assert (PyAnySet_Check(so));
assert (PyAnySet_Check(otherset));
@@ -529,10 +596,8 @@
if (set_table_resize(so, (so->used + other->used)*2) != 0)
return -1;
}
- othermask = other->mask;
- othertable = other->table;
- for (i = 0; i <= othermask; i++) {
- entry = &othertable[i];
+ for (i = 0; i <= other->mask; i++) {
+ entry = &other->table[i];
if (entry->key != NULL &&
entry->key != dummy) {
Py_INCREF(entry->key);
@@ -569,9 +634,9 @@
static PyObject *
set_pop(PySetObject *so)
{
- PyObject *key;
- register setentry *entry;
register int i = 0;
+ register setentry *entry;
+ PyObject *key;
assert (PyAnySet_Check(so));
if (so->used == 0) {
@@ -612,9 +677,49 @@
PyDoc_STRVAR(pop_doc, "Remove and return an arbitrary set element.");
static int
-set_len(PyObject *so)
+set_traverse(PySetObject *so, visitproc visit, void *arg)
{
- return ((PySetObject *)so)->used;
+ int pos = 0;
+ setentry *entry;
+
+ while (set_next(so, &pos, &entry))
+ Py_VISIT(entry->key);
+ return 0;
+}
+
+static long
+frozenset_hash(PyObject *self)
+{
+ PySetObject *so = (PySetObject *)self;
+ long h, hash = 1927868237L;
+ setentry *entry;
+ int pos = 0;
+
+ if (so->hash != -1)
+ return so->hash;
+
+ hash *= PySet_GET_SIZE(self) + 1;
+ while (set_next(so, &pos, &entry)) {
+ /* Work to increase the bit dispersion for closely spaced hash
+ values. The is important because some use cases have many
+ combinations of a small number of elements with nearby
+ hashes so that many distinct combinations collapse to only
+ a handful of distinct hash values. */
+ h = entry->hash;
+ hash ^= (h ^ (h << 16) ^ 89869747L) * 3644798167u;
+ }
+ hash = hash * 69069L + 907133923L;
+ if (hash == -1)
+ hash = 590923713L;
+ so->hash = hash;
+ return hash;
+}
+
+static long
+set_nohash(PyObject *self)
+{
+ PyErr_SetString(PyExc_TypeError, "set objects are unhashable");
+ return -1;
}
/***** Set iterator type ***********************************************/
@@ -660,6 +765,7 @@
static PySequenceMethods setiter_as_sequence = {
(inquiry)setiter_len, /* sq_length */
+ 0, /* sq_concat */
};
static PyObject *setiter_iternext(setiterobject *si)
@@ -681,8 +787,7 @@
}
i = si->si_pos;
- if (i < 0)
- goto fail;
+ assert(i>=0);
entry = so->table;
mask = so->mask;
while (i <= mask && (entry[i].key == NULL || entry[i].key == dummy))
@@ -874,44 +979,6 @@
return make_new_set(type, NULL);
}
-static void
-set_dealloc(PySetObject *so)
-{
- register setentry *entry;
- int fill = so->fill;
-
- PyObject_GC_UnTrack(so);
- Py_TRASHCAN_SAFE_BEGIN(so)
- if (so->weakreflist != NULL)
- PyObject_ClearWeakRefs((PyObject *) so);
-
- for (entry = so->table; fill > 0; entry++) {
- if (entry->key) {
- --fill;
- Py_DECREF(entry->key);
- }
- }
- if (so->table != so->smalltable)
- PyMem_DEL(so->table);
-
- if (num_free_sets < MAXFREESETS && PyAnySet_CheckExact(so))
- free_sets[num_free_sets++] = so;
- else
- so->ob_type->tp_free(so);
- Py_TRASHCAN_SAFE_END(so)
-}
-
-static int
-set_traverse(PySetObject *so, visitproc visit, void *arg)
-{
- int pos = 0;
- setentry *entry;
-
- while (set_next(so, &pos, &entry))
- Py_VISIT(entry->key);
- return 0;
-}
-
/* set_swap_bodies() switches the contents of any two sets by moving their
internal data pointers and, if needed, copying the internal smalltables.
Semantically equivalent to:
@@ -1461,79 +1528,6 @@
return -1;
}
-static long
-frozenset_hash(PyObject *self)
-{
- PySetObject *so = (PySetObject *)self;
- long h, hash = 1927868237L;
- setentry *entry;
- int pos = 0;
-
- if (so->hash != -1)
- return so->hash;
-
- hash *= PySet_GET_SIZE(self) + 1;
- while (set_next(so, &pos, &entry)) {
- /* Work to increase the bit dispersion for closely spaced hash
- values. The is important because some use cases have many
- combinations of a small number of elements with nearby
- hashes so that many distinct combinations collapse to only
- a handful of distinct hash values. */
- h = entry->hash;
- hash ^= (h ^ (h << 16) ^ 89869747L) * 3644798167u;
- }
- hash = hash * 69069L + 907133923L;
- if (hash == -1)
- hash = 590923713L;
- so->hash = hash;
- return hash;
-}
-
-static long
-set_nohash(PyObject *self)
-{
- PyErr_SetString(PyExc_TypeError, "set objects are unhashable");
- return -1;
-}
-
-static PyObject *
-set_repr(PySetObject *so)
-{
- PyObject *keys, *result, *listrepr;
-
- keys = PySequence_List((PyObject *)so);
- if (keys == NULL)
- return NULL;
- listrepr = PyObject_Repr(keys);
- Py_DECREF(keys);
- if (listrepr == NULL)
- return NULL;
-
- result = PyString_FromFormat("%s(%s)", so->ob_type->tp_name,
- PyString_AS_STRING(listrepr));
- Py_DECREF(listrepr);
- return result;
-}
-
-static int
-set_tp_print(PySetObject *so, FILE *fp, int flags)
-{
- setentry *entry;
- int pos=0;
- char *emit = ""; /* No separator emitted on first pass */
- char *separator = ", ";
-
- fprintf(fp, "%s([", so->ob_type->tp_name);
- while (set_next(so, &pos, &entry)) {
- fputs(emit, fp);
- emit = separator;
- if (PyObject_Print(entry->key, fp, 0) != 0)
- return -1;
- }
- fputs("])", fp);
- return 0;
-}
-
static PyObject *
set_add(PySetObject *so, PyObject *key)
{
More information about the Python-checkins
mailing list