cpython-lru_cache-weakref: Objects/setobject.c annotate

annotate Objects/setobject.c @ 46567:ffeecbebf3ca

Block 2.6-only doc change.

author	Georg Brandl <georg@python.org>
date	Sat, 26 Apr 2008 18:28:08 +0000
parents	142a11b3057e
children	981caf24dd8a

rev	line source
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1
35311 541bfbb10030 * Move copyright notice to top and indicate derivation from sets.py and Raymond Hettinger <python@rcn.com> parents: 35301 diff changeset	2 /* set object implementation
541bfbb10030 * Move copyright notice to top and indicate derivation from sets.py and Raymond Hettinger <python@rcn.com> parents: 35301 diff changeset	3 Written and maintained by Raymond D. Hettinger <python@rcn.com>
541bfbb10030 * Move copyright notice to top and indicate derivation from sets.py and Raymond Hettinger <python@rcn.com> parents: 35301 diff changeset	4 Derived from Lib/sets.py and Objects/dictobject.c.
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	5
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41782 diff changeset	6 Copyright (c) 2003-2007 Python Software Foundation.
35311 541bfbb10030 * Move copyright notice to top and indicate derivation from sets.py and Raymond Hettinger <python@rcn.com> parents: 35301 diff changeset	7 All rights reserved.
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	8 */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	9
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	10 #include "Python.h"
35311 541bfbb10030 * Move copyright notice to top and indicate derivation from sets.py and Raymond Hettinger <python@rcn.com> parents: 35301 diff changeset	11 #include "structmember.h"
44252 444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	12 #include "stringlib/eq.h"
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	13
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	14 /* Set a key error with the specified argument, wrapping it in a
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	15 * tuple automatically so that tuple keys are not unpacked as the
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	16 * exception arguments. */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	17 static void
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	18 set_key_error(PyObject *arg)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	19 {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	20 PyObject *tup;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	21 tup = PyTuple_Pack(1, arg);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	22 if (!tup)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	23 return; /* caller will expect error to be set anyway */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	24 PyErr_SetObject(PyExc_KeyError, tup);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	25 Py_DECREF(tup);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	26 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	27
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	28 /* This must be >= 1. */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	29 #define PERTURB_SHIFT 5
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	30
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	31 /* Object used as dummy key to fill deleted entries */
35311 541bfbb10030 * Move copyright notice to top and indicate derivation from sets.py and Raymond Hettinger <python@rcn.com> parents: 35301 diff changeset	32 static PyObject dummy = NULL; / Initialized by first call to make_new_set() */
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	33
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	34 #ifdef Py_REF_DEBUG
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	35 PyObject *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	36 _PySet_Dummy(void)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	37 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	38 return dummy;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	39 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	40 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	41
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	42 #define INIT_NONZERO_SET_SLOTS(so) do { \
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	43 (so)->table = (so)->smalltable; \
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	44 (so)->mask = PySet_MINSIZE - 1; \
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	45 (so)->hash = -1; \
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	46 } while(0)
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	47
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	48 #define EMPTY_TO_MINSIZE(so) do { \
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	49 memset((so)->smalltable, 0, sizeof((so)->smalltable)); \
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	50 (so)->used = (so)->fill = 0; \
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	51 INIT_NONZERO_SET_SLOTS(so); \
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	52 } while(0)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	53
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	54 /* Reuse scheme to save calls to malloc, free, and memset */
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	55 #ifndef PySet_MAXFREELIST
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	56 #define PySet_MAXFREELIST 80
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	57 #endif
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	58 static PySetObject *free_list[PySet_MAXFREELIST];
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	59 static int numfree = 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	60
44252 444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	61
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	62 /*
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	63 The basic lookup function used by all operations.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	64 This is based on Algorithm D from Knuth Vol. 3, Sec. 6.4.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	65 Open addressing is preferred over chaining since the link overhead for
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	66 chaining would be substantial (100% with typical malloc overhead).
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	67
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	68 The initial probe index is computed as hash mod the table size. Subsequent
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	69 probe indices are computed as explained in Objects/dictobject.c.
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	70
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	71 All arithmetic on hash should ignore overflow.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	72
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	73 Unlike the dictionary implementation, the lookkey functions can return
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	74 NULL if the rich comparison returns an error.
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	75 */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	76
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	77 static setentry *
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	78 set_lookkey(PySetObject so, PyObject key, register long hash)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	79 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	80 register Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	81 register size_t perturb;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	82 register setentry *freeslot;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	83 register size_t mask = so->mask;
35312 8aa9bd80286b * Improve a variable name: entry0 --> table. Raymond Hettinger <python@rcn.com> parents: 35311 diff changeset	84 setentry *table = so->table;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	85 register setentry *entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	86 register int cmp;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	87 PyObject *startkey;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	88
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	89 i = hash & mask;
35312 8aa9bd80286b * Improve a variable name: entry0 --> table. Raymond Hettinger <python@rcn.com> parents: 35311 diff changeset	90 entry = &table[i];
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	91 if (entry->key == NULL \|\| entry->key == key)
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	92 return entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	93
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	94 if (entry->key == dummy)
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	95 freeslot = entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	96 else {
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	97 if (entry->hash == hash) {
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	98 startkey = entry->key;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	99 cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	100 if (cmp < 0)
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	101 return NULL;
35312 8aa9bd80286b * Improve a variable name: entry0 --> table. Raymond Hettinger <python@rcn.com> parents: 35311 diff changeset	102 if (table == so->table && entry->key == startkey) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	103 if (cmp > 0)
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	104 return entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	105 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	106 else {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	107 /* The compare did major nasty stuff to the
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	108 * set: start over.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	109 */
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	110 return set_lookkey(so, key, hash);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	111 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	112 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	113 freeslot = NULL;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	114 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	115
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	116 /* In the loop, key == dummy is by far (factor of 100s) the
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	117 least likely outcome, so test for that last. */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	118 for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	119 i = (i << 2) + i + perturb + 1;
35312 8aa9bd80286b * Improve a variable name: entry0 --> table. Raymond Hettinger <python@rcn.com> parents: 35311 diff changeset	120 entry = &table[i & mask];
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	121 if (entry->key == NULL) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	122 if (freeslot != NULL)
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	123 entry = freeslot;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	124 break;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	125 }
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	126 if (entry->key == key)
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	127 break;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	128 if (entry->hash == hash && entry->key != dummy) {
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	129 startkey = entry->key;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	130 cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	131 if (cmp < 0)
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	132 return NULL;
35312 8aa9bd80286b * Improve a variable name: entry0 --> table. Raymond Hettinger <python@rcn.com> parents: 35311 diff changeset	133 if (table == so->table && entry->key == startkey) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	134 if (cmp > 0)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	135 break;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	136 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	137 else {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	138 /* The compare did major nasty stuff to the
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	139 * set: start over.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	140 */
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	141 return set_lookkey(so, key, hash);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	142 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	143 }
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	144 else if (entry->key == dummy && freeslot == NULL)
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	145 freeslot = entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	146 }
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	147 return entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	148 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	149
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	150 /*
44252 444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	151 * Hacked up version of set_lookkey which can assume keys are always unicode;
444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	152 * This means we can always use unicode_eq directly and not have to check to
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	153 * see if the comparison altered the table.
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	154 */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	155 static setentry *
44252 444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	156 set_lookkey_unicode(PySetObject so, PyObject key, register long hash)
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	157 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	158 register Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	159 register size_t perturb;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	160 register setentry *freeslot;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	161 register size_t mask = so->mask;
35312 8aa9bd80286b * Improve a variable name: entry0 --> table. Raymond Hettinger <python@rcn.com> parents: 35311 diff changeset	162 setentry *table = so->table;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	163 register setentry *entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	164
44252 444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	165 /* Make sure this function doesn't have to handle non-unicode keys,
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	166 including subclasses of str; e.g., one reason to subclass
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	167 strings is to override __eq__, and for speed we don't cater to
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	168 that here. */
44252 444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	169 if (!PyUnicode_CheckExact(key)) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	170 so->lookup = set_lookkey;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	171 return set_lookkey(so, key, hash);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	172 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	173 i = hash & mask;
35312 8aa9bd80286b * Improve a variable name: entry0 --> table. Raymond Hettinger <python@rcn.com> parents: 35311 diff changeset	174 entry = &table[i];
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	175 if (entry->key == NULL \|\| entry->key == key)
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	176 return entry;
35339 028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	177 if (entry->key == dummy)
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	178 freeslot = entry;
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	179 else {
44252 444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	180 if (entry->hash == hash && unicode_eq(entry->key, key))
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	181 return entry;
35339 028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	182 freeslot = NULL;
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	183 }
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	184
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	185 /* In the loop, key == dummy is by far (factor of 100s) the
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	186 least likely outcome, so test for that last. */
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	187 for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	188 i = (i << 2) + i + perturb + 1;
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	189 entry = &table[i & mask];
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	190 if (entry->key == NULL)
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	191 return freeslot == NULL ? entry : freeslot;
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	192 if (entry->key == key
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	193 \|\| (entry->hash == hash
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	194 && entry->key != dummy
44252 444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	195 && unicode_eq(entry->key, key)))
35339 028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	196 return entry;
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	197 if (entry->key == dummy && freeslot == NULL)
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	198 freeslot = entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	199 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	200 assert(0); /* NOT REACHED */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	201 return 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	202 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	203
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	204 /*
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	205 Internal routine to insert a new key into the table.
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	206 Used by the public insert routine.
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	207 Eats a reference to key.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	208 */
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	209 static int
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	210 set_insert_key(register PySetObject so, PyObject key, long hash)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	211 {
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	212 register setentry *entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	213 typedef setentry (lookupfunc)(PySetObject , PyObject , long);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	214
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	215 assert(so->lookup != NULL);
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	216 entry = so->lookup(so, key, hash);
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	217 if (entry == NULL)
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	218 return -1;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	219 if (entry->key == NULL) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	220 /* UNUSED */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	221 so->fill++;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	222 entry->key = key;
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	223 entry->hash = hash;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	224 so->used++;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	225 } else if (entry->key == dummy) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	226 /* DUMMY */
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	227 entry->key = key;
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	228 entry->hash = hash;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	229 so->used++;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	230 Py_DECREF(dummy);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	231 } else {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	232 /* ACTIVE */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	233 Py_DECREF(key);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	234 }
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	235 return 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	236 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	237
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	238 /*
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	239 Internal routine used by set_table_resize() to insert an item which is
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	240 known to be absent from the set. This routine also assumes that
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	241 the set contains no deleted entries. Besides the performance benefit,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	242 using set_insert_clean() in set_table_resize() is dangerous (SF bug #1456209).
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	243 Note that no refcounts are changed by this routine; if needed, the caller
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	244 is responsible for incref'ing `key`.
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	245 */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	246 static void
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	247 set_insert_clean(register PySetObject so, PyObject key, long hash)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	248 {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	249 register size_t i;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	250 register size_t perturb;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	251 register size_t mask = (size_t)so->mask;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	252 setentry *table = so->table;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	253 register setentry *entry;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	254
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	255 i = hash & mask;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	256 entry = &table[i];
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	257 for (perturb = hash; entry->key != NULL; perturb >>= PERTURB_SHIFT) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	258 i = (i << 2) + i + perturb + 1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	259 entry = &table[i & mask];
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	260 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	261 so->fill++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	262 entry->key = key;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	263 entry->hash = hash;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	264 so->used++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	265 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	266
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	267 /*
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	268 Restructure the table by allocating a new table and reinserting all
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	269 keys again. When entries have been deleted, the new table may
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	270 actually be smaller than the old one.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	271 */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	272 static int
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	273 set_table_resize(PySetObject *so, Py_ssize_t minused)
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	274 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	275 Py_ssize_t newsize;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	276 setentry oldtable, newtable, *entry;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	277 Py_ssize_t i;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	278 int is_oldtable_malloced;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	279 setentry small_copy[PySet_MINSIZE];
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	280
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	281 assert(minused >= 0);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	282
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	283 /* Find the smallest table size > minused. */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	284 for (newsize = PySet_MINSIZE;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	285 newsize <= minused && newsize > 0;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	286 newsize <<= 1)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	287 ;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	288 if (newsize <= 0) {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	289 PyErr_NoMemory();
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	290 return -1;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	291 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	292
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	293 /* Get space for a new table. */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	294 oldtable = so->table;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	295 assert(oldtable != NULL);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	296 is_oldtable_malloced = oldtable != so->smalltable;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	297
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	298 if (newsize == PySet_MINSIZE) {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	299 /* A large table is shrinking, or we can't get any smaller. */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	300 newtable = so->smalltable;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	301 if (newtable == oldtable) {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	302 if (so->fill == so->used) {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	303 /* No dummies, so no point doing anything. */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	304 return 0;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	305 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	306 /* We're not going to resize it, but rebuild the
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	307 table anyway to purge old dummy entries.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	308 Subtle: This is necessary if fill==size,
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	309 as set_lookkey needs at least one virgin slot to
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	310 terminate failing searches. If fill < size, it's
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	311 merely desirable, as dummies slow searches. */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	312 assert(so->fill > so->used);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	313 memcpy(small_copy, oldtable, sizeof(small_copy));
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	314 oldtable = small_copy;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	315 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	316 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	317 else {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	318 newtable = PyMem_NEW(setentry, newsize);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	319 if (newtable == NULL) {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	320 PyErr_NoMemory();
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	321 return -1;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	322 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	323 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	324
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	325 /* Make the set empty, using the new table. */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	326 assert(newtable != oldtable);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	327 so->table = newtable;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	328 so->mask = newsize - 1;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	329 memset(newtable, 0, sizeof(setentry) * newsize);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	330 so->used = 0;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	331 i = so->fill;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	332 so->fill = 0;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	333
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	334 /* Copy the data over; this is refcount-neutral for active entries;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	335 dummy entries aren't copied over, of course */
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	336 for (entry = oldtable; i > 0; entry++) {
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	337 if (entry->key == NULL) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	338 /* UNUSED */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	339 ;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	340 } else if (entry->key == dummy) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	341 /* DUMMY */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	342 --i;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	343 assert(entry->key == dummy);
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	344 Py_DECREF(entry->key);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	345 } else {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	346 /* ACTIVE */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	347 --i;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	348 set_insert_clean(so, entry->key, entry->hash);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	349 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	350 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	351
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	352 if (is_oldtable_malloced)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	353 PyMem_DEL(oldtable);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	354 return 0;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	355 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	356
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	357 /* CAUTION: set_add_key/entry() must guarantee it won't resize the table */
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	358
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	359 static int
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	360 set_add_entry(register PySetObject so, setentry entry)
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	361 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	362 register Py_ssize_t n_used;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	363
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	364 assert(so->fill <= so->mask); /* at least one empty slot */
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	365 n_used = so->used;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	366 Py_INCREF(entry->key);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	367 if (set_insert_key(so, entry->key, entry->hash) == -1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	368 Py_DECREF(entry->key);
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	369 return -1;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	370 }
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	371 if (!(so->used > n_used && so->fill3 >= (so->mask+1)2))
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	372 return 0;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	373 return set_table_resize(so, so->used>50000 ? so->used2 : so->used4);
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	374 }
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	375
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	376 static int
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	377 set_add_key(register PySetObject so, PyObject key)
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	378 {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	379 register long hash;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	380 register Py_ssize_t n_used;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	381
44252 444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	382 if (!PyUnicode_CheckExact(key) \|\|
444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	383 (hash = ((PyUnicodeObject *) key)->hash) == -1) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	384 hash = PyObject_Hash(key);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	385 if (hash == -1)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	386 return -1;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	387 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	388 assert(so->fill <= so->mask); /* at least one empty slot */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	389 n_used = so->used;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	390 Py_INCREF(key);
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	391 if (set_insert_key(so, key, hash) == -1) {
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	392 Py_DECREF(key);
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	393 return -1;
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	394 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	395 if (!(so->used > n_used && so->fill3 >= (so->mask+1)2))
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	396 return 0;
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	397 return set_table_resize(so, so->used>50000 ? so->used2 : so->used4);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	398 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	399
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	400 #define DISCARD_NOTFOUND 0
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	401 #define DISCARD_FOUND 1
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	402
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	403 static int
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	404 set_discard_entry(PySetObject so, setentry oldentry)
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	405 { register setentry *entry;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	406 PyObject *old_key;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	407
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	408 entry = (so->lookup)(so, oldentry->key, oldentry->hash);
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	409 if (entry == NULL)
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	410 return -1;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	411 if (entry->key == NULL \|\| entry->key == dummy)
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	412 return DISCARD_NOTFOUND;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	413 old_key = entry->key;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	414 Py_INCREF(dummy);
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	415 entry->key = dummy;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	416 so->used--;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	417 Py_DECREF(old_key);
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	418 return DISCARD_FOUND;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	419 }
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	420
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	421 static int
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	422 set_discard_key(PySetObject so, PyObject key)
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	423 {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	424 register long hash;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	425 register setentry *entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	426 PyObject *old_key;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	427
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	428 assert (PyAnySet_Check(so));
44252 444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	429
444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	430 if (!PyUnicode_CheckExact(key) \|\|
444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	431 (hash = ((PyUnicodeObject *) key)->hash) == -1) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	432 hash = PyObject_Hash(key);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	433 if (hash == -1)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	434 return -1;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	435 }
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	436 entry = (so->lookup)(so, key, hash);
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	437 if (entry == NULL)
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	438 return -1;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	439 if (entry->key == NULL \|\| entry->key == dummy)
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	440 return DISCARD_NOTFOUND;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	441 old_key = entry->key;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	442 Py_INCREF(dummy);
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	443 entry->key = dummy;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	444 so->used--;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	445 Py_DECREF(old_key);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	446 return DISCARD_FOUND;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	447 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	448
35315 a6cbfcd0e691 Factor away a redundant clear() function. Raymond Hettinger <python@rcn.com> parents: 35312 diff changeset	449 static int
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	450 set_clear_internal(PySetObject *so)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	451 {
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	452 setentry entry, table;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	453 int table_is_malloced;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	454 Py_ssize_t fill;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	455 setentry small_copy[PySet_MINSIZE];
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	456 #ifdef Py_DEBUG
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	457 Py_ssize_t i, n;
35312 8aa9bd80286b * Improve a variable name: entry0 --> table. Raymond Hettinger <python@rcn.com> parents: 35311 diff changeset	458 assert (PyAnySet_Check(so));
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	459
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	460 n = so->mask + 1;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	461 i = 0;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	462 #endif
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	463
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	464 table = so->table;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	465 assert(table != NULL);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	466 table_is_malloced = table != so->smalltable;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	467
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	468 /* This is delicate. During the process of clearing the set,
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	469 * decrefs can cause the set to mutate. To avoid fatal confusion
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	470 * (voice of experience), we have to make the set empty before
35315 a6cbfcd0e691 Factor away a redundant clear() function. Raymond Hettinger <python@rcn.com> parents: 35312 diff changeset	471 * clearing the slots, and never refer to anything via so->ref while
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	472 * clearing.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	473 */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	474 fill = so->fill;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	475 if (table_is_malloced)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	476 EMPTY_TO_MINSIZE(so);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	477
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	478 else if (fill > 0) {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	479 /* It's a small table with something that needs to be cleared.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	480 * Afraid the only safe way is to copy the set entries into
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	481 * another small table first.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	482 */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	483 memcpy(small_copy, table, sizeof(small_copy));
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	484 table = small_copy;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	485 EMPTY_TO_MINSIZE(so);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	486 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	487 /* else it's a small table that's already empty */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	488
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	489 /* Now we can finally clear things. If C had refcounts, we could
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	490 * assert that the refcount on table is 1 now, i.e. that this function
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	491 * has unique access to it, so decref side-effects can't alter it.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	492 */
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	493 for (entry = table; fill > 0; ++entry) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	494 #ifdef Py_DEBUG
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	495 assert(i < n);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	496 ++i;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	497 #endif
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	498 if (entry->key) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	499 --fill;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	500 Py_DECREF(entry->key);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	501 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	502 #ifdef Py_DEBUG
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	503 else
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	504 assert(entry->key == NULL);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	505 #endif
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	506 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	507
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	508 if (table_is_malloced)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	509 PyMem_DEL(table);
35315 a6cbfcd0e691 Factor away a redundant clear() function. Raymond Hettinger <python@rcn.com> parents: 35312 diff changeset	510 return 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	511 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	512
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	513 /*
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	514 * Iterate over a set table. Use like so:
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	515 *
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	516 * Py_ssize_t pos;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	517 * setentry *entry;
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	518 * pos = 0; # important! pos should not otherwise be changed by you
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	519 * while (set_next(yourset, &pos, &entry)) {
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	520 * Refer to borrowed reference in entry->key.
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	521 * }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	522 *
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	523 * CAUTION: In general, it isn't safe to use set_next in a loop that
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	524 * mutates the table.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	525 */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	526 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	527 set_next(PySetObject so, Py_ssize_t pos_ptr, setentry **entry_ptr)
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	528 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	529 Py_ssize_t i;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	530 Py_ssize_t mask;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	531 register setentry *table;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	532
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	533 assert (PyAnySet_Check(so));
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	534 i = *pos_ptr;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	535 assert(i >= 0);
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	536 table = so->table;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	537 mask = so->mask;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	538 while (i <= mask && (table[i].key == NULL \|\| table[i].key == dummy))
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	539 i++;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	540 *pos_ptr = i+1;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	541 if (i > mask)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	542 return 0;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	543 assert(table[i].key != NULL);
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	544 *entry_ptr = &table[i];
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	545 return 1;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	546 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	547
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	548 static void
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	549 set_dealloc(PySetObject *so)
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	550 {
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	551 register setentry *entry;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	552 Py_ssize_t fill = so->fill;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	553 PyObject_GC_UnTrack(so);
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	554 Py_TRASHCAN_SAFE_BEGIN(so)
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	555 if (so->weakreflist != NULL)
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	556 PyObject_ClearWeakRefs((PyObject *) so);
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	557
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	558 for (entry = so->table; fill > 0; entry++) {
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	559 if (entry->key) {
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	560 --fill;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	561 Py_DECREF(entry->key);
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	562 }
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	563 }
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	564 if (so->table != so->smalltable)
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	565 PyMem_DEL(so->table);
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	566 if (numfree < PySet_MAXFREELIST && PyAnySet_CheckExact(so))
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	567 free_list[numfree++] = so;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	568 else
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	569 Py_TYPE(so)->tp_free(so);
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	570 Py_TRASHCAN_SAFE_END(so)
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	571 }
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	572
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	573 static PyObject *
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	574 set_repr(PySetObject *so)
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	575 {
41782 bee8d01ef42c Add a format specifier %R to PyUnicode_FromFormat(), which embeds Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	576 PyObject keys, result=NULL;
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41683 diff changeset	577 Py_UNICODE *u;
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	578 int status = Py_ReprEnter((PyObject*)so);
42482 4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	579 PyObject *listrepr;
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	580 Py_ssize_t newsize;
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	581
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	582 if (status != 0) {
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	583 if (status < 0)
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	584 return NULL;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	585 return PyUnicode_FromFormat("%s(...)", Py_TYPE(so)->tp_name);
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	586 }
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	587
39696 d14f10a4d9d4 Fix str() and repr() of empty sets. Georg Brandl <georg@python.org> parents: 39693 diff changeset	588 /* shortcut for the empty set */
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	589 if (!so->used) {
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	590 Py_ReprLeave((PyObject*)so);
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	591 return PyUnicode_FromFormat("%s()", Py_TYPE(so)->tp_name);
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	592 }
39696 d14f10a4d9d4 Fix str() and repr() of empty sets. Georg Brandl <georg@python.org> parents: 39693 diff changeset	593
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	594 keys = PySequence_List((PyObject *)so);
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	595 if (keys == NULL)
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	596 goto done;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	597
42482 4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	598 listrepr = PyObject_Repr(keys);
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	599 Py_DECREF(keys);
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	600 if (listrepr == NULL) {
41782 bee8d01ef42c Add a format specifier %R to PyUnicode_FromFormat(), which embeds Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	601 Py_DECREF(keys);
42482 4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	602 goto done;
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	603 }
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	604 newsize = PyUnicode_GET_SIZE(listrepr);
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	605 result = PyUnicode_FromUnicode(NULL, newsize);
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	606 if (result) {
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	607 u = PyUnicode_AS_UNICODE(result);
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	608 *u++ = '{';
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	609 /* Omit the brackets from the listrepr */
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	610 Py_UNICODE_COPY(u, PyUnicode_AS_UNICODE(listrepr)+1,
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	611 PyUnicode_GET_SIZE(listrepr)-2);
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	612 u += newsize-2;
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	613 *u++ = '}';
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	614 }
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	615 Py_DECREF(listrepr);
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	616 if (Py_TYPE(so) != &PySet_Type) {
42482 4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	617 PyObject *tmp = PyUnicode_FromFormat("%s(%U)",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	618 Py_TYPE(so)->tp_name,
42482 4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	619 result);
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	620 Py_DECREF(result);
4dea3b68b013 Change the repr() of frozenset instances (and set subclasses) Guido van Rossum <guido@python.org> parents: 42477 diff changeset	621 result = tmp;
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39536 diff changeset	622 }
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	623 done:
67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	624 Py_ReprLeave((PyObject*)so);
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	625 return result;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	626 }
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	627
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	628 static Py_ssize_t
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	629 set_len(PyObject *so)
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	630 {
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	631 return ((PySetObject *)so)->used;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	632 }
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	633
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	634 static int
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	635 set_merge(PySetObject so, PyObject otherset)
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	636 {
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	637 PySetObject *other;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	638 register Py_ssize_t i;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	639 register setentry *entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	640
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	641 assert (PyAnySet_Check(so));
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	642 assert (PyAnySet_Check(otherset));
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	643
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	644 other = (PySetObject*)otherset;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	645 if (other == so \|\| other->used == 0)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	646 /* a.update(a) or a.update({}); nothing to do */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	647 return 0;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	648 /* Do one big resize at the start, rather than
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	649 * incrementally resizing as we insert new keys. Expect
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	650 * that there will be no (or few) overlapping keys.
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	651 */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	652 if ((so->fill + other->used)3 >= (so->mask+1)2) {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	653 if (set_table_resize(so, (so->used + other->used)*2) != 0)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	654 return -1;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	655 }
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	656 for (i = 0; i <= other->mask; i++) {
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	657 entry = &other->table[i];
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	658 if (entry->key != NULL &&
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	659 entry->key != dummy) {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	660 Py_INCREF(entry->key);
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	661 if (set_insert_key(so, entry->key, entry->hash) == -1) {
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	662 Py_DECREF(entry->key);
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	663 return -1;
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	664 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	665 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	666 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	667 return 0;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	668 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	669
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	670 static int
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	671 set_contains_key(PySetObject so, PyObject key)
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	672 {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	673 long hash;
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	674 setentry *entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	675
44252 444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	676 if (!PyUnicode_CheckExact(key) \|\|
444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	677 (hash = ((PyUnicodeObject *) key)->hash) == -1) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	678 hash = PyObject_Hash(key);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	679 if (hash == -1)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	680 return -1;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	681 }
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	682 entry = (so->lookup)(so, key, hash);
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	683 if (entry == NULL)
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	684 return -1;
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	685 key = entry->key;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	686 return key != NULL && key != dummy;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	687 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	688
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	689 static int
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	690 set_contains_entry(PySetObject so, setentry entry)
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	691 {
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	692 PyObject *key;
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	693 setentry *lu_entry;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	694
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	695 lu_entry = (so->lookup)(so, entry->key, entry->hash);
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	696 if (lu_entry == NULL)
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	697 return -1;
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	698 key = lu_entry->key;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	699 return key != NULL && key != dummy;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	700 }
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	701
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	702 static PyObject *
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	703 set_pop(PySetObject *so)
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	704 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	705 register Py_ssize_t i = 0;
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	706 register setentry *entry;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	707 PyObject *key;
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	708
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	709 assert (PyAnySet_Check(so));
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	710 if (so->used == 0) {
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	711 PyErr_SetString(PyExc_KeyError, "pop from an empty set");
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	712 return NULL;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	713 }
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	714
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	715 /* Set entry to "the first" unused or dummy set entry. We abuse
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	716 * the hash field of slot 0 to hold a search finger:
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	717 * If slot 0 has a value, use slot 0.
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	718 * Else slot 0 is being used to hold a search finger,
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	719 * and we use its hash value as the first index to look.
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	720 */
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	721 entry = &so->table[0];
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	722 if (entry->key == NULL \|\| entry->key == dummy) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	723 i = entry->hash;
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	724 /* The hash field may be a real hash value, or it may be a
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	725 * legit search finger, or it may be a once-legit search
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	726 * finger that's out of bounds now because it wrapped around
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	727 * or the table shrunk -- simply make sure it's in bounds now.
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	728 */
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	729 if (i > so->mask \|\| i < 1)
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	730 i = 1; /* skip slot 0 */
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	731 while ((entry = &so->table[i])->key == NULL \|\| entry->key==dummy) {
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	732 i++;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	733 if (i > so->mask)
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	734 i = 1;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	735 }
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	736 }
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	737 key = entry->key;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	738 Py_INCREF(dummy);
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	739 entry->key = dummy;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	740 so->used--;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	741 so->table[0].hash = i + 1; /* next place to start */
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	742 return key;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	743 }
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	744
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	745 PyDoc_STRVAR(pop_doc, "Remove and return an arbitrary set element.");
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	746
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	747 static int
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	748 set_traverse(PySetObject so, visitproc visit, void arg)
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	749 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	750 Py_ssize_t pos = 0;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	751 setentry *entry;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	752
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	753 while (set_next(so, &pos, &entry))
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	754 Py_VISIT(entry->key);
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	755 return 0;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	756 }
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	757
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	758 static long
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	759 frozenset_hash(PyObject *self)
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	760 {
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	761 PySetObject so = (PySetObject )self;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	762 long h, hash = 1927868237L;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	763 setentry *entry;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	764 Py_ssize_t pos = 0;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	765
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	766 if (so->hash != -1)
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	767 return so->hash;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	768
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	769 hash *= PySet_GET_SIZE(self) + 1;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	770 while (set_next(so, &pos, &entry)) {
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	771 /* Work to increase the bit dispersion for closely spaced hash
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	772 values. The is important because some use cases have many
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	773 combinations of a small number of elements with nearby
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	774 hashes so that many distinct combinations collapse to only
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	775 a handful of distinct hash values. */
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	776 h = entry->hash;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	777 hash ^= (h ^ (h << 16) ^ 89869747L) * 3644798167u;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	778 }
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	779 hash = hash * 69069L + 907133923L;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	780 if (hash == -1)
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	781 hash = 590923713L;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	782 so->hash = hash;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	783 return hash;
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	784 }
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	785
35311 541bfbb10030 * Move copyright notice to top and indicate derivation from sets.py and Raymond Hettinger <python@rcn.com> parents: 35301 diff changeset	786 /*** Set iterator type *********************************************/
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	787
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	788 typedef struct {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	789 PyObject_HEAD
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	790 PySetObject si_set; / Set to NULL when iterator is exhausted */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	791 Py_ssize_t si_used;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	792 Py_ssize_t si_pos;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	793 Py_ssize_t len;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	794 } setiterobject;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	795
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	796 static void
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	797 setiter_dealloc(setiterobject *si)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	798 {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	799 Py_XDECREF(si->si_set);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	800 PyObject_Del(si);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	801 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	802
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35581 diff changeset	803 static PyObject *
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	804 setiter_len(setiterobject *si)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	805 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	806 Py_ssize_t len = 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	807 if (si->si_set != NULL && si->si_used == si->si_set->used)
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35581 diff changeset	808 len = si->len;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44061 diff changeset	809 return PyLong_FromLong(len);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	810 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	811
36484 20f75d5e79e9 Renamed _length_cue() to __length_hint__(). See: Armin Rigo <arigo@tunes.org> parents: 36244 diff changeset	812 PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35581 diff changeset	813
e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35581 diff changeset	814 static PyMethodDef setiter_methods[] = {
36484 20f75d5e79e9 Renamed _length_cue() to __length_hint__(). See: Armin Rigo <arigo@tunes.org> parents: 36244 diff changeset	815 {"__length_hint__", (PyCFunction)setiter_len, METH_NOARGS, length_hint_doc},
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35581 diff changeset	816 {NULL, NULL} /* sentinel */
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	817 };
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	818
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	819 static PyObject setiter_iternext(setiterobject si)
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	820 {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	821 PyObject *key;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	822 register Py_ssize_t i, mask;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	823 register setentry *entry;
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	824 PySetObject *so = si->si_set;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	825
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	826 if (so == NULL)
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	827 return NULL;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	828 assert (PyAnySet_Check(so));
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	829
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	830 if (si->si_used != so->used) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	831 PyErr_SetString(PyExc_RuntimeError,
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	832 "Set changed size during iteration");
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	833 si->si_used = -1; /* Make this state sticky */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	834 return NULL;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	835 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	836
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	837 i = si->si_pos;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	838 assert(i>=0);
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	839 entry = so->table;
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	840 mask = so->mask;
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	841 while (i <= mask && (entry[i].key == NULL \|\| entry[i].key == dummy))
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	842 i++;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	843 si->si_pos = i+1;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	844 if (i > mask)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	845 goto fail;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	846 si->len--;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	847 key = entry[i].key;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	848 Py_INCREF(key);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	849 return key;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	850
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	851 fail:
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	852 Py_DECREF(so);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	853 si->si_set = NULL;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	854 return NULL;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	855 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	856
44061 0cc552ab76bd Added all PyTypeObjects to the appropriate header files. Christian Heimes <christian@cheimes.de> parents: 44043 diff changeset	857 PyTypeObject PySetIter_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41782 diff changeset	858 PyVarObject_HEAD_INIT(&PyType_Type, 0)
44043 1f024a95e9d9 Added view and iterator types to collections / _abcoll Christian Heimes <christian@cheimes.de> parents: 43961 diff changeset	859 "set_iterator", /* tp_name */
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	860 sizeof(setiterobject), /* tp_basicsize */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	861 0, /* tp_itemsize */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	862 /* methods */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	863 (destructor)setiter_dealloc, /* tp_dealloc */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	864 0, /* tp_print */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	865 0, /* tp_getattr */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	866 0, /* tp_setattr */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	867 0, /* tp_compare */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	868 0, /* tp_repr */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	869 0, /* tp_as_number */
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35581 diff changeset	870 0, /* tp_as_sequence */
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	871 0, /* tp_as_mapping */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	872 0, /* tp_hash */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	873 0, /* tp_call */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	874 0, /* tp_str */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	875 PyObject_GenericGetAttr, /* tp_getattro */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	876 0, /* tp_setattro */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	877 0, /* tp_as_buffer */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	878 Py_TPFLAGS_DEFAULT, /* tp_flags */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	879 0, /* tp_doc */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	880 0, /* tp_traverse */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	881 0, /* tp_clear */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	882 0, /* tp_richcompare */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	883 0, /* tp_weaklistoffset */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	884 PyObject_SelfIter, /* tp_iter */
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	885 (iternextfunc)setiter_iternext, /* tp_iternext */
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35581 diff changeset	886 setiter_methods, /* tp_methods */
e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35581 diff changeset	887 0,
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	888 };
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	889
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	890 static PyObject *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	891 set_iter(PySetObject *so)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	892 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	893 setiterobject *si = PyObject_New(setiterobject, &PySetIter_Type);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	894 if (si == NULL)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	895 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	896 Py_INCREF(so);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	897 si->si_set = so;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	898 si->si_used = so->used;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	899 si->si_pos = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	900 si->len = so->used;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	901 return (PyObject *)si;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	902 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	903
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	904 static int
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	905 set_update_internal(PySetObject so, PyObject other)
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	906 {
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	907 PyObject key, it;
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	908
44999 7c02182e2979 Merged revisions 60284-60349 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	909 if (PyAnySet_Check(other))
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	910 return set_merge(so, other);
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	911
40742 f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40643 diff changeset	912 if (PyDict_CheckExact(other)) {
36244 e7880f4f53a4 Remove some shadowed variables Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	913 PyObject *value;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	914 Py_ssize_t pos = 0;
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	915 long hash;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	916 Py_ssize_t dictsize = PyDict_Size(other);
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	917
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	918 /* Do one big resize at the start, rather than
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	919 * incrementally resizing as we insert new keys. Expect
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	920 * that there will be no (or few) overlapping keys.
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	921 */
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	922 if (dictsize == -1)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	923 return -1;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	924 if ((so->fill + dictsize)3 >= (so->mask+1)2) {
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	925 if (set_table_resize(so, (so->used + dictsize)*2) != 0)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	926 return -1;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	927 }
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	928 while (_PyDict_Next(other, &pos, &key, &value, &hash)) {
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	929 setentry an_entry;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	930
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	931 an_entry.hash = hash;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	932 an_entry.key = key;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	933 if (set_add_entry(so, &an_entry) == -1)
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	934 return -1;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	935 }
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	936 return 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	937 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	938
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	939 it = PyObject_GetIter(other);
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	940 if (it == NULL)
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	941 return -1;
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	942
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	943 while ((key = PyIter_Next(it)) != NULL) {
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	944 if (set_add_key(so, key) == -1) {
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	945 Py_DECREF(it);
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	946 Py_DECREF(key);
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	947 return -1;
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	948 }
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	949 Py_DECREF(key);
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	950 }
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	951 Py_DECREF(it);
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	952 if (PyErr_Occurred())
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	953 return -1;
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	954 return 0;
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	955 }
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	956
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	957 static PyObject *
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	958 set_update(PySetObject so, PyObject other)
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	959 {
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	960 if (set_update_internal(so, other) == -1)
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	961 return NULL;
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	962 Py_RETURN_NONE;
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	963 }
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	964
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	965 PyDoc_STRVAR(update_doc,
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	966 "Update a set with the union of itself and another.");
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	967
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	968 static PyObject *
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	969 make_new_set(PyTypeObject type, PyObject iterable)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	970 {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	971 register PySetObject *so = NULL;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	972
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	973 if (dummy == NULL) { /* Auto-initialize dummy */
42750 ce52cd71a8d9 Convert a bunch of constant strings in C to unicode. Neal Norwitz <nnorwitz@gmail.com> parents: 42482 diff changeset	974 dummy = PyUnicode_FromString("<dummy key>");
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	975 if (dummy == NULL)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	976 return NULL;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	977 }
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	978
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	979 /* create PySetObject structure */
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	980 if (numfree &&
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	981 (type == &PySet_Type \|\| type == &PyFrozenSet_Type)) {
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	982 so = free_list[--numfree];
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	983 assert (so != NULL && PyAnySet_CheckExact(so));
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	984 Py_TYPE(so) = type;
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	985 _Py_NewReference((PyObject *)so);
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	986 EMPTY_TO_MINSIZE(so);
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	987 PyObject_GC_Track(so);
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	988 } else {
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	989 so = (PySetObject *)type->tp_alloc(type, 0);
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	990 if (so == NULL)
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	991 return NULL;
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	992 /* tp_alloc has already zeroed the structure */
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	993 assert(so->table == NULL && so->fill == 0 && so->used == 0);
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	994 INIT_NONZERO_SET_SLOTS(so);
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	995 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	996
44252 444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	997 so->lookup = set_lookkey_unicode;
32158 679e5c8effae Make sets and deques weak referencable. Raymond Hettinger <python@rcn.com> parents: 31628 diff changeset	998 so->weakreflist = NULL;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	999
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	1000 if (iterable != NULL) {
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1001 if (set_update_internal(so, iterable) == -1) {
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	1002 Py_DECREF(so);
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	1003 return NULL;
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	1004 }
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	1005 }
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	1006
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1007 return (PyObject *)so;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1008 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1009
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1010 /* The empty frozenset is a singleton */
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1011 static PyObject *emptyfrozenset = NULL;
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1012
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1013 static PyObject *
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1014 frozenset_new(PyTypeObject type, PyObject args, PyObject *kwds)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1015 {
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1016 PyObject iterable = NULL, result;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1017
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40582 diff changeset	1018 if (type == &PyFrozenSet_Type && !_PyArg_NoKeywords("frozenset()", kwds))
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 35398 diff changeset	1019 return NULL;
1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 35398 diff changeset	1020
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1021 if (!PyArg_UnpackTuple(args, type->tp_name, 0, 1, &iterable))
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1022 return NULL;
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1023
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1024 if (type != &PyFrozenSet_Type)
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1025 return make_new_set(type, iterable);
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1026
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1027 if (iterable != NULL) {
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1028 /* frozenset(f) is idempotent */
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1029 if (PyFrozenSet_CheckExact(iterable)) {
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1030 Py_INCREF(iterable);
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1031 return iterable;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1032 }
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1033 result = make_new_set(type, iterable);
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	1034 if (result == NULL \|\| PySet_GET_SIZE(result))
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1035 return result;
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1036 Py_DECREF(result);
31004 5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1037 }
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1038 /* The empty frozenset is a singleton */
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1039 if (emptyfrozenset == NULL)
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1040 emptyfrozenset = make_new_set(type, NULL);
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1041 Py_XINCREF(emptyfrozenset);
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1042 return emptyfrozenset;
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1043 }
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1044
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1045 void
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1046 PySet_Fini(void)
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1047 {
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	1048 PySetObject *so;
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	1049
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	1050 while (numfree) {
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	1051 numfree--;
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	1052 so = free_list[numfree];
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	1053 PyObject_GC_Del(so);
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	1054 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1055 Py_CLEAR(dummy);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1056 Py_CLEAR(emptyfrozenset);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1057 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1058
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1059 static PyObject *
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1060 set_new(PyTypeObject type, PyObject args, PyObject *kwds)
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1061 {
40643 47f9efdc0855 Merged revisions 53304-53433,53435-53450 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40582 diff changeset	1062 if (type == &PySet_Type && !_PyArg_NoKeywords("set()", kwds))
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 35398 diff changeset	1063 return NULL;
1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 35398 diff changeset	1064
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1065 return make_new_set(type, NULL);
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1066 }
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1067
35293 8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1068 /* set_swap_bodies() switches the contents of any two sets by moving their
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1069 internal data pointers and, if needed, copying the internal smalltables.
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1070 Semantically equivalent to:
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1071
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1072 t=set(a); a.clear(); a.update(b); b.clear(); b.update(t); del t
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1073
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1074 The function always succeeds and it leaves both objects in a stable state.
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1075 Useful for creating temporary frozensets from sets for membership testing
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1076 in __contains__(), discard(), and remove(). Also useful for operations
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1077 that update in-place (by allowing an intermediate result to be swapped
35294 3f1b48f9ff0d Fix frozenset() ref count and a comment typo. Raymond Hettinger <python@rcn.com> parents: 35293 diff changeset	1078 into one of the original inputs).
35293 8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1079 */
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1080
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1081 static void
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1082 set_swap_bodies(PySetObject a, PySetObject b)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1083 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1084 Py_ssize_t t;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1085 setentry *u;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1086 setentry (f)(PySetObject so, PyObject key, long hash);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1087 setentry tab[PySet_MINSIZE];
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1088 long h;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1089
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1090 t = a->fill; a->fill = b->fill; b->fill = t;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1091 t = a->used; a->used = b->used; b->used = t;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1092 t = a->mask; a->mask = b->mask; b->mask = t;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1093
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1094 u = a->table;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1095 if (a->table == a->smalltable)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1096 u = b->smalltable;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1097 a->table = b->table;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1098 if (b->table == b->smalltable)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1099 a->table = a->smalltable;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1100 b->table = u;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1101
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1102 f = a->lookup; a->lookup = b->lookup; b->lookup = f;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1103
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1104 if (a->table == a->smalltable \|\| b->table == b->smalltable) {
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1105 memcpy(tab, a->smalltable, sizeof(tab));
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1106 memcpy(a->smalltable, b->smalltable, sizeof(tab));
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1107 memcpy(b->smalltable, tab, sizeof(tab));
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1108 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1109
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	1110 if (PyType_IsSubtype(Py_TYPE(a), &PyFrozenSet_Type) &&
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	1111 PyType_IsSubtype(Py_TYPE(b), &PyFrozenSet_Type)) {
35312 8aa9bd80286b * Improve a variable name: entry0 --> table. Raymond Hettinger <python@rcn.com> parents: 35311 diff changeset	1112 h = a->hash; a->hash = b->hash; b->hash = h;
8aa9bd80286b * Improve a variable name: entry0 --> table. Raymond Hettinger <python@rcn.com> parents: 35311 diff changeset	1113 } else {
8aa9bd80286b * Improve a variable name: entry0 --> table. Raymond Hettinger <python@rcn.com> parents: 35311 diff changeset	1114 a->hash = -1;
8aa9bd80286b * Improve a variable name: entry0 --> table. Raymond Hettinger <python@rcn.com> parents: 35311 diff changeset	1115 b->hash = -1;
8aa9bd80286b * Improve a variable name: entry0 --> table. Raymond Hettinger <python@rcn.com> parents: 35311 diff changeset	1116 }
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1117 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1118
31172 e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 31019 diff changeset	1119 static PyObject *
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1120 set_copy(PySetObject *so)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1121 {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	1122 return make_new_set(Py_TYPE(so), (PyObject *)so);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1123 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1124
31004 5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1125 static PyObject *
5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1126 frozenset_copy(PySetObject *so)
5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1127 {
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1128 if (PyFrozenSet_CheckExact(so)) {
31004 5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1129 Py_INCREF(so);
5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1130 return (PyObject *)so;
5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1131 }
5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1132 return set_copy(so);
5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1133 }
5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1134
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1135 PyDoc_STRVAR(copy_doc, "Return a shallow copy of a set.");
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1136
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1137 static PyObject *
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1138 set_clear(PySetObject *so)
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1139 {
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1140 set_clear_internal(so);
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1141 Py_RETURN_NONE;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1142 }
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1143
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1144 PyDoc_STRVAR(clear_doc, "Remove all elements from this set.");
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1145
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1146 static PyObject *
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1147 set_union(PySetObject so, PyObject other)
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1148 {
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1149 PySetObject *result;
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1150
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1151 result = (PySetObject *)set_copy(so);
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1152 if (result == NULL)
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1153 return NULL;
35353 e8806094d644 Add shortcuts for a\|a and a&a. Raymond Hettinger <python@rcn.com> parents: 35349 diff changeset	1154 if ((PyObject *)so == other)
e8806094d644 Add shortcuts for a\|a and a&a. Raymond Hettinger <python@rcn.com> parents: 35349 diff changeset	1155 return (PyObject *)result;
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1156 if (set_update_internal(result, other) == -1) {
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1157 Py_DECREF(result);
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1158 return NULL;
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1159 }
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1160 return (PyObject *)result;
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1161 }
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1162
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1163 PyDoc_STRVAR(union_doc,
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1164 "Return the union of two sets as a new set.\n\
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1165 \n\
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1166 (i.e. all elements that are in either set.)");
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1167
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1168 static PyObject *
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1169 set_or(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1170 {
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1171 if (!PyAnySet_Check(so) \|\| !PyAnySet_Check(other)) {
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1172 Py_INCREF(Py_NotImplemented);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1173 return Py_NotImplemented;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1174 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1175 return set_union(so, other);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1176 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1177
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1178 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1179 set_ior(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1180 {
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1181 if (!PyAnySet_Check(other)) {
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1182 Py_INCREF(Py_NotImplemented);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1183 return Py_NotImplemented;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1184 }
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1185 if (set_update_internal(so, other) == -1)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1186 return NULL;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1187 Py_INCREF(so);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1188 return (PyObject *)so;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1189 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1190
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1191 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1192 set_intersection(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1193 {
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1194 PySetObject *result;
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1195 PyObject key, it, *tmp;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1196
35353 e8806094d644 Add shortcuts for a\|a and a&a. Raymond Hettinger <python@rcn.com> parents: 35349 diff changeset	1197 if ((PyObject *)so == other)
e8806094d644 Add shortcuts for a\|a and a&a. Raymond Hettinger <python@rcn.com> parents: 35349 diff changeset	1198 return set_copy(so);
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1199
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	1200 result = (PySetObject *)make_new_set(Py_TYPE(so), NULL);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1201 if (result == NULL)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1202 return NULL;
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1203
44999 7c02182e2979 Merged revisions 60284-60349 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1204 if (PyAnySet_Check(other)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1205 Py_ssize_t pos = 0;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1206 setentry *entry;
35332 fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1207
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	1208 if (PySet_GET_SIZE(other) > PySet_GET_SIZE(so)) {
35332 fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1209 tmp = (PyObject *)so;
fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1210 so = (PySetObject *)other;
fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1211 other = tmp;
fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1212 }
fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1213
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1214 while (set_next((PySetObject *)other, &pos, &entry)) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1215 int rv = set_contains_entry(so, entry);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1216 if (rv == -1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1217 Py_DECREF(result);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1218 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1219 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1220 if (rv) {
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1221 if (set_add_entry(result, entry) == -1) {
31300 bf8402a56fa4 * Simplify and speedup logic for tp_print. Raymond Hettinger <python@rcn.com> parents: 31203 diff changeset	1222 Py_DECREF(result);
bf8402a56fa4 * Simplify and speedup logic for tp_print. Raymond Hettinger <python@rcn.com> parents: 31203 diff changeset	1223 return NULL;
bf8402a56fa4 * Simplify and speedup logic for tp_print. Raymond Hettinger <python@rcn.com> parents: 31203 diff changeset	1224 }
bf8402a56fa4 * Simplify and speedup logic for tp_print. Raymond Hettinger <python@rcn.com> parents: 31203 diff changeset	1225 }
bf8402a56fa4 * Simplify and speedup logic for tp_print. Raymond Hettinger <python@rcn.com> parents: 31203 diff changeset	1226 }
bf8402a56fa4 * Simplify and speedup logic for tp_print. Raymond Hettinger <python@rcn.com> parents: 31203 diff changeset	1227 return (PyObject *)result;
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1228 }
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1229
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1230 it = PyObject_GetIter(other);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1231 if (it == NULL) {
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1232 Py_DECREF(result);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1233 return NULL;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1234 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1235
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1236 while ((key = PyIter_Next(it)) != NULL) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1237 int rv;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1238 setentry entry;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1239 long hash = PyObject_Hash(key);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1240
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1241 if (hash == -1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1242 Py_DECREF(it);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1243 Py_DECREF(result);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1244 Py_DECREF(key);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1245 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1246 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1247 entry.hash = hash;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1248 entry.key = key;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1249 rv = set_contains_entry(so, &entry);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1250 if (rv == -1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1251 Py_DECREF(it);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1252 Py_DECREF(result);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1253 Py_DECREF(key);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1254 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1255 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1256 if (rv) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1257 if (set_add_entry(result, &entry) == -1) {
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1258 Py_DECREF(it);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1259 Py_DECREF(result);
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1260 Py_DECREF(key);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1261 return NULL;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1262 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1263 }
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1264 Py_DECREF(key);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1265 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1266 Py_DECREF(it);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1267 if (PyErr_Occurred()) {
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1268 Py_DECREF(result);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1269 return NULL;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1270 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1271 return (PyObject *)result;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1272 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1273
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1274 PyDoc_STRVAR(intersection_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1275 "Return the intersection of two sets as a new set.\n\
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1276 \n\
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1277 (i.e. all elements that are in both sets.)");
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1278
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1279 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1280 set_intersection_update(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1281 {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1282 PyObject *tmp;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1283
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1284 tmp = set_intersection(so, other);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1285 if (tmp == NULL)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1286 return NULL;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1287 set_swap_bodies(so, (PySetObject *)tmp);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1288 Py_DECREF(tmp);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1289 Py_RETURN_NONE;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1290 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1291
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1292 PyDoc_STRVAR(intersection_update_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1293 "Update a set with the intersection of itself and another.");
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1294
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1295 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1296 set_and(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1297 {
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1298 if (!PyAnySet_Check(so) \|\| !PyAnySet_Check(other)) {
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1299 Py_INCREF(Py_NotImplemented);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1300 return Py_NotImplemented;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1301 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1302 return set_intersection(so, other);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1303 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1304
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1305 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1306 set_iand(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1307 {
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1308 PyObject *result;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1309
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1310 if (!PyAnySet_Check(other)) {
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1311 Py_INCREF(Py_NotImplemented);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1312 return Py_NotImplemented;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1313 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1314 result = set_intersection_update(so, other);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1315 if (result == NULL)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1316 return NULL;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1317 Py_DECREF(result);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1318 Py_INCREF(so);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1319 return (PyObject *)so;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1320 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1321
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1322 static PyObject *
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1323 set_isdisjoint(PySetObject so, PyObject other)
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1324 {
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1325 PyObject key, it, *tmp;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1326
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1327 if ((PyObject *)so == other) {
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1328 if (PySet_GET_SIZE(so) == 0)
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1329 Py_RETURN_TRUE;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1330 else
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1331 Py_RETURN_FALSE;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1332 }
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1333
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1334 if (PyAnySet_CheckExact(other)) {
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1335 Py_ssize_t pos = 0;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1336 setentry *entry;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1337
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1338 if (PySet_GET_SIZE(other) > PySet_GET_SIZE(so)) {
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1339 tmp = (PyObject *)so;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1340 so = (PySetObject *)other;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1341 other = tmp;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1342 }
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1343 while (set_next((PySetObject *)other, &pos, &entry)) {
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1344 int rv = set_contains_entry(so, entry);
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1345 if (rv == -1)
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1346 return NULL;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1347 if (rv)
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1348 Py_RETURN_FALSE;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1349 }
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1350 Py_RETURN_TRUE;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1351 }
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1352
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1353 it = PyObject_GetIter(other);
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1354 if (it == NULL)
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1355 return NULL;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1356
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1357 while ((key = PyIter_Next(it)) != NULL) {
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1358 int rv;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1359 setentry entry;
44252 444da08f78a4 Fixed issue #1564: The set implementation should special-case PyUnicode instead of PyString Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1360 long hash = PyObject_Hash(key);;
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1361
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1362 if (hash == -1) {
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1363 Py_DECREF(key);
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1364 Py_DECREF(it);
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1365 return NULL;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1366 }
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1367 entry.hash = hash;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1368 entry.key = key;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1369 rv = set_contains_entry(so, &entry);
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1370 Py_DECREF(key);
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1371 if (rv == -1) {
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1372 Py_DECREF(it);
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1373 return NULL;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1374 }
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1375 if (rv) {
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1376 Py_DECREF(it);
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1377 Py_RETURN_FALSE;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1378 }
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1379 }
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1380 Py_DECREF(it);
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1381 if (PyErr_Occurred())
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1382 return NULL;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1383 Py_RETURN_TRUE;
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1384 }
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1385
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1386 PyDoc_STRVAR(isdisjoint_doc,
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1387 "Return True if two sets have a null intersection.");
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1388
35862 6867995a18a7 Prevent name pollution by making lots of internal functions static. Neal Norwitz <nnorwitz@gmail.com> parents: 35636 diff changeset	1389 static int
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1390 set_difference_update_internal(PySetObject so, PyObject other)
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1391 {
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1392 if ((PyObject *)so == other)
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1393 return set_clear_internal(so);
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1394
44999 7c02182e2979 Merged revisions 60284-60349 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1395 if (PyAnySet_Check(other)) {
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1396 setentry *entry;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1397 Py_ssize_t pos = 0;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1398
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1399 while (set_next((PySetObject *)other, &pos, &entry))
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1400 if (set_discard_entry(so, entry) == -1)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1401 return -1;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1402 } else {
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1403 PyObject key, it;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1404 it = PyObject_GetIter(other);
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1405 if (it == NULL)
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1406 return -1;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1407
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1408 while ((key = PyIter_Next(it)) != NULL) {
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1409 if (set_discard_key(so, key) == -1) {
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1410 Py_DECREF(it);
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1411 Py_DECREF(key);
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1412 return -1;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1413 }
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1414 Py_DECREF(key);
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1415 }
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1416 Py_DECREF(it);
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1417 if (PyErr_Occurred())
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1418 return -1;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1419 }
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1420 /* If more than 1/5 are dummies, then resize them away. */
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1421 if ((so->fill - so->used) * 5 < so->mask)
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1422 return 0;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1423 return set_table_resize(so, so->used>50000 ? so->used2 : so->used4);
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1424 }
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1425
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1426 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1427 set_difference_update(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1428 {
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1429 if (set_difference_update_internal(so, other) != -1)
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	1430 Py_RETURN_NONE;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1431 return NULL;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1432 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1433
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1434 PyDoc_STRVAR(difference_update_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1435 "Remove all elements of another set from this set.");
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1436
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1437 static PyObject *
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1438 set_difference(PySetObject so, PyObject other)
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1439 {
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1440 PyObject *result;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1441 setentry *entry;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1442 Py_ssize_t pos = 0;
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1443
44999 7c02182e2979 Merged revisions 60284-60349 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1444 if (!PyAnySet_Check(other) && !PyDict_CheckExact(other)) {
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1445 result = set_copy(so);
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1446 if (result == NULL)
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1447 return NULL;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1448 if (set_difference_update_internal((PySetObject *)result, other) != -1)
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1449 return result;
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1450 Py_DECREF(result);
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1451 return NULL;
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1452 }
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1453
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	1454 result = make_new_set(Py_TYPE(so), NULL);
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1455 if (result == NULL)
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1456 return NULL;
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1457
40742 f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40643 diff changeset	1458 if (PyDict_CheckExact(other)) {
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1459 while (set_next(so, &pos, &entry)) {
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1460 setentry entrycopy;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1461 entrycopy.hash = entry->hash;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1462 entrycopy.key = entry->key;
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	1463 if (!_PyDict_Contains(other, entry->key, entry->hash)) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1464 if (set_add_entry((PySetObject *)result, &entrycopy) == -1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1465 Py_DECREF(result);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1466 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1467 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1468 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1469 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1470 return result;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1471 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1472
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1473 while (set_next(so, &pos, &entry)) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1474 int rv = set_contains_entry((PySetObject *)other, entry);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1475 if (rv == -1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1476 Py_DECREF(result);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1477 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1478 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1479 if (!rv) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1480 if (set_add_entry((PySetObject *)result, entry) == -1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1481 Py_DECREF(result);
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1482 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1483 }
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1484 }
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1485 }
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1486 return result;
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1487 }
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1488
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1489 PyDoc_STRVAR(difference_doc,
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1490 "Return the difference of two sets as a new set.\n\
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1491 \n\
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1492 (i.e. all elements that are in this set but not the other.)");
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1493 static PyObject *
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1494 set_sub(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1495 {
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1496 if (!PyAnySet_Check(so) \|\| !PyAnySet_Check(other)) {
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1497 Py_INCREF(Py_NotImplemented);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1498 return Py_NotImplemented;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1499 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1500 return set_difference(so, other);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1501 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1502
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1503 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1504 set_isub(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1505 {
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1506 PyObject *result;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1507
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1508 if (!PyAnySet_Check(other)) {
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1509 Py_INCREF(Py_NotImplemented);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1510 return Py_NotImplemented;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1511 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1512 result = set_difference_update(so, other);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1513 if (result == NULL)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1514 return NULL;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1515 Py_DECREF(result);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1516 Py_INCREF(so);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1517 return (PyObject *)so;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1518 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1519
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1520 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1521 set_symmetric_difference_update(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1522 {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1523 PySetObject *otherset;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1524 PyObject *key;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1525 Py_ssize_t pos = 0;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1526 setentry *entry;
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1527
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1528 if ((PyObject *)so == other)
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1529 return set_clear(so);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1530
40742 f1701ba2452b Merged revisions 53538-53622 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40643 diff changeset	1531 if (PyDict_CheckExact(other)) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1532 PyObject *value;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1533 int rv;
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	1534 long hash;
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40742 diff changeset	1535 while (_PyDict_Next(other, &pos, &key, &value, &hash)) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1536 setentry an_entry;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1537
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1538 an_entry.hash = hash;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1539 an_entry.key = key;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1540 rv = set_discard_entry(so, &an_entry);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1541 if (rv == -1)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1542 return NULL;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1543 if (rv == DISCARD_NOTFOUND) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1544 if (set_add_entry(so, &an_entry) == -1)
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1545 return NULL;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1546 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1547 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1548 Py_RETURN_NONE;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1549 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1550
44999 7c02182e2979 Merged revisions 60284-60349 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1551 if (PyAnySet_Check(other)) {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1552 Py_INCREF(other);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1553 otherset = (PySetObject *)other;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1554 } else {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	1555 otherset = (PySetObject *)make_new_set(Py_TYPE(so), other);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1556 if (otherset == NULL)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1557 return NULL;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1558 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1559
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1560 while (set_next(otherset, &pos, &entry)) {
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1561 int rv = set_discard_entry(so, entry);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1562 if (rv == -1) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1563 Py_DECREF(otherset);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1564 return NULL;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1565 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1566 if (rv == DISCARD_NOTFOUND) {
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1567 if (set_add_entry(so, entry) == -1) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1568 Py_DECREF(otherset);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1569 return NULL;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1570 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1571 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1572 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1573 Py_DECREF(otherset);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1574 Py_RETURN_NONE;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1575 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1576
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1577 PyDoc_STRVAR(symmetric_difference_update_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1578 "Update a set with the symmetric difference of itself and another.");
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1579
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1580 static PyObject *
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1581 set_symmetric_difference(PySetObject so, PyObject other)
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1582 {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1583 PyObject *rv;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1584 PySetObject *otherset;
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1585
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	1586 otherset = (PySetObject *)make_new_set(Py_TYPE(so), other);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1587 if (otherset == NULL)
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1588 return NULL;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1589 rv = set_symmetric_difference_update(otherset, (PyObject *)so);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1590 if (rv == NULL)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1591 return NULL;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1592 Py_DECREF(rv);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1593 return (PyObject *)otherset;
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1594 }
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1595
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1596 PyDoc_STRVAR(symmetric_difference_doc,
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1597 "Return the symmetric difference of two sets as a new set.\n\
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1598 \n\
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1599 (i.e. all elements that are in exactly one of the sets.)");
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1600
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1601 static PyObject *
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1602 set_xor(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1603 {
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1604 if (!PyAnySet_Check(so) \|\| !PyAnySet_Check(other)) {
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1605 Py_INCREF(Py_NotImplemented);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1606 return Py_NotImplemented;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1607 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1608 return set_symmetric_difference(so, other);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1609 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1610
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1611 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1612 set_ixor(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1613 {
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1614 PyObject *result;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1615
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1616 if (!PyAnySet_Check(other)) {
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1617 Py_INCREF(Py_NotImplemented);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1618 return Py_NotImplemented;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1619 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1620 result = set_symmetric_difference_update(so, other);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1621 if (result == NULL)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1622 return NULL;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1623 Py_DECREF(result);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1624 Py_INCREF(so);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1625 return (PyObject *)so;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1626 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1627
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1628 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1629 set_issubset(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1630 {
35339 028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	1631 setentry *entry;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1632 Py_ssize_t pos = 0;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1633
44999 7c02182e2979 Merged revisions 60284-60349 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1634 if (!PyAnySet_Check(other)) {
35339 028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	1635 PyObject tmp, result;
30994 632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1636 tmp = make_new_set(&PySet_Type, other);
632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1637 if (tmp == NULL)
632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1638 return NULL;
632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1639 result = set_issubset(so, tmp);
632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1640 Py_DECREF(tmp);
632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1641 return result;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1642 }
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	1643 if (PySet_GET_SIZE(so) > PySet_GET_SIZE(other))
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1644 Py_RETURN_FALSE;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1645
35339 028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	1646 while (set_next(so, &pos, &entry)) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1647 int rv = set_contains_entry((PySetObject *)other, entry);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1648 if (rv == -1)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1649 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1650 if (!rv)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1651 Py_RETURN_FALSE;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1652 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1653 Py_RETURN_TRUE;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1654 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1655
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1656 PyDoc_STRVAR(issubset_doc, "Report whether another set contains this set.");
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1657
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1658 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1659 set_issuperset(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1660 {
30994 632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1661 PyObject tmp, result;
632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1662
44999 7c02182e2979 Merged revisions 60284-60349 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1663 if (!PyAnySet_Check(other)) {
30994 632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1664 tmp = make_new_set(&PySet_Type, other);
632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1665 if (tmp == NULL)
632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1666 return NULL;
632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1667 result = set_issuperset(so, tmp);
632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1668 Py_DECREF(tmp);
632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1669 return result;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1670 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1671 return set_issubset((PySetObject )other, (PyObject )so);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1672 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1673
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1674 PyDoc_STRVAR(issuperset_doc, "Report whether this set contains another set.");
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1675
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1676 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1677 set_richcompare(PySetObject v, PyObject w, int op)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1678 {
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1679 PyObject r1, r2;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1680
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1681 if(!PyAnySet_Check(w)) {
42756 0b62539acfb8 Patch by Keir Mierle so that sets can be compared to other objects that know Guido van Rossum <guido@python.org> parents: 42750 diff changeset	1682 Py_INCREF(Py_NotImplemented);
0b62539acfb8 Patch by Keir Mierle so that sets can be compared to other objects that know Guido van Rossum <guido@python.org> parents: 42750 diff changeset	1683 return Py_NotImplemented;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1684 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1685 switch (op) {
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1686 case Py_EQ:
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	1687 if (PySet_GET_SIZE(v) != PySet_GET_SIZE(w))
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1688 Py_RETURN_FALSE;
35398 1708479ade4d * Add a fast equality check path for frozensets where the hash value has Raymond Hettinger <python@rcn.com> parents: 35353 diff changeset	1689 if (v->hash != -1 &&
1708479ade4d * Add a fast equality check path for frozensets where the hash value has Raymond Hettinger <python@rcn.com> parents: 35353 diff changeset	1690 ((PySetObject *)w)->hash != -1 &&
1708479ade4d * Add a fast equality check path for frozensets where the hash value has Raymond Hettinger <python@rcn.com> parents: 35353 diff changeset	1691 v->hash != ((PySetObject *)w)->hash)
1708479ade4d * Add a fast equality check path for frozensets where the hash value has Raymond Hettinger <python@rcn.com> parents: 35353 diff changeset	1692 Py_RETURN_FALSE;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1693 return set_issubset(v, w);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1694 case Py_NE:
35398 1708479ade4d * Add a fast equality check path for frozensets where the hash value has Raymond Hettinger <python@rcn.com> parents: 35353 diff changeset	1695 r1 = set_richcompare(v, w, Py_EQ);
1708479ade4d * Add a fast equality check path for frozensets where the hash value has Raymond Hettinger <python@rcn.com> parents: 35353 diff changeset	1696 if (r1 == NULL)
1708479ade4d * Add a fast equality check path for frozensets where the hash value has Raymond Hettinger <python@rcn.com> parents: 35353 diff changeset	1697 return NULL;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1698 r2 = PyBool_FromLong(PyObject_Not(r1));
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1699 Py_DECREF(r1);
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1700 return r2;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1701 case Py_LE:
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1702 return set_issubset(v, w);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1703 case Py_GE:
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1704 return set_issuperset(v, w);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1705 case Py_LT:
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	1706 if (PySet_GET_SIZE(v) >= PySet_GET_SIZE(w))
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1707 Py_RETURN_FALSE;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1708 return set_issubset(v, w);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1709 case Py_GT:
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	1710 if (PySet_GET_SIZE(v) <= PySet_GET_SIZE(w))
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1711 Py_RETURN_FALSE;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1712 return set_issuperset(v, w);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1713 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1714 Py_INCREF(Py_NotImplemented);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1715 return Py_NotImplemented;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1716 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1717
35339 028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	1718 static int
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1719 set_nocmp(PyObject self, PyObject other)
35339 028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	1720 {
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	1721 PyErr_SetString(PyExc_TypeError, "cannot compare sets using cmp()");
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	1722 return -1;
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	1723 }
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	1724
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1725 static PyObject *
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1726 set_add(PySetObject so, PyObject key)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1727 {
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1728 if (set_add_key(so, key) == -1)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1729 return NULL;
31178 1bbc2085f213 * Refactor set.__contains__() Raymond Hettinger <python@rcn.com> parents: 31177 diff changeset	1730 Py_RETURN_NONE;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1731 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1732
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1733 PyDoc_STRVAR(add_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1734 "Add an element to a set.\n\
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1735 \n\
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1736 This has no effect if the element is already present.");
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1737
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1738 static int
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1739 set_contains(PySetObject so, PyObject key)
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1740 {
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1741 PyObject *tmpkey;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1742 int rv;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1743
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1744 rv = set_contains_key(so, key);
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1745 if (rv == -1) {
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1746 if (!PyAnySet_Check(key) \|\| !PyErr_ExceptionMatches(PyExc_TypeError))
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1747 return -1;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1748 PyErr_Clear();
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1749 tmpkey = make_new_set(&PyFrozenSet_Type, NULL);
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1750 if (tmpkey == NULL)
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1751 return -1;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1752 set_swap_bodies((PySetObject )tmpkey, (PySetObject )key);
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1753 rv = set_contains(so, tmpkey);
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1754 set_swap_bodies((PySetObject )tmpkey, (PySetObject )key);
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1755 Py_DECREF(tmpkey);
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1756 }
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1757 return rv;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1758 }
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1759
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1760 static PyObject *
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1761 set_direct_contains(PySetObject so, PyObject key)
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1762 {
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1763 long result;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1764
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1765 result = set_contains(so, key);
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1766 if (result == -1)
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1767 return NULL;
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1768 return PyBool_FromLong(result);
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1769 }
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1770
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1771 PyDoc_STRVAR(contains_doc, "x.__contains__(y) <==> y in x.");
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1772
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1773 static PyObject *
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1774 set_remove(PySetObject so, PyObject key)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1775 {
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1776 PyObject tmpkey, result;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1777 int rv;
31002 622a76bc0237 Extend temporary hashability to remove() and discard(). Raymond Hettinger <python@rcn.com> parents: 30995 diff changeset	1778
35332 fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1779 rv = set_discard_key(so, key);
fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1780 if (rv == -1) {
fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1781 if (!PyAnySet_Check(key) \|\| !PyErr_ExceptionMatches(PyExc_TypeError))
fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1782 return NULL;
fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1783 PyErr_Clear();
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1784 tmpkey = make_new_set(&PyFrozenSet_Type, NULL);
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1785 if (tmpkey == NULL)
31002 622a76bc0237 Extend temporary hashability to remove() and discard(). Raymond Hettinger <python@rcn.com> parents: 30995 diff changeset	1786 return NULL;
35332 fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1787 set_swap_bodies((PySetObject )tmpkey, (PySetObject )key);
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1788 result = set_remove(so, tmpkey);
35332 fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1789 set_swap_bodies((PySetObject )tmpkey, (PySetObject )key);
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1790 Py_DECREF(tmpkey);
31177 eeaa3660671c Refactor set.discard() and set.remove(). Raymond Hettinger <python@rcn.com> parents: 31175 diff changeset	1791 return result;
35332 fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1792 } else if (rv == DISCARD_NOTFOUND) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40401 diff changeset	1793 set_key_error(key);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1794 return NULL;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1795 }
31178 1bbc2085f213 * Refactor set.__contains__() Raymond Hettinger <python@rcn.com> parents: 31177 diff changeset	1796 Py_RETURN_NONE;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1797 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1798
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1799 PyDoc_STRVAR(remove_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1800 "Remove an element from a set; it must be a member.\n\
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1801 \n\
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1802 If the element is not a member, raise a KeyError.");
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1803
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1804 static PyObject *
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1805 set_discard(PySetObject so, PyObject key)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1806 {
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1807 PyObject tmpkey, result;
35332 fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1808 int rv;
31177 eeaa3660671c Refactor set.discard() and set.remove(). Raymond Hettinger <python@rcn.com> parents: 31175 diff changeset	1809
35332 fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1810 rv = set_discard_key(so, key);
fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1811 if (rv == -1) {
fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1812 if (!PyAnySet_Check(key) \|\| !PyErr_ExceptionMatches(PyExc_TypeError))
fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1813 return NULL;
fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1814 PyErr_Clear();
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1815 tmpkey = make_new_set(&PyFrozenSet_Type, NULL);
f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1816 if (tmpkey == NULL)
31177 eeaa3660671c Refactor set.discard() and set.remove(). Raymond Hettinger <python@rcn.com> parents: 31175 diff changeset	1817 return NULL;
35332 fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1818 set_swap_bodies((PySetObject )tmpkey, (PySetObject )key);
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1819 result = set_discard(so, tmpkey);
35332 fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1820 set_swap_bodies((PySetObject )tmpkey, (PySetObject )key);
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1821 Py_DECREF(tmpkey);
31177 eeaa3660671c Refactor set.discard() and set.remove(). Raymond Hettinger <python@rcn.com> parents: 31175 diff changeset	1822 return result;
eeaa3660671c Refactor set.discard() and set.remove(). Raymond Hettinger <python@rcn.com> parents: 31175 diff changeset	1823 }
31178 1bbc2085f213 * Refactor set.__contains__() Raymond Hettinger <python@rcn.com> parents: 31177 diff changeset	1824 Py_RETURN_NONE;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1825 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1826
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1827 PyDoc_STRVAR(discard_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1828 "Remove an element from a set if it is a member.\n\
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1829 \n\
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1830 If the element is not a member, do nothing.");
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1831
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1832 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1833 set_reduce(PySetObject *so)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1834 {
33948 f2ce15b02ba3 SF 1062353: set pickling problems Raymond Hettinger <python@rcn.com> parents: 33605 diff changeset	1835 PyObject keys=NULL, args=NULL, result=NULL, dict=NULL;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1836
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1837 keys = PySequence_List((PyObject *)so);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1838 if (keys == NULL)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1839 goto done;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1840 args = PyTuple_Pack(1, keys);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1841 if (args == NULL)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1842 goto done;
33948 f2ce15b02ba3 SF 1062353: set pickling problems Raymond Hettinger <python@rcn.com> parents: 33605 diff changeset	1843 dict = PyObject_GetAttrString((PyObject *)so, "__dict__");
f2ce15b02ba3 SF 1062353: set pickling problems Raymond Hettinger <python@rcn.com> parents: 33605 diff changeset	1844 if (dict == NULL) {
f2ce15b02ba3 SF 1062353: set pickling problems Raymond Hettinger <python@rcn.com> parents: 33605 diff changeset	1845 PyErr_Clear();
f2ce15b02ba3 SF 1062353: set pickling problems Raymond Hettinger <python@rcn.com> parents: 33605 diff changeset	1846 dict = Py_None;
f2ce15b02ba3 SF 1062353: set pickling problems Raymond Hettinger <python@rcn.com> parents: 33605 diff changeset	1847 Py_INCREF(dict);
f2ce15b02ba3 SF 1062353: set pickling problems Raymond Hettinger <python@rcn.com> parents: 33605 diff changeset	1848 }
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	1849 result = PyTuple_Pack(3, Py_TYPE(so), args, dict);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1850 done:
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1851 Py_XDECREF(args);
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1852 Py_XDECREF(keys);
33948 f2ce15b02ba3 SF 1062353: set pickling problems Raymond Hettinger <python@rcn.com> parents: 33605 diff changeset	1853 Py_XDECREF(dict);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1854 return result;
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1855 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1856
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1857 PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1858
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1859 static int
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1860 set_init(PySetObject self, PyObject args, PyObject *kwds)
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1861 {
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1862 PyObject *iterable = NULL;
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1863
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1864 if (!PyAnySet_Check(self))
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1865 return -1;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	1866 if (!PyArg_UnpackTuple(args, Py_TYPE(self)->tp_name, 0, 1, &iterable))
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1867 return -1;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1868 set_clear_internal(self);
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1869 self->hash = -1;
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1870 if (iterable == NULL)
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1871 return 0;
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1872 return set_update_internal(self, iterable);
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1873 }
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1874
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1875 static PySequenceMethods set_as_sequence = {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1876 set_len, /* sq_length */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1877 0, /* sq_concat */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1878 0, /* sq_repeat */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1879 0, /* sq_item */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1880 0, /* sq_slice */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1881 0, /* sq_ass_item */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1882 0, /* sq_ass_slice */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1883 (objobjproc)set_contains, /* sq_contains */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1884 };
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1885
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1886 /* set object ********************************************************/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1887
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	1888 #ifdef Py_DEBUG
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	1889 static PyObject test_c_api(PySetObject so);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	1890
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	1891 PyDoc_STRVAR(test_c_api_doc, "Exercises C API. Returns True.\n\
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	1892 All is well if assertions don't fail.");
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	1893 #endif
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	1894
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1895 static PyMethodDef set_methods[] = {
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1896 {"add", (PyCFunction)set_add, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1897 add_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1898 {"clear", (PyCFunction)set_clear, METH_NOARGS,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1899 clear_doc},
31177 eeaa3660671c Refactor set.discard() and set.remove(). Raymond Hettinger <python@rcn.com> parents: 31175 diff changeset	1900 {"__contains__",(PyCFunction)set_direct_contains, METH_O \| METH_COEXIST,
31172 e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 31019 diff changeset	1901 contains_doc},
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1902 {"copy", (PyCFunction)set_copy, METH_NOARGS,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1903 copy_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1904 {"discard", (PyCFunction)set_discard, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1905 discard_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1906 {"difference", (PyCFunction)set_difference, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1907 difference_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1908 {"difference_update", (PyCFunction)set_difference_update, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1909 difference_update_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1910 {"intersection",(PyCFunction)set_intersection, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1911 intersection_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1912 {"intersection_update",(PyCFunction)set_intersection_update, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1913 intersection_update_doc},
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1914 {"isdisjoint", (PyCFunction)set_isdisjoint, METH_O,
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	1915 isdisjoint_doc},
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1916 {"issubset", (PyCFunction)set_issubset, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1917 issubset_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1918 {"issuperset", (PyCFunction)set_issuperset, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1919 issuperset_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1920 {"pop", (PyCFunction)set_pop, METH_NOARGS,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1921 pop_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1922 {"__reduce__", (PyCFunction)set_reduce, METH_NOARGS,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1923 reduce_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1924 {"remove", (PyCFunction)set_remove, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1925 remove_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1926 {"symmetric_difference",(PyCFunction)set_symmetric_difference, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1927 symmetric_difference_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1928 {"symmetric_difference_update",(PyCFunction)set_symmetric_difference_update, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1929 symmetric_difference_update_doc},
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	1930 #ifdef Py_DEBUG
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	1931 {"test_c_api", (PyCFunction)test_c_api, METH_NOARGS,
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	1932 test_c_api_doc},
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	1933 #endif
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1934 {"union", (PyCFunction)set_union, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1935 union_doc},
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	1936 {"update", (PyCFunction)set_update, METH_O,
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	1937 update_doc},
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1938 {NULL, NULL} /* sentinel */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1939 };
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1940
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1941 static PyNumberMethods set_as_number = {
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1942 0, /nb_add/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1943 (binaryfunc)set_sub, /nb_subtract/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1944 0, /nb_multiply/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1945 0, /nb_remainder/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1946 0, /nb_divmod/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1947 0, /nb_power/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1948 0, /nb_negative/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1949 0, /nb_positive/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1950 0, /nb_absolute/
40401 88133417dfd0 - patch #1600346 submitted by Tomer Filiba Jack Diederich <jackdied@gmail.com> parents: 39696 diff changeset	1951 0, /nb_bool/
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1952 0, /nb_invert/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1953 0, /nb_lshift/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1954 0, /nb_rshift/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1955 (binaryfunc)set_and, /nb_and/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1956 (binaryfunc)set_xor, /nb_xor/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1957 (binaryfunc)set_or, /nb_or/
43420 0ff41b163f5b Remove more cruft leftover from nb_coerce. Rename nb_coerce to Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 42756 diff changeset	1958 0, /nb_reserved/
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1959 0, /nb_int/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1960 0, /nb_long/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1961 0, /nb_float/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1962 0, /nb_oct/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1963 0, /nb_hex/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1964 0, /nb_inplace_add/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1965 (binaryfunc)set_isub, /nb_inplace_subtract/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1966 0, /nb_inplace_multiply/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1967 0, /nb_inplace_remainder/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1968 0, /nb_inplace_power/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1969 0, /nb_inplace_lshift/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1970 0, /nb_inplace_rshift/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1971 (binaryfunc)set_iand, /nb_inplace_and/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1972 (binaryfunc)set_ixor, /nb_inplace_xor/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1973 (binaryfunc)set_ior, /nb_inplace_or/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1974 };
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1975
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1976 PyDoc_STRVAR(set_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1977 "set(iterable) --> set object\n\
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1978 \n\
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1979 Build an unordered collection of unique elements.");
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1980
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1981 PyTypeObject PySet_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41782 diff changeset	1982 PyVarObject_HEAD_INIT(&PyType_Type, 0)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1983 "set", /* tp_name */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1984 sizeof(PySetObject), /* tp_basicsize */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1985 0, /* tp_itemsize */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1986 /* methods */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1987 (destructor)set_dealloc, /* tp_dealloc */
42477 e7fd327e0c19 Kill all uses and definitions of tp_print under Objects/. (Others will follow.) Guido van Rossum <guido@python.org> parents: 42335 diff changeset	1988 0, /* tp_print */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1989 0, /* tp_getattr */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1990 0, /* tp_setattr */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1991 set_nocmp, /* tp_compare */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1992 (reprfunc)set_repr, /* tp_repr */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1993 &set_as_number, /* tp_as_number */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1994 &set_as_sequence, /* tp_as_sequence */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1995 0, /* tp_as_mapping */
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1996 0, /* tp_hash */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1997 0, /* tp_call */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1998 0, /* tp_str */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1999 PyObject_GenericGetAttr, /* tp_getattro */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2000 0, /* tp_setattro */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2001 0, /* tp_as_buffer */
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 37879 diff changeset	2002 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	2003 Py_TPFLAGS_BASETYPE, /* tp_flags */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2004 set_doc, /* tp_doc */
35110 f3d3151f8417 SF patch #1200018: Restore GC support to set objects Raymond Hettinger <python@rcn.com> parents: 33948 diff changeset	2005 (traverseproc)set_traverse, /* tp_traverse */
35315 a6cbfcd0e691 Factor away a redundant clear() function. Raymond Hettinger <python@rcn.com> parents: 35312 diff changeset	2006 (inquiry)set_clear_internal, /* tp_clear */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2007 (richcmpfunc)set_richcompare, /* tp_richcompare */
32158 679e5c8effae Make sets and deques weak referencable. Raymond Hettinger <python@rcn.com> parents: 31628 diff changeset	2008 offsetof(PySetObject, weakreflist), /* tp_weaklistoffset */
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	2009 (getiterfunc)set_iter, /* tp_iter */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2010 0, /* tp_iternext */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2011 set_methods, /* tp_methods */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2012 0, /* tp_members */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2013 0, /* tp_getset */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2014 0, /* tp_base */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2015 0, /* tp_dict */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2016 0, /* tp_descr_get */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2017 0, /* tp_descr_set */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2018 0, /* tp_dictoffset */
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	2019 (initproc)set_init, /* tp_init */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2020 PyType_GenericAlloc, /* tp_alloc */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2021 set_new, /* tp_new */
35110 f3d3151f8417 SF patch #1200018: Restore GC support to set objects Raymond Hettinger <python@rcn.com> parents: 33948 diff changeset	2022 PyObject_GC_Del, /* tp_free */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2023 };
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2024
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2025 /* frozenset object ********************************************************/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2026
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2027
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2028 static PyMethodDef frozenset_methods[] = {
31177 eeaa3660671c Refactor set.discard() and set.remove(). Raymond Hettinger <python@rcn.com> parents: 31175 diff changeset	2029 {"__contains__",(PyCFunction)set_direct_contains, METH_O \| METH_COEXIST,
31172 e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 31019 diff changeset	2030 contains_doc},
31004 5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	2031 {"copy", (PyCFunction)frozenset_copy, METH_NOARGS,
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2032 copy_doc},
31004 5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	2033 {"difference", (PyCFunction)set_difference, METH_O,
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2034 difference_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2035 {"intersection",(PyCFunction)set_intersection, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2036 intersection_doc},
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	2037 {"isdisjoint", (PyCFunction)set_isdisjoint, METH_O,
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43420 diff changeset	2038 isdisjoint_doc},
31004 5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	2039 {"issubset", (PyCFunction)set_issubset, METH_O,
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2040 issubset_doc},
31004 5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	2041 {"issuperset", (PyCFunction)set_issuperset, METH_O,
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2042 issuperset_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2043 {"__reduce__", (PyCFunction)set_reduce, METH_NOARGS,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2044 reduce_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2045 {"symmetric_difference",(PyCFunction)set_symmetric_difference, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2046 symmetric_difference_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2047 {"union", (PyCFunction)set_union, METH_O,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2048 union_doc},
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2049 {NULL, NULL} /* sentinel */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2050 };
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2051
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2052 static PyNumberMethods frozenset_as_number = {
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2053 0, /nb_add/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2054 (binaryfunc)set_sub, /nb_subtract/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2055 0, /nb_multiply/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2056 0, /nb_remainder/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2057 0, /nb_divmod/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2058 0, /nb_power/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2059 0, /nb_negative/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2060 0, /nb_positive/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2061 0, /nb_absolute/
40401 88133417dfd0 - patch #1600346 submitted by Tomer Filiba Jack Diederich <jackdied@gmail.com> parents: 39696 diff changeset	2062 0, /nb_bool/
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2063 0, /nb_invert/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2064 0, /nb_lshift/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2065 0, /nb_rshift/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2066 (binaryfunc)set_and, /nb_and/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2067 (binaryfunc)set_xor, /nb_xor/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2068 (binaryfunc)set_or, /nb_or/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2069 };
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2070
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2071 PyDoc_STRVAR(frozenset_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2072 "frozenset(iterable) --> frozenset object\n\
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2073 \n\
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2074 Build an immutable unordered collection of unique elements.");
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2075
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2076 PyTypeObject PyFrozenSet_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41782 diff changeset	2077 PyVarObject_HEAD_INIT(&PyType_Type, 0)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2078 "frozenset", /* tp_name */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2079 sizeof(PySetObject), /* tp_basicsize */
31300 bf8402a56fa4 * Simplify and speedup logic for tp_print. Raymond Hettinger <python@rcn.com> parents: 31203 diff changeset	2080 0, /* tp_itemsize */
bf8402a56fa4 * Simplify and speedup logic for tp_print. Raymond Hettinger <python@rcn.com> parents: 31203 diff changeset	2081 /* methods */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2082 (destructor)set_dealloc, /* tp_dealloc */
42477 e7fd327e0c19 Kill all uses and definitions of tp_print under Objects/. (Others will follow.) Guido van Rossum <guido@python.org> parents: 42335 diff changeset	2083 0, /* tp_print */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2084 0, /* tp_getattr */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2085 0, /* tp_setattr */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2086 set_nocmp, /* tp_compare */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2087 (reprfunc)set_repr, /* tp_repr */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2088 &frozenset_as_number, /* tp_as_number */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2089 &set_as_sequence, /* tp_as_sequence */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2090 0, /* tp_as_mapping */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2091 frozenset_hash, /* tp_hash */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2092 0, /* tp_call */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2093 0, /* tp_str */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2094 PyObject_GenericGetAttr, /* tp_getattro */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2095 0, /* tp_setattro */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2096 0, /* tp_as_buffer */
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 37879 diff changeset	2097 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	2098 Py_TPFLAGS_BASETYPE, /* tp_flags */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2099 frozenset_doc, /* tp_doc */
35110 f3d3151f8417 SF patch #1200018: Restore GC support to set objects Raymond Hettinger <python@rcn.com> parents: 33948 diff changeset	2100 (traverseproc)set_traverse, /* tp_traverse */
35315 a6cbfcd0e691 Factor away a redundant clear() function. Raymond Hettinger <python@rcn.com> parents: 35312 diff changeset	2101 (inquiry)set_clear_internal, /* tp_clear */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2102 (richcmpfunc)set_richcompare, /* tp_richcompare */
32158 679e5c8effae Make sets and deques weak referencable. Raymond Hettinger <python@rcn.com> parents: 31628 diff changeset	2103 offsetof(PySetObject, weakreflist), /* tp_weaklistoffset */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2104 (getiterfunc)set_iter, /* tp_iter */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2105 0, /* tp_iternext */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2106 frozenset_methods, /* tp_methods */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2107 0, /* tp_members */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2108 0, /* tp_getset */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2109 0, /* tp_base */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2110 0, /* tp_dict */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2111 0, /* tp_descr_get */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2112 0, /* tp_descr_set */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2113 0, /* tp_dictoffset */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2114 0, /* tp_init */
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2115 PyType_GenericAlloc, /* tp_alloc */
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	2116 frozenset_new, /* tp_new */
35110 f3d3151f8417 SF patch #1200018: Restore GC support to set objects Raymond Hettinger <python@rcn.com> parents: 33948 diff changeset	2117 PyObject_GC_Del, /* tp_free */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2118 };
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2119
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2120
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2121 /*** C API functions ***********************************************/
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2122
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2123 PyObject *
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2124 PySet_New(PyObject *iterable)
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2125 {
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2126 return make_new_set(&PySet_Type, iterable);
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2127 }
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2128
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2129 PyObject *
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2130 PyFrozenSet_New(PyObject *iterable)
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2131 {
45044 c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44999 diff changeset	2132 return make_new_set(&PyFrozenSet_Type, iterable);
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2133 }
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2134
36833 9e81788b0d4b Use Py_ssize_t for PySet_Size() like all the other Py_Size() functions. Neal Norwitz <nnorwitz@gmail.com>* parents: 36501 diff changeset	2135 Py_ssize_t
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2136 PySet_Size(PyObject *anyset)
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2137 {
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2138 if (!PyAnySet_Check(anyset)) {
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2139 PyErr_BadInternalCall();
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2140 return -1;
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2141 }
35398 1708479ade4d * Add a fast equality check path for frozensets where the hash value has Raymond Hettinger <python@rcn.com> parents: 35353 diff changeset	2142 return PySet_GET_SIZE(anyset);
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2143 }
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2144
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2145 int
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2146 PySet_Clear(PyObject *set)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2147 {
45044 c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44999 diff changeset	2148 if (!PySet_Check(set)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2149 PyErr_BadInternalCall();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2150 return -1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2151 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2152 return set_clear_internal((PySetObject *)set);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2153 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2154
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2155 int
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2156 PySet_Contains(PyObject anyset, PyObject key)
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2157 {
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2158 if (!PyAnySet_Check(anyset)) {
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2159 PyErr_BadInternalCall();
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2160 return -1;
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2161 }
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2162 return set_contains_key((PySetObject *)anyset, key);
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2163 }
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2164
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2165 int
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2166 PySet_Discard(PyObject set, PyObject key)
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2167 {
45044 c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44999 diff changeset	2168 if (!PySet_Check(set)) {
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2169 PyErr_BadInternalCall();
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2170 return -1;
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2171 }
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2172 return set_discard_key((PySetObject *)set, key);
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2173 }
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2174
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2175 int
45044 c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44999 diff changeset	2176 PySet_Add(PyObject anyset, PyObject key)
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2177 {
45145 3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45066 diff changeset	2178 if (!PySet_Check(anyset) &&
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45066 diff changeset	2179 (!PyFrozenSet_Check(anyset) \|\| Py_REFCNT(anyset) != 1)) {
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2180 PyErr_BadInternalCall();
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2181 return -1;
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2182 }
45044 c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44999 diff changeset	2183 return set_add_key((PySetObject *)anyset, key);
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2184 }
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2185
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2186 int
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2187 _PySet_NextEntry(PyObject set, Py_ssize_t pos, PyObject *key, long hash)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2188 {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2189 setentry *entry;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2190
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2191 if (!PyAnySet_Check(set)) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2192 PyErr_BadInternalCall();
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2193 return -1;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2194 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2195 if (set_next((PySetObject *)set, pos, &entry) == 0)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2196 return 0;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2197 *key = entry->key;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	2198 *hash = entry->hash;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2199 return 1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2200 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2201
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2202 PyObject *
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2203 PySet_Pop(PyObject *set)
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2204 {
45044 c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44999 diff changeset	2205 if (!PySet_Check(set)) {
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2206 PyErr_BadInternalCall();
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2207 return NULL;
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2208 }
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2209 return set_pop((PySetObject *)set);
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2210 }
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2211
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2212 int
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2213 _PySet_Update(PyObject set, PyObject iterable)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2214 {
45044 c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44999 diff changeset	2215 if (!PySet_Check(set)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2216 PyErr_BadInternalCall();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2217 return -1;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2218 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2219 return set_update_internal((PySetObject *)set, iterable);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2220 }
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2221
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2222 #ifdef Py_DEBUG
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2223
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2224 /* Test code to be called with any three element set.
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2225 Returns True and original set is restored. */
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2226
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2227 #define assertRaises(call_return_value, exception) \
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2228 do { \
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2229 assert(call_return_value); \
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2230 assert(PyErr_ExceptionMatches(exception)); \
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2231 PyErr_Clear(); \
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2232 } while(0)
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2233
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2234 static PyObject *
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2235 test_c_api(PySetObject *so)
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2236 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2237 Py_ssize_t count;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2238 char *s;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2239 Py_ssize_t i;
41683 c5ebf9c219be Merged revisions 55228 via svnmerge from Guido van Rossum <guido@python.org> parents: 41554 diff changeset	2240 PyObject elem=NULL, dup=NULL, t, f, dup2, x;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2241 PyObject ob = (PyObject )so;
45066 3f2496dc91db Fixed r60466 Christian Heimes <christian@cheimes.de> parents: 45065 diff changeset	2242 long hash;
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2243
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2244 /* Verify preconditions and exercise type/size checks */
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2245 assert(PyAnySet_Check(ob));
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2246 assert(PyAnySet_CheckExact(ob));
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2247 assert(!PyFrozenSet_CheckExact(ob));
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2248 assert(PySet_Size(ob) == 3);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2249 assert(PySet_GET_SIZE(ob) == 3);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2250
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2251 /* Raise TypeError for non-iterable constructor arguments */
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2252 assertRaises(PySet_New(Py_None) == NULL, PyExc_TypeError);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2253 assertRaises(PyFrozenSet_New(Py_None) == NULL, PyExc_TypeError);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2254
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2255 /* Raise TypeError for unhashable key */
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2256 dup = PySet_New(ob);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2257 assertRaises(PySet_Discard(ob, dup) == -1, PyExc_TypeError);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2258 assertRaises(PySet_Contains(ob, dup) == -1, PyExc_TypeError);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2259 assertRaises(PySet_Add(ob, dup) == -1, PyExc_TypeError);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2260
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2261 /* Exercise successful pop, contains, add, and discard */
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2262 elem = PySet_Pop(ob);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2263 assert(PySet_Contains(ob, elem) == 0);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2264 assert(PySet_GET_SIZE(ob) == 2);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2265 assert(PySet_Add(ob, elem) == 0);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2266 assert(PySet_Contains(ob, elem) == 1);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2267 assert(PySet_GET_SIZE(ob) == 3);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2268 assert(PySet_Discard(ob, elem) == 1);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2269 assert(PySet_GET_SIZE(ob) == 2);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2270 assert(PySet_Discard(ob, elem) == 0);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2271 assert(PySet_GET_SIZE(ob) == 2);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2272
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2273 /* Exercise clear */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2274 dup2 = PySet_New(dup);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2275 assert(PySet_Clear(dup2) == 0);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2276 assert(PySet_Size(dup2) == 0);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2277 Py_DECREF(dup2);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2278
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2279 /* Raise SystemError on clear or update of frozen set */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2280 f = PyFrozenSet_New(dup);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2281 assertRaises(PySet_Clear(f) == -1, PyExc_SystemError);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2282 assertRaises(_PySet_Update(f, dup) == -1, PyExc_SystemError);
45145 3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45066 diff changeset	2283 assert(PySet_Add(f, elem) == 0);
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45066 diff changeset	2284 Py_INCREF(f);
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45066 diff changeset	2285 assertRaises(PySet_Add(f, elem) == -1, PyExc_SystemError);
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45066 diff changeset	2286 Py_DECREF(f);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2287 Py_DECREF(f);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2288
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2289 /* Exercise direct iteration */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2290 i = 0, count = 0;
45066 3f2496dc91db Fixed r60466 Christian Heimes <christian@cheimes.de> parents: 45065 diff changeset	2291 while (_PySet_NextEntry((PyObject *)dup, &i, &x, &hash)) {
43961 b231bda653a4 PyString_AsString is permissive and accepts unicode strings. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43815 diff changeset	2292 s = PyUnicode_AsString(x);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2293 assert(s && (s[0] == 'a' \|\| s[0] == 'b' \|\| s[0] == 'c'));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2294 count++;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2295 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2296 assert(count == 3);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2297
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2298 /* Exercise updates */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2299 dup2 = PySet_New(NULL);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2300 assert(_PySet_Update(dup2, dup) == 0);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2301 assert(PySet_Size(dup2) == 3);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2302 assert(_PySet_Update(dup2, dup) == 0);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2303 assert(PySet_Size(dup2) == 3);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2304 Py_DECREF(dup2);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2305
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2306 /* Raise SystemError when self argument is not a set or frozenset. */
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2307 t = PyTuple_New(0);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2308 assertRaises(PySet_Size(t) == -1, PyExc_SystemError);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2309 assertRaises(PySet_Contains(t, elem) == -1, PyExc_SystemError);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2310 Py_DECREF(t);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2311
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2312 /* Raise SystemError when self argument is not a set. */
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2313 f = PyFrozenSet_New(dup);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2314 assert(PySet_Size(f) == 3);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2315 assert(PyFrozenSet_CheckExact(f));
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2316 assertRaises(PySet_Discard(f, elem) == -1, PyExc_SystemError);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2317 assertRaises(PySet_Pop(f) == NULL, PyExc_SystemError);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2318 Py_DECREF(f);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2319
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2320 /* Raise KeyError when popping from an empty set */
35353 e8806094d644 Add shortcuts for a\|a and a&a. Raymond Hettinger <python@rcn.com> parents: 35349 diff changeset	2321 assert(PyNumber_InPlaceSubtract(ob, ob) == ob);
e8806094d644 Add shortcuts for a\|a and a&a. Raymond Hettinger <python@rcn.com> parents: 35349 diff changeset	2322 Py_DECREF(ob);
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2323 assert(PySet_GET_SIZE(ob) == 0);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2324 assertRaises(PySet_Pop(ob) == NULL, PyExc_KeyError);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2325
35353 e8806094d644 Add shortcuts for a\|a and a&a. Raymond Hettinger <python@rcn.com> parents: 35349 diff changeset	2326 /* Restore the set from the copy using the PyNumber API */
e8806094d644 Add shortcuts for a\|a and a&a. Raymond Hettinger <python@rcn.com> parents: 35349 diff changeset	2327 assert(PyNumber_InPlaceOr(ob, dup) == ob);
e8806094d644 Add shortcuts for a\|a and a&a. Raymond Hettinger <python@rcn.com> parents: 35349 diff changeset	2328 Py_DECREF(ob);
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2329
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2330 /* Verify constructors accept NULL arguments */
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2331 f = PySet_New(NULL);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2332 assert(f != NULL);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2333 assert(PySet_GET_SIZE(f) == 0);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2334 Py_DECREF(f);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2335 f = PyFrozenSet_New(NULL);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2336 assert(f != NULL);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2337 assert(PyFrozenSet_CheckExact(f));
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2338 assert(PySet_GET_SIZE(f) == 0);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2339 Py_DECREF(f);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2340
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2341 Py_DECREF(elem);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2342 Py_DECREF(dup);
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2343 Py_RETURN_TRUE;
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2344 }
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2345
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	2346 #undef assertRaises
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	2347
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2348 #endif

Mercurial > cpython-lru_cache-weakref

annotate Objects/setobject.c @ 46567:ffeecbebf3ca