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

annotate Objects/setobject.c @ 73807:1efefeda00a7 3.2

#8414: add more tests for "assert". Initial patch by Gregory Nofi.

author	Ezio Melotti <ezio.melotti@gmail.com>
date	Fri, 02 Dec 2011 18:22:52 +0200
parents	cdd9a97f3d28
children	5c4e440852db d4860087f664

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

Mercurial > cpython-lru_cache-weakref

annotate Objects/setobject.c @ 73807:1efefeda00a7 3.2