Mercurial > cpython-lru_cache-weakref
annotate Objects/setobject.c @ 32527:0da660e05e69 legacy-trunk
"#if WITH_THREAD" is incorrect; must be #ifdef instead; WITH_THREAD
isn't always set to an integer value when it's defined.
| author | Tim Peters <tim.peters@gmail.com> |
|---|---|
| date | Wed, 07 Jul 2004 20:42:07 +0000 |
| parents | b8fce2258c20 |
| children | ff26714bf86d |
| rev | line source |
|---|---|
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1 #include "Python.h" |
|
32158
679e5c8effae
Make sets and deques weak referencable.
Raymond Hettinger <python@rcn.com>
parents:
31628
diff
changeset
|
2 #include "structmember.h" |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
3 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
4 /* set object implementation |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
5 written and maintained by Raymond D. Hettinger <python@rcn.com> |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
6 derived from sets.py written by Greg V. Wilson, Alex Martelli, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
7 Guido van Rossum, Raymond Hettinger, and Tim Peters. |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
8 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
9 Copyright (c) 2003 Python Software Foundation. |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
10 All rights reserved. |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
11 */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
12 |
|
32363
b8fce2258c20
Fixed end-of-loop code not reached warning when using SunPro C
Nicholas Bastin <nick.bastin@gmail.com>
parents:
32348
diff
changeset
|
13 #ifdef __SUNPRO_C |
|
b8fce2258c20
Fixed end-of-loop code not reached warning when using SunPro C
Nicholas Bastin <nick.bastin@gmail.com>
parents:
32348
diff
changeset
|
14 #pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED) |
|
b8fce2258c20
Fixed end-of-loop code not reached warning when using SunPro C
Nicholas Bastin <nick.bastin@gmail.com>
parents:
32348
diff
changeset
|
15 #endif |
|
b8fce2258c20
Fixed end-of-loop code not reached warning when using SunPro C
Nicholas Bastin <nick.bastin@gmail.com>
parents:
32348
diff
changeset
|
16 |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
17 static PyObject * |
|
31015
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
18 set_update(PySetObject *so, PyObject *other) |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
19 { |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
20 PyObject *item, *data, *it; |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
21 |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
22 if (PyAnySet_Check(other)) { |
|
31203
bfa0369d6760
Speedup set.update by using the override mode for PyDict_Merge().
Raymond Hettinger <python@rcn.com>
parents:
31191
diff
changeset
|
23 if (PyDict_Merge(so->data, ((PySetObject *)other)->data, 1) == -1) |
|
31015
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
24 return NULL; |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
25 Py_RETURN_NONE; |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
26 } |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
27 |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
28 it = PyObject_GetIter(other); |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
29 if (it == NULL) |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
30 return NULL; |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
31 data = so->data; |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
32 |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
33 while ((item = PyIter_Next(it)) != NULL) { |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
34 if (PyDict_SetItem(data, item, Py_True) == -1) { |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
35 Py_DECREF(it); |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
36 Py_DECREF(item); |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
37 return NULL; |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
38 } |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
39 Py_DECREF(item); |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
40 } |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
41 Py_DECREF(it); |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
42 if (PyErr_Occurred()) |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
43 return NULL; |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
44 Py_RETURN_NONE; |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
45 } |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
46 |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
47 PyDoc_STRVAR(update_doc, |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
48 "Update a set with the union of itself and another."); |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
49 |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
50 static PyObject * |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
51 make_new_set(PyTypeObject *type, PyObject *iterable) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
52 { |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
53 PyObject *data = NULL; |
|
31015
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
54 PyObject *tmp; |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
55 PySetObject *so = NULL; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
56 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
57 data = PyDict_New(); |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
58 if (data == NULL) |
|
31015
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
59 return NULL; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
60 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
61 /* create PySetObject structure */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
62 so = (PySetObject *)type->tp_alloc(type, 0); |
|
31015
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
63 if (so == NULL) { |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
64 Py_DECREF(data); |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
65 return NULL; |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
66 } |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
67 so->data = data; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
68 so->hash = -1; |
|
32158
679e5c8effae
Make sets and deques weak referencable.
Raymond Hettinger <python@rcn.com>
parents:
31628
diff
changeset
|
69 so->weakreflist = NULL; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
70 |
|
31015
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
71 if (iterable != NULL) { |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
72 tmp = set_update(so, iterable); |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
73 if (tmp == NULL) { |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
74 Py_DECREF(so); |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
75 return NULL; |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
76 } |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
77 Py_DECREF(tmp); |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
78 } |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
79 |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
80 return (PyObject *)so; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
81 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
82 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
83 static PyObject * |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
84 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
|
85 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
86 PyObject *iterable = NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
87 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
88 if (!PyArg_UnpackTuple(args, type->tp_name, 0, 1, &iterable)) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
89 return NULL; |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
90 if (iterable != NULL && PyFrozenSet_CheckExact(iterable)) { |
|
31004
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
91 Py_INCREF(iterable); |
|
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
92 return iterable; |
|
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
93 } |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
94 return make_new_set(type, iterable); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
95 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
96 |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
97 static PyObject * |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
98 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
|
99 { |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
100 return make_new_set(type, NULL); |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
101 } |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
102 |
|
31002
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
103 static PyObject * |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
104 frozenset_dict_wrapper(PyObject *d) |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
105 { |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
106 PySetObject *w; |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
107 |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
108 assert(PyDict_Check(d)); |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
109 w = (PySetObject *)make_new_set(&PyFrozenSet_Type, NULL); |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
110 if (w == NULL) |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
111 return NULL; |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
112 Py_DECREF(w->data); |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
113 Py_INCREF(d); |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
114 w->data = d; |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
115 return (PyObject *)w; |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
116 } |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
117 |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
118 static void |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
119 set_dealloc(PySetObject *so) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
120 { |
|
32158
679e5c8effae
Make sets and deques weak referencable.
Raymond Hettinger <python@rcn.com>
parents:
31628
diff
changeset
|
121 if (so->weakreflist != NULL) |
|
679e5c8effae
Make sets and deques weak referencable.
Raymond Hettinger <python@rcn.com>
parents:
31628
diff
changeset
|
122 PyObject_ClearWeakRefs((PyObject *) so); |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
123 Py_XDECREF(so->data); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
124 so->ob_type->tp_free(so); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
125 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
126 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
127 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
128 set_iter(PySetObject *so) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
129 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
130 return PyObject_GetIter(so->data); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
131 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
132 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
133 static int |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
134 set_len(PySetObject *so) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
135 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
136 return PyDict_Size(so->data); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
137 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
138 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
139 static int |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
140 set_contains(PySetObject *so, PyObject *key) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
141 { |
|
31002
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
142 PyObject *tmp; |
|
30995
d4826e097a3f
Allow temporary hashability for the __contains__ test.
Raymond Hettinger <python@rcn.com>
parents:
30994
diff
changeset
|
143 int result; |
|
d4826e097a3f
Allow temporary hashability for the __contains__ test.
Raymond Hettinger <python@rcn.com>
parents:
30994
diff
changeset
|
144 |
|
31019
b2fd7af17186
Expose dict_contains() and PyDict_Contains() with is about 10% faster
Raymond Hettinger <python@rcn.com>
parents:
31015
diff
changeset
|
145 result = PyDict_Contains(so->data, key); |
|
31015
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
146 if (result == -1 && PyAnySet_Check(key)) { |
|
30995
d4826e097a3f
Allow temporary hashability for the __contains__ test.
Raymond Hettinger <python@rcn.com>
parents:
30994
diff
changeset
|
147 PyErr_Clear(); |
|
31002
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
148 tmp = frozenset_dict_wrapper(((PySetObject *)(key))->data); |
|
30995
d4826e097a3f
Allow temporary hashability for the __contains__ test.
Raymond Hettinger <python@rcn.com>
parents:
30994
diff
changeset
|
149 if (tmp == NULL) |
|
d4826e097a3f
Allow temporary hashability for the __contains__ test.
Raymond Hettinger <python@rcn.com>
parents:
30994
diff
changeset
|
150 return -1; |
|
31019
b2fd7af17186
Expose dict_contains() and PyDict_Contains() with is about 10% faster
Raymond Hettinger <python@rcn.com>
parents:
31015
diff
changeset
|
151 result = PyDict_Contains(so->data, tmp); |
|
30995
d4826e097a3f
Allow temporary hashability for the __contains__ test.
Raymond Hettinger <python@rcn.com>
parents:
30994
diff
changeset
|
152 Py_DECREF(tmp); |
|
d4826e097a3f
Allow temporary hashability for the __contains__ test.
Raymond Hettinger <python@rcn.com>
parents:
30994
diff
changeset
|
153 } |
|
d4826e097a3f
Allow temporary hashability for the __contains__ test.
Raymond Hettinger <python@rcn.com>
parents:
30994
diff
changeset
|
154 return result; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
155 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
156 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
157 static PyObject * |
|
31172
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
158 set_direct_contains(PySetObject *so, PyObject *key) |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
159 { |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
160 long result; |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
161 |
|
31178
1bbc2085f213
* Refactor set.__contains__()
Raymond Hettinger <python@rcn.com>
parents:
31177
diff
changeset
|
162 result = set_contains(so, key); |
|
31172
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
163 if (result == -1) |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
164 return NULL; |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
165 return PyBool_FromLong(result); |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
166 } |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
167 |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
168 PyDoc_STRVAR(contains_doc, "x.__contains__(y) <==> y in x."); |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
169 |
|
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
170 static PyObject * |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
171 set_copy(PySetObject *so) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
172 { |
|
31015
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
173 return make_new_set(so->ob_type, (PyObject *)so); |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
174 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
175 |
|
31004
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
176 static PyObject * |
|
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
177 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
|
178 { |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
179 if (PyFrozenSet_CheckExact(so)) { |
|
31004
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
180 Py_INCREF(so); |
|
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
181 return (PyObject *)so; |
|
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
182 } |
|
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
183 return set_copy(so); |
|
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
184 } |
|
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
185 |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
186 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
|
187 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
188 static PyObject * |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
189 set_union(PySetObject *so, PyObject *other) |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
190 { |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
191 PySetObject *result; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
192 PyObject *rv; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
193 |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
194 result = (PySetObject *)set_copy(so); |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
195 if (result == NULL) |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
196 return NULL; |
|
31015
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
197 rv = set_update(result, other); |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
198 if (rv == NULL) { |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
199 Py_DECREF(result); |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
200 return NULL; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
201 } |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
202 Py_DECREF(rv); |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
203 return (PyObject *)result; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
204 } |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
205 |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
206 PyDoc_STRVAR(union_doc, |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
207 "Return the union of two sets as a new set.\n\ |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
208 \n\ |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
209 (i.e. all elements that are in either set.)"); |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
210 |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
211 static PyObject * |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
212 set_or(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
213 { |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
214 if (!PyAnySet_Check(so) || !PyAnySet_Check(other)) { |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
215 Py_INCREF(Py_NotImplemented); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
216 return Py_NotImplemented; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
217 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
218 return set_union(so, other); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
219 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
220 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
221 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
222 set_ior(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
223 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
224 PyObject *result; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
225 |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
226 if (!PyAnySet_Check(other)) { |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
227 Py_INCREF(Py_NotImplemented); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
228 return Py_NotImplemented; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
229 } |
|
31015
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
230 result = set_update(so, other); |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
231 if (result == NULL) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
232 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
233 Py_DECREF(result); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
234 Py_INCREF(so); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
235 return (PyObject *)so; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
236 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
237 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
238 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
239 set_intersection(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
240 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
241 PySetObject *result; |
|
31300
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
242 PyObject *item, *selfdata, *tgtdata, *it, *tmp; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
243 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
244 result = (PySetObject *)make_new_set(so->ob_type, NULL); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
245 if (result == NULL) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
246 return NULL; |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
247 tgtdata = result->data; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
248 selfdata = so->data; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
249 |
|
31300
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
250 if (PyAnySet_Check(other)) |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
251 other = ((PySetObject *)other)->data; |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
252 |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
253 if (PyDict_Check(other) && PyDict_Size(other) > PyDict_Size(selfdata)) { |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
254 tmp = selfdata; |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
255 selfdata = other; |
|
31300
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
256 other = tmp; |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
257 } |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
258 |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
259 if (PyDict_CheckExact(other)) { |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
260 PyObject *value; |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
261 int pos = 0; |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
262 while (PyDict_Next(other, &pos, &item, &value)) { |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
263 if (PyDict_Contains(selfdata, item)) { |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
264 if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
265 Py_DECREF(result); |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
266 return NULL; |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
267 } |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
268 } |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
269 } |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
270 return (PyObject *)result; |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
271 } |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
272 |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
273 it = PyObject_GetIter(other); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
274 if (it == NULL) { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
275 Py_DECREF(result); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
276 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
277 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
278 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
279 while ((item = PyIter_Next(it)) != NULL) { |
|
31019
b2fd7af17186
Expose dict_contains() and PyDict_Contains() with is about 10% faster
Raymond Hettinger <python@rcn.com>
parents:
31015
diff
changeset
|
280 if (PyDict_Contains(selfdata, item)) { |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
281 if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
282 Py_DECREF(it); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
283 Py_DECREF(result); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
284 Py_DECREF(item); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
285 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
286 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
287 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
288 Py_DECREF(item); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
289 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
290 Py_DECREF(it); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
291 if (PyErr_Occurred()) { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
292 Py_DECREF(result); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
293 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
294 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
295 return (PyObject *)result; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
296 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
297 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
298 PyDoc_STRVAR(intersection_doc, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
299 "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
|
300 \n\ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
301 (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
|
302 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
303 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
304 set_intersection_update(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
305 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
306 PyObject *item, *selfdata, *it, *newdict, *tmp; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
307 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
308 newdict = PyDict_New(); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
309 if (newdict == NULL) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
310 return newdict; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
311 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
312 it = PyObject_GetIter(other); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
313 if (it == NULL) { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
314 Py_DECREF(newdict); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
315 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
316 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
317 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
318 selfdata = so->data; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
319 while ((item = PyIter_Next(it)) != NULL) { |
|
31019
b2fd7af17186
Expose dict_contains() and PyDict_Contains() with is about 10% faster
Raymond Hettinger <python@rcn.com>
parents:
31015
diff
changeset
|
320 if (PyDict_Contains(selfdata, item)) { |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
321 if (PyDict_SetItem(newdict, item, Py_True) == -1) { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
322 Py_DECREF(newdict); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
323 Py_DECREF(it); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
324 Py_DECREF(item); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
325 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
326 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
327 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
328 Py_DECREF(item); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
329 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
330 Py_DECREF(it); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
331 if (PyErr_Occurred()) { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
332 Py_DECREF(newdict); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
333 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
334 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
335 tmp = so->data; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
336 so->data = newdict; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
337 Py_DECREF(tmp); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
338 Py_RETURN_NONE; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
339 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
340 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
341 PyDoc_STRVAR(intersection_update_doc, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
342 "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
|
343 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
344 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
345 set_and(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
346 { |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
347 if (!PyAnySet_Check(so) || !PyAnySet_Check(other)) { |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
348 Py_INCREF(Py_NotImplemented); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
349 return Py_NotImplemented; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
350 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
351 return set_intersection(so, other); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
352 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
353 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
354 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
355 set_iand(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
356 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
357 PyObject *result; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
358 |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
359 if (!PyAnySet_Check(other)) { |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
360 Py_INCREF(Py_NotImplemented); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
361 return Py_NotImplemented; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
362 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
363 result = set_intersection_update(so, other); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
364 if (result == NULL) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
365 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
366 Py_DECREF(result); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
367 Py_INCREF(so); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
368 return (PyObject *)so; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
369 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
370 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
371 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
372 set_difference_update(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
373 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
374 PyObject *item, *tgtdata, *it; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
375 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
376 it = PyObject_GetIter(other); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
377 if (it == NULL) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
378 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
379 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
380 tgtdata = so->data; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
381 while ((item = PyIter_Next(it)) != NULL) { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
382 if (PyDict_DelItem(tgtdata, item) == -1) { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
383 if (PyErr_ExceptionMatches(PyExc_KeyError)) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
384 PyErr_Clear(); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
385 else { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
386 Py_DECREF(it); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
387 Py_DECREF(item); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
388 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
389 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
390 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
391 Py_DECREF(item); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
392 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
393 Py_DECREF(it); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
394 if (PyErr_Occurred()) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
395 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
396 Py_RETURN_NONE; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
397 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
398 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
399 PyDoc_STRVAR(difference_update_doc, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
400 "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
|
401 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
402 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
|
403 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
|
404 { |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
405 PyObject *result, *tmp; |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
406 PyObject *otherdata, *tgtdata; |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
407 PyObject *key, *value; |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
408 int pos = 0; |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
409 |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
410 if (PyDict_Check(other)) |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
411 otherdata = other; |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
412 else if (PyAnySet_Check(other)) |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
413 otherdata = ((PySetObject *)other)->data; |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
414 else { |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
415 result = set_copy(so); |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
416 if (result == NULL) |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
417 return result; |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
418 tmp = set_difference_update((PySetObject *)result, other); |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
419 if (tmp != NULL) { |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
420 Py_DECREF(tmp); |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
421 return result; |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
422 } |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
423 Py_DECREF(result); |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
424 return NULL; |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
425 } |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
426 |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
427 result = make_new_set(so->ob_type, NULL); |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
428 if (result == NULL) |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
429 return NULL; |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
430 tgtdata = ((PySetObject *)result)->data; |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
431 |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
432 while (PyDict_Next(so->data, &pos, &key, &value)) { |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
433 if (!PyDict_Contains(otherdata, key)) { |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
434 if (PyDict_SetItem(tgtdata, key, Py_True) == -1) |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
435 return NULL; |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
436 } |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
437 } |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
438 return result; |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
439 } |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
440 |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
441 PyDoc_STRVAR(difference_doc, |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
442 "Return the difference of two sets as a new set.\n\ |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
443 \n\ |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
444 (i.e. all elements that are in this set but not the other.)"); |
|
e4682af7aea9
Improve algorithm for set.difference when the input is not a set.
Raymond Hettinger <python@rcn.com>
parents:
31178
diff
changeset
|
445 static PyObject * |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
446 set_sub(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
447 { |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
448 if (!PyAnySet_Check(so) || !PyAnySet_Check(other)) { |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
449 Py_INCREF(Py_NotImplemented); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
450 return Py_NotImplemented; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
451 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
452 return set_difference(so, other); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
453 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
454 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
455 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
456 set_isub(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
457 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
458 PyObject *result; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
459 |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
460 if (!PyAnySet_Check(other)) { |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
461 Py_INCREF(Py_NotImplemented); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
462 return Py_NotImplemented; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
463 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
464 result = set_difference_update(so, other); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
465 if (result == NULL) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
466 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
467 Py_DECREF(result); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
468 Py_INCREF(so); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
469 return (PyObject *)so; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
470 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
471 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
472 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
473 set_symmetric_difference_update(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
474 { |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
475 PyObject *selfdata, *otherdata; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
476 PySetObject *otherset = NULL; |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
477 PyObject *key, *value; |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
478 int pos = 0; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
479 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
480 selfdata = so->data; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
481 if (PyDict_Check(other)) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
482 otherdata = other; |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
483 else if (PyAnySet_Check(other)) |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
484 otherdata = ((PySetObject *)other)->data; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
485 else { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
486 otherset = (PySetObject *)make_new_set(so->ob_type, other); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
487 if (otherset == NULL) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
488 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
489 otherdata = otherset->data; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
490 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
491 |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
492 while (PyDict_Next(otherdata, &pos, &key, &value)) { |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
493 if (PyDict_Contains(selfdata, key)) { |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
494 if (PyDict_DelItem(selfdata, key) == -1) { |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
495 Py_XDECREF(otherset); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
496 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
497 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
498 } else { |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
499 if (PyDict_SetItem(selfdata, key, Py_True) == -1) { |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
500 Py_XDECREF(otherset); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
501 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
502 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
503 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
504 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
505 Py_XDECREF(otherset); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
506 Py_RETURN_NONE; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
507 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
508 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
509 PyDoc_STRVAR(symmetric_difference_update_doc, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
510 "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
|
511 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
512 static PyObject * |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
513 set_symmetric_difference(PySetObject *so, PyObject *other) |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
514 { |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
515 PySetObject *result; |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
516 PyObject *selfdata, *otherdata, *tgtdata, *rv, *otherset; |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
517 PyObject *key, *value; |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
518 int pos = 0; |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
519 |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
520 if (PyDict_Check(other)) |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
521 otherdata = other; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
522 else if (PyAnySet_Check(other)) |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
523 otherdata = ((PySetObject *)other)->data; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
524 else { |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
525 otherset = make_new_set(so->ob_type, other); |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
526 if (otherset == NULL) |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
527 return NULL; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
528 rv = set_symmetric_difference_update((PySetObject *)otherset, (PyObject *)so); |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
529 if (rv == NULL) |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
530 return NULL; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
531 Py_DECREF(rv); |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
532 return otherset; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
533 } |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
534 |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
535 result = (PySetObject *)make_new_set(so->ob_type, NULL); |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
536 if (result == NULL) |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
537 return NULL; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
538 tgtdata = result->data; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
539 selfdata = so->data; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
540 |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
541 while (PyDict_Next(otherdata, &pos, &key, &value)) { |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
542 if (!PyDict_Contains(selfdata, key)) { |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
543 if (PyDict_SetItem(tgtdata, key, Py_True) == -1) { |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
544 Py_DECREF(result); |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
545 return NULL; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
546 } |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
547 } |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
548 } |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
549 |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
550 pos = 0; |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
551 while (PyDict_Next(selfdata, &pos, &key, &value)) { |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
552 if (!PyDict_Contains(otherdata, key)) { |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
553 if (PyDict_SetItem(tgtdata, key, Py_True) == -1) { |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
554 Py_DECREF(result); |
|
31008
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
555 return NULL; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
556 } |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
557 } |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
558 } |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
559 |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
560 return (PyObject *)result; |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
561 } |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
562 |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
563 PyDoc_STRVAR(symmetric_difference_doc, |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
564 "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
|
565 \n\ |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
566 (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
|
567 |
|
4224d807911c
* Checkin remaining documentation
Raymond Hettinger <python@rcn.com>
parents:
31004
diff
changeset
|
568 static PyObject * |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
569 set_xor(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
570 { |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
571 if (!PyAnySet_Check(so) || !PyAnySet_Check(other)) { |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
572 Py_INCREF(Py_NotImplemented); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
573 return Py_NotImplemented; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
574 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
575 return set_symmetric_difference(so, other); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
576 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
577 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
578 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
579 set_ixor(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
580 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
581 PyObject *result; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
582 |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
583 if (!PyAnySet_Check(other)) { |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
584 Py_INCREF(Py_NotImplemented); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
585 return Py_NotImplemented; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
586 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
587 result = set_symmetric_difference_update(so, other); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
588 if (result == NULL) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
589 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
590 Py_DECREF(result); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
591 Py_INCREF(so); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
592 return (PyObject *)so; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
593 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
594 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
595 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
596 set_issubset(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
597 { |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
598 PyObject *otherdata, *tmp, *result; |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
599 PyObject *key, *value; |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
600 int pos = 0; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
601 |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
602 if (!PyAnySet_Check(other)) { |
|
30994
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
603 tmp = make_new_set(&PySet_Type, other); |
|
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
604 if (tmp == NULL) |
|
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
605 return NULL; |
|
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
606 result = set_issubset(so, tmp); |
|
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
607 Py_DECREF(tmp); |
|
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
608 return result; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
609 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
610 if (set_len(so) > set_len((PySetObject *)other)) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
611 Py_RETURN_FALSE; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
612 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
613 otherdata = ((PySetObject *)other)->data; |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
614 while (PyDict_Next(((PySetObject *)so)->data, &pos, &key, &value)) { |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
615 if (!PyDict_Contains(otherdata, key)) |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
616 Py_RETURN_FALSE; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
617 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
618 Py_RETURN_TRUE; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
619 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
620 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
621 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
|
622 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
623 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
624 set_issuperset(PySetObject *so, PyObject *other) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
625 { |
|
30994
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
626 PyObject *tmp, *result; |
|
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
627 |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
628 if (!PyAnySet_Check(other)) { |
|
30994
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
629 tmp = make_new_set(&PySet_Type, other); |
|
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
630 if (tmp == NULL) |
|
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
631 return NULL; |
|
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
632 result = set_issuperset(so, tmp); |
|
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
633 Py_DECREF(tmp); |
|
632b223cb8e8
issubset() and issuperset() to work with general iterables
Raymond Hettinger <python@rcn.com>
parents:
30993
diff
changeset
|
634 return result; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
635 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
636 return set_issubset((PySetObject *)other, (PyObject *)so); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
637 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
638 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
639 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
|
640 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
641 static long |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
642 set_nohash(PyObject *self) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
643 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
644 PyErr_SetString(PyExc_TypeError, "set objects are unhashable"); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
645 return -1; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
646 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
647 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
648 static int |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
649 set_nocmp(PyObject *self) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
650 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
651 PyErr_SetString(PyExc_TypeError, "cannot compare sets using cmp()"); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
652 return -1; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
653 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
654 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
655 static long |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
656 frozenset_hash(PyObject *self) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
657 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
658 PySetObject *so = (PySetObject *)self; |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
659 PyObject *key, *value; |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
660 int pos = 0; |
|
32320
87302ac07255
Futher improvements to frozenset hashing (based on Yitz Gale's battery of
Raymond Hettinger <python@rcn.com>
parents:
32319
diff
changeset
|
661 long hash = 1927868237L; |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
662 |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
663 if (so->hash != -1) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
664 return so->hash; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
665 |
|
32320
87302ac07255
Futher improvements to frozenset hashing (based on Yitz Gale's battery of
Raymond Hettinger <python@rcn.com>
parents:
32319
diff
changeset
|
666 hash *= (PyDict_Size(so->data) + 1); |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
667 while (PyDict_Next(so->data, &pos, &key, &value)) { |
|
32320
87302ac07255
Futher improvements to frozenset hashing (based on Yitz Gale's battery of
Raymond Hettinger <python@rcn.com>
parents:
32319
diff
changeset
|
668 /* Work to increase the bit dispersion for closely spaced hash |
|
87302ac07255
Futher improvements to frozenset hashing (based on Yitz Gale's battery of
Raymond Hettinger <python@rcn.com>
parents:
32319
diff
changeset
|
669 values. The is important because some use cases have many |
|
87302ac07255
Futher improvements to frozenset hashing (based on Yitz Gale's battery of
Raymond Hettinger <python@rcn.com>
parents:
32319
diff
changeset
|
670 combinations of a small number of elements with nearby |
|
87302ac07255
Futher improvements to frozenset hashing (based on Yitz Gale's battery of
Raymond Hettinger <python@rcn.com>
parents:
32319
diff
changeset
|
671 hashes so that many distinct combinations collapse to only |
|
87302ac07255
Futher improvements to frozenset hashing (based on Yitz Gale's battery of
Raymond Hettinger <python@rcn.com>
parents:
32319
diff
changeset
|
672 a handful of distinct hash values. */ |
|
87302ac07255
Futher improvements to frozenset hashing (based on Yitz Gale's battery of
Raymond Hettinger <python@rcn.com>
parents:
32319
diff
changeset
|
673 long h = PyObject_Hash(key); |
|
87302ac07255
Futher improvements to frozenset hashing (based on Yitz Gale's battery of
Raymond Hettinger <python@rcn.com>
parents:
32319
diff
changeset
|
674 hash ^= (h ^ (h << 16) ^ 89869747L) * 3644798167u; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
675 } |
|
32320
87302ac07255
Futher improvements to frozenset hashing (based on Yitz Gale's battery of
Raymond Hettinger <python@rcn.com>
parents:
32319
diff
changeset
|
676 hash = hash * 69069L + 907133923L; |
|
32319
b9de6b665273
Fixups to the hash function for frozensets.
Raymond Hettinger <python@rcn.com>
parents:
32158
diff
changeset
|
677 if (hash == -1) |
|
b9de6b665273
Fixups to the hash function for frozensets.
Raymond Hettinger <python@rcn.com>
parents:
32158
diff
changeset
|
678 hash = 590923713L; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
679 so->hash = hash; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
680 return hash; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
681 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
682 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
683 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
684 set_richcompare(PySetObject *v, PyObject *w, int op) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
685 { |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
686 if(!PyAnySet_Check(w)) { |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
687 if (op == Py_EQ) |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
688 Py_RETURN_FALSE; |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
689 if (op == Py_NE) |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
690 Py_RETURN_TRUE; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
691 PyErr_SetString(PyExc_TypeError, "can only compare to a set"); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
692 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
693 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
694 switch (op) { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
695 case Py_EQ: |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
696 case Py_NE: |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
697 return PyObject_RichCompare(((PySetObject *)v)->data, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
698 ((PySetObject *)w)->data, op); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
699 case Py_LE: |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
700 return set_issubset((PySetObject *)v, w); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
701 case Py_GE: |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
702 return set_issuperset((PySetObject *)v, w); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
703 case Py_LT: |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
704 if (set_len(v) >= set_len((PySetObject *)w)) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
705 Py_RETURN_FALSE; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
706 return set_issubset((PySetObject *)v, w); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
707 case Py_GT: |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
708 if (set_len(v) <= set_len((PySetObject *)w)) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
709 Py_RETURN_FALSE; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
710 return set_issuperset((PySetObject *)v, w); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
711 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
712 Py_INCREF(Py_NotImplemented); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
713 return Py_NotImplemented; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
714 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
715 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
716 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
717 set_repr(PySetObject *so) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
718 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
719 PyObject *keys, *result, *listrepr; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
720 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
721 keys = PyDict_Keys(so->data); |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
722 if (keys == NULL) |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
723 return NULL; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
724 listrepr = PyObject_Repr(keys); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
725 Py_DECREF(keys); |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
726 if (listrepr == NULL) |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
727 return NULL; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
728 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
729 result = PyString_FromFormat("%s(%s)", so->ob_type->tp_name, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
730 PyString_AS_STRING(listrepr)); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
731 Py_DECREF(listrepr); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
732 return result; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
733 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
734 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
735 static int |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
736 set_tp_print(PySetObject *so, FILE *fp, int flags) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
737 { |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
738 PyObject *key, *value; |
|
31300
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
739 int pos=0; |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
740 char *emit = ""; /* No separator emitted on first pass */ |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
741 char *separator = ", "; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
742 |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
743 fprintf(fp, "%s([", so->ob_type->tp_name); |
|
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
744 while (PyDict_Next(so->data, &pos, &key, &value)) { |
|
31300
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
745 fputs(emit, fp); |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
746 emit = separator; |
|
31175
5cc1a400a02c
Use dictionary specific looping idiom where possible.
Raymond Hettinger <python@rcn.com>
parents:
31172
diff
changeset
|
747 if (PyObject_Print(key, fp, 0) != 0) |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
748 return -1; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
749 } |
|
31300
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
750 fputs("])", fp); |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
751 return 0; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
752 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
753 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
754 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
755 set_clear(PySetObject *so) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
756 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
757 PyDict_Clear(so->data); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
758 so->hash = -1; |
|
31178
1bbc2085f213
* Refactor set.__contains__()
Raymond Hettinger <python@rcn.com>
parents:
31177
diff
changeset
|
759 Py_RETURN_NONE; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
760 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
761 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
762 PyDoc_STRVAR(clear_doc, "Remove all elements from this set."); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
763 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
764 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
765 set_add(PySetObject *so, PyObject *item) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
766 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
767 if (PyDict_SetItem(so->data, item, Py_True) == -1) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
768 return NULL; |
|
31178
1bbc2085f213
* Refactor set.__contains__()
Raymond Hettinger <python@rcn.com>
parents:
31177
diff
changeset
|
769 Py_RETURN_NONE; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
770 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
771 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
772 PyDoc_STRVAR(add_doc, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
773 "Add an element to a set.\n\ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
774 \n\ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
775 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
|
776 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
777 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
778 set_remove(PySetObject *so, PyObject *item) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
779 { |
|
31177
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
780 PyObject *tmp, *result; |
|
31002
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
781 |
|
31177
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
782 if (PyType_IsSubtype(item->ob_type, &PySet_Type)) { |
|
31002
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
783 tmp = frozenset_dict_wrapper(((PySetObject *)(item))->data); |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
784 if (tmp == NULL) |
|
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
785 return NULL; |
|
31177
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
786 result = set_remove(so, tmp); |
|
31002
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
787 Py_DECREF(tmp); |
|
31177
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
788 return result; |
|
31002
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
789 } |
|
31177
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
790 |
|
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
791 if (PyDict_DelItem(so->data, item) == -1) |
|
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
792 return NULL; |
|
31178
1bbc2085f213
* Refactor set.__contains__()
Raymond Hettinger <python@rcn.com>
parents:
31177
diff
changeset
|
793 Py_RETURN_NONE; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
794 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
795 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
796 PyDoc_STRVAR(remove_doc, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
797 "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
|
798 \n\ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
799 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
|
800 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
801 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
802 set_discard(PySetObject *so, PyObject *item) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
803 { |
|
31177
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
804 PyObject *tmp, *result; |
|
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
805 |
|
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
806 if (PyType_IsSubtype(item->ob_type, &PySet_Type)) { |
|
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
807 tmp = frozenset_dict_wrapper(((PySetObject *)(item))->data); |
|
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
808 if (tmp == NULL) |
|
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
809 return NULL; |
|
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
810 result = set_discard(so, tmp); |
|
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
811 Py_DECREF(tmp); |
|
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
812 return result; |
|
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
813 } |
|
31002
622a76bc0237
Extend temporary hashability to remove() and discard().
Raymond Hettinger <python@rcn.com>
parents:
30995
diff
changeset
|
814 |
|
30934
4effcbf80b45
Implement straightforward suggestions from gcc warnings (remove unused
Guido van Rossum <guido@python.org>
parents:
30932
diff
changeset
|
815 if (PyDict_DelItem(so->data, item) == -1) { |
|
31177
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
816 if (!PyErr_ExceptionMatches(PyExc_KeyError)) |
|
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
817 return NULL; |
|
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
818 PyErr_Clear(); |
|
30934
4effcbf80b45
Implement straightforward suggestions from gcc warnings (remove unused
Guido van Rossum <guido@python.org>
parents:
30932
diff
changeset
|
819 } |
|
31178
1bbc2085f213
* Refactor set.__contains__()
Raymond Hettinger <python@rcn.com>
parents:
31177
diff
changeset
|
820 Py_RETURN_NONE; |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
821 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
822 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
823 PyDoc_STRVAR(discard_doc, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
824 "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
|
825 \n\ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
826 If the element is not a member, do nothing."); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
827 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
828 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
829 set_pop(PySetObject *so) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
830 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
831 PyObject *key, *value; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
832 int pos = 0; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
833 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
834 if (!PyDict_Next(so->data, &pos, &key, &value)) { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
835 PyErr_SetString(PyExc_KeyError, "pop from an empty set"); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
836 return NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
837 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
838 Py_INCREF(key); |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
839 if (PyDict_DelItem(so->data, key) == -1) { |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
840 Py_DECREF(key); |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
841 return NULL; |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
842 } |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
843 return key; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
844 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
845 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
846 PyDoc_STRVAR(pop_doc, "Remove and return an arbitrary set element."); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
847 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
848 static PyObject * |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
849 set_reduce(PySetObject *so) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
850 { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
851 PyObject *keys=NULL, *args=NULL, *result=NULL; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
852 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
853 keys = PyDict_Keys(so->data); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
854 if (keys == NULL) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
855 goto done; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
856 args = PyTuple_Pack(1, keys); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
857 if (args == NULL) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
858 goto done; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
859 result = PyTuple_Pack(2, so->ob_type, args); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
860 done: |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
861 Py_XDECREF(args); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
862 Py_XDECREF(keys); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
863 return result; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
864 } |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
865 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
866 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
|
867 |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
868 static int |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
869 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
|
870 { |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
871 PyObject *iterable = NULL; |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
872 PyObject *result; |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
873 |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
874 if (!PyAnySet_Check(self)) |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
875 return -1; |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
876 if (!PyArg_UnpackTuple(args, self->ob_type->tp_name, 0, 1, &iterable)) |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
877 return -1; |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
878 PyDict_Clear(self->data); |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
879 self->hash = -1; |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
880 if (iterable == NULL) |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
881 return 0; |
|
31015
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
882 result = set_update(self, iterable); |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
883 if (result != NULL) { |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
884 Py_DECREF(result); |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
885 return 0; |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
886 } |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
887 return -1; |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
888 } |
|
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
889 |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
890 static PySequenceMethods set_as_sequence = { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
891 (inquiry)set_len, /* sq_length */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
892 0, /* sq_concat */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
893 0, /* sq_repeat */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
894 0, /* sq_item */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
895 0, /* sq_slice */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
896 0, /* sq_ass_item */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
897 0, /* sq_ass_slice */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
898 (objobjproc)set_contains, /* sq_contains */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
899 }; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
900 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
901 /* set object ********************************************************/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
902 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
903 static PyMethodDef set_methods[] = { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
904 {"add", (PyCFunction)set_add, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
905 add_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
906 {"clear", (PyCFunction)set_clear, METH_NOARGS, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
907 clear_doc}, |
|
31177
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
908 {"__contains__",(PyCFunction)set_direct_contains, METH_O | METH_COEXIST, |
|
31172
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
909 contains_doc}, |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
910 {"copy", (PyCFunction)set_copy, METH_NOARGS, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
911 copy_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
912 {"discard", (PyCFunction)set_discard, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
913 discard_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
914 {"difference", (PyCFunction)set_difference, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
915 difference_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
916 {"difference_update", (PyCFunction)set_difference_update, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
917 difference_update_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
918 {"intersection",(PyCFunction)set_intersection, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
919 intersection_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
920 {"intersection_update",(PyCFunction)set_intersection_update, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
921 intersection_update_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
922 {"issubset", (PyCFunction)set_issubset, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
923 issubset_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
924 {"issuperset", (PyCFunction)set_issuperset, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
925 issuperset_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
926 {"pop", (PyCFunction)set_pop, METH_NOARGS, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
927 pop_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
928 {"__reduce__", (PyCFunction)set_reduce, METH_NOARGS, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
929 reduce_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
930 {"remove", (PyCFunction)set_remove, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
931 remove_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
932 {"symmetric_difference",(PyCFunction)set_symmetric_difference, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
933 symmetric_difference_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
934 {"symmetric_difference_update",(PyCFunction)set_symmetric_difference_update, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
935 symmetric_difference_update_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
936 {"union", (PyCFunction)set_union, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
937 union_doc}, |
|
31015
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
938 {"update", (PyCFunction)set_update, METH_O, |
|
8d413578eb1a
Factor out more duplicate code.
Raymond Hettinger <python@rcn.com>
parents:
31012
diff
changeset
|
939 update_doc}, |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
940 {NULL, NULL} /* sentinel */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
941 }; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
942 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
943 static PyNumberMethods set_as_number = { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
944 0, /*nb_add*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
945 (binaryfunc)set_sub, /*nb_subtract*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
946 0, /*nb_multiply*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
947 0, /*nb_divide*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
948 0, /*nb_remainder*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
949 0, /*nb_divmod*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
950 0, /*nb_power*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
951 0, /*nb_negative*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
952 0, /*nb_positive*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
953 0, /*nb_absolute*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
954 0, /*nb_nonzero*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
955 0, /*nb_invert*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
956 0, /*nb_lshift*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
957 0, /*nb_rshift*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
958 (binaryfunc)set_and, /*nb_and*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
959 (binaryfunc)set_xor, /*nb_xor*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
960 (binaryfunc)set_or, /*nb_or*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
961 0, /*nb_coerce*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
962 0, /*nb_int*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
963 0, /*nb_long*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
964 0, /*nb_float*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
965 0, /*nb_oct*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
966 0, /*nb_hex*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
967 0, /*nb_inplace_add*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
968 (binaryfunc)set_isub, /*nb_inplace_subtract*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
969 0, /*nb_inplace_multiply*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
970 0, /*nb_inplace_divide*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
971 0, /*nb_inplace_remainder*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
972 0, /*nb_inplace_power*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
973 0, /*nb_inplace_lshift*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
974 0, /*nb_inplace_rshift*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
975 (binaryfunc)set_iand, /*nb_inplace_and*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
976 (binaryfunc)set_ixor, /*nb_inplace_xor*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
977 (binaryfunc)set_ior, /*nb_inplace_or*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
978 }; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
979 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
980 PyDoc_STRVAR(set_doc, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
981 "set(iterable) --> set object\n\ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
982 \n\ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
983 Build an unordered collection."); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
984 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
985 PyTypeObject PySet_Type = { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
986 PyObject_HEAD_INIT(&PyType_Type) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
987 0, /* ob_size */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
988 "set", /* tp_name */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
989 sizeof(PySetObject), /* tp_basicsize */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
990 0, /* tp_itemsize */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
991 /* methods */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
992 (destructor)set_dealloc, /* tp_dealloc */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
993 (printfunc)set_tp_print, /* tp_print */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
994 0, /* tp_getattr */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
995 0, /* tp_setattr */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
996 (cmpfunc)set_nocmp, /* tp_compare */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
997 (reprfunc)set_repr, /* tp_repr */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
998 &set_as_number, /* tp_as_number */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
999 &set_as_sequence, /* tp_as_sequence */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1000 0, /* tp_as_mapping */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1001 set_nohash, /* tp_hash */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1002 0, /* tp_call */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1003 0, /* tp_str */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1004 PyObject_GenericGetAttr, /* tp_getattro */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1005 0, /* tp_setattro */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1006 0, /* tp_as_buffer */ |
|
32338
a627d9493149
Remove unnecessary GC support. Sets cannot have cycles.
Raymond Hettinger <python@rcn.com>
parents:
32320
diff
changeset
|
1007 Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES | |
|
32158
679e5c8effae
Make sets and deques weak referencable.
Raymond Hettinger <python@rcn.com>
parents:
31628
diff
changeset
|
1008 Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */ |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1009 set_doc, /* tp_doc */ |
|
32338
a627d9493149
Remove unnecessary GC support. Sets cannot have cycles.
Raymond Hettinger <python@rcn.com>
parents:
32320
diff
changeset
|
1010 0, /* tp_traverse */ |
|
a627d9493149
Remove unnecessary GC support. Sets cannot have cycles.
Raymond Hettinger <python@rcn.com>
parents:
32320
diff
changeset
|
1011 0, /* tp_clear */ |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1012 (richcmpfunc)set_richcompare, /* tp_richcompare */ |
|
32158
679e5c8effae
Make sets and deques weak referencable.
Raymond Hettinger <python@rcn.com>
parents:
31628
diff
changeset
|
1013 offsetof(PySetObject, weakreflist), /* tp_weaklistoffset */ |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1014 (getiterfunc)set_iter, /* tp_iter */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1015 0, /* tp_iternext */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1016 set_methods, /* tp_methods */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1017 0, /* tp_members */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1018 0, /* tp_getset */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1019 0, /* tp_base */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1020 0, /* tp_dict */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1021 0, /* tp_descr_get */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1022 0, /* tp_descr_set */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1023 0, /* tp_dictoffset */ |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
1024 (initproc)set_init, /* tp_init */ |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1025 PyType_GenericAlloc, /* tp_alloc */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1026 set_new, /* tp_new */ |
|
32338
a627d9493149
Remove unnecessary GC support. Sets cannot have cycles.
Raymond Hettinger <python@rcn.com>
parents:
32320
diff
changeset
|
1027 PyObject_Del, /* tp_free */ |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1028 }; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1029 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1030 /* frozenset object ********************************************************/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1031 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1032 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1033 static PyMethodDef frozenset_methods[] = { |
|
31177
eeaa3660671c
Refactor set.discard() and set.remove().
Raymond Hettinger <python@rcn.com>
parents:
31175
diff
changeset
|
1034 {"__contains__",(PyCFunction)set_direct_contains, METH_O | METH_COEXIST, |
|
31172
e4fb6164158c
* Added a new method flag, METH_COEXIST.
Raymond Hettinger <python@rcn.com>
parents:
31019
diff
changeset
|
1035 contains_doc}, |
|
31004
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
1036 {"copy", (PyCFunction)frozenset_copy, METH_NOARGS, |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1037 copy_doc}, |
|
31004
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
1038 {"difference", (PyCFunction)set_difference, METH_O, |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1039 difference_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1040 {"intersection",(PyCFunction)set_intersection, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1041 intersection_doc}, |
|
31004
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
1042 {"issubset", (PyCFunction)set_issubset, METH_O, |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1043 issubset_doc}, |
|
31004
5b77bc4d25b1
* Simplify hash function and add test to show effectiveness of the hash
Raymond Hettinger <python@rcn.com>
parents:
31002
diff
changeset
|
1044 {"issuperset", (PyCFunction)set_issuperset, METH_O, |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1045 issuperset_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1046 {"__reduce__", (PyCFunction)set_reduce, METH_NOARGS, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1047 reduce_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1048 {"symmetric_difference",(PyCFunction)set_symmetric_difference, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1049 symmetric_difference_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1050 {"union", (PyCFunction)set_union, METH_O, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1051 union_doc}, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1052 {NULL, NULL} /* sentinel */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1053 }; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1054 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1055 static PyNumberMethods frozenset_as_number = { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1056 0, /*nb_add*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1057 (binaryfunc)set_sub, /*nb_subtract*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1058 0, /*nb_multiply*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1059 0, /*nb_divide*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1060 0, /*nb_remainder*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1061 0, /*nb_divmod*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1062 0, /*nb_power*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1063 0, /*nb_negative*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1064 0, /*nb_positive*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1065 0, /*nb_absolute*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1066 0, /*nb_nonzero*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1067 0, /*nb_invert*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1068 0, /*nb_lshift*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1069 0, /*nb_rshift*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1070 (binaryfunc)set_and, /*nb_and*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1071 (binaryfunc)set_xor, /*nb_xor*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1072 (binaryfunc)set_or, /*nb_or*/ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1073 }; |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1074 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1075 PyDoc_STRVAR(frozenset_doc, |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1076 "frozenset(iterable) --> frozenset object\n\ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1077 \n\ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1078 Build an immutable unordered collection."); |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1079 |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1080 PyTypeObject PyFrozenSet_Type = { |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1081 PyObject_HEAD_INIT(&PyType_Type) |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1082 0, /* ob_size */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1083 "frozenset", /* tp_name */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1084 sizeof(PySetObject), /* tp_basicsize */ |
|
31300
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
1085 0, /* tp_itemsize */ |
|
bf8402a56fa4
* Simplify and speedup logic for tp_print.
Raymond Hettinger <python@rcn.com>
parents:
31203
diff
changeset
|
1086 /* methods */ |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1087 (destructor)set_dealloc, /* tp_dealloc */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1088 (printfunc)set_tp_print, /* tp_print */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1089 0, /* tp_getattr */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1090 0, /* tp_setattr */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1091 (cmpfunc)set_nocmp, /* tp_compare */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1092 (reprfunc)set_repr, /* tp_repr */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1093 &frozenset_as_number, /* tp_as_number */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1094 &set_as_sequence, /* tp_as_sequence */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1095 0, /* tp_as_mapping */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1096 frozenset_hash, /* tp_hash */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1097 0, /* tp_call */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1098 0, /* tp_str */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1099 PyObject_GenericGetAttr, /* tp_getattro */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1100 0, /* tp_setattro */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1101 0, /* tp_as_buffer */ |
|
32338
a627d9493149
Remove unnecessary GC support. Sets cannot have cycles.
Raymond Hettinger <python@rcn.com>
parents:
32320
diff
changeset
|
1102 Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES | |
|
32158
679e5c8effae
Make sets and deques weak referencable.
Raymond Hettinger <python@rcn.com>
parents:
31628
diff
changeset
|
1103 Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */ |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1104 frozenset_doc, /* tp_doc */ |
|
32338
a627d9493149
Remove unnecessary GC support. Sets cannot have cycles.
Raymond Hettinger <python@rcn.com>
parents:
32320
diff
changeset
|
1105 0, /* tp_traverse */ |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1106 0, /* tp_clear */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1107 (richcmpfunc)set_richcompare, /* tp_richcompare */ |
|
32158
679e5c8effae
Make sets and deques weak referencable.
Raymond Hettinger <python@rcn.com>
parents:
31628
diff
changeset
|
1108 offsetof(PySetObject, weakreflist), /* tp_weaklistoffset */ |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1109 (getiterfunc)set_iter, /* tp_iter */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1110 0, /* tp_iternext */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1111 frozenset_methods, /* tp_methods */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1112 0, /* tp_members */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1113 0, /* tp_getset */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1114 0, /* tp_base */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1115 0, /* tp_dict */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1116 0, /* tp_descr_get */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1117 0, /* tp_descr_set */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1118 0, /* tp_dictoffset */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1119 0, /* tp_init */ |
|
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1120 PyType_GenericAlloc, /* tp_alloc */ |
|
30931
fa6e8d4f88c6
Various fixups (most suggested by Armin Rigo).
Raymond Hettinger <python@rcn.com>
parents:
30930
diff
changeset
|
1121 frozenset_new, /* tp_new */ |
|
32338
a627d9493149
Remove unnecessary GC support. Sets cannot have cycles.
Raymond Hettinger <python@rcn.com>
parents:
32320
diff
changeset
|
1122 PyObject_Del, /* tp_free */ |
|
30929
54ff68e973ee
* Migrate set() and frozenset() from the sandbox.
Raymond Hettinger <python@rcn.com>
parents:
diff
changeset
|
1123 }; |
