mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-24 18:34:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
ea9dcdc062
cpython/Objects/setobject.c

1829 lines
43 KiB
C
Raw Normal View History

Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
/* Set object implementation using a hash table
Functions adapted from dictobject.c
*/
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
#include "Python.h"
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
/* This must be >= 1. */
#define PERTURB_SHIFT 5
/* Object used as dummy key to fill deleted entries */
static PyObject *dummy; /* Initialized by first call to make_new_set() */
#define EMPTY_TO_MINSIZE(so) do { \
memset((so)->smalltable, 0, sizeof((so)->smalltable)); \
(so)->used = (so)->fill = 0; \
(so)->table = (so)->smalltable; \
(so)->mask = PySet_MINSIZE - 1; \
} while(0)
/*
The basic lookup function used by all operations.
This is based on Algorithm D from Knuth Vol. 3, Sec. 6.4.
Open addressing is preferred over chaining since the link overhead for
chaining would be substantial (100% with typical malloc overhead).
The initial probe index is computed as hash mod the table size. Subsequent
probe indices are computed as explained earlier.
All arithmetic on hash should ignore overflow.
This function must never return NULL; failures are indicated by returning
a setentry* for which the value field is NULL. Exceptions are never
reported by this function, and outstanding exceptions are maintained.
*/
static setentry *
set_lookkey(PySetObject *so, PyObject *key, register long hash)
{
register int i;
register unsigned int perturb;
register setentry *freeslot;
register unsigned int mask = so->mask;
Improve variable names.
2005-07-31 23:36:06 +08:00
setentry *entry0 = so->table;
register setentry *entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
register int restore_error;
register int checked_error;
register int cmp;
PyObject *err_type, *err_value, *err_tb;
PyObject *startkey;
i = hash & mask;
Improve variable names.
2005-07-31 23:36:06 +08:00
entry = &entry0[i];
if (entry->key == NULL || entry->key == key)
return entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
restore_error = checked_error = 0;
Improve variable names.
2005-07-31 23:36:06 +08:00
if (entry->key == dummy)
freeslot = entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
else {
Improve variable names.
2005-07-31 23:36:06 +08:00
if (entry->hash == hash) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
/* error can't have been checked yet */
checked_error = 1;
if (PyErr_Occurred()) {
restore_error = 1;
PyErr_Fetch(&err_type, &err_value, &err_tb);
}
Improve variable names.
2005-07-31 23:36:06 +08:00
startkey = entry->key;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
if (cmp < 0)
PyErr_Clear();
Improve variable names.
2005-07-31 23:36:06 +08:00
if (entry0 == so->table && entry->key == startkey) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (cmp > 0)
goto Done;
}
else {
/* The compare did major nasty stuff to the
* set: start over.
*/
Improve variable names.
2005-07-31 23:36:06 +08:00
entry = set_lookkey(so, key, hash);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
goto Done;
}
}
freeslot = NULL;
}
/* In the loop, key == dummy is by far (factor of 100s) the
least likely outcome, so test for that last. */
for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
i = (i << 2) + i + perturb + 1;
Improve variable names.
2005-07-31 23:36:06 +08:00
entry = &entry0[i & mask];
if (entry->key == NULL) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (freeslot != NULL)
Improve variable names.
2005-07-31 23:36:06 +08:00
entry = freeslot;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
break;
}
Improve variable names.
2005-07-31 23:36:06 +08:00
if (entry->key == key)
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
break;
Improve variable names.
2005-07-31 23:36:06 +08:00
if (entry->hash == hash && entry->key != dummy) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (!checked_error) {
checked_error = 1;
if (PyErr_Occurred()) {
restore_error = 1;
PyErr_Fetch(&err_type, &err_value,
&err_tb);
}
}
Improve variable names.
2005-07-31 23:36:06 +08:00
startkey = entry->key;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
if (cmp < 0)
PyErr_Clear();
Improve variable names.
2005-07-31 23:36:06 +08:00
if (entry0 == so->table && entry->key == startkey) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (cmp > 0)
break;
}
else {
/* The compare did major nasty stuff to the
* set: start over.
*/
Improve variable names.
2005-07-31 23:36:06 +08:00
entry = set_lookkey(so, key, hash);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
break;
}
}
Improve variable names.
2005-07-31 23:36:06 +08:00
else if (entry->key == dummy && freeslot == NULL)
freeslot = entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
}
Done:
if (restore_error)
PyErr_Restore(err_type, err_value, err_tb);
Improve variable names.
2005-07-31 23:36:06 +08:00
return entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
}
/*
* Hacked up version of set_lookkey which can assume keys are always strings;
* this assumption allows testing for errors during PyObject_Compare() to
* be dropped; string-string comparisons never raise exceptions. This also
* means we don't need to go through PyObject_Compare(); we can always use
* _PyString_Eq directly.
*
* This is valuable because the general-case error handling in set_lookkey() is
* expensive, and sets with pure-string keys may be very common.
*/
static setentry *
set_lookkey_string(PySetObject *so, PyObject *key, register long hash)
{
register int i;
register unsigned int perturb;
register setentry *freeslot;
register unsigned int mask = so->mask;
Improve variable names.
2005-07-31 23:36:06 +08:00
setentry *entry0 = so->table;
register setentry *entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
/* Make sure this function doesn't have to handle non-string keys,
including subclasses of str; e.g., one reason to subclass
strings is to override __eq__, and for speed we don't cater to
that here. */
if (!PyString_CheckExact(key)) {
so->lookup = set_lookkey;
return set_lookkey(so, key, hash);
}
i = hash & mask;
Improve variable names.
2005-07-31 23:36:06 +08:00
entry = &entry0[i];
if (entry->key == NULL || entry->key == key)
return entry;
if (entry->key == dummy)
freeslot = entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
else {
Improve variable names.
2005-07-31 23:36:06 +08:00
if (entry->hash == hash && _PyString_Eq(entry->key, key))
return entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
freeslot = NULL;
}
/* In the loop, key == dummy is by far (factor of 100s) the
least likely outcome, so test for that last. */
for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
i = (i << 2) + i + perturb + 1;
Improve variable names.
2005-07-31 23:36:06 +08:00
entry = &entry0[i & mask];
if (entry->key == NULL)
return freeslot == NULL ? entry : freeslot;
if (entry->key == key
|| (entry->hash == hash
&& entry->key != dummy
&& _PyString_Eq(entry->key, key)))
return entry;
if (entry->key == dummy && freeslot == NULL)
freeslot = entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
}
}
/*
Improve variable names.
2005-07-31 23:36:06 +08:00
Internal routine to insert a new key into the table.
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Used both by the internal resize routine and by the public insert routine.
Eats a reference to key.
*/
static void
set_insert_key(register PySetObject *so, PyObject *key, long hash)
{
Improve variable names.
2005-07-31 23:36:06 +08:00
register setentry *entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
typedef setentry *(*lookupfunc)(PySetObject *, PyObject *, long);
assert(so->lookup != NULL);
Improve variable names.
2005-07-31 23:36:06 +08:00
entry = so->lookup(so, key, hash);
if (entry->key == NULL) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
/* UNUSED */
so->fill++;
Improve variable names.
2005-07-31 23:36:06 +08:00
entry->key = key;
entry->hash = hash;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
so->used++;
Improve variable names.
2005-07-31 23:36:06 +08:00
} else if (entry->key == dummy) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
/* DUMMY */
Improve variable names.
2005-07-31 23:36:06 +08:00
entry->key = key;
entry->hash = hash;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
so->used++;
Py_DECREF(dummy);
} else {
/* ACTIVE */
Py_DECREF(key);
}
}
/*
Restructure the table by allocating a new table and reinserting all
Improve variable names.
2005-07-31 23:36:06 +08:00
keys again. When entries have been deleted, the new table may
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
actually be smaller than the old one.
*/
static int
set_table_resize(PySetObject *so, int minused)
{
int newsize;
Improve variable names.
2005-07-31 23:36:06 +08:00
setentry *oldtable, *newtable, *entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
int i;
int is_oldtable_malloced;
setentry small_copy[PySet_MINSIZE];
assert(minused >= 0);
/* Find the smallest table size > minused. */
for (newsize = PySet_MINSIZE;
newsize <= minused && newsize > 0;
newsize <<= 1)
;
if (newsize <= 0) {
PyErr_NoMemory();
return -1;
}
/* Get space for a new table. */
oldtable = so->table;
assert(oldtable != NULL);
is_oldtable_malloced = oldtable != so->smalltable;
if (newsize == PySet_MINSIZE) {
/* A large table is shrinking, or we can't get any smaller. */
newtable = so->smalltable;
if (newtable == oldtable) {
if (so->fill == so->used) {
/* No dummies, so no point doing anything. */
return 0;
}
/* We're not going to resize it, but rebuild the
table anyway to purge old dummy entries.
Subtle: This is *necessary* if fill==size,
as set_lookkey needs at least one virgin slot to
terminate failing searches. If fill < size, it's
merely desirable, as dummies slow searches. */
assert(so->fill > so->used);
memcpy(small_copy, oldtable, sizeof(small_copy));
oldtable = small_copy;
}
}
else {
newtable = PyMem_NEW(setentry, newsize);
if (newtable == NULL) {
PyErr_NoMemory();
return -1;
}
}
/* Make the set empty, using the new table. */
assert(newtable != oldtable);
so->table = newtable;
so->mask = newsize - 1;
memset(newtable, 0, sizeof(setentry) * newsize);
so->used = 0;
i = so->fill;
so->fill = 0;
/* Copy the data over; this is refcount-neutral for active entries;
dummy entries aren't copied over, of course */
Improve variable names.
2005-07-31 23:36:06 +08:00
for (entry = oldtable; i > 0; entry++) {
if (entry->key == NULL) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
/* UNUSED */
;
Improve variable names.
2005-07-31 23:36:06 +08:00
} else if (entry->key == dummy) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
/* DUMMY */
--i;
Improve variable names.
2005-07-31 23:36:06 +08:00
assert(entry->key == dummy);
Py_DECREF(entry->key);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
} else {
/* ACTIVE */
--i;
Improve variable names.
2005-07-31 23:36:06 +08:00
set_insert_key(so, entry->key, entry->hash);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
}
}
if (is_oldtable_malloced)
PyMem_DEL(oldtable);
return 0;
}
/* CAUTION: set_add_internal() must guarantee that it won't resize the table */
static int
set_add_internal(register PySetObject *so, PyObject *key)
{
register long hash;
register int n_used;
if (PyString_CheckExact(key)) {
hash = ((PyStringObject *)key)->ob_shash;
if (hash == -1)
hash = PyObject_Hash(key);
} else {
hash = PyObject_Hash(key);
if (hash == -1)
return -1;
}
assert(so->fill <= so->mask); /* at least one empty slot */
n_used = so->used;
Py_INCREF(key);
set_insert_key(so, key, hash);
if (!(so->used > n_used && so->fill*3 >= (so->mask+1)*2))
return 0;
return set_table_resize(so, so->used*(so->used>50000 ? 2 : 4));
}
#define DISCARD_NOTFOUND 0
#define DISCARD_FOUND 1
static int
set_discard_internal(PySetObject *so, PyObject *key)
{
register long hash;
Improve variable names.
2005-07-31 23:36:06 +08:00
register setentry *entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
PyObject *old_key;
assert (PyAnySet_Check(so));
if (!PyString_CheckExact(key) ||
(hash = ((PyStringObject *) key)->ob_shash) == -1) {
hash = PyObject_Hash(key);
if (hash == -1)
return -1;
}
Improve variable names.
2005-07-31 23:36:06 +08:00
entry = (so->lookup)(so, key, hash);
if (entry->key == NULL || entry->key == dummy)
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
return DISCARD_NOTFOUND;
Improve variable names.
2005-07-31 23:36:06 +08:00
old_key = entry->key;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Py_INCREF(dummy);
Improve variable names.
2005-07-31 23:36:06 +08:00
entry->key = dummy;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
so->used--;
Py_DECREF(old_key);
return DISCARD_FOUND;
}
static void
set_clear_internal(PySetObject *so)
{
Improve variable names.
2005-07-31 23:36:06 +08:00
setentry *entry, *table;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
int table_is_malloced;
int fill;
setentry small_copy[PySet_MINSIZE];
#ifdef Py_DEBUG
int i, n;
#endif
assert (PyAnySet_Check(so));
#ifdef Py_DEBUG
n = so->mask + 1;
i = 0;
#endif
table = so->table;
assert(table != NULL);
table_is_malloced = table != so->smalltable;
/* This is delicate. During the process of clearing the set,
* decrefs can cause the set to mutate. To avoid fatal confusion
* (voice of experience), we have to make the set empty before
* clearing the slots, and never refer to anything via mp->ref while
* clearing.
*/
fill = so->fill;
if (table_is_malloced)
EMPTY_TO_MINSIZE(so);
else if (fill > 0) {
/* It's a small table with something that needs to be cleared.
* Afraid the only safe way is to copy the set entries into
* another small table first.
*/
memcpy(small_copy, table, sizeof(small_copy));
table = small_copy;
EMPTY_TO_MINSIZE(so);
}
/* else it's a small table that's already empty */
/* Now we can finally clear things. If C had refcounts, we could
* assert that the refcount on table is 1 now, i.e. that this function
* has unique access to it, so decref side-effects can't alter it.
*/
Improve variable names.
2005-07-31 23:36:06 +08:00
for (entry = table; fill > 0; ++entry) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
#ifdef Py_DEBUG
assert(i < n);
++i;
#endif
Improve variable names.
2005-07-31 23:36:06 +08:00
if (entry->key) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
--fill;
Improve variable names.
2005-07-31 23:36:06 +08:00
Py_DECREF(entry->key);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
}
#ifdef Py_DEBUG
else
Improve variable names.
2005-07-31 23:36:06 +08:00
assert(entry->key == NULL || entry->key == dummy);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
#endif
}
if (table_is_malloced)
PyMem_DEL(table);
}
/*
* Iterate over a set table. Use like so:
*
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
* int pos;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
* PyObject *key;
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
* pos = 0; # important! pos should not otherwise be changed by you
* while (set_next_internal(yourset, &pos, &key)) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
* Refer to borrowed reference in key.
* }
*
* CAUTION: In general, it isn't safe to use set_next_internal in a loop that
* mutates the table.
*/
static int
Improve variable names.
2005-07-31 23:36:06 +08:00
set_next_internal(PySetObject *so, int *pos, PyObject **key)
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
{
register int i, mask;
Improve variable names.
2005-07-31 23:36:06 +08:00
register setentry *entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
assert (PyAnySet_Check(so));
Improve variable names.
2005-07-31 23:36:06 +08:00
i = *pos;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (i < 0)
return 0;
Improve variable names.
2005-07-31 23:36:06 +08:00
entry = so->table;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
mask = so->mask;
Improve variable names.
2005-07-31 23:36:06 +08:00
while (i <= mask && (entry[i].key == NULL || entry[i].key == dummy))
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
i++;
Improve variable names.
2005-07-31 23:36:06 +08:00
*pos = i+1;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (i > mask)
return 0;
Improve variable names.
2005-07-31 23:36:06 +08:00
if (key)
*key = entry[i].key;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
return 1;
}
static int
Improve variable names.
2005-07-31 23:36:06 +08:00
set_merge_internal(PySetObject *so, PyObject *otherset)
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
{
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
PySetObject *other;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
register int i;
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
register setentry *entry, *othertable;
register int othermask;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
assert (PyAnySet_Check(so));
Improve variable names.
2005-07-31 23:36:06 +08:00
assert (PyAnySet_Check(otherset));
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Improve variable names.
2005-07-31 23:36:06 +08:00
other = (PySetObject*)otherset;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (other == so || other->used == 0)
/* a.update(a) or a.update({}); nothing to do */
return 0;
/* Do one big resize at the start, rather than
Improve variable names.
2005-07-31 23:36:06 +08:00
* incrementally resizing as we insert new keys. Expect
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
* that there will be no (or few) overlapping keys.
*/
if ((so->fill + other->used)*3 >= (so->mask+1)*2) {
if (set_table_resize(so, (so->used + other->used)*2) != 0)
return -1;
}
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
othermask = other->mask;
othertable = other->table;
for (i = 0; i <= othermask; i++) {
entry = &othertable[i];
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (entry->key != NULL &&
entry->key != dummy) {
Py_INCREF(entry->key);
set_insert_key(so, entry->key, entry->hash);
}
}
return 0;
}
static int
set_contains_internal(PySetObject *so, PyObject *key)
{
long hash;
if (!PyString_CheckExact(key) ||
(hash = ((PyStringObject *) key)->ob_shash) == -1) {
hash = PyObject_Hash(key);
if (hash == -1)
return -1;
}
key = (so->lookup)(so, key, hash)->key;
return key != NULL && key != dummy;
}
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
/***** Set iterator types **********************************************/
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
static PyTypeObject PySetIter_Type; /* Forward */
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
typedef struct {
PyObject_HEAD
PySetObject *si_set; /* Set to NULL when iterator is exhausted */
int si_used;
int si_pos;
long len;
} setiterobject;
static PyObject *
set_iter(PySetObject *so)
{
setiterobject *si = PyObject_New(setiterobject, &PySetIter_Type);
if (si == NULL)
return NULL;
Py_INCREF(so);
si->si_set = so;
si->si_used = so->used;
si->si_pos = 0;
si->len = so->used;
return (PyObject *)si;
}
static void
setiter_dealloc(setiterobject *si)
{
Py_XDECREF(si->si_set);
PyObject_Del(si);
}
static int
setiter_len(setiterobject *si)
{
if (si->si_set != NULL && si->si_used == si->si_set->used)
return si->len;
return 0;
}
static PySequenceMethods setiter_as_sequence = {
(inquiry)setiter_len, /* sq_length */
0, /* sq_concat */
};
Improve variable names.
2005-07-31 23:36:06 +08:00
static PyObject *setiter_iternext(setiterobject *si)
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
{
PyObject *key;
register int i, mask;
Improve variable names.
2005-07-31 23:36:06 +08:00
register setentry *entry;
PySetObject *so = si->si_set;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Improve variable names.
2005-07-31 23:36:06 +08:00
if (so == NULL)
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
return NULL;
Improve variable names.
2005-07-31 23:36:06 +08:00
assert (PyAnySet_Check(so));
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Improve variable names.
2005-07-31 23:36:06 +08:00
if (si->si_used != so->used) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
PyErr_SetString(PyExc_RuntimeError,
"Set changed size during iteration");
si->si_used = -1; /* Make this state sticky */
return NULL;
}
i = si->si_pos;
if (i < 0)
goto fail;
Improve variable names.
2005-07-31 23:36:06 +08:00
entry = so->table;
mask = so->mask;
while (i <= mask && (entry[i].key == NULL || entry[i].key == dummy))
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
i++;
si->si_pos = i+1;
if (i > mask)
goto fail;
si->len--;
Improve variable names.
2005-07-31 23:36:06 +08:00
key = entry[i].key;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Py_INCREF(key);
return key;
fail:
Improve variable names.
2005-07-31 23:36:06 +08:00
Py_DECREF(so);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
si->si_set = NULL;
return NULL;
}
Fix build on gcc: PySetIter_Type should be static in definition part also.
2005-08-01 13:26:41 +08:00
static PyTypeObject PySetIter_Type = {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
PyObject_HEAD_INIT(&PyType_Type)
0, /* ob_size */
Improve variable names.
2005-07-31 23:36:06 +08:00
"setiterator", /* tp_name */
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
sizeof(setiterobject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
(destructor)setiter_dealloc, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_compare */
0, /* tp_repr */
0, /* tp_as_number */
&setiter_as_sequence, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
PyObject_GenericGetAttr, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */
0, /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
PyObject_SelfIter, /* tp_iter */
Improve variable names.
2005-07-31 23:36:06 +08:00
(iternextfunc)setiter_iternext, /* tp_iternext */
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
};
/***** Derived functions (table accesses only done with above primitives *****/
Make sets and deques weak referencable.
2004-05-30 15:26:47 +08:00
#include "structmember.h"
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
/* set object implementation
written and maintained by Raymond D. Hettinger <python@rcn.com>
derived from sets.py written by Greg V. Wilson, Alex Martelli,
Guido van Rossum, Raymond Hettinger, and Tim Peters.
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Copyright (c) 2003-5 Python Software Foundation.
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
All rights reserved.
*/
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
static int
set_len(PyObject *so)
{
return ((PySetObject *)so)->used;
}
static int
set_update_internal(PySetObject *so, PyObject *other)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
{
Improve variable names.
2005-07-31 23:36:06 +08:00
PyObject *key, *it;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
if (PyAnySet_Check(other))
return set_merge_internal(so, other);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (PyDict_Check(other)) {
Improve variable names.
2005-07-31 23:36:06 +08:00
PyObject *key, *value;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
int pos = 0;
Improve variable names.
2005-07-31 23:36:06 +08:00
while (PyDict_Next(other, &pos, &key, &value)) {
if (set_add_internal(so, key) == -1)
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
return -1;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
}
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
return 0;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
}
Factor out more duplicate code.
2003-11-25 06:18:49 +08:00
it = PyObject_GetIter(other);
if (it == NULL)
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
return -1;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Improve variable names.
2005-07-31 23:36:06 +08:00
while ((key = PyIter_Next(it)) != NULL) {
if (set_add_internal(so, key) == -1) {
Factor out more duplicate code.
2003-11-25 06:18:49 +08:00
Py_DECREF(it);
Improve variable names.
2005-07-31 23:36:06 +08:00
Py_DECREF(key);
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
return -1;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
Improve variable names.
2005-07-31 23:36:06 +08:00
Py_DECREF(key);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
Factor out more duplicate code.
2003-11-25 06:18:49 +08:00
Py_DECREF(it);
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
if (PyErr_Occurred())
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
return -1;
return 0;
}
static PyObject *
set_update(PySetObject *so, PyObject *other)
{
if (set_update_internal(so, other) == -1)
Factor out more duplicate code.
2003-11-25 06:18:49 +08:00
return NULL;
Py_RETURN_NONE;
}
PyDoc_STRVAR(update_doc,
"Update a set with the union of itself and another.");
static PyObject *
make_new_set(PyTypeObject *type, PyObject *iterable)
{
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
register PySetObject *so = NULL;
Factor out more duplicate code.
2003-11-25 06:18:49 +08:00
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (dummy == NULL) { /* Auto-initialize dummy */
dummy = PyString_FromString("<dummy key>");
if (dummy == NULL)
return NULL;
}
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
/* create PySetObject structure */
so = (PySetObject *)type->tp_alloc(type, 0);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (so == NULL)
Factor out more duplicate code.
2003-11-25 06:18:49 +08:00
return NULL;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
EMPTY_TO_MINSIZE(so);
so->lookup = set_lookkey_string;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
so->hash = -1;
Make sets and deques weak referencable.
2004-05-30 15:26:47 +08:00
so->weakreflist = NULL;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Factor out more duplicate code.
2003-11-25 06:18:49 +08:00
if (iterable != NULL) {
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
if (set_update_internal(so, iterable) == -1) {
Factor out more duplicate code.
2003-11-25 06:18:49 +08:00
Py_DECREF(so);
return NULL;
}
}
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
return (PyObject *)so;
}
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
/* The empty frozenset is a singleton */
static PyObject *emptyfrozenset = NULL;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
static PyObject *
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
frozenset_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
{
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
PyObject *iterable = NULL, *result;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
if (!PyArg_UnpackTuple(args, type->tp_name, 0, 1, &iterable))
return NULL;
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
if (type != &PyFrozenSet_Type)
return make_new_set(type, iterable);
if (iterable != NULL) {
/* frozenset(f) is idempotent */
if (PyFrozenSet_CheckExact(iterable)) {
Py_INCREF(iterable);
return iterable;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
}
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
result = make_new_set(type, iterable);
if (result == NULL || set_len(result))
return result;
Py_DECREF(result);
* Simplify hash function and add test to show effectiveness of the hash function. * Add a better test for deepcopying. * Add tests to show the __init__() function works like it does for list and tuple. Add related test. * Have shallow copies of frozensets return self. Add related test. * Have frozenset(f) return f if f is already a frozenset. Add related test. * Beefed-up some existing tests.
2003-11-23 10:49:05 +08:00
}
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
/* The empty frozenset is a singleton */
if (emptyfrozenset == NULL)
emptyfrozenset = make_new_set(type, NULL);
Py_XINCREF(emptyfrozenset);
return emptyfrozenset;
}
void
PySet_Fini(void)
{
Py_XDECREF(emptyfrozenset);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
static PyObject *
set_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
return make_new_set(type, NULL);
}
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
static void
set_dealloc(PySetObject *so)
{
Improve variable names.
2005-07-31 23:36:06 +08:00
register setentry *entry;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
int fill = so->fill;
SF patch #1200018: Restore GC support to set objects Reverts 1.26 and 1.27. And adds cycle testing.
2005-06-19 05:00:26 +08:00
PyObject_GC_UnTrack(so);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Py_TRASHCAN_SAFE_BEGIN(so)
Make sets and deques weak referencable.
2004-05-30 15:26:47 +08:00
if (so->weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *) so);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Improve variable names.
2005-07-31 23:36:06 +08:00
for (entry = so->table; fill > 0; entry++) {
if (entry->key) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
--fill;
Improve variable names.
2005-07-31 23:36:06 +08:00
Py_DECREF(entry->key);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
}
}
if (so->table != so->smalltable)
PyMem_DEL(so->table);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
so->ob_type->tp_free(so);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Py_TRASHCAN_SAFE_END(so)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
SF patch #1200018: Restore GC support to set objects Reverts 1.26 and 1.27. And adds cycle testing.
2005-06-19 05:00:26 +08:00
static int
set_traverse(PySetObject *so, visitproc visit, void *arg)
{
Improve variable names.
2005-07-31 23:36:06 +08:00
int pos = 0;
PyObject *key;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Improve variable names.
2005-07-31 23:36:06 +08:00
while (set_next_internal(so, &pos, &key))
Py_VISIT(key);
SF patch #1200018: Restore GC support to set objects Reverts 1.26 and 1.27. And adds cycle testing.
2005-06-19 05:00:26 +08:00
return 0;
}
Comment on the set_swap_bodies() helper function.
2005-07-31 09:33:10 +08:00
/* 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:
t=set(a); a.clear(); a.update(b); b.clear(); b.update(t); del t
The function always succeeds and it leaves both objects in a stable state.
Useful for creating temporary frozensets from sets for membership testing
in __contains__(), discard(), and remove(). Also useful for operations
that update in-place (by allowing an intermediate result to be swapped
Fix frozenset() ref count and a comment typo.
2005-07-31 21:09:28 +08:00
into one of the original inputs).
Comment on the set_swap_bodies() helper function.
2005-07-31 09:33:10 +08:00
*/
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
static void
set_swap_bodies(PySetObject *a, PySetObject *b)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
{
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
int t;
setentry *u;
setentry *(*f)(PySetObject *so, PyObject *key, long hash);
setentry tab[PySet_MINSIZE];
long h;
t = a->fill; a->fill = b->fill; b->fill = t;
t = a->used; a->used = b->used; b->used = t;
t = a->mask; a->mask = b->mask; b->mask = t;
u = a->table;
if (a->table == a->smalltable)
u = b->smalltable;
a->table = b->table;
if (b->table == b->smalltable)
a->table = a->smalltable;
b->table = u;
f = a->lookup; a->lookup = b->lookup; b->lookup = f;
if (a->table == a->smalltable || b->table == b->smalltable) {
memcpy(tab, a->smalltable, sizeof(tab));
memcpy(a->smalltable, b->smalltable, sizeof(tab));
memcpy(b->smalltable, tab, sizeof(tab));
}
Improve variable names.
2005-07-31 23:36:06 +08:00
h = a->hash; a->hash = b->hash; b->hash = h;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
static int
set_contains(PySetObject *so, PyObject *key)
{
Improve variable names.
2005-07-31 23:36:06 +08:00
PyObject *tmpkey;
Allow temporary hashability for the __contains__ test. (Requested by Alex Martelli.)
2003-11-22 02:36:54 +08:00
int result;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
result = set_contains_internal(so, key);
Factor out more duplicate code.
2003-11-25 06:18:49 +08:00
if (result == -1 && PyAnySet_Check(key)) {
Allow temporary hashability for the __contains__ test. (Requested by Alex Martelli.)
2003-11-22 02:36:54 +08:00
PyErr_Clear();
Improve variable names.
2005-07-31 23:36:06 +08:00
tmpkey = make_new_set(&PyFrozenSet_Type, NULL);
if (tmpkey == NULL)
Allow temporary hashability for the __contains__ test. (Requested by Alex Martelli.)
2003-11-22 02:36:54 +08:00
return -1;
Improve variable names.
2005-07-31 23:36:06 +08:00
set_swap_bodies((PySetObject *)tmpkey, (PySetObject *)key);
result = set_contains_internal(so, tmpkey);
set_swap_bodies((PySetObject *)tmpkey, (PySetObject *)key);
Py_DECREF(tmpkey);
Allow temporary hashability for the __contains__ test. (Requested by Alex Martelli.)
2003-11-22 02:36:54 +08:00
}
return result;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
* Added a new method flag, METH_COEXIST. * Used the flag to optimize set.__contains__(), dict.__contains__(), dict.__getitem__(), and list.__getitem__().
2003-12-13 19:26:12 +08:00
static PyObject *
set_direct_contains(PySetObject *so, PyObject *key)
{
long result;
* Refactor set.__contains__() * Use Py_RETURN_NONE everywhere. * Fix-up the firstpass check for the tp_print slot.
2003-12-14 03:38:47 +08:00
result = set_contains(so, key);
* Added a new method flag, METH_COEXIST. * Used the flag to optimize set.__contains__(), dict.__contains__(), dict.__getitem__(), and list.__getitem__().
2003-12-13 19:26:12 +08:00
if (result == -1)
return NULL;
return PyBool_FromLong(result);
}
PyDoc_STRVAR(contains_doc, "x.__contains__(y) <==> y in x.");
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
static PyObject *
set_copy(PySetObject *so)
{
Factor out more duplicate code.
2003-11-25 06:18:49 +08:00
return make_new_set(so->ob_type, (PyObject *)so);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
* Simplify hash function and add test to show effectiveness of the hash function. * Add a better test for deepcopying. * Add tests to show the __init__() function works like it does for list and tuple. Add related test. * Have shallow copies of frozensets return self. Add related test. * Have frozenset(f) return f if f is already a frozenset. Add related test. * Beefed-up some existing tests.
2003-11-23 10:49:05 +08:00
static PyObject *
frozenset_copy(PySetObject *so)
{
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
if (PyFrozenSet_CheckExact(so)) {
* Simplify hash function and add test to show effectiveness of the hash function. * Add a better test for deepcopying. * Add tests to show the __init__() function works like it does for list and tuple. Add related test. * Have shallow copies of frozensets return self. Add related test. * Have frozenset(f) return f if f is already a frozenset. Add related test. * Beefed-up some existing tests.
2003-11-23 10:49:05 +08:00
Py_INCREF(so);
return (PyObject *)so;
}
return set_copy(so);
}
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
PyDoc_STRVAR(copy_doc, "Return a shallow copy of a set.");
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
static PyObject *
set_union(PySetObject *so, PyObject *other)
{
PySetObject *result;
result = (PySetObject *)set_copy(so);
if (result == NULL)
return NULL;
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
if (set_update_internal(result, other) == -1) {
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
Py_DECREF(result);
return NULL;
}
return (PyObject *)result;
}
PyDoc_STRVAR(union_doc,
"Return the union of two sets as a new set.\n\
\n\
(i.e. all elements that are in either set.)");
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
static PyObject *
set_or(PySetObject *so, PyObject *other)
{
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
if (!PyAnySet_Check(so) || !PyAnySet_Check(other)) {
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
return set_union(so, other);
}
static PyObject *
set_ior(PySetObject *so, PyObject *other)
{
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
if (!PyAnySet_Check(other)) {
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
if (set_update_internal(so, other) == -1)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
return NULL;
Py_INCREF(so);
return (PyObject *)so;
}
static PyObject *
set_intersection(PySetObject *so, PyObject *other)
{
PySetObject *result;
Improve variable names.
2005-07-31 23:36:06 +08:00
PyObject *key, *it, *tmp;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
result = (PySetObject *)make_new_set(so->ob_type, NULL);
if (result == NULL)
return NULL;
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (PyAnySet_Check(other) && set_len(other) > set_len((PyObject *)so)) {
tmp = (PyObject *)so;
so = (PySetObject *)other;
* Simplify and speedup logic for tp_print. * Speed-up intersection whenever PyDict_Next can be used.
2003-12-31 22:08:58 +08:00
other = tmp;
}
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (PyAnySet_Check(other)) {
* Simplify and speedup logic for tp_print. * Speed-up intersection whenever PyDict_Next can be used.
2003-12-31 22:08:58 +08:00
int pos = 0;
Improve variable names.
2005-07-31 23:36:06 +08:00
while (set_next_internal((PySetObject *)other, &pos, &key)) {
if (set_contains_internal(so, key)) {
if (set_add_internal(result, key) == -1) {
* Simplify and speedup logic for tp_print. * Speed-up intersection whenever PyDict_Next can be used.
2003-12-31 22:08:58 +08:00
Py_DECREF(result);
return NULL;
}
}
}
return (PyObject *)result;
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
}
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
it = PyObject_GetIter(other);
if (it == NULL) {
Py_DECREF(result);
return NULL;
}
Improve variable names.
2005-07-31 23:36:06 +08:00
while ((key = PyIter_Next(it)) != NULL) {
if (set_contains_internal(so, key)) {
if (set_add_internal(result, key) == -1) {
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_DECREF(it);
Py_DECREF(result);
Improve variable names.
2005-07-31 23:36:06 +08:00
Py_DECREF(key);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
return NULL;
}
}
Improve variable names.
2005-07-31 23:36:06 +08:00
Py_DECREF(key);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
Py_DECREF(it);
if (PyErr_Occurred()) {
Py_DECREF(result);
return NULL;
}
return (PyObject *)result;
}
PyDoc_STRVAR(intersection_doc,
"Return the intersection of two sets as a new set.\n\
\n\
(i.e. all elements that are in both sets.)");
static PyObject *
set_intersection_update(PySetObject *so, PyObject *other)
{
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
PyObject *tmp;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
tmp = set_intersection(so, other);
if (tmp == NULL)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
return NULL;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
set_swap_bodies(so, (PySetObject *)tmp);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_DECREF(tmp);
Py_RETURN_NONE;
}
PyDoc_STRVAR(intersection_update_doc,
"Update a set with the intersection of itself and another.");
static PyObject *
set_and(PySetObject *so, PyObject *other)
{
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
if (!PyAnySet_Check(so) || !PyAnySet_Check(other)) {
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
return set_intersection(so, other);
}
static PyObject *
set_iand(PySetObject *so, PyObject *other)
{
PyObject *result;
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
if (!PyAnySet_Check(other)) {
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
result = set_intersection_update(so, other);
if (result == NULL)
return NULL;
Py_DECREF(result);
Py_INCREF(so);
return (PyObject *)so;
}
static PyObject *
set_difference_update(PySetObject *so, PyObject *other)
{
Improve variable names.
2005-07-31 23:36:06 +08:00
PyObject *key, *it;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
it = PyObject_GetIter(other);
if (it == NULL)
return NULL;
Improve variable names.
2005-07-31 23:36:06 +08:00
while ((key = PyIter_Next(it)) != NULL) {
if (set_discard_internal(so, key) == -1) {
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Py_DECREF(it);
Improve variable names.
2005-07-31 23:36:06 +08:00
Py_DECREF(key);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
return NULL;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
Improve variable names.
2005-07-31 23:36:06 +08:00
Py_DECREF(key);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
Py_DECREF(it);
if (PyErr_Occurred())
return NULL;
Py_RETURN_NONE;
}
PyDoc_STRVAR(difference_update_doc,
"Remove all elements of another set from this set.");
Improve algorithm for set.difference when the input is not a set.
2003-12-15 21:23:55 +08:00
static PyObject *
set_difference(PySetObject *so, PyObject *other)
{
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
PyObject *tmp, *key, *result;
Improve algorithm for set.difference when the input is not a set.
2003-12-15 21:23:55 +08:00
int pos = 0;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (!PyAnySet_Check(other) && !PyDict_Check(other)) {
Improve algorithm for set.difference when the input is not a set.
2003-12-15 21:23:55 +08:00
result = set_copy(so);
if (result == NULL)
return result;
tmp = set_difference_update((PySetObject *)result, other);
if (tmp != NULL) {
Py_DECREF(tmp);
return result;
}
Py_DECREF(result);
return NULL;
}
result = make_new_set(so->ob_type, NULL);
if (result == NULL)
return NULL;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (PyDict_Check(other)) {
while (set_next_internal(so, &pos, &key)) {
if (!PyDict_Contains(other, key)) {
if (set_add_internal((PySetObject *)result, key) == -1)
return NULL;
}
}
return result;
}
while (set_next_internal(so, &pos, &key)) {
if (!set_contains_internal((PySetObject *)other, key)) {
if (set_add_internal((PySetObject *)result, key) == -1)
Improve algorithm for set.difference when the input is not a set.
2003-12-15 21:23:55 +08:00
return NULL;
}
}
return result;
}
PyDoc_STRVAR(difference_doc,
"Return the difference of two sets as a new set.\n\
\n\
(i.e. all elements that are in this set but not the other.)");
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
static PyObject *
set_sub(PySetObject *so, PyObject *other)
{
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
if (!PyAnySet_Check(so) || !PyAnySet_Check(other)) {
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
return set_difference(so, other);
}
static PyObject *
set_isub(PySetObject *so, PyObject *other)
{
PyObject *result;
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
if (!PyAnySet_Check(other)) {
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
result = set_difference_update(so, other);
if (result == NULL)
return NULL;
Py_DECREF(result);
Py_INCREF(so);
return (PyObject *)so;
}
static PyObject *
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
set_symmetric_difference_update(PySetObject *so, PyObject *other)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
{
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
PySetObject *otherset;
PyObject *key;
Use dictionary specific looping idiom where possible. Simplifies and speeds-up the code.
2003-12-13 22:46:46 +08:00
int pos = 0;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (PyDict_Check(other)) {
PyObject *value;
int rv;
while (PyDict_Next(other, &pos, &key, &value)) {
rv = set_discard_internal(so, key);
if (rv == -1)
return NULL;
if (rv == DISCARD_NOTFOUND) {
if (set_add_internal(so, key) == -1)
return NULL;
}
}
Py_RETURN_NONE;
}
if (PyAnySet_Check(other)) {
Py_INCREF(other);
otherset = (PySetObject *)other;
} else {
Three minor performance improvements: * Improve the hash function to increase the chance that distinct sets will have distinct xor'd hash totals. * Use PyDict_Merge where possible (it is faster than an equivalent iter/set pair). * Don't rebuild dictionaries where the input already has one.
2003-11-21 06:54:33 +08:00
otherset = (PySetObject *)make_new_set(so->ob_type, other);
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
if (otherset == NULL)
Three minor performance improvements: * Improve the hash function to increase the chance that distinct sets will have distinct xor'd hash totals. * Use PyDict_Merge where possible (it is faster than an equivalent iter/set pair). * Don't rebuild dictionaries where the input already has one.
2003-11-21 06:54:33 +08:00
return NULL;
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
}
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
while (set_next_internal(otherset, &pos, &key)) {
int rv = set_discard_internal(so, key);
if (rv == -1) {
Py_XDECREF(otherset);
return NULL;
}
if (rv == DISCARD_NOTFOUND) {
if (set_add_internal(so, key) == -1) {
Three minor performance improvements: * Improve the hash function to increase the chance that distinct sets will have distinct xor'd hash totals. * Use PyDict_Merge where possible (it is faster than an equivalent iter/set pair). * Don't rebuild dictionaries where the input already has one.
2003-11-21 06:54:33 +08:00
Py_XDECREF(otherset);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
return NULL;
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
}
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
}
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Py_DECREF(otherset);
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
Py_RETURN_NONE;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
PyDoc_STRVAR(symmetric_difference_update_doc,
"Update a set with the symmetric difference of itself and another.");
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
static PyObject *
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
set_symmetric_difference(PySetObject *so, PyObject *other)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
{
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
PyObject *rv;
PySetObject *otherset;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
otherset = (PySetObject *)make_new_set(so->ob_type, other);
if (otherset == NULL)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
return NULL;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
rv = set_symmetric_difference_update(otherset, (PyObject *)so);
if (rv == NULL)
return NULL;
Py_DECREF(rv);
return (PyObject *)otherset;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
* Checkin remaining documentation * Add more tests * Refactor and neaten the code a bit. * Rename union_update() to update(). * Improve the algorithms (making them a closer to sets.py).
2003-11-24 10:57:33 +08:00
PyDoc_STRVAR(symmetric_difference_doc,
"Return the symmetric difference of two sets as a new set.\n\
\n\
(i.e. all elements that are in exactly one of the sets.)");
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
static PyObject *
set_xor(PySetObject *so, PyObject *other)
{
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
if (!PyAnySet_Check(so) || !PyAnySet_Check(other)) {
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
return set_symmetric_difference(so, other);
}
static PyObject *
set_ixor(PySetObject *so, PyObject *other)
{
PyObject *result;
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
if (!PyAnySet_Check(other)) {
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
result = set_symmetric_difference_update(so, other);
if (result == NULL)
return NULL;
Py_DECREF(result);
Py_INCREF(so);
return (PyObject *)so;
}
static PyObject *
set_issubset(PySetObject *so, PyObject *other)
{
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
PyObject *tmp, *result;
PyObject *key;
Use dictionary specific looping idiom where possible. Simplifies and speeds-up the code.
2003-12-13 22:46:46 +08:00
int pos = 0;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
if (!PyAnySet_Check(other)) {
issubset() and issuperset() to work with general iterables
2003-11-21 15:56:36 +08:00
tmp = make_new_set(&PySet_Type, other);
if (tmp == NULL)
return NULL;
result = set_issubset(so, tmp);
Py_DECREF(tmp);
return result;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (set_len((PyObject *)so) > set_len(other))
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_RETURN_FALSE;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
while (set_next_internal(so, &pos, &key)) {
if (!set_contains_internal((PySetObject *)other, key))
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_RETURN_FALSE;
}
Py_RETURN_TRUE;
}
PyDoc_STRVAR(issubset_doc, "Report whether another set contains this set.");
static PyObject *
set_issuperset(PySetObject *so, PyObject *other)
{
issubset() and issuperset() to work with general iterables
2003-11-21 15:56:36 +08:00
PyObject *tmp, *result;
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
if (!PyAnySet_Check(other)) {
issubset() and issuperset() to work with general iterables
2003-11-21 15:56:36 +08:00
tmp = make_new_set(&PySet_Type, other);
if (tmp == NULL)
return NULL;
result = set_issuperset(so, tmp);
Py_DECREF(tmp);
return result;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
return set_issubset((PySetObject *)other, (PyObject *)so);
}
PyDoc_STRVAR(issuperset_doc, "Report whether this set contains another set.");
static long
set_nohash(PyObject *self)
{
PyErr_SetString(PyExc_TypeError, "set objects are unhashable");
return -1;
}
static int
set_nocmp(PyObject *self)
{
PyErr_SetString(PyExc_TypeError, "cannot compare sets using cmp()");
return -1;
}
static long
frozenset_hash(PyObject *self)
{
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
PyObject *key;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
PySetObject *so = (PySetObject *)self;
Use dictionary specific looping idiom where possible. Simplifies and speeds-up the code.
2003-12-13 22:46:46 +08:00
int pos = 0;
Futher improvements to frozenset hashing (based on Yitz Gale's battery of tests which nicely highly highlight weaknesses). * Initial value is now a large prime. * Pre-multiply by the set length to add one more basis of differentiation. * Work a bit harder inside the loop to scatter bits from sources that may have closely spaced hash values. All of this is necessary to make up for keep the hash function commutative. Fortunately, the hash value is cached so the call to frozenset_hash() will only occur once per set.
2004-06-11 06:41:48 +08:00
long hash = 1927868237L;
* Refactor set.__contains__() * Use Py_RETURN_NONE everywhere. * Fix-up the firstpass check for the tp_print slot.
2003-12-14 03:38:47 +08:00
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
if (so->hash != -1)
return so->hash;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
hash *= set_len(self) + 1;
while (set_next_internal(so, &pos, &key)) {
Futher improvements to frozenset hashing (based on Yitz Gale's battery of tests which nicely highly highlight weaknesses). * Initial value is now a large prime. * Pre-multiply by the set length to add one more basis of differentiation. * Work a bit harder inside the loop to scatter bits from sources that may have closely spaced hash values. All of this is necessary to make up for keep the hash function commutative. Fortunately, the hash value is cached so the call to frozenset_hash() will only occur once per set.
2004-06-11 06:41:48 +08:00
/* 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. */
long h = PyObject_Hash(key);
hash ^= (h ^ (h << 16) ^ 89869747L) * 3644798167u;
}
hash = hash * 69069L + 907133923L;
Fixups to the hash function for frozensets. * Non-zero initial value so that hash(frozenset()) != hash(0). * Final permutation to differentiate nested sets. * Add logic to make sure that -1 is not a possible hash value.
2004-06-11 05:38:41 +08:00
if (hash == -1)
hash = 590923713L;
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
so->hash = hash;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
return hash;
}
static PyObject *
set_richcompare(PySetObject *v, PyObject *w, int op)
{
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
PyObject *r1, *r2;
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
if(!PyAnySet_Check(w)) {
if (op == Py_EQ)
Py_RETURN_FALSE;
if (op == Py_NE)
Py_RETURN_TRUE;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
PyErr_SetString(PyExc_TypeError, "can only compare to a set");
return NULL;
}
switch (op) {
case Py_EQ:
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (set_len((PyObject *)v) != set_len(w))
Py_RETURN_FALSE;
return set_issubset(v, w);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
case Py_NE:
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (set_len((PyObject *)v) != set_len(w))
Py_RETURN_TRUE;
r1 = set_issubset(v, w);
assert (r1 != NULL);
r2 = PyBool_FromLong(PyObject_Not(r1));
Py_DECREF(r1);
return r2;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
case Py_LE:
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
return set_issubset(v, w);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
case Py_GE:
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
return set_issuperset(v, w);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
case Py_LT:
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (set_len((PyObject *)v) >= set_len(w))
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_RETURN_FALSE;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
return set_issubset(v, w);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
case Py_GT:
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (set_len((PyObject *)v) <= set_len(w))
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Py_RETURN_FALSE;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
return set_issuperset(v, w);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
static PyObject *
set_repr(PySetObject *so)
{
PyObject *keys, *result, *listrepr;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
keys = PySequence_List((PyObject *)so);
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
if (keys == NULL)
return NULL;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
listrepr = PyObject_Repr(keys);
Py_DECREF(keys);
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
if (listrepr == NULL)
return NULL;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
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)
{
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
PyObject *key;
* Simplify and speedup logic for tp_print. * Speed-up intersection whenever PyDict_Next can be used.
2003-12-31 22:08:58 +08:00
int pos=0;
char *emit = ""; /* No separator emitted on first pass */
char *separator = ", ";
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
fprintf(fp, "%s([", so->ob_type->tp_name);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
while (set_next_internal(so, &pos, &key)) {
* Simplify and speedup logic for tp_print. * Speed-up intersection whenever PyDict_Next can be used.
2003-12-31 22:08:58 +08:00
fputs(emit, fp);
emit = separator;
Use dictionary specific looping idiom where possible. Simplifies and speeds-up the code.
2003-12-13 22:46:46 +08:00
if (PyObject_Print(key, fp, 0) != 0)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
return -1;
}
* Simplify and speedup logic for tp_print. * Speed-up intersection whenever PyDict_Next can be used.
2003-12-31 22:08:58 +08:00
fputs("])", fp);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
return 0;
}
static PyObject *
set_clear(PySetObject *so)
{
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
set_clear_internal(so);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
so->hash = -1;
* Refactor set.__contains__() * Use Py_RETURN_NONE everywhere. * Fix-up the firstpass check for the tp_print slot.
2003-12-14 03:38:47 +08:00
Py_RETURN_NONE;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
PyDoc_STRVAR(clear_doc, "Remove all elements from this set.");
SF patch #1200018: Restore GC support to set objects Reverts 1.26 and 1.27. And adds cycle testing.
2005-06-19 05:00:26 +08:00
static int
set_tp_clear(PySetObject *so)
{
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
set_clear_internal(so);
SF patch #1200018: Restore GC support to set objects Reverts 1.26 and 1.27. And adds cycle testing.
2005-06-19 05:00:26 +08:00
so->hash = -1;
return 0;
}
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
static PyObject *
Improve variable names.
2005-07-31 23:36:06 +08:00
set_add(PySetObject *so, PyObject *key)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
{
Improve variable names.
2005-07-31 23:36:06 +08:00
if (set_add_internal(so, key) == -1)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
return NULL;
* Refactor set.__contains__() * Use Py_RETURN_NONE everywhere. * Fix-up the firstpass check for the tp_print slot.
2003-12-14 03:38:47 +08:00
Py_RETURN_NONE;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
PyDoc_STRVAR(add_doc,
"Add an element to a set.\n\
\n\
This has no effect if the element is already present.");
static PyObject *
Improve variable names.
2005-07-31 23:36:06 +08:00
set_remove(PySetObject *so, PyObject *key)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
{
Improve variable names.
2005-07-31 23:36:06 +08:00
PyObject *tmpkey, *result;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
int rv;
Extend temporary hashability to remove() and discard(). Brings the functionality back in line with sets.py.
2003-11-22 11:55:23 +08:00
Improve variable names.
2005-07-31 23:36:06 +08:00
if (PyType_IsSubtype(key->ob_type, &PySet_Type)) {
tmpkey = make_new_set(&PyFrozenSet_Type, NULL);
if (tmpkey == NULL)
Extend temporary hashability to remove() and discard(). Brings the functionality back in line with sets.py.
2003-11-22 11:55:23 +08:00
return NULL;
Improve variable names.
2005-07-31 23:36:06 +08:00
set_swap_bodies((PySetObject *)key, (PySetObject *)tmpkey);
result = set_remove(so, tmpkey);
set_swap_bodies((PySetObject *)key, (PySetObject *)tmpkey);
Py_DECREF(tmpkey);
Refactor set.discard() and set.remove().
2003-12-14 02:53:18 +08:00
return result;
Extend temporary hashability to remove() and discard(). Brings the functionality back in line with sets.py.
2003-11-22 11:55:23 +08:00
}
Refactor set.discard() and set.remove().
2003-12-14 02:53:18 +08:00
Improve variable names.
2005-07-31 23:36:06 +08:00
rv = set_discard_internal(so, key);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
if (rv == -1)
Refactor set.discard() and set.remove().
2003-12-14 02:53:18 +08:00
return NULL;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
else if (rv == DISCARD_NOTFOUND) {
Improve variable names.
2005-07-31 23:36:06 +08:00
PyErr_SetObject(PyExc_KeyError, key);
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
return NULL;
}
* Refactor set.__contains__() * Use Py_RETURN_NONE everywhere. * Fix-up the firstpass check for the tp_print slot.
2003-12-14 03:38:47 +08:00
Py_RETURN_NONE;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
PyDoc_STRVAR(remove_doc,
"Remove an element from a set; it must be a member.\n\
\n\
If the element is not a member, raise a KeyError.");
static PyObject *
Improve variable names.
2005-07-31 23:36:06 +08:00
set_discard(PySetObject *so, PyObject *key)
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
{
Improve variable names.
2005-07-31 23:36:06 +08:00
PyObject *tmpkey, *result;
Refactor set.discard() and set.remove().
2003-12-14 02:53:18 +08:00
Improve variable names.
2005-07-31 23:36:06 +08:00
if (PyType_IsSubtype(key->ob_type, &PySet_Type)) {
tmpkey = make_new_set(&PyFrozenSet_Type, NULL);
if (tmpkey == NULL)
Refactor set.discard() and set.remove().
2003-12-14 02:53:18 +08:00
return NULL;
Improve variable names.
2005-07-31 23:36:06 +08:00
set_swap_bodies((PySetObject *)key, (PySetObject *)tmpkey);
result = set_discard(so, tmpkey);
set_swap_bodies((PySetObject *)key, (PySetObject *)tmpkey);
Py_DECREF(tmpkey);
Refactor set.discard() and set.remove().
2003-12-14 02:53:18 +08:00
return result;
}
Extend temporary hashability to remove() and discard(). Brings the functionality back in line with sets.py.
2003-11-22 11:55:23 +08:00
Improve variable names.
2005-07-31 23:36:06 +08:00
if (set_discard_internal(so, key) == -1)
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
return NULL;
* Refactor set.__contains__() * Use Py_RETURN_NONE everywhere. * Fix-up the firstpass check for the tp_print slot.
2003-12-14 03:38:47 +08:00
Py_RETURN_NONE;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
}
PyDoc_STRVAR(discard_doc,
"Remove an element from a set if it is a member.\n\
\n\
If the element is not a member, do nothing.");
static PyObject *
set_pop(PySetObject *so)
{
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
PyObject *key;
Model set.pop() after dict.popitem().
2005-08-02 11:45:16 +08:00
register setentry *entry;
register int i = 0;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Model set.pop() after dict.popitem().
2005-08-02 11:45:16 +08:00
assert (PyAnySet_Check(so));
if (so->used == 0) {
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
PyErr_SetString(PyExc_KeyError, "pop from an empty set");
return NULL;
}
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Model set.pop() after dict.popitem().
2005-08-02 11:45:16 +08:00
/* Set entry to "the first" unused or dummy set entry. We abuse
* the hash field of slot 0 to hold a search finger:
* If slot 0 has a value, use slot 0.
* Else slot 0 is being used to hold a search finger,
* and we use its hash value as the first index to look.
*/
entry = &so->table[0];
if (entry->key == NULL || entry->key == dummy) {
i = (int)entry->hash;
/* The hash field may be a real hash value, or it may be a
* legit search finger, or it may be a once-legit search
* finger that's out of bounds now because it wrapped around
* or the table shrunk -- simply make sure it's in bounds now.
*/
if (i > so->mask || i < 1)
i = 1; /* skip slot 0 */
while ((entry = &so->table[i])->key == NULL || entry->key==dummy) {
i++;
if (i > so->mask)
i = 1;
}
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
}
Model set.pop() after dict.popitem().
2005-08-02 11:45:16 +08:00
key = entry->key;
Py_INCREF(dummy);
entry->key = dummy;
so->used--;
so->table[0].hash = i + 1; /* next place to start */
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
return key;
}
PyDoc_STRVAR(pop_doc, "Remove and return an arbitrary set element.");
static PyObject *
set_reduce(PySetObject *so)
{
SF 1062353: set pickling problems Support automatic pickling of dictionaries in instance of set subclasses.
2004-11-09 15:25:31 +08:00
PyObject *keys=NULL, *args=NULL, *result=NULL, *dict=NULL;
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
keys = PySequence_List((PyObject *)so);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
if (keys == NULL)
goto done;
args = PyTuple_Pack(1, keys);
if (args == NULL)
goto done;
SF 1062353: set pickling problems Support automatic pickling of dictionaries in instance of set subclasses.
2004-11-09 15:25:31 +08:00
dict = PyObject_GetAttrString((PyObject *)so, "__dict__");
if (dict == NULL) {
PyErr_Clear();
dict = Py_None;
Py_INCREF(dict);
}
result = PyTuple_Pack(3, so->ob_type, args, dict);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
done:
Py_XDECREF(args);
Py_XDECREF(keys);
SF 1062353: set pickling problems Support automatic pickling of dictionaries in instance of set subclasses.
2004-11-09 15:25:31 +08:00
Py_XDECREF(dict);
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
return result;
}
PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
static int
set_init(PySetObject *self, PyObject *args, PyObject *kwds)
{
PyObject *iterable = NULL;
if (!PyAnySet_Check(self))
return -1;
if (!PyArg_UnpackTuple(args, self->ob_type->tp_name, 0, 1, &iterable))
return -1;
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
set_clear_internal(self);
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
self->hash = -1;
if (iterable == NULL)
return 0;
* Improve code for the empty frozenset singleton: - Handle both frozenset() and frozenset([]). - Do not use singleton for frozenset subclasses. - Finalize the singleton. - Add test cases. * Factor-out set_update_internal() from set_update(). Simplifies the code for several internal callers. * Factor constant expressions out of loop in set_merge_internal(). * Minor comment touch-ups.
2005-08-02 05:39:29 +08:00
return set_update_internal(self, iterable);
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
}
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
static PySequenceMethods set_as_sequence = {
(inquiry)set_len, /* sq_length */
0, /* sq_concat */
0, /* sq_repeat */
0, /* sq_item */
0, /* sq_slice */
0, /* sq_ass_item */
0, /* sq_ass_slice */
(objobjproc)set_contains, /* sq_contains */
};
/* set object ********************************************************/
static PyMethodDef set_methods[] = {
{"add", (PyCFunction)set_add, METH_O,
add_doc},
{"clear", (PyCFunction)set_clear, METH_NOARGS,
clear_doc},
Refactor set.discard() and set.remove().
2003-12-14 02:53:18 +08:00
{"__contains__",(PyCFunction)set_direct_contains, METH_O | METH_COEXIST,
* Added a new method flag, METH_COEXIST. * Used the flag to optimize set.__contains__(), dict.__contains__(), dict.__getitem__(), and list.__getitem__().
2003-12-13 19:26:12 +08:00
contains_doc},
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
{"copy", (PyCFunction)set_copy, METH_NOARGS,
copy_doc},
{"discard", (PyCFunction)set_discard, METH_O,
discard_doc},
{"difference", (PyCFunction)set_difference, METH_O,
difference_doc},
{"difference_update", (PyCFunction)set_difference_update, METH_O,
difference_update_doc},
{"intersection",(PyCFunction)set_intersection, METH_O,
intersection_doc},
{"intersection_update",(PyCFunction)set_intersection_update, METH_O,
intersection_update_doc},
{"issubset", (PyCFunction)set_issubset, METH_O,
issubset_doc},
{"issuperset", (PyCFunction)set_issuperset, METH_O,
issuperset_doc},
{"pop", (PyCFunction)set_pop, METH_NOARGS,
pop_doc},
{"__reduce__", (PyCFunction)set_reduce, METH_NOARGS,
reduce_doc},
{"remove", (PyCFunction)set_remove, METH_O,
remove_doc},
{"symmetric_difference",(PyCFunction)set_symmetric_difference, METH_O,
symmetric_difference_doc},
{"symmetric_difference_update",(PyCFunction)set_symmetric_difference_update, METH_O,
symmetric_difference_update_doc},
{"union", (PyCFunction)set_union, METH_O,
union_doc},
Factor out more duplicate code.
2003-11-25 06:18:49 +08:00
{"update", (PyCFunction)set_update, METH_O,
update_doc},
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
{NULL, NULL} /* sentinel */
};
static PyNumberMethods set_as_number = {
0, /*nb_add*/
(binaryfunc)set_sub, /*nb_subtract*/
0, /*nb_multiply*/
0, /*nb_divide*/
0, /*nb_remainder*/
0, /*nb_divmod*/
0, /*nb_power*/
0, /*nb_negative*/
0, /*nb_positive*/
0, /*nb_absolute*/
0, /*nb_nonzero*/
0, /*nb_invert*/
0, /*nb_lshift*/
0, /*nb_rshift*/
(binaryfunc)set_and, /*nb_and*/
(binaryfunc)set_xor, /*nb_xor*/
(binaryfunc)set_or, /*nb_or*/
0, /*nb_coerce*/
0, /*nb_int*/
0, /*nb_long*/
0, /*nb_float*/
0, /*nb_oct*/
0, /*nb_hex*/
0, /*nb_inplace_add*/
(binaryfunc)set_isub, /*nb_inplace_subtract*/
0, /*nb_inplace_multiply*/
0, /*nb_inplace_divide*/
0, /*nb_inplace_remainder*/
0, /*nb_inplace_power*/
0, /*nb_inplace_lshift*/
0, /*nb_inplace_rshift*/
(binaryfunc)set_iand, /*nb_inplace_and*/
(binaryfunc)set_ixor, /*nb_inplace_xor*/
(binaryfunc)set_ior, /*nb_inplace_or*/
};
PyDoc_STRVAR(set_doc,
"set(iterable) --> set object\n\
\n\
Build an unordered collection.");
PyTypeObject PySet_Type = {
PyObject_HEAD_INIT(&PyType_Type)
0, /* ob_size */
"set", /* tp_name */
sizeof(PySetObject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
(destructor)set_dealloc, /* tp_dealloc */
(printfunc)set_tp_print, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
(cmpfunc)set_nocmp, /* tp_compare */
(reprfunc)set_repr, /* tp_repr */
&set_as_number, /* tp_as_number */
&set_as_sequence, /* tp_as_sequence */
0, /* tp_as_mapping */
set_nohash, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
PyObject_GenericGetAttr, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
SF patch #1200018: Restore GC support to set objects Reverts 1.26 and 1.27. And adds cycle testing.
2005-06-19 05:00:26 +08:00
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_CHECKTYPES |
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Py_TPFLAGS_BASETYPE, /* tp_flags */
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
set_doc, /* tp_doc */
SF patch #1200018: Restore GC support to set objects Reverts 1.26 and 1.27. And adds cycle testing.
2005-06-19 05:00:26 +08:00
(traverseproc)set_traverse, /* tp_traverse */
(inquiry)set_tp_clear, /* tp_clear */
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
(richcmpfunc)set_richcompare, /* tp_richcompare */
Make sets and deques weak referencable.
2004-05-30 15:26:47 +08:00
offsetof(PySetObject, weakreflist), /* tp_weaklistoffset */
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
(getiterfunc)set_iter, /* tp_iter */
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
0, /* tp_iternext */
set_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
(initproc)set_init, /* tp_init */
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
PyType_GenericAlloc, /* tp_alloc */
set_new, /* tp_new */
SF patch #1200018: Restore GC support to set objects Reverts 1.26 and 1.27. And adds cycle testing.
2005-06-19 05:00:26 +08:00
PyObject_GC_Del, /* tp_free */
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
};
/* frozenset object ********************************************************/
static PyMethodDef frozenset_methods[] = {
Refactor set.discard() and set.remove().
2003-12-14 02:53:18 +08:00
{"__contains__",(PyCFunction)set_direct_contains, METH_O | METH_COEXIST,
* Added a new method flag, METH_COEXIST. * Used the flag to optimize set.__contains__(), dict.__contains__(), dict.__getitem__(), and list.__getitem__().
2003-12-13 19:26:12 +08:00
contains_doc},
* Simplify hash function and add test to show effectiveness of the hash function. * Add a better test for deepcopying. * Add tests to show the __init__() function works like it does for list and tuple. Add related test. * Have shallow copies of frozensets return self. Add related test. * Have frozenset(f) return f if f is already a frozenset. Add related test. * Beefed-up some existing tests.
2003-11-23 10:49:05 +08:00
{"copy", (PyCFunction)frozenset_copy, METH_NOARGS,
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
copy_doc},
* Simplify hash function and add test to show effectiveness of the hash function. * Add a better test for deepcopying. * Add tests to show the __init__() function works like it does for list and tuple. Add related test. * Have shallow copies of frozensets return self. Add related test. * Have frozenset(f) return f if f is already a frozenset. Add related test. * Beefed-up some existing tests.
2003-11-23 10:49:05 +08:00
{"difference", (PyCFunction)set_difference, METH_O,
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
difference_doc},
{"intersection",(PyCFunction)set_intersection, METH_O,
intersection_doc},
* Simplify hash function and add test to show effectiveness of the hash function. * Add a better test for deepcopying. * Add tests to show the __init__() function works like it does for list and tuple. Add related test. * Have shallow copies of frozensets return self. Add related test. * Have frozenset(f) return f if f is already a frozenset. Add related test. * Beefed-up some existing tests.
2003-11-23 10:49:05 +08:00
{"issubset", (PyCFunction)set_issubset, METH_O,
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
issubset_doc},
* Simplify hash function and add test to show effectiveness of the hash function. * Add a better test for deepcopying. * Add tests to show the __init__() function works like it does for list and tuple. Add related test. * Have shallow copies of frozensets return self. Add related test. * Have frozenset(f) return f if f is already a frozenset. Add related test. * Beefed-up some existing tests.
2003-11-23 10:49:05 +08:00
{"issuperset", (PyCFunction)set_issuperset, METH_O,
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
issuperset_doc},
{"__reduce__", (PyCFunction)set_reduce, METH_NOARGS,
reduce_doc},
{"symmetric_difference",(PyCFunction)set_symmetric_difference, METH_O,
symmetric_difference_doc},
{"union", (PyCFunction)set_union, METH_O,
union_doc},
{NULL, NULL} /* sentinel */
};
static PyNumberMethods frozenset_as_number = {
0, /*nb_add*/
(binaryfunc)set_sub, /*nb_subtract*/
0, /*nb_multiply*/
0, /*nb_divide*/
0, /*nb_remainder*/
0, /*nb_divmod*/
0, /*nb_power*/
0, /*nb_negative*/
0, /*nb_positive*/
0, /*nb_absolute*/
0, /*nb_nonzero*/
0, /*nb_invert*/
0, /*nb_lshift*/
0, /*nb_rshift*/
(binaryfunc)set_and, /*nb_and*/
(binaryfunc)set_xor, /*nb_xor*/
(binaryfunc)set_or, /*nb_or*/
};
PyDoc_STRVAR(frozenset_doc,
"frozenset(iterable) --> frozenset object\n\
\n\
Build an immutable unordered collection.");
PyTypeObject PyFrozenSet_Type = {
PyObject_HEAD_INIT(&PyType_Type)
0, /* ob_size */
"frozenset", /* tp_name */
sizeof(PySetObject), /* tp_basicsize */
* Simplify and speedup logic for tp_print. * Speed-up intersection whenever PyDict_Next can be used.
2003-12-31 22:08:58 +08:00
0, /* tp_itemsize */
/* methods */
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
(destructor)set_dealloc, /* tp_dealloc */
(printfunc)set_tp_print, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
(cmpfunc)set_nocmp, /* tp_compare */
(reprfunc)set_repr, /* tp_repr */
&frozenset_as_number, /* tp_as_number */
&set_as_sequence, /* tp_as_sequence */
0, /* tp_as_mapping */
frozenset_hash, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
PyObject_GenericGetAttr, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
SF patch #1200018: Restore GC support to set objects Reverts 1.26 and 1.27. And adds cycle testing.
2005-06-19 05:00:26 +08:00
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_CHECKTYPES |
Revised the set() and frozenset() implementaion to use its own internal data structure instead of using dictionaries. Reduces memory consumption by 1/3 and provides modest speed-ups for most set operations.
2005-07-31 09:16:36 +08:00
Py_TPFLAGS_BASETYPE, /* tp_flags */
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
frozenset_doc, /* tp_doc */
SF patch #1200018: Restore GC support to set objects Reverts 1.26 and 1.27. And adds cycle testing.
2005-06-19 05:00:26 +08:00
(traverseproc)set_traverse, /* tp_traverse */
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
0, /* tp_clear */
(richcmpfunc)set_richcompare, /* tp_richcompare */
Make sets and deques weak referencable.
2004-05-30 15:26:47 +08:00
offsetof(PySetObject, weakreflist), /* tp_weaklistoffset */
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
(getiterfunc)set_iter, /* tp_iter */
0, /* tp_iternext */
frozenset_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
0, /* tp_init */
PyType_GenericAlloc, /* tp_alloc */
Various fixups (most suggested by Armin Rigo).
2003-11-18 00:42:33 +08:00
frozenset_new, /* tp_new */
SF patch #1200018: Restore GC support to set objects Reverts 1.26 and 1.27. And adds cycle testing.
2005-06-19 05:00:26 +08:00
PyObject_GC_Del, /* tp_free */
* Migrate set() and frozenset() from the sandbox. * Install the unittests, docs, newsitem, include file, and makefile update. * Exercise the new functions whereever sets.py was being used. Includes the docs for libfuncs.tex. Separate docs for the types are forthcoming.
2003-11-17 00:17:49 +08:00
};
Reference in New Issue Copy Permalink