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

annotate Objects/setobject.c @ 80661:94de77bd0b4b 2.7

Issue #16194: document imp.load_dynamic problems when read several extension modules from the same binary object file.

author	Andrew Svetlov <andrew.svetlov@gmail.com>
date	Thu, 29 Nov 2012 19:51:28 +0200
parents	eef42c4f295d
children	3571a921a3d6

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
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2 /* set object implementation
35311 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
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 41682 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"
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	12
40433 fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	13 /* Set a key error with the specified argument, wrapping it in a
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	14 * tuple automatically so that tuple keys are not unpacked as the
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	15 * exception arguments. */
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	16 static void
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	17 set_key_error(PyObject *arg)
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	18 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	19 PyObject *tup;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	20 tup = PyTuple_Pack(1, arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	21 if (!tup)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	22 return; /* caller will expect error to be set anyway */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	23 PyErr_SetObject(PyExc_KeyError, tup);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	24 Py_DECREF(tup);
40433 fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	25 }
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	26
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	27 /* 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	28 #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	29
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	30 /* 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	31 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	32
37638 65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37602 diff changeset	33 #ifdef Py_REF_DEBUG
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37602 diff changeset	34 PyObject *
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37602 diff changeset	35 _PySet_Dummy(void)
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37602 diff changeset	36 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	37 return dummy;
37638 65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37602 diff changeset	38 }
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37602 diff changeset	39 #endif
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37602 diff changeset	40
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	41 #define INIT_NONZERO_SET_SLOTS(so) do { \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	42 (so)->table = (so)->smalltable; \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	43 (so)->mask = PySet_MINSIZE - 1; \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	44 (so)->hash = -1; \
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	45 } while(0)
bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	46
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	47 #define EMPTY_TO_MINSIZE(so) do { \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	48 memset((so)->smalltable, 0, sizeof((so)->smalltable)); \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	49 (so)->used = (so)->fill = 0; \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	50 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	51 } while(0)
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	52
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	53 /* Reuse scheme to save calls to malloc, free, and memset */
45191 920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 45138 diff changeset	54 #ifndef PySet_MAXFREELIST
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 45138 diff changeset	55 #define PySet_MAXFREELIST 80
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 45138 diff changeset	56 #endif
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 45138 diff changeset	57 static PySetObject *free_list[PySet_MAXFREELIST];
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 45138 diff changeset	58 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	59
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	60 /*
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	61 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	62 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	63 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	64 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	65
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	66 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	67 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	68
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	69 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	70
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	71 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	72 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	73 */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	74
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	75 static setentry *
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	76 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	77 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	78 register Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	79 register size_t perturb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	80 register setentry *freeslot;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	81 register size_t mask = so->mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	82 setentry *table = so->table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	83 register setentry *entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	84 register int cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	85 PyObject *startkey;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	86
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	87 i = hash & mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	88 entry = &table[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	89 if (entry->key == NULL \|\| entry->key == key)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	90 return entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	91
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	92 if (entry->key == dummy)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	93 freeslot = entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	94 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	95 if (entry->hash == hash) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	96 startkey = entry->key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	97 Py_INCREF(startkey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	98 cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	99 Py_DECREF(startkey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	100 if (cmp < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	101 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	102 if (table == so->table && entry->key == startkey) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	103 if (cmp > 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	104 return entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	105 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	106 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	107 /* The compare did major nasty stuff to the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	108 * set: start over.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	109 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	110 return set_lookkey(so, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	111 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	112 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	113 freeslot = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	114 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	115
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	116 /* In the loop, key == dummy is by far (factor of 100s) the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	117 least likely outcome, so test for that last. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	118 for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	119 i = (i << 2) + i + perturb + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	120 entry = &table[i & mask];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	121 if (entry->key == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	122 if (freeslot != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	123 entry = freeslot;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	124 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	125 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	126 if (entry->key == key)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	127 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	128 if (entry->hash == hash && entry->key != dummy) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	129 startkey = entry->key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	130 Py_INCREF(startkey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	131 cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	132 Py_DECREF(startkey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	133 if (cmp < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	134 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	135 if (table == so->table && entry->key == startkey) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	136 if (cmp > 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	137 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	138 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	139 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	140 /* The compare did major nasty stuff to the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	141 * set: start over.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	142 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	143 return set_lookkey(so, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	144 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	145 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	146 else if (entry->key == dummy && freeslot == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	147 freeslot = entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	148 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	149 return entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	150 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	151
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	152 /*
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	153 * Hacked up version of set_lookkey which can assume keys are always strings;
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	154 * This means we can always use _PyString_Eq directly and not have to check to
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	155 * 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	156 */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	157 static setentry *
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	158 set_lookkey_string(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	159 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	160 register Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	161 register size_t perturb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	162 register setentry *freeslot;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	163 register size_t mask = so->mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	164 setentry *table = so->table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	165 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	166
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	167 /* Make sure this function doesn't have to handle non-string keys,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	168 including subclasses of str; e.g., one reason to subclass
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	169 strings is to override __eq__, and for speed we don't cater to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	170 that here. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	171 if (!PyString_CheckExact(key)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	172 so->lookup = set_lookkey;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	173 return set_lookkey(so, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	174 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	175 i = hash & mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	176 entry = &table[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	177 if (entry->key == NULL \|\| entry->key == key)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	178 return entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	179 if (entry->key == dummy)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	180 freeslot = entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	181 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	182 if (entry->hash == hash && _PyString_Eq(entry->key, key))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	183 return entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	184 freeslot = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	185 }
35339 028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	186
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	187 /* In the loop, key == dummy is by far (factor of 100s) the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	188 least likely outcome, so test for that last. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	189 for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	190 i = (i << 2) + i + perturb + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	191 entry = &table[i & mask];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	192 if (entry->key == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	193 return freeslot == NULL ? entry : freeslot;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	194 if (entry->key == key
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	195 \|\| (entry->hash == hash
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	196 && entry->key != dummy
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	197 && _PyString_Eq(entry->key, key)))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	198 return entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	199 if (entry->key == dummy && freeslot == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	200 freeslot = entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	201 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	202 assert(0); /* NOT REACHED */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	203 return 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	204 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	205
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	206 /*
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	207 Internal routine to insert a new key into the table.
40433 fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	208 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	209 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	210 */
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	211 static int
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	212 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	213 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	214 register setentry *entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	215 typedef setentry (lookupfunc)(PySetObject , PyObject , long);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	216
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	217 assert(so->lookup != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	218 entry = so->lookup(so, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	219 if (entry == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	220 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	221 if (entry->key == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	222 /* UNUSED */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	223 so->fill++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	224 entry->key = key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	225 entry->hash = hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	226 so->used++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	227 } else if (entry->key == dummy) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	228 /* DUMMY */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	229 entry->key = key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	230 entry->hash = hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	231 so->used++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	232 Py_DECREF(dummy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	233 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	234 /* ACTIVE */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	235 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	236 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	237 return 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	238 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	239
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	240 /*
40433 fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	241 Internal routine used by set_table_resize() to insert an item which is
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	242 known to be absent from the set. This routine also assumes that
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	243 the set contains no deleted entries. Besides the performance benefit,
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	244 using set_insert_clean() in set_table_resize() is dangerous (SF bug #1456209).
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	245 Note that no refcounts are changed by this routine; if needed, the caller
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	246 is responsible for incref'ing `key`.
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	247 */
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	248 static void
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	249 set_insert_clean(register PySetObject so, PyObject key, long hash)
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	250 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	251 register size_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	252 register size_t perturb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	253 register size_t mask = (size_t)so->mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	254 setentry *table = so->table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	255 register setentry *entry;
40433 fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	256
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	257 i = hash & mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	258 entry = &table[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	259 for (perturb = hash; entry->key != NULL; perturb >>= PERTURB_SHIFT) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	260 i = (i << 2) + i + perturb + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	261 entry = &table[i & mask];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	262 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	263 so->fill++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	264 entry->key = key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	265 entry->hash = hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	266 so->used++;
40433 fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	267 }
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	268
fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	269 /*
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	270 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	271 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	272 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	273 */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	274 static int
38872 805f41881e27 Use Py_ssize_t Neal Norwitz <nnorwitz@gmail.com> parents: 37747 diff changeset	275 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	276 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	277 Py_ssize_t newsize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	278 setentry oldtable, newtable, *entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	279 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	280 int is_oldtable_malloced;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	281 setentry small_copy[PySet_MINSIZE];
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	282
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	283 assert(minused >= 0);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	284
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	285 /* Find the smallest table size > minused. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	286 for (newsize = PySet_MINSIZE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	287 newsize <= minused && newsize > 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	288 newsize <<= 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	289 ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	290 if (newsize <= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	291 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	292 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	293 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	294
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	295 /* Get space for a new table. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	296 oldtable = so->table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	297 assert(oldtable != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	298 is_oldtable_malloced = oldtable != so->smalltable;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	299
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	300 if (newsize == PySet_MINSIZE) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	301 /* A large table is shrinking, or we can't get any smaller. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	302 newtable = so->smalltable;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	303 if (newtable == oldtable) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	304 if (so->fill == so->used) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	305 /* No dummies, so no point doing anything. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	306 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	307 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	308 /* We're not going to resize it, but rebuild the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	309 table anyway to purge old dummy entries.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	310 Subtle: This is necessary if fill==size,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	311 as set_lookkey needs at least one virgin slot to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	312 terminate failing searches. If fill < size, it's
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	313 merely desirable, as dummies slow searches. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	314 assert(so->fill > so->used);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	315 memcpy(small_copy, oldtable, sizeof(small_copy));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	316 oldtable = small_copy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	317 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	318 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	319 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	320 newtable = PyMem_NEW(setentry, newsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	321 if (newtable == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	322 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	323 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	324 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	325 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	326
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	327 /* Make the set empty, using the new table. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	328 assert(newtable != oldtable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	329 so->table = newtable;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	330 so->mask = newsize - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	331 memset(newtable, 0, sizeof(setentry) * newsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	332 so->used = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	333 i = so->fill;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	334 so->fill = 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	335
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	336 /* Copy the data over; this is refcount-neutral for active entries;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	337 dummy entries aren't copied over, of course */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	338 for (entry = oldtable; i > 0; entry++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	339 if (entry->key == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	340 /* UNUSED */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	341 ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	342 } else if (entry->key == dummy) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	343 /* DUMMY */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	344 --i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	345 assert(entry->key == dummy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	346 Py_DECREF(entry->key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	347 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	348 /* ACTIVE */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	349 --i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	350 set_insert_clean(so, entry->key, entry->hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	351 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	352 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	353
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	354 if (is_oldtable_malloced)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	355 PyMem_DEL(oldtable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	356 return 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	357 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	358
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	359 /* 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	360
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	361 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	362 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	363 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	364 register Py_ssize_t n_used;
68856 24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	365 PyObject *key = entry->key;
24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	366 long hash = entry->hash;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	367
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	368 assert(so->fill <= so->mask); /* at least one empty slot */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	369 n_used = so->used;
68856 24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	370 Py_INCREF(key);
24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	371 if (set_insert_key(so, key, hash) == -1) {
24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	372 Py_DECREF(key);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	373 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	374 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	375 if (!(so->used > n_used && so->fill3 >= (so->mask+1)2))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	376 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	377 return set_table_resize(so, so->used>50000 ? so->used2 : so->used4);
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	378 }
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	379
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	380 static int
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	381 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	382 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	383 register long hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	384 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	385
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	386 if (!PyString_CheckExact(key) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	387 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	388 hash = PyObject_Hash(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	389 if (hash == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	390 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	391 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	392 assert(so->fill <= so->mask); /* at least one empty slot */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	393 n_used = so->used;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	394 Py_INCREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	395 if (set_insert_key(so, key, hash) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	396 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	397 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	398 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	399 if (!(so->used > n_used && so->fill3 >= (so->mask+1)2))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	400 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	401 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	402 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	403
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	404 #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	405 #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	406
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	407 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	408 set_discard_entry(PySetObject so, setentry oldentry)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	409 { register setentry *entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	410 PyObject *old_key;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	411
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	412 entry = (so->lookup)(so, oldentry->key, oldentry->hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	413 if (entry == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	414 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	415 if (entry->key == NULL \|\| entry->key == dummy)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	416 return DISCARD_NOTFOUND;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	417 old_key = entry->key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	418 Py_INCREF(dummy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	419 entry->key = dummy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	420 so->used--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	421 Py_DECREF(old_key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	422 return DISCARD_FOUND;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	423 }
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	424
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	425 static int
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	426 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	427 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	428 register long hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	429 register setentry *entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	430 PyObject *old_key;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	431
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	432 assert (PyAnySet_Check(so));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	433 if (!PyString_CheckExact(key) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	434 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	435 hash = PyObject_Hash(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	436 if (hash == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	437 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	438 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	439 entry = (so->lookup)(so, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	440 if (entry == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	441 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	442 if (entry->key == NULL \|\| entry->key == dummy)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	443 return DISCARD_NOTFOUND;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	444 old_key = entry->key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	445 Py_INCREF(dummy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	446 entry->key = dummy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	447 so->used--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	448 Py_DECREF(old_key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	449 return DISCARD_FOUND;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	450 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	451
35315 a6cbfcd0e691 Factor away a redundant clear() function. Raymond Hettinger <python@rcn.com> parents: 35312 diff changeset	452 static int
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	453 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	454 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	455 setentry entry, table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	456 int table_is_malloced;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	457 Py_ssize_t fill;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	458 setentry small_copy[PySet_MINSIZE];
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	459 #ifdef Py_DEBUG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	460 Py_ssize_t i, n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	461 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	462
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	463 n = so->mask + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	464 i = 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	465 #endif
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	466
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	467 table = so->table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	468 assert(table != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	469 table_is_malloced = table != so->smalltable;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	470
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	471 /* This is delicate. During the process of clearing the set,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	472 * decrefs can cause the set to mutate. To avoid fatal confusion
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	473 * (voice of experience), we have to make the set empty before
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	474 * clearing the slots, and never refer to anything via so->ref while
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	475 * clearing.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	476 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	477 fill = so->fill;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	478 if (table_is_malloced)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	479 EMPTY_TO_MINSIZE(so);
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	480
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	481 else if (fill > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	482 /* It's a small table with something that needs to be cleared.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	483 * Afraid the only safe way is to copy the set entries into
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	484 * another small table first.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	485 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	486 memcpy(small_copy, table, sizeof(small_copy));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	487 table = small_copy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	488 EMPTY_TO_MINSIZE(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	489 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	490 /* else it's a small table that's already empty */
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	491
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	492 /* Now we can finally clear things. If C had refcounts, we could
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	493 * assert that the refcount on table is 1 now, i.e. that this function
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	494 * has unique access to it, so decref side-effects can't alter it.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	495 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	496 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	497 #ifdef Py_DEBUG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	498 assert(i < n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	499 ++i;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	500 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	501 if (entry->key) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	502 --fill;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	503 Py_DECREF(entry->key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	504 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	505 #ifdef Py_DEBUG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	506 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	507 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	508 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	509 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	510
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	511 if (table_is_malloced)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	512 PyMem_DEL(table);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	513 return 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	514 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	515
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	516 /*
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	517 * 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	518 *
38872 805f41881e27 Use Py_ssize_t Neal Norwitz <nnorwitz@gmail.com> parents: 37747 diff changeset	519 * 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	520 * setentry *entry;
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	521 * 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	522 * 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	523 * 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	524 * }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	525 *
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	526 * CAUTION: In general, it isn't safe to use set_next in a loop that
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	527 * mutates the table.
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	528 */
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	529 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	530 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	531 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	532 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	533 Py_ssize_t mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	534 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	535
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	536 assert (PyAnySet_Check(so));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	537 i = *pos_ptr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	538 assert(i >= 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	539 table = so->table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	540 mask = so->mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	541 while (i <= mask && (table[i].key == NULL \|\| table[i].key == dummy))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	542 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	543 *pos_ptr = i+1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	544 if (i > mask)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	545 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	546 assert(table[i].key != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	547 *entry_ptr = &table[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	548 return 1;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	549 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	550
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	551 static void
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	552 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	553 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	554 register setentry *entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	555 Py_ssize_t fill = so->fill;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	556 PyObject_GC_UnTrack(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	557 Py_TRASHCAN_SAFE_BEGIN(so)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	558 if (so->weakreflist != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	559 PyObject_ClearWeakRefs((PyObject *) so);
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	560
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	561 for (entry = so->table; fill > 0; entry++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	562 if (entry->key) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	563 --fill;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	564 Py_DECREF(entry->key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	565 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	566 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	567 if (so->table != so->smalltable)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	568 PyMem_DEL(so->table);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	569 if (numfree < PySet_MAXFREELIST && PyAnySet_CheckExact(so))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	570 free_list[numfree++] = so;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	571 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	572 Py_TYPE(so)->tp_free(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	573 Py_TRASHCAN_SAFE_END(so)
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	574 }
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	575
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	576 static int
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	577 set_tp_print(PySetObject so, FILE fp, int flags)
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	578 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	579 setentry *entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	580 Py_ssize_t pos=0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	581 char emit = ""; / No separator emitted on first pass */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	582 char *separator = ", ";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	583 int status = Py_ReprEnter((PyObject*)so);
40535 94375d81487d For sets with cyclical reprs, emit '...' instead of recursing. Raymond Hettinger <python@rcn.com> parents: 40433 diff changeset	584
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	585 if (status != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	586 if (status < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	587 return status;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	588 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	589 fprintf(fp, "%s(...)", so->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	590 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	591 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	592 }
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	593
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	594 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	595 fprintf(fp, "%s([", so->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	596 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	597 while (set_next(so, &pos, &entry)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	598 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	599 fputs(emit, fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	600 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	601 emit = separator;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	602 if (PyObject_Print(entry->key, fp, 0) != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	603 Py_ReprLeave((PyObject*)so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	604 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	605 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	606 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	607 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	608 fputs("])", fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	609 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	610 Py_ReprLeave((PyObject*)so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	611 return 0;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	612 }
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	613
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	614 static PyObject *
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	615 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	616 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	617 PyObject keys, result=NULL, *listrepr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	618 int status = Py_ReprEnter((PyObject*)so);
40535 94375d81487d For sets with cyclical reprs, emit '...' instead of recursing. Raymond Hettinger <python@rcn.com> parents: 40433 diff changeset	619
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	620 if (status != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	621 if (status < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	622 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	623 return PyString_FromFormat("%s(...)", so->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	624 }
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	625
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	626 keys = PySequence_List((PyObject *)so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	627 if (keys == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	628 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	629 listrepr = PyObject_Repr(keys);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	630 Py_DECREF(keys);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	631 if (listrepr == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	632 goto done;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	633
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	634 result = PyString_FromFormat("%s(%s)", so->ob_type->tp_name,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	635 PyString_AS_STRING(listrepr));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	636 Py_DECREF(listrepr);
40535 94375d81487d For sets with cyclical reprs, emit '...' instead of recursing. Raymond Hettinger <python@rcn.com> parents: 40433 diff changeset	637 done:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	638 Py_ReprLeave((PyObject*)so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	639 return result;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	640 }
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	641
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	642 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	643 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	644 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	645 return ((PySetObject *)so)->used;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	646 }
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	647
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	648 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	649 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	650 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	651 PySetObject *other;
68856 24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	652 PyObject *key;
24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	653 long hash;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	654 register Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	655 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	656
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	657 assert (PyAnySet_Check(so));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	658 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	659
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	660 other = (PySetObject*)otherset;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	661 if (other == so \|\| other->used == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	662 /* a.update(a) or a.update({}); nothing to do */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	663 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	664 /* Do one big resize at the start, rather than
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	665 * incrementally resizing as we insert new keys. Expect
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	666 * that there will be no (or few) overlapping keys.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	667 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	668 if ((so->fill + other->used)3 >= (so->mask+1)2) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	669 if (set_table_resize(so, (so->used + other->used)*2) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	670 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	671 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	672 for (i = 0; i <= other->mask; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	673 entry = &other->table[i];
68856 24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	674 key = entry->key;
24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	675 hash = entry->hash;
24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	676 if (key != NULL &&
24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	677 key != dummy) {
24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	678 Py_INCREF(key);
24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	679 if (set_insert_key(so, key, hash) == -1) {
24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	680 Py_DECREF(key);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	681 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	682 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	683 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	684 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	685 return 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	686 }
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 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	689 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	690 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	691 long hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	692 setentry *entry;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	693
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	694 if (!PyString_CheckExact(key) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	695 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	696 hash = PyObject_Hash(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	697 if (hash == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	698 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	699 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	700 entry = (so->lookup)(so, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	701 if (entry == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	702 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	703 key = entry->key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	704 return key != NULL && key != dummy;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	705 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	706
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	707 static int
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	708 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	709 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	710 PyObject *key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	711 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	712
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	713 lu_entry = (so->lookup)(so, entry->key, entry->hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	714 if (lu_entry == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	715 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	716 key = lu_entry->key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	717 return key != NULL && key != dummy;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	718 }
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	719
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	720 static PyObject *
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	721 set_pop(PySetObject *so)
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	722 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	723 register Py_ssize_t i = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	724 register setentry *entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	725 PyObject *key;
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	726
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	727 assert (PyAnySet_Check(so));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	728 if (so->used == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	729 PyErr_SetString(PyExc_KeyError, "pop from an empty set");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	730 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	731 }
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	732
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	733 /* Set entry to "the first" unused or dummy set entry. We abuse
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	734 * the hash field of slot 0 to hold a search finger:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	735 * If slot 0 has a value, use slot 0.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	736 * Else slot 0 is being used to hold a search finger,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	737 * and we use its hash value as the first index to look.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	738 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	739 entry = &so->table[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	740 if (entry->key == NULL \|\| entry->key == dummy) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	741 i = entry->hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	742 /* The hash field may be a real hash value, or it may be a
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	743 * legit search finger, or it may be a once-legit search
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	744 * finger that's out of bounds now because it wrapped around
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	745 * or the table shrunk -- simply make sure it's in bounds now.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	746 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	747 if (i > so->mask \|\| i < 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	748 i = 1; /* skip slot 0 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	749 while ((entry = &so->table[i])->key == NULL \|\| entry->key==dummy) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	750 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	751 if (i > so->mask)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	752 i = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	753 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	754 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	755 key = entry->key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	756 Py_INCREF(dummy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	757 entry->key = dummy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	758 so->used--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	759 so->table[0].hash = i + 1; /* next place to start */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	760 return key;
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	761 }
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	762
49431 2e794757bdc8 Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47961 diff changeset	763 PyDoc_STRVAR(pop_doc, "Remove and return an arbitrary set element.\n\
2e794757bdc8 Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47961 diff changeset	764 Raises KeyError if the set is empty.");
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	765
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	766 static int
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	767 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	768 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	769 Py_ssize_t pos = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	770 setentry *entry;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	771
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	772 while (set_next(so, &pos, &entry))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	773 Py_VISIT(entry->key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	774 return 0;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	775 }
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	776
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	777 static long
6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	778 frozenset_hash(PyObject *self)
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	779 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	780 PySetObject so = (PySetObject )self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	781 long h, hash = 1927868237L;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	782 setentry *entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	783 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	784
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	785 if (so->hash != -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	786 return so->hash;
35349 6f1cd28d6b87 Results of a line-by-line comparison back to dictobject.c. Raymond Hettinger <python@rcn.com> parents: 35348 diff changeset	787
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	788 hash *= PySet_GET_SIZE(self) + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	789 while (set_next(so, &pos, &entry)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	790 /* Work to increase the bit dispersion for closely spaced hash
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	791 values. The is important because some use cases have many
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	792 combinations of a small number of elements with nearby
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	793 hashes so that many distinct combinations collapse to only
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	794 a handful of distinct hash values. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	795 h = entry->hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	796 hash ^= (h ^ (h << 16) ^ 89869747L) * 3644798167u;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	797 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	798 hash = hash * 69069L + 907133923L;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	799 if (hash == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	800 hash = 590923713L;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	801 so->hash = hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	802 return hash;
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	803 }
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	804
35311 541bfbb10030 * Move copyright notice to top and indicate derivation from sets.py and Raymond Hettinger <python@rcn.com> parents: 35301 diff changeset	805 /*** 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	806
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	807 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	808 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	809 PySetObject si_set; / Set to NULL when iterator is exhausted */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	810 Py_ssize_t si_used;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	811 Py_ssize_t si_pos;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	812 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	813 } setiterobject;
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	814
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	815 static void
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	816 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	817 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	818 Py_XDECREF(si->si_set);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	819 PyObject_GC_Del(si);
50424 df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49466 diff changeset	820 }
df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49466 diff changeset	821
df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49466 diff changeset	822 static int
df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49466 diff changeset	823 setiter_traverse(setiterobject si, visitproc visit, void arg)
df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49466 diff changeset	824 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	825 Py_VISIT(si->si_set);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	826 return 0;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	827 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	828
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35581 diff changeset	829 static PyObject *
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	830 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	831 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	832 Py_ssize_t len = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	833 if (si->si_set != NULL && si->si_used == si->si_set->used)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	834 len = si->len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	835 return PyInt_FromLong(len);
35292 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
36484 20f75d5e79e9 Renamed _length_cue() to __length_hint__(). See: Armin Rigo <arigo@tunes.org> parents: 36244 diff changeset	838 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	839
e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35581 diff changeset	840 static PyMethodDef setiter_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	841 {"__length_hint__", (PyCFunction)setiter_len, METH_NOARGS, length_hint_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	842 {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	843 };
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	844
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	845 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	846 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	847 PyObject *key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	848 register Py_ssize_t i, mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	849 register setentry *entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	850 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	851
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	852 if (so == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	853 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	854 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	855
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	856 if (si->si_used != so->used) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	857 PyErr_SetString(PyExc_RuntimeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	858 "Set changed size during iteration");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	859 si->si_used = -1; /* Make this state sticky */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	860 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	861 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	862
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	863 i = si->si_pos;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	864 assert(i>=0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	865 entry = so->table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	866 mask = so->mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	867 while (i <= mask && (entry[i].key == NULL \|\| entry[i].key == dummy))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	868 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	869 si->si_pos = i+1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	870 if (i > mask)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	871 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	872 si->len--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	873 key = entry[i].key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	874 Py_INCREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	875 return key;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	876
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	877 fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	878 Py_DECREF(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	879 si->si_set = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	880 return NULL;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	881 }
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	882
35296 d91964f5fe0d Fix build on gcc: PySetIter_Type should be static in definition Hye-Shik Chang <hyeshik@gmail.com> parents: 35295 diff changeset	883 static PyTypeObject PySetIter_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	884 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	885 "setiterator", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	886 sizeof(setiterobject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	887 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	888 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	889 (destructor)setiter_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	890 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	891 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	892 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	893 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	894 0, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	895 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	896 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	897 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	898 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	899 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	900 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	901 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	902 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	903 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	904 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	905 0, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	906 (traverseproc)setiter_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	907 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	908 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	909 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	910 PyObject_SelfIter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	911 (iternextfunc)setiter_iternext, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	912 setiter_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	913 0,
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	914 };
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	915
37602 ca95ad5b0fbc Remove "static forward" declaration. Move constructors Martin v. Löwis <martin@v.loewis.de> parents: 37315 diff changeset	916 static PyObject *
ca95ad5b0fbc Remove "static forward" declaration. Move constructors Martin v. Löwis <martin@v.loewis.de> parents: 37315 diff changeset	917 set_iter(PySetObject *so)
ca95ad5b0fbc Remove "static forward" declaration. Move constructors Martin v. Löwis <martin@v.loewis.de> parents: 37315 diff changeset	918 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	919 setiterobject *si = PyObject_GC_New(setiterobject, &PySetIter_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	920 if (si == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	921 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	922 Py_INCREF(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	923 si->si_set = so;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	924 si->si_used = so->used;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	925 si->si_pos = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	926 si->len = so->used;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	927 _PyObject_GC_TRACK(si);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	928 return (PyObject *)si;
37602 ca95ad5b0fbc Remove "static forward" declaration. Move constructors Martin v. Löwis <martin@v.loewis.de> parents: 37315 diff changeset	929 }
ca95ad5b0fbc Remove "static forward" declaration. Move constructors Martin v. Löwis <martin@v.loewis.de> parents: 37315 diff changeset	930
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	931 static int
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	932 set_update_internal(PySetObject so, PyObject other)
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	933 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	934 PyObject key, it;
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	935
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	936 if (PyAnySet_Check(other))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	937 return set_merge(so, other);
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	938
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	939 if (PyDict_CheckExact(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	940 PyObject *value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	941 Py_ssize_t pos = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	942 long hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	943 Py_ssize_t dictsize = PyDict_Size(other);
40865 81b5df5798c2 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40767 diff changeset	944
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	945 /* Do one big resize at the start, rather than
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	946 * incrementally resizing as we insert new keys. Expect
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	947 * that there will be no (or few) overlapping keys.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	948 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	949 if (dictsize == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	950 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	951 if ((so->fill + dictsize)3 >= (so->mask+1)2) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	952 if (set_table_resize(so, (so->used + dictsize)*2) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	953 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	954 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	955 while (_PyDict_Next(other, &pos, &key, &value, &hash)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	956 setentry an_entry;
40865 81b5df5798c2 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40767 diff changeset	957
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	958 an_entry.hash = hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	959 an_entry.key = key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	960 if (set_add_entry(so, &an_entry) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	961 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	962 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	963 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	964 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	965
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	966 it = PyObject_GetIter(other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	967 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	968 return -1;
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	969
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	970 while ((key = PyIter_Next(it)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	971 if (set_add_key(so, key) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	972 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	973 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	974 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	975 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	976 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	977 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	978 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	979 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	980 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	981 return 0;
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	982 }
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	983
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	984 static PyObject *
47530 d4cd7223af3b Let set.union() and set.update() accept multiple inputs. Raymond Hettinger <python@rcn.com> parents: 47527 diff changeset	985 set_update(PySetObject so, PyObject args)
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	986 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	987 Py_ssize_t i;
47530 d4cd7223af3b Let set.union() and set.update() accept multiple inputs. Raymond Hettinger <python@rcn.com> parents: 47527 diff changeset	988
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	989 for (i=0 ; i<PyTuple_GET_SIZE(args) ; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	990 PyObject *other = PyTuple_GET_ITEM(args, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	991 if (set_update_internal(so, other) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	992 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	993 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	994 Py_RETURN_NONE;
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	995 }
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	996
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	997 PyDoc_STRVAR(update_doc,
47530 d4cd7223af3b Let set.union() and set.update() accept multiple inputs. Raymond Hettinger <python@rcn.com> parents: 47527 diff changeset	998 "Update a set with the union of itself and others.");
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	999
8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	1000 static PyObject *
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1001 make_new_set(PyTypeObject type, PyObject iterable)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1002 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1003 register PySetObject *so = NULL;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1004
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1005 if (dummy == NULL) { /* Auto-initialize dummy */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1006 dummy = PyString_FromString("<dummy key>");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1007 if (dummy == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1008 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1009 }
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1010
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1011 /* create PySetObject structure */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1012 if (numfree &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1013 (type == &PySet_Type \|\| type == &PyFrozenSet_Type)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1014 so = free_list[--numfree];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1015 assert (so != NULL && PyAnySet_CheckExact(so));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1016 Py_TYPE(so) = type;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1017 _Py_NewReference((PyObject *)so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1018 EMPTY_TO_MINSIZE(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1019 PyObject_GC_Track(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1020 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1021 so = (PySetObject *)type->tp_alloc(type, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1022 if (so == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1023 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1024 /* tp_alloc has already zeroed the structure */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1025 assert(so->table == NULL && so->fill == 0 && so->used == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1026 INIT_NONZERO_SET_SLOTS(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1027 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1028
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1029 so->lookup = set_lookkey_string;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1030 so->weakreflist = NULL;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1031
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1032 if (iterable != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1033 if (set_update_internal(so, iterable) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1034 Py_DECREF(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1035 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1036 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1037 }
31015 8d413578eb1a Factor out more duplicate code. Raymond Hettinger <python@rcn.com> parents: 31012 diff changeset	1038
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1039 return (PyObject *)so;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1040 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1041
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1042 /* The empty frozenset is a singleton */
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1043 static PyObject *emptyfrozenset = NULL;
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1044
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1045 static PyObject *
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1046 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	1047 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1048 PyObject iterable = NULL, result;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1049
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1050 if (type == &PyFrozenSet_Type && !_PyArg_NoKeywords("frozenset()", kwds))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1051 return NULL;
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 35398 diff changeset	1052
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1053 if (!PyArg_UnpackTuple(args, type->tp_name, 0, 1, &iterable))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1054 return NULL;
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1055
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1056 if (type != &PyFrozenSet_Type)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1057 return make_new_set(type, iterable);
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1058
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1059 if (iterable != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1060 /* frozenset(f) is idempotent */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1061 if (PyFrozenSet_CheckExact(iterable)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1062 Py_INCREF(iterable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1063 return iterable;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1064 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1065 result = make_new_set(type, iterable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1066 if (result == NULL \|\| PySet_GET_SIZE(result))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1067 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1068 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1069 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1070 /* The empty frozenset is a singleton */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1071 if (emptyfrozenset == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1072 emptyfrozenset = make_new_set(type, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1073 Py_XINCREF(emptyfrozenset);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1074 return emptyfrozenset;
35297 26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1075 }
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1076
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1077 void
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1078 PySet_Fini(void)
26bf6c27e9ce * Improve code for the empty frozenset singleton: Raymond Hettinger <python@rcn.com> parents: 35296 diff changeset	1079 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1080 PySetObject *so;
35321 bdcb01a9b60c * Bring in INIT_NONZERO_SET_SLOTS macro from dictionary code. Raymond Hettinger <python@rcn.com> parents: 35317 diff changeset	1081
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1082 while (numfree) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1083 numfree--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1084 so = free_list[numfree];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1085 PyObject_GC_Del(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1086 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1087 Py_CLEAR(dummy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1088 Py_CLEAR(emptyfrozenset);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1089 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1090
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1091 static PyObject *
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1092 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	1093 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1094 if (type == &PySet_Type && !_PyArg_NoKeywords("set()", kwds))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1095 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1096
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1097 return make_new_set(type, NULL);
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1098 }
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1099
35293 8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1100 /* 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	1101 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	1102 Semantically equivalent to:
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1103
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1104 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	1105
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1106 The function always succeeds and it leaves both objects in a stable state.
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1107 Useful for creating temporary frozensets from sets for membership testing
35293 8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1108 in __contains__(), discard(), and remove(). Also useful for operations
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1109 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	1110 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	1111 */
8fffb4c95487 Comment on the set_swap_bodies() helper function. Raymond Hettinger <python@rcn.com> parents: 35292 diff changeset	1112
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1113 static void
35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1114 set_swap_bodies(PySetObject a, PySetObject b)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1115 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1116 Py_ssize_t t;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1117 setentry *u;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1118 setentry (f)(PySetObject so, PyObject key, long hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1119 setentry tab[PySet_MINSIZE];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1120 long h;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1121
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1122 t = a->fill; a->fill = b->fill; b->fill = t;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1123 t = a->used; a->used = b->used; b->used = t;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1124 t = a->mask; a->mask = b->mask; b->mask = t;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1125
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1126 u = a->table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1127 if (a->table == a->smalltable)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1128 u = b->smalltable;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1129 a->table = b->table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1130 if (b->table == b->smalltable)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1131 a->table = a->smalltable;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1132 b->table = u;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1133
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1134 f = a->lookup; a->lookup = b->lookup; b->lookup = f;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1135
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1136 if (a->table == a->smalltable \|\| b->table == b->smalltable) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1137 memcpy(tab, a->smalltable, sizeof(tab));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1138 memcpy(a->smalltable, b->smalltable, sizeof(tab));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1139 memcpy(b->smalltable, tab, sizeof(tab));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1140 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1141
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1142 if (PyType_IsSubtype(Py_TYPE(a), &PyFrozenSet_Type) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1143 PyType_IsSubtype(Py_TYPE(b), &PyFrozenSet_Type)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1144 h = a->hash; a->hash = b->hash; b->hash = h;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1145 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1146 a->hash = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1147 b->hash = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1148 }
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1149 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1150
31172 e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 31019 diff changeset	1151 static PyObject *
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1152 set_copy(PySetObject *so)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1153 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1154 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	1155 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1156
31004 5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1157 static PyObject *
5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1158 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	1159 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1160 if (PyFrozenSet_CheckExact(so)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1161 Py_INCREF(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1162 return (PyObject *)so;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1163 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1164 return set_copy(so);
31004 5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1165 }
5b77bc4d25b1 * Simplify hash function and add test to show effectiveness of the hash Raymond Hettinger <python@rcn.com> parents: 31002 diff changeset	1166
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1167 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	1168
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1169 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	1170 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	1171 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1172 set_clear_internal(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1173 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	1174 }
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1175
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1176 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	1177
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1178 static PyObject *
47530 d4cd7223af3b Let set.union() and set.update() accept multiple inputs. Raymond Hettinger <python@rcn.com> parents: 47527 diff changeset	1179 set_union(PySetObject so, PyObject args)
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1180 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1181 PySetObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1182 PyObject *other;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1183 Py_ssize_t i;
47530 d4cd7223af3b Let set.union() and set.update() accept multiple inputs. Raymond Hettinger <python@rcn.com> parents: 47527 diff changeset	1184
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1185 result = (PySetObject *)set_copy(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1186 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1187 return NULL;
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1188
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1189 for (i=0 ; i<PyTuple_GET_SIZE(args) ; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1190 other = PyTuple_GET_ITEM(args, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1191 if ((PyObject *)so == other)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1192 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1193 if (set_update_internal(result, other) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1194 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1195 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1196 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1197 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1198 return (PyObject *)result;
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1199 }
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1200
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1201 PyDoc_STRVAR(union_doc,
47530 d4cd7223af3b Let set.union() and set.update() accept multiple inputs. Raymond Hettinger <python@rcn.com> parents: 47527 diff changeset	1202 "Return the union of sets as a new set.\n\
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1203 \n\
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1204 (i.e. all elements that are in either set.)");
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1205
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1206 static PyObject *
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1207 set_or(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1208 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1209 PySetObject *result;
47530 d4cd7223af3b Let set.union() and set.update() accept multiple inputs. Raymond Hettinger <python@rcn.com> parents: 47527 diff changeset	1210
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1211 if (!PyAnySet_Check(so) \|\| !PyAnySet_Check(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1212 Py_INCREF(Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1213 return Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1214 }
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1215
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1216 result = (PySetObject *)set_copy(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1217 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1218 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1219 if ((PyObject *)so == other)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1220 return (PyObject *)result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1221 if (set_update_internal(result, other) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1222 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1223 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1224 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1225 return (PyObject *)result;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1226 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1227
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1228 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1229 set_ior(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1230 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1231 if (!PyAnySet_Check(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1232 Py_INCREF(Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1233 return Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1234 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1235 if (set_update_internal(so, other) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1236 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1237 Py_INCREF(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1238 return (PyObject *)so;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1239 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1240
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1241 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1242 set_intersection(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1243 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1244 PySetObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1245 PyObject key, it, *tmp;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1246
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1247 if ((PyObject *)so == other)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1248 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	1249
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1250 result = (PySetObject *)make_new_set(Py_TYPE(so), NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1251 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1252 return NULL;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1253
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1254 if (PyAnySet_Check(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1255 Py_ssize_t pos = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1256 setentry *entry;
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1257
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1258 if (PySet_GET_SIZE(other) > PySet_GET_SIZE(so)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1259 tmp = (PyObject *)so;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1260 so = (PySetObject *)other;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1261 other = tmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1262 }
35332 fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1263
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1264 while (set_next((PySetObject *)other, &pos, &entry)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1265 int rv = set_contains_entry(so, entry);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1266 if (rv == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1267 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1268 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1269 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1270 if (rv) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1271 if (set_add_entry(result, entry) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1272 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1273 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1274 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1275 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1276 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1277 return (PyObject *)result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1278 }
35332 fd02b84fb2db * Fix SF #1257731. Make __contains__(), remove(), and discard() only do Raymond Hettinger <python@rcn.com> parents: 35328 diff changeset	1279
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1280 it = PyObject_GetIter(other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1281 if (it == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1282 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1283 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1284 }
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1285
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1286 while ((key = PyIter_Next(it)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1287 int rv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1288 setentry entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1289 long hash = PyObject_Hash(key);
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1290
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1291 if (hash == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1292 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1293 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1294 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1295 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1296 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1297 entry.hash = hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1298 entry.key = key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1299 rv = set_contains_entry(so, &entry);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1300 if (rv == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1301 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1302 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1303 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1304 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1305 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1306 if (rv) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1307 if (set_add_entry(result, &entry) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1308 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1309 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1310 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1311 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1312 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1313 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1314 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1315 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1316 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1317 if (PyErr_Occurred()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1318 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1319 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1320 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1321 return (PyObject *)result;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1322 }
40433 fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	1323
47533 10577e25f78f Let set.intersection() and set.intersection_update() take multiple input arguments. Raymond Hettinger <python@rcn.com> parents: 47530 diff changeset	1324 static PyObject *
10577e25f78f Let set.intersection() and set.intersection_update() take multiple input arguments. Raymond Hettinger <python@rcn.com> parents: 47530 diff changeset	1325 set_intersection_multi(PySetObject so, PyObject args)
10577e25f78f Let set.intersection() and set.intersection_update() take multiple input arguments. Raymond Hettinger <python@rcn.com> parents: 47530 diff changeset	1326 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1327 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1328 PyObject result = (PyObject )so;
47533 10577e25f78f Let set.intersection() and set.intersection_update() take multiple input arguments. Raymond Hettinger <python@rcn.com> parents: 47530 diff changeset	1329
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1330 if (PyTuple_GET_SIZE(args) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1331 return set_copy(so);
47574 7d70b59eeaf2 Handle the case with zero arguments. Raymond Hettinger <python@rcn.com> parents: 47533 diff changeset	1332
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1333 Py_INCREF(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1334 for (i=0 ; i<PyTuple_GET_SIZE(args) ; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1335 PyObject *other = PyTuple_GET_ITEM(args, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1336 PyObject newresult = set_intersection((PySetObject )result, other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1337 if (newresult == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1338 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1339 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1340 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1341 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1342 result = newresult;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1343 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1344 return result;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1345 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1346
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1347 PyDoc_STRVAR(intersection_doc,
57329 4633ed237970 Issue 7263: Fix set.intersection() docstring. Raymond Hettinger <python@rcn.com> parents: 55469 diff changeset	1348 "Return the intersection of two or more sets as a new set.\n\
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1349 \n\
57329 4633ed237970 Issue 7263: Fix set.intersection() docstring. Raymond Hettinger <python@rcn.com> parents: 55469 diff changeset	1350 (i.e. elements that are common to all of the sets.)");
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1351
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1352 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1353 set_intersection_update(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1354 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1355 PyObject *tmp;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1356
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1357 tmp = set_intersection(so, other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1358 if (tmp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1359 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1360 set_swap_bodies(so, (PySetObject *)tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1361 Py_DECREF(tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1362 Py_RETURN_NONE;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1363 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1364
47533 10577e25f78f Let set.intersection() and set.intersection_update() take multiple input arguments. Raymond Hettinger <python@rcn.com> parents: 47530 diff changeset	1365 static PyObject *
10577e25f78f Let set.intersection() and set.intersection_update() take multiple input arguments. Raymond Hettinger <python@rcn.com> parents: 47530 diff changeset	1366 set_intersection_update_multi(PySetObject so, PyObject args)
10577e25f78f Let set.intersection() and set.intersection_update() take multiple input arguments. Raymond Hettinger <python@rcn.com> parents: 47530 diff changeset	1367 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1368 PyObject *tmp;
47533 10577e25f78f Let set.intersection() and set.intersection_update() take multiple input arguments. Raymond Hettinger <python@rcn.com> parents: 47530 diff changeset	1369
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1370 tmp = set_intersection_multi(so, args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1371 if (tmp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1372 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1373 set_swap_bodies(so, (PySetObject *)tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1374 Py_DECREF(tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1375 Py_RETURN_NONE;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1376 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1377
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1378 PyDoc_STRVAR(intersection_update_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1379 "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	1380
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1381 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1382 set_and(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1383 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1384 if (!PyAnySet_Check(so) \|\| !PyAnySet_Check(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1385 Py_INCREF(Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1386 return Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1387 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1388 return set_intersection(so, other);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1389 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1390
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1391 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1392 set_iand(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1393 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1394 PyObject *result;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1395
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1396 if (!PyAnySet_Check(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1397 Py_INCREF(Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1398 return Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1399 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1400 result = set_intersection_update(so, other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1401 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1402 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1403 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1404 Py_INCREF(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1405 return (PyObject *)so;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1406 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1407
43794 2b3abe3d3ae6 Add set.isdisjoint() Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	1408 static PyObject *
2b3abe3d3ae6 Add set.isdisjoint() Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	1409 set_isdisjoint(PySetObject so, PyObject other)
2b3abe3d3ae6 Add set.isdisjoint() Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	1410 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1411 PyObject key, it, *tmp;
43794 2b3abe3d3ae6 Add set.isdisjoint() Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	1412
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1413 if ((PyObject *)so == other) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1414 if (PySet_GET_SIZE(so) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1415 Py_RETURN_TRUE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1416 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1417 Py_RETURN_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1418 }
43794 2b3abe3d3ae6 Add set.isdisjoint() Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	1419
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1420 if (PyAnySet_CheckExact(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1421 Py_ssize_t pos = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1422 setentry *entry;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1423
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1424 if (PySet_GET_SIZE(other) > PySet_GET_SIZE(so)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1425 tmp = (PyObject *)so;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1426 so = (PySetObject *)other;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1427 other = tmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1428 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1429 while (set_next((PySetObject *)other, &pos, &entry)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1430 int rv = set_contains_entry(so, entry);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1431 if (rv == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1432 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1433 if (rv)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1434 Py_RETURN_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1435 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1436 Py_RETURN_TRUE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1437 }
43794 2b3abe3d3ae6 Add set.isdisjoint() Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	1438
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1439 it = PyObject_GetIter(other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1440 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1441 return NULL;
43794 2b3abe3d3ae6 Add set.isdisjoint() Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	1442
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1443 while ((key = PyIter_Next(it)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1444 int rv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1445 setentry entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1446 long hash = PyObject_Hash(key);
43794 2b3abe3d3ae6 Add set.isdisjoint() Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	1447
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1448 if (hash == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1449 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1450 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1451 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1452 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1453 entry.hash = hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1454 entry.key = key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1455 rv = set_contains_entry(so, &entry);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1456 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1457 if (rv == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1458 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1459 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1460 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1461 if (rv) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1462 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1463 Py_RETURN_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1464 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1465 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1466 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1467 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1468 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1469 Py_RETURN_TRUE;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1470 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1471
43794 2b3abe3d3ae6 Add set.isdisjoint() Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	1472 PyDoc_STRVAR(isdisjoint_doc,
2b3abe3d3ae6 Add set.isdisjoint() Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	1473 "Return True if two sets have a null intersection.");
2b3abe3d3ae6 Add set.isdisjoint() Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	1474
35862 6867995a18a7 Prevent name pollution by making lots of internal functions static. Neal Norwitz <nnorwitz@gmail.com> parents: 35636 diff changeset	1475 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	1476 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	1477 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1478 if ((PyObject *)so == other)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1479 return set_clear_internal(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1480
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1481 if (PyAnySet_Check(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1482 setentry *entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1483 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	1484
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1485 while (set_next((PySetObject *)other, &pos, &entry))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1486 if (set_discard_entry(so, entry) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1487 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1488 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1489 PyObject key, it;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1490 it = PyObject_GetIter(other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1491 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1492 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	1493
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1494 while ((key = PyIter_Next(it)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1495 if (set_discard_key(so, key) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1496 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1497 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1498 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1499 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1500 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1501 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1502 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1503 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1504 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1505 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1506 /* If more than 1/5 are dummies, then resize them away. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1507 if ((so->fill - so->used) * 5 < so->mask)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1508 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1509 return set_table_resize(so, so->used>50000 ? so->used2 : so->used4);
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1510 }
0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1511
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1512 static PyObject *
47588 8fe47b2c8bfe Multi-arg form for set.difference() and set.difference_update(). Raymond Hettinger <python@rcn.com> parents: 47574 diff changeset	1513 set_difference_update(PySetObject so, PyObject args)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1514 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1515 Py_ssize_t i;
47588 8fe47b2c8bfe Multi-arg form for set.difference() and set.difference_update(). Raymond Hettinger <python@rcn.com> parents: 47574 diff changeset	1516
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1517 for (i=0 ; i<PyTuple_GET_SIZE(args) ; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1518 PyObject *other = PyTuple_GET_ITEM(args, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1519 if (set_difference_update_internal(so, other) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1520 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1521 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1522 Py_RETURN_NONE;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1523 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1524
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1525 PyDoc_STRVAR(difference_update_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1526 "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	1527
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1528 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	1529 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	1530 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1531 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1532 setentry *entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1533 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	1534
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1535 if (!PyAnySet_Check(other) && !PyDict_CheckExact(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1536 result = set_copy(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1537 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1538 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1539 if (set_difference_update_internal((PySetObject *)result, other) != -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1540 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1541 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1542 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1543 }
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1544
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1545 result = make_new_set(Py_TYPE(so), NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1546 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1547 return NULL;
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1548
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1549 if (PyDict_CheckExact(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1550 while (set_next(so, &pos, &entry)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1551 setentry entrycopy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1552 entrycopy.hash = entry->hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1553 entrycopy.key = entry->key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1554 if (!_PyDict_Contains(other, entry->key, entry->hash)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1555 if (set_add_entry((PySetObject *)result, &entrycopy) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1556 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1557 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1558 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1559 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1560 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1561 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1562 }
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1563
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1564 while (set_next(so, &pos, &entry)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1565 int rv = set_contains_entry((PySetObject *)other, entry);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1566 if (rv == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1567 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1568 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1569 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1570 if (!rv) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1571 if (set_add_entry((PySetObject *)result, entry) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1572 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1573 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1574 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1575 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1576 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1577 return result;
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1578 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1579
47588 8fe47b2c8bfe Multi-arg form for set.difference() and set.difference_update(). Raymond Hettinger <python@rcn.com> parents: 47574 diff changeset	1580 static PyObject *
8fe47b2c8bfe Multi-arg form for set.difference() and set.difference_update(). Raymond Hettinger <python@rcn.com> parents: 47574 diff changeset	1581 set_difference_multi(PySetObject so, PyObject args)
8fe47b2c8bfe Multi-arg form for set.difference() and set.difference_update(). Raymond Hettinger <python@rcn.com> parents: 47574 diff changeset	1582 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1583 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1584 PyObject result, other;
47588 8fe47b2c8bfe Multi-arg form for set.difference() and set.difference_update(). Raymond Hettinger <python@rcn.com> parents: 47574 diff changeset	1585
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1586 if (PyTuple_GET_SIZE(args) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1587 return set_copy(so);
47588 8fe47b2c8bfe Multi-arg form for set.difference() and set.difference_update(). Raymond Hettinger <python@rcn.com> parents: 47574 diff changeset	1588
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1589 other = PyTuple_GET_ITEM(args, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1590 result = set_difference(so, other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1591 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1592 return NULL;
47588 8fe47b2c8bfe Multi-arg form for set.difference() and set.difference_update(). Raymond Hettinger <python@rcn.com> parents: 47574 diff changeset	1593
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1594 for (i=1 ; i<PyTuple_GET_SIZE(args) ; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1595 other = PyTuple_GET_ITEM(args, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1596 if (set_difference_update_internal((PySetObject *)result, other) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1597 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1598 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1599 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1600 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1601 return result;
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1602 }
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1603
e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1604 PyDoc_STRVAR(difference_doc,
47588 8fe47b2c8bfe Multi-arg form for set.difference() and set.difference_update(). Raymond Hettinger <python@rcn.com> parents: 47574 diff changeset	1605 "Return the difference of two or more sets as a new set.\n\
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1606 \n\
47588 8fe47b2c8bfe Multi-arg form for set.difference() and set.difference_update(). Raymond Hettinger <python@rcn.com> parents: 47574 diff changeset	1607 (i.e. all elements that are in this set but not the others.)");
31191 e4682af7aea9 Improve algorithm for set.difference when the input is not a set. Raymond Hettinger <python@rcn.com> parents: 31178 diff changeset	1608 static PyObject *
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1609 set_sub(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1610 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1611 if (!PyAnySet_Check(so) \|\| !PyAnySet_Check(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1612 Py_INCREF(Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1613 return Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1614 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1615 return set_difference(so, other);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1616 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1617
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1618 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1619 set_isub(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1620 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1621 if (!PyAnySet_Check(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1622 Py_INCREF(Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1623 return Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1624 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1625 if (set_difference_update_internal(so, other) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1626 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1627 Py_INCREF(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1628 return (PyObject *)so;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1629 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1630
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1631 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1632 set_symmetric_difference_update(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1633 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1634 PySetObject *otherset;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1635 PyObject *key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1636 Py_ssize_t pos = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1637 setentry *entry;
35328 0ef64a93f3f2 * Add short-circuit code for in-place operations with self (such as Raymond Hettinger <python@rcn.com> parents: 35321 diff changeset	1638
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1639 if ((PyObject *)so == other)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1640 return set_clear(so);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1641
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1642 if (PyDict_CheckExact(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1643 PyObject *value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1644 int rv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1645 long hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1646 while (_PyDict_Next(other, &pos, &key, &value, &hash)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1647 setentry an_entry;
40433 fa280d7c7d5e Backport fixes to set objects: Raymond Hettinger <python@rcn.com> parents: 40225 diff changeset	1648
68856 24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	1649 Py_INCREF(key);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1650 an_entry.hash = hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1651 an_entry.key = key;
68856 24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	1652
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1653 rv = set_discard_entry(so, &an_entry);
68856 24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	1654 if (rv == -1) {
24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	1655 Py_DECREF(key);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1656 return NULL;
68856 24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	1657 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1658 if (rv == DISCARD_NOTFOUND) {
68856 24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	1659 if (set_add_entry(so, &an_entry) == -1) {
24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	1660 Py_DECREF(key);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1661 return NULL;
68856 24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	1662 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1663 }
68856 24179f82b7de Fix obscure set crashers (#4420). Backport of d56b3cafb1e6, reviewed by Raymond. Éric Araujo <merwok@netwok.org> parents: 68256 diff changeset	1664 Py_DECREF(key);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1665 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1666 Py_RETURN_NONE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1667 }
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1668
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1669 if (PyAnySet_Check(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1670 Py_INCREF(other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1671 otherset = (PySetObject *)other;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1672 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1673 otherset = (PySetObject *)make_new_set(Py_TYPE(so), other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1674 if (otherset == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1675 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1676 }
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1677
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1678 while (set_next(otherset, &pos, &entry)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1679 int rv = set_discard_entry(so, entry);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1680 if (rv == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1681 Py_DECREF(otherset);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1682 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1683 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1684 if (rv == DISCARD_NOTFOUND) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1685 if (set_add_entry(so, entry) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1686 Py_DECREF(otherset);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1687 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1688 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1689 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1690 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1691 Py_DECREF(otherset);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1692 Py_RETURN_NONE;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1693 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1694
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1695 PyDoc_STRVAR(symmetric_difference_update_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1696 "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	1697
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1698 static PyObject *
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1699 set_symmetric_difference(PySetObject so, PyObject other)
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1700 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1701 PyObject *rv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1702 PySetObject *otherset;
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1703
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1704 otherset = (PySetObject *)make_new_set(Py_TYPE(so), other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1705 if (otherset == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1706 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1707 rv = set_symmetric_difference_update(otherset, (PyObject *)so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1708 if (rv == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1709 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1710 Py_DECREF(rv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1711 return (PyObject *)otherset;
31008 4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1712 }
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1713
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1714 PyDoc_STRVAR(symmetric_difference_doc,
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1715 "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	1716 \n\
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1717 (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	1718
4224d807911c * Checkin remaining documentation Raymond Hettinger <python@rcn.com> parents: 31004 diff changeset	1719 static PyObject *
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1720 set_xor(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1721 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1722 if (!PyAnySet_Check(so) \|\| !PyAnySet_Check(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1723 Py_INCREF(Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1724 return Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1725 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1726 return set_symmetric_difference(so, other);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1727 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1728
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1729 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1730 set_ixor(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1731 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1732 PyObject *result;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1733
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1734 if (!PyAnySet_Check(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1735 Py_INCREF(Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1736 return Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1737 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1738 result = set_symmetric_difference_update(so, other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1739 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1740 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1741 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1742 Py_INCREF(so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1743 return (PyObject *)so;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1744 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1745
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1746 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1747 set_issubset(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1748 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1749 setentry *entry;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1750 Py_ssize_t pos = 0;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1751
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1752 if (!PyAnySet_Check(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1753 PyObject tmp, result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1754 tmp = make_new_set(&PySet_Type, other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1755 if (tmp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1756 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1757 result = set_issubset(so, tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1758 Py_DECREF(tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1759 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1760 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1761 if (PySet_GET_SIZE(so) > PySet_GET_SIZE(other))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1762 Py_RETURN_FALSE;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1763
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1764 while (set_next(so, &pos, &entry)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1765 int rv = set_contains_entry((PySetObject *)other, entry);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1766 if (rv == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1767 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1768 if (!rv)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1769 Py_RETURN_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1770 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1771 Py_RETURN_TRUE;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1772 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1773
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1774 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	1775
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1776 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1777 set_issuperset(PySetObject so, PyObject other)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1778 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1779 PyObject tmp, result;
30994 632b223cb8e8 issubset() and issuperset() to work with general iterables Raymond Hettinger <python@rcn.com> parents: 30993 diff changeset	1780
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1781 if (!PyAnySet_Check(other)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1782 tmp = make_new_set(&PySet_Type, other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1783 if (tmp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1784 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1785 result = set_issuperset(so, tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1786 Py_DECREF(tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1787 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1788 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1789 return set_issubset((PySetObject )other, (PyObject )so);
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1790 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1791
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1792 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	1793
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1794 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1795 set_richcompare(PySetObject v, PyObject w, int op)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1796 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1797 PyObject r1, r2;
35292 35a698302c63 Revised the set() and frozenset() implementaion to use its own internal Raymond Hettinger <python@rcn.com> parents: 35110 diff changeset	1798
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1799 if(!PyAnySet_Check(w)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1800 if (op == Py_EQ)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1801 Py_RETURN_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1802 if (op == Py_NE)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1803 Py_RETURN_TRUE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1804 PyErr_SetString(PyExc_TypeError, "can only compare to a set");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1805 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1806 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1807 switch (op) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1808 case Py_EQ:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1809 if (PySet_GET_SIZE(v) != PySet_GET_SIZE(w))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1810 Py_RETURN_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1811 if (v->hash != -1 &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1812 ((PySetObject *)w)->hash != -1 &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1813 v->hash != ((PySetObject *)w)->hash)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1814 Py_RETURN_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1815 return set_issubset(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1816 case Py_NE:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1817 r1 = set_richcompare(v, w, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1818 if (r1 == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1819 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1820 r2 = PyBool_FromLong(PyObject_Not(r1));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1821 Py_DECREF(r1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1822 return r2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1823 case Py_LE:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1824 return set_issubset(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1825 case Py_GE:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1826 return set_issuperset(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1827 case Py_LT:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1828 if (PySet_GET_SIZE(v) >= PySet_GET_SIZE(w))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1829 Py_RETURN_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1830 return set_issubset(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1831 case Py_GT:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1832 if (PySet_GET_SIZE(v) <= PySet_GET_SIZE(w))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1833 Py_RETURN_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1834 return set_issuperset(v, w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1835 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1836 Py_INCREF(Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1837 return Py_NotImplemented;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1838 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1839
35339 028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	1840 static int
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37219 diff changeset	1841 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	1842 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1843 PyErr_SetString(PyExc_TypeError, "cannot compare sets using cmp()");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1844 return -1;
35339 028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	1845 }
028e94a6efc5 * Bring lookkey() and lookkey_string() closer to dict version. Raymond Hettinger <python@rcn.com> parents: 35332 diff changeset	1846
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1847 static PyObject *
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1848 set_add(PySetObject so, PyObject key)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1849 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1850 if (set_add_key(so, key) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1851 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1852 Py_RETURN_NONE;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1853 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1854
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1855 PyDoc_STRVAR(add_doc,
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1856 "Add an element to a set.\n\
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1857 \n\
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1858 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	1859
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1860 static int
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1861 set_contains(PySetObject so, PyObject key)
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1862 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1863 PyObject *tmpkey;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1864 int rv;
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1865
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1866 rv = set_contains_key(so, key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1867 if (rv == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1868 if (!PySet_Check(key) \|\| !PyErr_ExceptionMatches(PyExc_TypeError))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1869 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1870 PyErr_Clear();
63770 0f8a4fcfdd1e Issue8757: Implicit set-to-frozenset conversion not thread-safe. Raymond Hettinger <python@rcn.com> parents: 61463 diff changeset	1871 tmpkey = make_new_set(&PyFrozenSet_Type, key);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1872 if (tmpkey == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1873 return -1;
73199 72de2ac8bb4f Avoid unnecessary recursive function calls (closes #10519) Petri Lehtinen <petri@digip.org> parents: 68856 diff changeset	1874 rv = set_contains_key(so, tmpkey);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1875 Py_DECREF(tmpkey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1876 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1877 return rv;
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1878 }
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1879
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1880 static PyObject *
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1881 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	1882 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1883 long result;
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1884
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1885 result = set_contains(so, key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1886 if (result == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1887 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1888 return PyBool_FromLong(result);
35341 f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1889 }
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1890
f6b462d2a3a3 More function re-ordering (placing like functions together). Raymond Hettinger <python@rcn.com> parents: 35339 diff changeset	1891 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	1892
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1893 static PyObject *
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1894 set_remove(PySetObject so, PyObject key)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1895 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1896 PyObject *tmpkey;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1897 int rv;
31002 622a76bc0237 Extend temporary hashability to remove() and discard(). Raymond Hettinger <python@rcn.com> parents: 30995 diff changeset	1898
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1899 rv = set_discard_key(so, key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1900 if (rv == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1901 if (!PySet_Check(key) \|\| !PyErr_ExceptionMatches(PyExc_TypeError))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1902 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1903 PyErr_Clear();
63770 0f8a4fcfdd1e Issue8757: Implicit set-to-frozenset conversion not thread-safe. Raymond Hettinger <python@rcn.com> parents: 61463 diff changeset	1904 tmpkey = make_new_set(&PyFrozenSet_Type, key);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1905 if (tmpkey == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1906 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1907 rv = set_discard_key(so, tmpkey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1908 Py_DECREF(tmpkey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1909 if (rv == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1910 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1911 }
49466 6e7b853e8616 #4069: aSet.remove(otherSet) would always report the empty frozenset([]) as the missing key. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 49431 diff changeset	1912
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1913 if (rv == DISCARD_NOTFOUND) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1914 set_key_error(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1915 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1916 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1917 Py_RETURN_NONE;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1918 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1919
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1920 PyDoc_STRVAR(remove_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1921 "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	1922 \n\
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1923 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	1924
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1925 static PyObject *
35295 f30ebdc3bddf Improve variable names. Raymond Hettinger <python@rcn.com> parents: 35294 diff changeset	1926 set_discard(PySetObject so, PyObject key)
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1927 {
73208 eef42c4f295d remove unused variable Benjamin Peterson <benjamin@python.org> parents: 73202 diff changeset	1928 PyObject *tmpkey;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1929 int rv;
31177 eeaa3660671c Refactor set.discard() and set.remove(). Raymond Hettinger <python@rcn.com> parents: 31175 diff changeset	1930
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1931 rv = set_discard_key(so, key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1932 if (rv == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1933 if (!PySet_Check(key) \|\| !PyErr_ExceptionMatches(PyExc_TypeError))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1934 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1935 PyErr_Clear();
63770 0f8a4fcfdd1e Issue8757: Implicit set-to-frozenset conversion not thread-safe. Raymond Hettinger <python@rcn.com> parents: 61463 diff changeset	1936 tmpkey = make_new_set(&PyFrozenSet_Type, key);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1937 if (tmpkey == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1938 return NULL;
73202 7ddc7b339a8b Fix the return value of set_discard (issue #10519) Petri Lehtinen <petri@digip.org> parents: 73199 diff changeset	1939 rv = set_discard_key(so, tmpkey);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1940 Py_DECREF(tmpkey);
73202 7ddc7b339a8b Fix the return value of set_discard (issue #10519) Petri Lehtinen <petri@digip.org> parents: 73199 diff changeset	1941 if (rv == -1)
7ddc7b339a8b Fix the return value of set_discard (issue #10519) Petri Lehtinen <petri@digip.org> parents: 73199 diff changeset	1942 return NULL;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1943 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1944 Py_RETURN_NONE;
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1945 }
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1946
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1947 PyDoc_STRVAR(discard_doc,
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1948 "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	1949 \n\
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1950 If the element is not a member, do nothing.");
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1951
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1952 static PyObject *
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1953 set_reduce(PySetObject *so)
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1954 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1955 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	1956
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1957 keys = PySequence_List((PyObject *)so);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1958 if (keys == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1959 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1960 args = PyTuple_Pack(1, keys);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1961 if (args == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1962 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1963 dict = PyObject_GetAttrString((PyObject *)so, "__dict__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1964 if (dict == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1965 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1966 dict = Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1967 Py_INCREF(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1968 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1969 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	1970 done:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1971 Py_XDECREF(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1972 Py_XDECREF(keys);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1973 Py_XDECREF(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1974 return result;
30929 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
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	1977 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	1978
47922 7cfc28ac0715 Added additional __sizeof__ implementations and addressed comments made in Robert Schuppenies <okkotonushi@googlemail.com> parents: 47588 diff changeset	1979 static PyObject *
7cfc28ac0715 Added additional __sizeof__ implementations and addressed comments made in Robert Schuppenies <okkotonushi@googlemail.com> parents: 47588 diff changeset	1980 set_sizeof(PySetObject *so)
7cfc28ac0715 Added additional __sizeof__ implementations and addressed comments made in Robert Schuppenies <okkotonushi@googlemail.com> parents: 47588 diff changeset	1981 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1982 Py_ssize_t res;
47922 7cfc28ac0715 Added additional __sizeof__ implementations and addressed comments made in Robert Schuppenies <okkotonushi@googlemail.com> parents: 47588 diff changeset	1983
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1984 res = sizeof(PySetObject);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1985 if (so->table != so->smalltable)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1986 res = res + (so->mask + 1) * sizeof(setentry);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1987 return PyInt_FromSsize_t(res);
47922 7cfc28ac0715 Added additional __sizeof__ implementations and addressed comments made in Robert Schuppenies <okkotonushi@googlemail.com> parents: 47588 diff changeset	1988 }
7cfc28ac0715 Added additional __sizeof__ implementations and addressed comments made in Robert Schuppenies <okkotonushi@googlemail.com> parents: 47588 diff changeset	1989
7cfc28ac0715 Added additional __sizeof__ implementations and addressed comments made in Robert Schuppenies <okkotonushi@googlemail.com> parents: 47588 diff changeset	1990 PyDoc_STRVAR(sizeof_doc, "S.__sizeof__() -> size of S in memory, in bytes");
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1991 static int
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1992 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	1993 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1994 PyObject *iterable = NULL;
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	1995
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1996 if (!PyAnySet_Check(self))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1997 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1998 if (PySet_Check(self) && !_PyArg_NoKeywords("set()", kwds))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	1999 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2000 if (!PyArg_UnpackTuple(args, Py_TYPE(self)->tp_name, 0, 1, &iterable))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2001 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2002 set_clear_internal(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2003 self->hash = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2004 if (iterable == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2005 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2006 return set_update_internal(self, iterable);
30931 fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	2007 }
fa6e8d4f88c6 Various fixups (most suggested by Armin Rigo). Raymond Hettinger <python@rcn.com> parents: 30930 diff changeset	2008
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2009 static PySequenceMethods set_as_sequence = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2010 set_len, /* sq_length */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2011 0, /* sq_concat */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2012 0, /* sq_repeat */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2013 0, /* sq_item */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2014 0, /* sq_slice */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2015 0, /* sq_ass_item */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2016 0, /* sq_ass_slice */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2017 (objobjproc)set_contains, /* sq_contains */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2018 };
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2019
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2020 /* set object ********************************************************/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2021
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2022 #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	2023 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	2024
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2025 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	2026 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	2027 #endif
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2028
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2029 static PyMethodDef set_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2030 {"add", (PyCFunction)set_add, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2031 add_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2032 {"clear", (PyCFunction)set_clear, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2033 clear_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2034 {"__contains__",(PyCFunction)set_direct_contains, METH_O \| METH_COEXIST,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2035 contains_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2036 {"copy", (PyCFunction)set_copy, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2037 copy_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2038 {"discard", (PyCFunction)set_discard, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2039 discard_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2040 {"difference", (PyCFunction)set_difference_multi, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2041 difference_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2042 {"difference_update", (PyCFunction)set_difference_update, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2043 difference_update_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2044 {"intersection",(PyCFunction)set_intersection_multi, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2045 intersection_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2046 {"intersection_update",(PyCFunction)set_intersection_update_multi, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2047 intersection_update_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2048 {"isdisjoint", (PyCFunction)set_isdisjoint, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2049 isdisjoint_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2050 {"issubset", (PyCFunction)set_issubset, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2051 issubset_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2052 {"issuperset", (PyCFunction)set_issuperset, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2053 issuperset_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2054 {"pop", (PyCFunction)set_pop, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2055 pop_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2056 {"__reduce__", (PyCFunction)set_reduce, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2057 reduce_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2058 {"remove", (PyCFunction)set_remove, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2059 remove_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2060 {"__sizeof__", (PyCFunction)set_sizeof, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2061 sizeof_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2062 {"symmetric_difference",(PyCFunction)set_symmetric_difference, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2063 symmetric_difference_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2064 {"symmetric_difference_update",(PyCFunction)set_symmetric_difference_update, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2065 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	2066 #ifdef Py_DEBUG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2067 {"test_c_api", (PyCFunction)test_c_api, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2068 test_c_api_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	2069 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2070 {"union", (PyCFunction)set_union, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2071 union_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2072 {"update", (PyCFunction)set_update, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2073 update_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2074 {NULL, NULL} /* sentinel */
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
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2077 static PyNumberMethods set_as_number = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2078 0, /nb_add/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2079 (binaryfunc)set_sub, /nb_subtract/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2080 0, /nb_multiply/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2081 0, /nb_divide/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2082 0, /nb_remainder/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2083 0, /nb_divmod/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2084 0, /nb_power/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2085 0, /nb_negative/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2086 0, /nb_positive/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2087 0, /nb_absolute/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2088 0, /nb_nonzero/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2089 0, /nb_invert/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2090 0, /nb_lshift/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2091 0, /nb_rshift/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2092 (binaryfunc)set_and, /nb_and/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2093 (binaryfunc)set_xor, /nb_xor/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2094 (binaryfunc)set_or, /nb_or/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2095 0, /nb_coerce/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2096 0, /nb_int/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2097 0, /nb_long/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2098 0, /nb_float/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2099 0, /nb_oct/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2100 0, /nb_hex/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2101 0, /nb_inplace_add/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2102 (binaryfunc)set_isub, /nb_inplace_subtract/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2103 0, /nb_inplace_multiply/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2104 0, /nb_inplace_divide/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2105 0, /nb_inplace_remainder/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2106 0, /nb_inplace_power/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2107 0, /nb_inplace_lshift/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2108 0, /nb_inplace_rshift/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2109 (binaryfunc)set_iand, /nb_inplace_and/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2110 (binaryfunc)set_ixor, /nb_inplace_xor/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2111 (binaryfunc)set_ior, /nb_inplace_or/
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2112 };
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2113
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2114 PyDoc_STRVAR(set_doc,
59223 0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 57329 diff changeset	2115 "set() -> new empty set object\n\
0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 57329 diff changeset	2116 set(iterable) -> new set object\n\
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2117 \n\
39268 2f3d871bf6ef [Bug #1414697] Change docstring of set/frozenset types to specify that the contents are unique. Raymond, please feel free to edit or revert. Andrew M. Kuchling <amk@amk.ca> parents: 39104 diff changeset	2118 Build an unordered collection of unique elements.");
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2119
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2120 PyTypeObject PySet_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2121 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2122 "set", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2123 sizeof(PySetObject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2124 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2125 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2126 (destructor)set_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2127 (printfunc)set_tp_print, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2128 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2129 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2130 set_nocmp, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2131 (reprfunc)set_repr, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2132 &set_as_number, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2133 &set_as_sequence, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2134 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2135 (hashfunc)PyObject_HashNotImplemented, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2136 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2137 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2138 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2139 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2140 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2141 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \| Py_TPFLAGS_CHECKTYPES \|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2142 Py_TPFLAGS_BASETYPE, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2143 set_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2144 (traverseproc)set_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2145 (inquiry)set_clear_internal, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2146 (richcmpfunc)set_richcompare, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2147 offsetof(PySetObject, weakreflist), /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2148 (getiterfunc)set_iter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2149 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2150 set_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2151 0, /* tp_members */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2152 0, /* tp_getset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2153 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2154 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2155 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2156 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2157 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2158 (initproc)set_init, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2159 PyType_GenericAlloc, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2160 set_new, /* tp_new */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2161 PyObject_GC_Del, /* tp_free */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2162 };
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2163
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2164 /* frozenset object ********************************************************/
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2165
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2166
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2167 static PyMethodDef frozenset_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2168 {"__contains__",(PyCFunction)set_direct_contains, METH_O \| METH_COEXIST,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2169 contains_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2170 {"copy", (PyCFunction)frozenset_copy, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2171 copy_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2172 {"difference", (PyCFunction)set_difference_multi, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2173 difference_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2174 {"intersection",(PyCFunction)set_intersection_multi, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2175 intersection_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2176 {"isdisjoint", (PyCFunction)set_isdisjoint, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2177 isdisjoint_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2178 {"issubset", (PyCFunction)set_issubset, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2179 issubset_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2180 {"issuperset", (PyCFunction)set_issuperset, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2181 issuperset_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2182 {"__reduce__", (PyCFunction)set_reduce, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2183 reduce_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2184 {"__sizeof__", (PyCFunction)set_sizeof, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2185 sizeof_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2186 {"symmetric_difference",(PyCFunction)set_symmetric_difference, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2187 symmetric_difference_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2188 {"union", (PyCFunction)set_union, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2189 union_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2190 {NULL, NULL} /* sentinel */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2191 };
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2192
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2193 static PyNumberMethods frozenset_as_number = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2194 0, /nb_add/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2195 (binaryfunc)set_sub, /nb_subtract/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2196 0, /nb_multiply/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2197 0, /nb_divide/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2198 0, /nb_remainder/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2199 0, /nb_divmod/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2200 0, /nb_power/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2201 0, /nb_negative/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2202 0, /nb_positive/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2203 0, /nb_absolute/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2204 0, /nb_nonzero/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2205 0, /nb_invert/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2206 0, /nb_lshift/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2207 0, /nb_rshift/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2208 (binaryfunc)set_and, /nb_and/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2209 (binaryfunc)set_xor, /nb_xor/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2210 (binaryfunc)set_or, /nb_or/
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2211 };
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2212
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2213 PyDoc_STRVAR(frozenset_doc,
59223 0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 57329 diff changeset	2214 "frozenset() -> empty frozenset object\n\
0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 57329 diff changeset	2215 frozenset(iterable) -> frozenset object\n\
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2216 \n\
39268 2f3d871bf6ef [Bug #1414697] Change docstring of set/frozenset types to specify that the contents are unique. Raymond, please feel free to edit or revert. Andrew M. Kuchling <amk@amk.ca> parents: 39104 diff changeset	2217 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	2218
54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2219 PyTypeObject PyFrozenSet_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2220 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2221 "frozenset", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2222 sizeof(PySetObject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2223 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2224 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2225 (destructor)set_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2226 (printfunc)set_tp_print, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2227 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2228 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2229 set_nocmp, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2230 (reprfunc)set_repr, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2231 &frozenset_as_number, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2232 &set_as_sequence, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2233 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2234 frozenset_hash, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2235 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2236 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2237 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2238 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2239 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2240 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \| Py_TPFLAGS_CHECKTYPES \|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2241 Py_TPFLAGS_BASETYPE, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2242 frozenset_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2243 (traverseproc)set_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2244 (inquiry)set_clear_internal, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2245 (richcmpfunc)set_richcompare, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2246 offsetof(PySetObject, weakreflist), /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2247 (getiterfunc)set_iter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2248 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2249 frozenset_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2250 0, /* tp_members */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2251 0, /* tp_getset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2252 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2253 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2254 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2255 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2256 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2257 0, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2258 PyType_GenericAlloc, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2259 frozenset_new, /* tp_new */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2260 PyObject_GC_Del, /* tp_free */
30929 54ff68e973ee * Migrate set() and frozenset() from the sandbox. Raymond Hettinger <python@rcn.com> parents: diff changeset	2261 };
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2262
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2263
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2264 /*** C API functions ***********************************************/
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2265
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2266 PyObject *
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2267 PySet_New(PyObject *iterable)
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2268 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2269 return make_new_set(&PySet_Type, iterable);
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2270 }
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2271
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2272 PyObject *
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2273 PyFrozenSet_New(PyObject *iterable)
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2274 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2275 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	2276 }
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2277
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	2278 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	2279 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	2280 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2281 if (!PyAnySet_Check(anyset)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2282 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2283 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2284 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2285 return PySet_GET_SIZE(anyset);
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2286 }
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2287
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2288 int
37315 19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2289 PySet_Clear(PyObject *set)
19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2290 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2291 if (!PySet_Check(set)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2292 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2293 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2294 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2295 return set_clear_internal((PySetObject *)set);
37315 19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2296 }
19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2297
19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2298 int
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2299 PySet_Contains(PyObject anyset, PyObject key)
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2300 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2301 if (!PyAnySet_Check(anyset)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2302 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2303 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2304 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2305 return set_contains_key((PySetObject *)anyset, key);
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2306 }
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2307
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2308 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	2309 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	2310 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2311 if (!PySet_Check(set)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2312 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2313 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2314 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2315 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	2316 }
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2317
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2318 int
45035 15e8b34254ec Make PySet_Add() work with frozensets. Raymond Hettinger <python@rcn.com> parents: 44964 diff changeset	2319 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	2320 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2321 if (!PySet_Check(anyset) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2322 (!PyFrozenSet_Check(anyset) \|\| Py_REFCNT(anyset) != 1)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2323 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2324 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2325 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2326 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	2327 }
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2328
37315 19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2329 int
41249 50a6b33c9d2c Extend work on rev 52962 and 53830 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. Raymond Hettinger <python@rcn.com> parents: 40876 diff changeset	2330 _PySet_Next(PyObject set, Py_ssize_t pos, PyObject **key)
37315 19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2331 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2332 setentry *entry_ptr;
37315 19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2333
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2334 if (!PyAnySet_Check(set)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2335 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2336 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2337 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2338 if (set_next((PySetObject *)set, pos, &entry_ptr) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2339 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2340 *key = entry_ptr->key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2341 return 1;
41249 50a6b33c9d2c Extend work on rev 52962 and 53830 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. Raymond Hettinger <python@rcn.com> parents: 40876 diff changeset	2342 }
50a6b33c9d2c Extend work on rev 52962 and 53830 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. Raymond Hettinger <python@rcn.com> parents: 40876 diff changeset	2343
50a6b33c9d2c Extend work on rev 52962 and 53830 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. Raymond Hettinger <python@rcn.com> parents: 40876 diff changeset	2344 int
50a6b33c9d2c Extend work on rev 52962 and 53830 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. Raymond Hettinger <python@rcn.com> parents: 40876 diff changeset	2345 _PySet_NextEntry(PyObject set, Py_ssize_t pos, PyObject *key, long hash)
50a6b33c9d2c Extend work on rev 52962 and 53830 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. Raymond Hettinger <python@rcn.com> parents: 40876 diff changeset	2346 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2347 setentry *entry;
41249 50a6b33c9d2c Extend work on rev 52962 and 53830 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. Raymond Hettinger <python@rcn.com> parents: 40876 diff changeset	2348
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2349 if (!PyAnySet_Check(set)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2350 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2351 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2352 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2353 if (set_next((PySetObject *)set, pos, &entry) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2354 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2355 *key = entry->key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2356 *hash = entry->hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2357 return 1;
37315 19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2358 }
19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2359
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2360 PyObject *
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2361 PySet_Pop(PyObject *set)
dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2362 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2363 if (!PySet_Check(set)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2364 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2365 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2366 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2367 return set_pop((PySetObject *)set);
35346 dd2357953fe3 Add a C API for sets and frozensets. Raymond Hettinger <python@rcn.com> parents: 35341 diff changeset	2368 }
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2369
37315 19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2370 int
19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2371 _PySet_Update(PyObject set, PyObject iterable)
19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2372 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2373 if (!PySet_Check(set)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2374 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2375 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2376 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2377 return set_update_internal((PySetObject *)set, iterable);
37315 19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2378 }
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2379
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2380 #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	2381
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2382 /* Test code to be called with any three element set.
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2383 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	2384
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2385 #define assertRaises(call_return_value, exception) \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2386 do { \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2387 assert(call_return_value); \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2388 assert(PyErr_ExceptionMatches(exception)); \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2389 PyErr_Clear(); \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2390 } while(0)
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2391
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2392 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	2393 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	2394 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2395 Py_ssize_t count;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2396 char *s;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2397 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2398 PyObject elem=NULL, dup=NULL, t, f, dup2, x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2399 PyObject ob = (PyObject )so;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60709 diff changeset	2400 PyObject *str;
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2401
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60709 diff changeset	2402 /* Verify preconditions */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2403 assert(PyAnySet_Check(ob));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2404 assert(PyAnySet_CheckExact(ob));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2405 assert(!PyFrozenSet_CheckExact(ob));
59547 1e01ef975899 Issue #7818: set().test_c_api() doesn't expect a set('abc'), modify the set. Victor Stinner <victor.stinner@haypocalc.com> parents: 59199 diff changeset	2406
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60709 diff changeset	2407 /* so.clear(); so \|= set("abc"); */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60709 diff changeset	2408 str = PyString_FromString("abc");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60709 diff changeset	2409 if (str == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60709 diff changeset	2410 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60709 diff changeset	2411 set_clear_internal(so);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60709 diff changeset	2412 if (set_update_internal(so, str) == -1) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60709 diff changeset	2413 Py_DECREF(str);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60709 diff changeset	2414 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60709 diff changeset	2415 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60709 diff changeset	2416 Py_DECREF(str);
59547 1e01ef975899 Issue #7818: set().test_c_api() doesn't expect a set('abc'), modify the set. Victor Stinner <victor.stinner@haypocalc.com> parents: 59199 diff changeset	2417
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60709 diff changeset	2418 /* Exercise type/size checks */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2419 assert(PySet_Size(ob) == 3);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2420 assert(PySet_GET_SIZE(ob) == 3);
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2421
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2422 /* Raise TypeError for non-iterable constructor arguments */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2423 assertRaises(PySet_New(Py_None) == NULL, PyExc_TypeError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2424 assertRaises(PyFrozenSet_New(Py_None) == NULL, PyExc_TypeError);
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2425
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2426 /* Raise TypeError for unhashable key */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2427 dup = PySet_New(ob);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2428 assertRaises(PySet_Discard(ob, dup) == -1, PyExc_TypeError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2429 assertRaises(PySet_Contains(ob, dup) == -1, PyExc_TypeError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2430 assertRaises(PySet_Add(ob, dup) == -1, PyExc_TypeError);
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2431
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2432 /* Exercise successful pop, contains, add, and discard */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2433 elem = PySet_Pop(ob);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2434 assert(PySet_Contains(ob, elem) == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2435 assert(PySet_GET_SIZE(ob) == 2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2436 assert(PySet_Add(ob, elem) == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2437 assert(PySet_Contains(ob, elem) == 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2438 assert(PySet_GET_SIZE(ob) == 3);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2439 assert(PySet_Discard(ob, elem) == 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2440 assert(PySet_GET_SIZE(ob) == 2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2441 assert(PySet_Discard(ob, elem) == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2442 assert(PySet_GET_SIZE(ob) == 2);
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2443
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2444 /* Exercise clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2445 dup2 = PySet_New(dup);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2446 assert(PySet_Clear(dup2) == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2447 assert(PySet_Size(dup2) == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2448 Py_DECREF(dup2);
37315 19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2449
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2450 /* Raise SystemError on clear or update of frozen set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2451 f = PyFrozenSet_New(dup);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2452 assertRaises(PySet_Clear(f) == -1, PyExc_SystemError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2453 assertRaises(_PySet_Update(f, dup) == -1, PyExc_SystemError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2454 assert(PySet_Add(f, elem) == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2455 Py_INCREF(f);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2456 assertRaises(PySet_Add(f, elem) == -1, PyExc_SystemError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2457 Py_DECREF(f);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2458 Py_DECREF(f);
37315 19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2459
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2460 /* Exercise direct iteration */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2461 i = 0, count = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2462 while (_PySet_Next((PyObject *)dup, &i, &x)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2463 s = PyString_AsString(x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2464 assert(s && (s[0] == 'a' \|\| s[0] == 'b' \|\| s[0] == 'c'));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2465 count++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2466 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2467 assert(count == 3);
37315 19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2468
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2469 /* Exercise updates */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2470 dup2 = PySet_New(NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2471 assert(_PySet_Update(dup2, dup) == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2472 assert(PySet_Size(dup2) == 3);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2473 assert(_PySet_Update(dup2, dup) == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2474 assert(PySet_Size(dup2) == 3);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2475 Py_DECREF(dup2);
37315 19059df45cfe SF patch #1458476 with modifications based on discussions in python-dev. This Barry Warsaw <barry@python.org> parents: 37304 diff changeset	2476
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2477 /* Raise SystemError when self argument is not a set or frozenset. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2478 t = PyTuple_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2479 assertRaises(PySet_Size(t) == -1, PyExc_SystemError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2480 assertRaises(PySet_Contains(t, elem) == -1, PyExc_SystemError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2481 Py_DECREF(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	2482
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2483 /* Raise SystemError when self argument is not a set. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2484 f = PyFrozenSet_New(dup);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2485 assert(PySet_Size(f) == 3);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2486 assert(PyFrozenSet_CheckExact(f));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2487 assertRaises(PySet_Discard(f, elem) == -1, PyExc_SystemError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2488 assertRaises(PySet_Pop(f) == NULL, PyExc_SystemError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2489 Py_DECREF(f);
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2490
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2491 /* Raise KeyError when popping from an empty set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2492 assert(PyNumber_InPlaceSubtract(ob, ob) == ob);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2493 Py_DECREF(ob);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2494 assert(PySet_GET_SIZE(ob) == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2495 assertRaises(PySet_Pop(ob) == NULL, PyExc_KeyError);
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2496
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2497 /* Restore the set from the copy using the PyNumber API */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2498 assert(PyNumber_InPlaceOr(ob, dup) == ob);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2499 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	2500
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2501 /* Verify constructors accept NULL arguments */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2502 f = PySet_New(NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2503 assert(f != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2504 assert(PySet_GET_SIZE(f) == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2505 Py_DECREF(f);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2506 f = PyFrozenSet_New(NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2507 assert(f != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2508 assert(PyFrozenSet_CheckExact(f));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2509 assert(PySet_GET_SIZE(f) == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2510 Py_DECREF(f);
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2511
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2512 Py_DECREF(elem);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2513 Py_DECREF(dup);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60710 diff changeset	2514 Py_RETURN_TRUE;
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2515 }
2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2516
35581 37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	2517 #undef assertRaises
37859c6ad5bb No longer ignore exceptions raised by comparisons during key lookup. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	2518
35348 2f1bf64b837e Numerous fix-ups to C API and docs. Added tests for C API. Raymond Hettinger <python@rcn.com> parents: 35347 diff changeset	2519 #endif

Mercurial > cpython-lru_cache-weakref

annotate Objects/setobject.c @ 80661:94de77bd0b4b 2.7