blob: 82e82a8bc92330ba852d7bdc63d51e0bf6143812 [file] [log] [blame]
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001
Guido van Rossum2bc13791999-03-24 19:06:42 +00002/* Dictionary object implementation using a hash table */
Guido van Rossum9bfef441993-03-29 10:43:31 +00003
Raymond Hettinger930427b2003-05-03 06:51:59 +00004/* The distribution includes a separate file, Objects/dictnotes.txt,
5 describing explorations into dictionary design and optimization.
6 It covers typical dictionary use patterns, the parameters for
7 tuning dictionaries, and several ideas for possible optimizations.
8*/
9
Guido van Rossumc0b618a1997-05-02 03:12:38 +000010#include "Python.h"
Guido van Rossum4b1302b1993-03-27 18:11:32 +000011
Tim Peters6d6c1a32001-08-02 04:15:00 +000012typedef PyDictEntry dictentry;
13typedef PyDictObject dictobject;
Guido van Rossum16e93a81997-01-28 00:00:11 +000014
Tim Peterseb28ef22001-06-02 05:27:19 +000015/* Define this out if you don't want conversion statistics on exit. */
Fred Drake1bff34a2000-08-31 19:31:38 +000016#undef SHOW_CONVERSION_COUNTS
17
Tim Peterseb28ef22001-06-02 05:27:19 +000018/* See large comment block below. This must be >= 1. */
19#define PERTURB_SHIFT 5
20
Guido van Rossum16e93a81997-01-28 00:00:11 +000021/*
Tim Peterseb28ef22001-06-02 05:27:19 +000022Major subtleties ahead: Most hash schemes depend on having a "good" hash
23function, in the sense of simulating randomness. Python doesn't: its most
24important hash functions (for strings and ints) are very regular in common
25cases:
Tim Peters15d49292001-05-27 07:39:22 +000026
Tim Peterseb28ef22001-06-02 05:27:19 +000027>>> map(hash, (0, 1, 2, 3))
28[0, 1, 2, 3]
29>>> map(hash, ("namea", "nameb", "namec", "named"))
30[-1658398457, -1658398460, -1658398459, -1658398462]
31>>>
Tim Peters15d49292001-05-27 07:39:22 +000032
Tim Peterseb28ef22001-06-02 05:27:19 +000033This isn't necessarily bad! To the contrary, in a table of size 2**i, taking
34the low-order i bits as the initial table index is extremely fast, and there
35are no collisions at all for dicts indexed by a contiguous range of ints.
36The same is approximately true when keys are "consecutive" strings. So this
37gives better-than-random behavior in common cases, and that's very desirable.
Tim Peters15d49292001-05-27 07:39:22 +000038
Tim Peterseb28ef22001-06-02 05:27:19 +000039OTOH, when collisions occur, the tendency to fill contiguous slices of the
40hash table makes a good collision resolution strategy crucial. Taking only
41the last i bits of the hash code is also vulnerable: for example, consider
42[i << 16 for i in range(20000)] as a set of keys. Since ints are their own
43hash codes, and this fits in a dict of size 2**15, the last 15 bits of every
44hash code are all 0: they *all* map to the same table index.
Tim Peters15d49292001-05-27 07:39:22 +000045
Tim Peterseb28ef22001-06-02 05:27:19 +000046But catering to unusual cases should not slow the usual ones, so we just take
47the last i bits anyway. It's up to collision resolution to do the rest. If
48we *usually* find the key we're looking for on the first try (and, it turns
49out, we usually do -- the table load factor is kept under 2/3, so the odds
50are solidly in our favor), then it makes best sense to keep the initial index
51computation dirt cheap.
Tim Peters15d49292001-05-27 07:39:22 +000052
Tim Peterseb28ef22001-06-02 05:27:19 +000053The first half of collision resolution is to visit table indices via this
54recurrence:
Tim Peters15d49292001-05-27 07:39:22 +000055
Tim Peterseb28ef22001-06-02 05:27:19 +000056 j = ((5*j) + 1) mod 2**i
Tim Peters15d49292001-05-27 07:39:22 +000057
Tim Peterseb28ef22001-06-02 05:27:19 +000058For any initial j in range(2**i), repeating that 2**i times generates each
59int in range(2**i) exactly once (see any text on random-number generation for
60proof). By itself, this doesn't help much: like linear probing (setting
61j += 1, or j -= 1, on each loop trip), it scans the table entries in a fixed
62order. This would be bad, except that's not the only thing we do, and it's
63actually *good* in the common cases where hash keys are consecutive. In an
64example that's really too small to make this entirely clear, for a table of
65size 2**3 the order of indices is:
Tim Peters15d49292001-05-27 07:39:22 +000066
Tim Peterseb28ef22001-06-02 05:27:19 +000067 0 -> 1 -> 6 -> 7 -> 4 -> 5 -> 2 -> 3 -> 0 [and here it's repeating]
68
69If two things come in at index 5, the first place we look after is index 2,
70not 6, so if another comes in at index 6 the collision at 5 didn't hurt it.
71Linear probing is deadly in this case because there the fixed probe order
72is the *same* as the order consecutive keys are likely to arrive. But it's
73extremely unlikely hash codes will follow a 5*j+1 recurrence by accident,
74and certain that consecutive hash codes do not.
75
76The other half of the strategy is to get the other bits of the hash code
77into play. This is done by initializing a (unsigned) vrbl "perturb" to the
78full hash code, and changing the recurrence to:
79
80 j = (5*j) + 1 + perturb;
81 perturb >>= PERTURB_SHIFT;
82 use j % 2**i as the next table index;
83
84Now the probe sequence depends (eventually) on every bit in the hash code,
85and the pseudo-scrambling property of recurring on 5*j+1 is more valuable,
86because it quickly magnifies small differences in the bits that didn't affect
87the initial index. Note that because perturb is unsigned, if the recurrence
88is executed often enough perturb eventually becomes and remains 0. At that
89point (very rarely reached) the recurrence is on (just) 5*j+1 again, and
90that's certain to find an empty slot eventually (since it generates every int
91in range(2**i), and we make sure there's always at least one empty slot).
92
93Selecting a good value for PERTURB_SHIFT is a balancing act. You want it
94small so that the high bits of the hash code continue to affect the probe
95sequence across iterations; but you want it large so that in really bad cases
96the high-order hash bits have an effect on early iterations. 5 was "the
97best" in minimizing total collisions across experiments Tim Peters ran (on
98both normal and pathological cases), but 4 and 6 weren't significantly worse.
99
100Historical: Reimer Behrends contributed the idea of using a polynomial-based
101approach, using repeated multiplication by x in GF(2**n) where an irreducible
102polynomial for each table size was chosen such that x was a primitive root.
103Christian Tismer later extended that to use division by x instead, as an
104efficient way to get the high bits of the hash code into play. This scheme
105also gave excellent collision statistics, but was more expensive: two
106if-tests were required inside the loop; computing "the next" index took about
107the same number of operations but without as much potential parallelism
108(e.g., computing 5*j can go on at the same time as computing 1+perturb in the
109above, and then shifting perturb can be done while the table index is being
110masked); and the dictobject struct required a member to hold the table's
111polynomial. In Tim's experiments the current scheme ran faster, produced
112equally good collision statistics, needed less code & used less memory.
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000113*/
Tim Petersdea48ec2001-05-22 20:40:22 +0000114
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000115/* Object used as dummy key to fill deleted entries */
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000116static PyObject *dummy; /* Initialized by first call to newdictobject() */
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000117
Fred Drake1bff34a2000-08-31 19:31:38 +0000118/* forward declarations */
119static dictentry *
120lookdict_string(dictobject *mp, PyObject *key, long hash);
121
122#ifdef SHOW_CONVERSION_COUNTS
123static long created = 0L;
124static long converted = 0L;
125
126static void
127show_counts(void)
128{
129 fprintf(stderr, "created %ld string dicts\n", created);
130 fprintf(stderr, "converted %ld to normal dicts\n", converted);
131 fprintf(stderr, "%.2f%% conversion rate\n", (100.0*converted)/created);
132}
133#endif
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000134
Tim Peters6d6c1a32001-08-02 04:15:00 +0000135/* Initialization macros.
136 There are two ways to create a dict: PyDict_New() is the main C API
137 function, and the tp_new slot maps to dict_new(). In the latter case we
138 can save a little time over what PyDict_New does because it's guaranteed
139 that the PyDictObject struct is already zeroed out.
140 Everyone except dict_new() should use EMPTY_TO_MINSIZE (unless they have
141 an excellent reason not to).
142*/
143
144#define INIT_NONZERO_DICT_SLOTS(mp) do { \
Tim Petersdea48ec2001-05-22 20:40:22 +0000145 (mp)->ma_table = (mp)->ma_smalltable; \
Tim Peters6d6c1a32001-08-02 04:15:00 +0000146 (mp)->ma_mask = PyDict_MINSIZE - 1; \
147 } while(0)
148
149#define EMPTY_TO_MINSIZE(mp) do { \
150 memset((mp)->ma_smalltable, 0, sizeof((mp)->ma_smalltable)); \
Tim Petersdea48ec2001-05-22 20:40:22 +0000151 (mp)->ma_used = (mp)->ma_fill = 0; \
Tim Peters6d6c1a32001-08-02 04:15:00 +0000152 INIT_NONZERO_DICT_SLOTS(mp); \
Tim Petersdea48ec2001-05-22 20:40:22 +0000153 } while(0)
154
Raymond Hettinger43442782004-03-17 21:55:03 +0000155/* Dictionary reuse scheme to save calls to malloc, free, and memset */
156#define MAXFREEDICTS 80
157static PyDictObject *free_dicts[MAXFREEDICTS];
158static int num_free_dicts = 0;
159
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000160PyObject *
Thomas Wouters78890102000-07-22 19:25:51 +0000161PyDict_New(void)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000162{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000163 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000164 if (dummy == NULL) { /* Auto-initialize dummy */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000165 dummy = PyString_FromString("<dummy key>");
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000166 if (dummy == NULL)
167 return NULL;
Fred Drake1bff34a2000-08-31 19:31:38 +0000168#ifdef SHOW_CONVERSION_COUNTS
169 Py_AtExit(show_counts);
170#endif
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000171 }
Raymond Hettinger43442782004-03-17 21:55:03 +0000172 if (num_free_dicts) {
173 mp = free_dicts[--num_free_dicts];
174 assert (mp != NULL);
175 assert (mp->ob_type == &PyDict_Type);
176 _Py_NewReference((PyObject *)mp);
177 if (mp->ma_fill) {
178 EMPTY_TO_MINSIZE(mp);
179 }
180 assert (mp->ma_used == 0);
181 assert (mp->ma_table == mp->ma_smalltable);
182 assert (mp->ma_mask == PyDict_MINSIZE - 1);
183 } else {
184 mp = PyObject_GC_New(dictobject, &PyDict_Type);
185 if (mp == NULL)
186 return NULL;
187 EMPTY_TO_MINSIZE(mp);
188 }
Fred Drake1bff34a2000-08-31 19:31:38 +0000189 mp->ma_lookup = lookdict_string;
190#ifdef SHOW_CONVERSION_COUNTS
191 ++created;
192#endif
Neil Schemenauere83c00e2001-08-29 23:54:21 +0000193 _PyObject_GC_TRACK(mp);
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000194 return (PyObject *)mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000195}
196
197/*
198The basic lookup function used by all operations.
Guido van Rossum16e93a81997-01-28 00:00:11 +0000199This is based on Algorithm D from Knuth Vol. 3, Sec. 6.4.
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000200Open addressing is preferred over chaining since the link overhead for
201chaining would be substantial (100% with typical malloc overhead).
202
Tim Peterseb28ef22001-06-02 05:27:19 +0000203The initial probe index is computed as hash mod the table size. Subsequent
204probe indices are computed as explained earlier.
Guido van Rossum2bc13791999-03-24 19:06:42 +0000205
206All arithmetic on hash should ignore overflow.
Guido van Rossum16e93a81997-01-28 00:00:11 +0000207
Tim Peterseb28ef22001-06-02 05:27:19 +0000208(The details in this version are due to Tim Peters, building on many past
209contributions by Reimer Behrends, Jyrki Alakuijala, Vladimir Marangozov and
210Christian Tismer).
Fred Drake1bff34a2000-08-31 19:31:38 +0000211
212This function must never return NULL; failures are indicated by returning
213a dictentry* for which the me_value field is NULL. Exceptions are never
214reported by this function, and outstanding exceptions are maintained.
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000215*/
Tim Peterseb28ef22001-06-02 05:27:19 +0000216
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000217static dictentry *
Tim Peters1f5871e2000-07-04 17:44:48 +0000218lookdict(dictobject *mp, PyObject *key, register long hash)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000219{
Guido van Rossum16e93a81997-01-28 00:00:11 +0000220 register int i;
Tim Peterseb28ef22001-06-02 05:27:19 +0000221 register unsigned int perturb;
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000222 register dictentry *freeslot;
Tim Petersafb6ae82001-06-04 21:00:21 +0000223 register unsigned int mask = mp->ma_mask;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000224 dictentry *ep0 = mp->ma_table;
225 register dictentry *ep;
Tim Peters7b5d0af2001-06-03 04:14:43 +0000226 register int restore_error;
227 register int checked_error;
Fred Drakec88b99c2000-08-31 19:04:07 +0000228 register int cmp;
229 PyObject *err_type, *err_value, *err_tb;
Tim Peters453163d2001-06-03 04:54:32 +0000230 PyObject *startkey;
Tim Peterseb28ef22001-06-02 05:27:19 +0000231
Tim Peters2f228e72001-05-13 00:19:31 +0000232 i = hash & mask;
Guido van Rossumefb46091997-01-29 15:53:56 +0000233 ep = &ep0[i];
Guido van Rossumc1c7b1a1998-10-06 16:01:14 +0000234 if (ep->me_key == NULL || ep->me_key == key)
Guido van Rossum7d181591997-01-16 21:06:45 +0000235 return ep;
Tim Peters7b5d0af2001-06-03 04:14:43 +0000236
237 restore_error = checked_error = 0;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000238 if (ep->me_key == dummy)
Guido van Rossum7d181591997-01-16 21:06:45 +0000239 freeslot = ep;
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000240 else {
Fred Drakec88b99c2000-08-31 19:04:07 +0000241 if (ep->me_hash == hash) {
242 /* error can't have been checked yet */
243 checked_error = 1;
244 if (PyErr_Occurred()) {
245 restore_error = 1;
246 PyErr_Fetch(&err_type, &err_value, &err_tb);
247 }
Tim Peters453163d2001-06-03 04:54:32 +0000248 startkey = ep->me_key;
249 cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
Tim Peters7b5d0af2001-06-03 04:14:43 +0000250 if (cmp < 0)
Guido van Rossumb9324202001-01-18 00:39:02 +0000251 PyErr_Clear();
Tim Peters453163d2001-06-03 04:54:32 +0000252 if (ep0 == mp->ma_table && ep->me_key == startkey) {
253 if (cmp > 0)
254 goto Done;
255 }
256 else {
257 /* The compare did major nasty stuff to the
258 * dict: start over.
259 * XXX A clever adversary could prevent this
260 * XXX from terminating.
261 */
262 ep = lookdict(mp, key, hash);
263 goto Done;
264 }
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000265 }
266 freeslot = NULL;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000267 }
Tim Peters15d49292001-05-27 07:39:22 +0000268
Tim Peters342c65e2001-05-13 06:43:53 +0000269 /* In the loop, me_key == dummy is by far (factor of 100s) the
270 least likely outcome, so test for that last. */
Tim Peterseb28ef22001-06-02 05:27:19 +0000271 for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
272 i = (i << 2) + i + perturb + 1;
273 ep = &ep0[i & mask];
Guido van Rossum16e93a81997-01-28 00:00:11 +0000274 if (ep->me_key == NULL) {
Tim Peters7b5d0af2001-06-03 04:14:43 +0000275 if (freeslot != NULL)
276 ep = freeslot;
277 break;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000278 }
Tim Peters7b5d0af2001-06-03 04:14:43 +0000279 if (ep->me_key == key)
280 break;
281 if (ep->me_hash == hash && ep->me_key != dummy) {
Fred Drakec88b99c2000-08-31 19:04:07 +0000282 if (!checked_error) {
283 checked_error = 1;
284 if (PyErr_Occurred()) {
285 restore_error = 1;
286 PyErr_Fetch(&err_type, &err_value,
287 &err_tb);
288 }
289 }
Tim Peters453163d2001-06-03 04:54:32 +0000290 startkey = ep->me_key;
291 cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
Tim Peters7b5d0af2001-06-03 04:14:43 +0000292 if (cmp < 0)
Guido van Rossumb9324202001-01-18 00:39:02 +0000293 PyErr_Clear();
Tim Peters453163d2001-06-03 04:54:32 +0000294 if (ep0 == mp->ma_table && ep->me_key == startkey) {
295 if (cmp > 0)
296 break;
297 }
298 else {
299 /* The compare did major nasty stuff to the
300 * dict: start over.
301 * XXX A clever adversary could prevent this
302 * XXX from terminating.
303 */
304 ep = lookdict(mp, key, hash);
305 break;
306 }
Guido van Rossum16e93a81997-01-28 00:00:11 +0000307 }
Tim Peters342c65e2001-05-13 06:43:53 +0000308 else if (ep->me_key == dummy && freeslot == NULL)
309 freeslot = ep;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000310 }
Tim Peters7b5d0af2001-06-03 04:14:43 +0000311
312Done:
313 if (restore_error)
314 PyErr_Restore(err_type, err_value, err_tb);
315 return ep;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000316}
317
318/*
Fred Drake1bff34a2000-08-31 19:31:38 +0000319 * Hacked up version of lookdict which can assume keys are always strings;
320 * this assumption allows testing for errors during PyObject_Compare() to
321 * be dropped; string-string comparisons never raise exceptions. This also
322 * means we don't need to go through PyObject_Compare(); we can always use
Martin v. Löwiscd353062001-05-24 16:56:35 +0000323 * _PyString_Eq directly.
Fred Drake1bff34a2000-08-31 19:31:38 +0000324 *
Tim Peters0ab085c2001-09-14 00:25:33 +0000325 * This is valuable because the general-case error handling in lookdict() is
326 * expensive, and dicts with pure-string keys are very common.
Fred Drake1bff34a2000-08-31 19:31:38 +0000327 */
328static dictentry *
329lookdict_string(dictobject *mp, PyObject *key, register long hash)
330{
331 register int i;
Tim Peterseb28ef22001-06-02 05:27:19 +0000332 register unsigned int perturb;
Fred Drake1bff34a2000-08-31 19:31:38 +0000333 register dictentry *freeslot;
Tim Petersafb6ae82001-06-04 21:00:21 +0000334 register unsigned int mask = mp->ma_mask;
Fred Drake1bff34a2000-08-31 19:31:38 +0000335 dictentry *ep0 = mp->ma_table;
336 register dictentry *ep;
Fred Drake1bff34a2000-08-31 19:31:38 +0000337
Tim Peters0ab085c2001-09-14 00:25:33 +0000338 /* Make sure this function doesn't have to handle non-string keys,
339 including subclasses of str; e.g., one reason to subclass
340 strings is to override __eq__, and for speed we don't cater to
341 that here. */
342 if (!PyString_CheckExact(key)) {
Fred Drake1bff34a2000-08-31 19:31:38 +0000343#ifdef SHOW_CONVERSION_COUNTS
344 ++converted;
345#endif
346 mp->ma_lookup = lookdict;
347 return lookdict(mp, key, hash);
348 }
Tim Peters2f228e72001-05-13 00:19:31 +0000349 i = hash & mask;
Fred Drake1bff34a2000-08-31 19:31:38 +0000350 ep = &ep0[i];
351 if (ep->me_key == NULL || ep->me_key == key)
352 return ep;
353 if (ep->me_key == dummy)
354 freeslot = ep;
355 else {
356 if (ep->me_hash == hash
Martin v. Löwiscd353062001-05-24 16:56:35 +0000357 && _PyString_Eq(ep->me_key, key)) {
Fred Drake1bff34a2000-08-31 19:31:38 +0000358 return ep;
359 }
360 freeslot = NULL;
361 }
Tim Peters15d49292001-05-27 07:39:22 +0000362
Tim Peters342c65e2001-05-13 06:43:53 +0000363 /* In the loop, me_key == dummy is by far (factor of 100s) the
364 least likely outcome, so test for that last. */
Tim Peterseb28ef22001-06-02 05:27:19 +0000365 for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
366 i = (i << 2) + i + perturb + 1;
367 ep = &ep0[i & mask];
Tim Peters342c65e2001-05-13 06:43:53 +0000368 if (ep->me_key == NULL)
369 return freeslot == NULL ? ep : freeslot;
370 if (ep->me_key == key
371 || (ep->me_hash == hash
372 && ep->me_key != dummy
Martin v. Löwiscd353062001-05-24 16:56:35 +0000373 && _PyString_Eq(ep->me_key, key)))
Fred Drake1bff34a2000-08-31 19:31:38 +0000374 return ep;
Tim Petersdea48ec2001-05-22 20:40:22 +0000375 if (ep->me_key == dummy && freeslot == NULL)
Tim Peters342c65e2001-05-13 06:43:53 +0000376 freeslot = ep;
Fred Drake1bff34a2000-08-31 19:31:38 +0000377 }
378}
379
380/*
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000381Internal routine to insert a new item into the table.
382Used both by the internal resize routine and by the public insert routine.
383Eats a reference to key and one to value.
384*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000385static void
Tim Peters1f5871e2000-07-04 17:44:48 +0000386insertdict(register dictobject *mp, PyObject *key, long hash, PyObject *value)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000387{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000388 PyObject *old_value;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000389 register dictentry *ep;
Tim Peters6d6c1a32001-08-02 04:15:00 +0000390 typedef PyDictEntry *(*lookupfunc)(PyDictObject *, PyObject *, long);
391
392 assert(mp->ma_lookup != NULL);
393 ep = mp->ma_lookup(mp, key, hash);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000394 if (ep->me_value != NULL) {
Guido van Rossumd7047b31995-01-02 19:07:15 +0000395 old_value = ep->me_value;
396 ep->me_value = value;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000397 Py_DECREF(old_value); /* which **CAN** re-enter */
398 Py_DECREF(key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000399 }
400 else {
401 if (ep->me_key == NULL)
402 mp->ma_fill++;
Raymond Hettinger07ead172005-02-05 23:42:57 +0000403 else {
404 assert(ep->me_key == dummy);
405 Py_DECREF(dummy);
406 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000407 ep->me_key = key;
408 ep->me_hash = hash;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000409 ep->me_value = value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000410 mp->ma_used++;
411 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000412}
413
414/*
415Restructure the table by allocating a new table and reinserting all
416items again. When entries have been deleted, the new table may
417actually be smaller than the old one.
418*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000419static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000420dictresize(dictobject *mp, int minused)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000421{
Tim Peterseb28ef22001-06-02 05:27:19 +0000422 int newsize;
Tim Peters0c6010b2001-05-23 23:33:57 +0000423 dictentry *oldtable, *newtable, *ep;
424 int i;
425 int is_oldtable_malloced;
Tim Peters6d6c1a32001-08-02 04:15:00 +0000426 dictentry small_copy[PyDict_MINSIZE];
Tim Peters91a364d2001-05-19 07:04:38 +0000427
428 assert(minused >= 0);
Tim Peters0c6010b2001-05-23 23:33:57 +0000429
Tim Peterseb28ef22001-06-02 05:27:19 +0000430 /* Find the smallest table size > minused. */
Tim Peters6d6c1a32001-08-02 04:15:00 +0000431 for (newsize = PyDict_MINSIZE;
Tim Peterseb28ef22001-06-02 05:27:19 +0000432 newsize <= minused && newsize > 0;
433 newsize <<= 1)
434 ;
435 if (newsize <= 0) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000436 PyErr_NoMemory();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000437 return -1;
438 }
Tim Peters0c6010b2001-05-23 23:33:57 +0000439
440 /* Get space for a new table. */
441 oldtable = mp->ma_table;
442 assert(oldtable != NULL);
443 is_oldtable_malloced = oldtable != mp->ma_smalltable;
444
Tim Peters6d6c1a32001-08-02 04:15:00 +0000445 if (newsize == PyDict_MINSIZE) {
Tim Petersf8a548c2001-05-24 16:26:40 +0000446 /* A large table is shrinking, or we can't get any smaller. */
Tim Petersdea48ec2001-05-22 20:40:22 +0000447 newtable = mp->ma_smalltable;
Tim Peters0c6010b2001-05-23 23:33:57 +0000448 if (newtable == oldtable) {
Tim Petersf8a548c2001-05-24 16:26:40 +0000449 if (mp->ma_fill == mp->ma_used) {
450 /* No dummies, so no point doing anything. */
Tim Peters0c6010b2001-05-23 23:33:57 +0000451 return 0;
Tim Petersf8a548c2001-05-24 16:26:40 +0000452 }
453 /* We're not going to resize it, but rebuild the
454 table anyway to purge old dummy entries.
455 Subtle: This is *necessary* if fill==size,
456 as lookdict needs at least one virgin slot to
457 terminate failing searches. If fill < size, it's
458 merely desirable, as dummies slow searches. */
459 assert(mp->ma_fill > mp->ma_used);
Tim Peters0c6010b2001-05-23 23:33:57 +0000460 memcpy(small_copy, oldtable, sizeof(small_copy));
461 oldtable = small_copy;
462 }
Tim Petersdea48ec2001-05-22 20:40:22 +0000463 }
464 else {
465 newtable = PyMem_NEW(dictentry, newsize);
466 if (newtable == NULL) {
467 PyErr_NoMemory();
468 return -1;
469 }
470 }
Tim Peters0c6010b2001-05-23 23:33:57 +0000471
472 /* Make the dict empty, using the new table. */
Tim Petersdea48ec2001-05-22 20:40:22 +0000473 assert(newtable != oldtable);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000474 mp->ma_table = newtable;
Tim Petersafb6ae82001-06-04 21:00:21 +0000475 mp->ma_mask = newsize - 1;
Tim Petersdea48ec2001-05-22 20:40:22 +0000476 memset(newtable, 0, sizeof(dictentry) * newsize);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000477 mp->ma_used = 0;
Tim Petersdea48ec2001-05-22 20:40:22 +0000478 i = mp->ma_fill;
479 mp->ma_fill = 0;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000480
Tim Peters19283142001-05-17 22:25:34 +0000481 /* Copy the data over; this is refcount-neutral for active entries;
482 dummy entries aren't copied over, of course */
Tim Petersdea48ec2001-05-22 20:40:22 +0000483 for (ep = oldtable; i > 0; ep++) {
484 if (ep->me_value != NULL) { /* active entry */
485 --i;
Tim Peters19283142001-05-17 22:25:34 +0000486 insertdict(mp, ep->me_key, ep->me_hash, ep->me_value);
Tim Petersdea48ec2001-05-22 20:40:22 +0000487 }
Tim Peters19283142001-05-17 22:25:34 +0000488 else if (ep->me_key != NULL) { /* dummy entry */
Tim Petersdea48ec2001-05-22 20:40:22 +0000489 --i;
Tim Peters19283142001-05-17 22:25:34 +0000490 assert(ep->me_key == dummy);
491 Py_DECREF(ep->me_key);
Guido van Rossum255443b1998-04-10 22:47:14 +0000492 }
Tim Peters19283142001-05-17 22:25:34 +0000493 /* else key == value == NULL: nothing to do */
Guido van Rossumd7047b31995-01-02 19:07:15 +0000494 }
495
Tim Peters0c6010b2001-05-23 23:33:57 +0000496 if (is_oldtable_malloced)
Guido van Rossumb18618d2000-05-03 23:44:39 +0000497 PyMem_DEL(oldtable);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000498 return 0;
499}
500
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000501PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000502PyDict_GetItem(PyObject *op, PyObject *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000503{
504 long hash;
Fred Drake1bff34a2000-08-31 19:31:38 +0000505 dictobject *mp = (dictobject *)op;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000506 if (!PyDict_Check(op)) {
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000507 return NULL;
508 }
Tim Peters0ab085c2001-09-14 00:25:33 +0000509 if (!PyString_CheckExact(key) ||
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000510 (hash = ((PyStringObject *) key)->ob_shash) == -1)
Guido van Rossumca756f21997-01-23 19:39:29 +0000511 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000512 hash = PyObject_Hash(key);
Guido van Rossum474b19e1998-05-14 01:00:51 +0000513 if (hash == -1) {
514 PyErr_Clear();
Guido van Rossumca756f21997-01-23 19:39:29 +0000515 return NULL;
Guido van Rossum474b19e1998-05-14 01:00:51 +0000516 }
Guido van Rossumca756f21997-01-23 19:39:29 +0000517 }
Fred Drake1bff34a2000-08-31 19:31:38 +0000518 return (mp->ma_lookup)(mp, key, hash)->me_value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000519}
520
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000521/* CAUTION: PyDict_SetItem() must guarantee that it won't resize the
522 * dictionary if it is merely replacing the value for an existing key.
523 * This is means that it's safe to loop over a dictionary with
524 * PyDict_Next() and occasionally replace a value -- but you can't
525 * insert new keys or remove them.
526 */
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000527int
Tim Peters1f5871e2000-07-04 17:44:48 +0000528PyDict_SetItem(register PyObject *op, PyObject *key, PyObject *value)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000529{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000530 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000531 register long hash;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000532 register int n_used;
533
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000534 if (!PyDict_Check(op)) {
535 PyErr_BadInternalCall();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000536 return -1;
537 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000538 mp = (dictobject *)op;
Tim Peters0ab085c2001-09-14 00:25:33 +0000539 if (PyString_CheckExact(key)) {
Guido van Rossum45ec02a2002-08-19 21:43:18 +0000540 hash = ((PyStringObject *)key)->ob_shash;
541 if (hash == -1)
542 hash = PyObject_Hash(key);
Guido van Rossum2a61e741997-01-18 07:55:05 +0000543 }
Tim Peters1f7df352002-03-29 03:29:08 +0000544 else {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000545 hash = PyObject_Hash(key);
Guido van Rossum2a61e741997-01-18 07:55:05 +0000546 if (hash == -1)
547 return -1;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000548 }
Tim Petersafb6ae82001-06-04 21:00:21 +0000549 assert(mp->ma_fill <= mp->ma_mask); /* at least one empty slot */
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000550 n_used = mp->ma_used;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000551 Py_INCREF(value);
552 Py_INCREF(key);
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000553 insertdict(mp, key, hash, value);
Raymond Hettinger3539f6b2003-05-05 22:22:10 +0000554 /* If we added a key, we can safely resize. Otherwise just return!
555 * If fill >= 2/3 size, adjust size. Normally, this doubles or
556 * quaduples the size, but it's also possible for the dict to shrink
557 * (if ma_fill is much larger than ma_used, meaning a lot of dict
558 * keys have been * deleted).
559 *
560 * Quadrupling the size improves average dictionary sparseness
561 * (reducing collisions) at the cost of some memory and iteration
562 * speed (which loops over every possible entry). It also halves
563 * the number of expensive resize operations in a growing dictionary.
564 *
565 * Very large dictionaries (over 50K items) use doubling instead.
566 * This may help applications with severe memory constraints.
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000567 */
Raymond Hettinger3539f6b2003-05-05 22:22:10 +0000568 if (!(mp->ma_used > n_used && mp->ma_fill*3 >= (mp->ma_mask+1)*2))
569 return 0;
570 return dictresize(mp, mp->ma_used*(mp->ma_used>50000 ? 2 : 4));
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000571}
572
573int
Tim Peters1f5871e2000-07-04 17:44:48 +0000574PyDict_DelItem(PyObject *op, PyObject *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000575{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000576 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000577 register long hash;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000578 register dictentry *ep;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000579 PyObject *old_value, *old_key;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000580
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000581 if (!PyDict_Check(op)) {
582 PyErr_BadInternalCall();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000583 return -1;
584 }
Tim Peters0ab085c2001-09-14 00:25:33 +0000585 if (!PyString_CheckExact(key) ||
Tim Peters1f7df352002-03-29 03:29:08 +0000586 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000587 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +0000588 if (hash == -1)
589 return -1;
590 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000591 mp = (dictobject *)op;
Fred Drake1bff34a2000-08-31 19:31:38 +0000592 ep = (mp->ma_lookup)(mp, key, hash);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000593 if (ep->me_value == NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000594 PyErr_SetObject(PyExc_KeyError, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000595 return -1;
596 }
Guido van Rossumd7047b31995-01-02 19:07:15 +0000597 old_key = ep->me_key;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000598 Py_INCREF(dummy);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000599 ep->me_key = dummy;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000600 old_value = ep->me_value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000601 ep->me_value = NULL;
602 mp->ma_used--;
Tim Petersea8f2bf2000-12-13 01:02:46 +0000603 Py_DECREF(old_value);
604 Py_DECREF(old_key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000605 return 0;
606}
607
Guido van Rossum25831651993-05-19 14:50:45 +0000608void
Tim Peters1f5871e2000-07-04 17:44:48 +0000609PyDict_Clear(PyObject *op)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000610{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000611 dictobject *mp;
Tim Petersdea48ec2001-05-22 20:40:22 +0000612 dictentry *ep, *table;
613 int table_is_malloced;
614 int fill;
Tim Peters6d6c1a32001-08-02 04:15:00 +0000615 dictentry small_copy[PyDict_MINSIZE];
Tim Petersdea48ec2001-05-22 20:40:22 +0000616#ifdef Py_DEBUG
617 int i, n;
618#endif
619
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000620 if (!PyDict_Check(op))
Guido van Rossum25831651993-05-19 14:50:45 +0000621 return;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000622 mp = (dictobject *)op;
Tim Petersdea48ec2001-05-22 20:40:22 +0000623#ifdef Py_DEBUG
Tim Petersafb6ae82001-06-04 21:00:21 +0000624 n = mp->ma_mask + 1;
Tim Petersdea48ec2001-05-22 20:40:22 +0000625 i = 0;
626#endif
627
628 table = mp->ma_table;
629 assert(table != NULL);
630 table_is_malloced = table != mp->ma_smalltable;
631
632 /* This is delicate. During the process of clearing the dict,
633 * decrefs can cause the dict to mutate. To avoid fatal confusion
634 * (voice of experience), we have to make the dict empty before
635 * clearing the slots, and never refer to anything via mp->xxx while
636 * clearing.
637 */
638 fill = mp->ma_fill;
639 if (table_is_malloced)
Tim Peters6d6c1a32001-08-02 04:15:00 +0000640 EMPTY_TO_MINSIZE(mp);
Tim Petersdea48ec2001-05-22 20:40:22 +0000641
642 else if (fill > 0) {
643 /* It's a small table with something that needs to be cleared.
644 * Afraid the only safe way is to copy the dict entries into
645 * another small table first.
646 */
647 memcpy(small_copy, table, sizeof(small_copy));
648 table = small_copy;
Tim Peters6d6c1a32001-08-02 04:15:00 +0000649 EMPTY_TO_MINSIZE(mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000650 }
Tim Petersdea48ec2001-05-22 20:40:22 +0000651 /* else it's a small table that's already empty */
652
653 /* Now we can finally clear things. If C had refcounts, we could
654 * assert that the refcount on table is 1 now, i.e. that this function
655 * has unique access to it, so decref side-effects can't alter it.
656 */
657 for (ep = table; fill > 0; ++ep) {
658#ifdef Py_DEBUG
659 assert(i < n);
660 ++i;
661#endif
662 if (ep->me_key) {
663 --fill;
664 Py_DECREF(ep->me_key);
665 Py_XDECREF(ep->me_value);
666 }
667#ifdef Py_DEBUG
668 else
669 assert(ep->me_value == NULL);
670#endif
671 }
672
673 if (table_is_malloced)
674 PyMem_DEL(table);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000675}
676
Tim Peters080c88b2003-02-15 03:01:11 +0000677/*
678 * Iterate over a dict. Use like so:
679 *
680 * int i;
681 * PyObject *key, *value;
682 * i = 0; # important! i should not otherwise be changed by you
Neal Norwitz07323012003-02-15 14:45:12 +0000683 * while (PyDict_Next(yourdict, &i, &key, &value)) {
Tim Peters080c88b2003-02-15 03:01:11 +0000684 * Refer to borrowed references in key and value.
685 * }
686 *
687 * CAUTION: In general, it isn't safe to use PyDict_Next in a loop that
Tim Peters67830702001-03-21 19:23:56 +0000688 * mutates the dict. One exception: it is safe if the loop merely changes
689 * the values associated with the keys (but doesn't insert new keys or
690 * delete keys), via PyDict_SetItem().
691 */
Guido van Rossum25831651993-05-19 14:50:45 +0000692int
Tim Peters1f5871e2000-07-04 17:44:48 +0000693PyDict_Next(PyObject *op, int *ppos, PyObject **pkey, PyObject **pvalue)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000694{
Raymond Hettinger43442782004-03-17 21:55:03 +0000695 register int i, mask;
696 register dictentry *ep;
697
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000698 if (!PyDict_Check(op))
Guido van Rossum25831651993-05-19 14:50:45 +0000699 return 0;
Guido van Rossum25831651993-05-19 14:50:45 +0000700 i = *ppos;
701 if (i < 0)
702 return 0;
Raymond Hettinger43442782004-03-17 21:55:03 +0000703 ep = ((dictobject *)op)->ma_table;
704 mask = ((dictobject *)op)->ma_mask;
705 while (i <= mask && ep[i].me_value == NULL)
Guido van Rossum25831651993-05-19 14:50:45 +0000706 i++;
707 *ppos = i+1;
Raymond Hettinger43442782004-03-17 21:55:03 +0000708 if (i > mask)
Guido van Rossum25831651993-05-19 14:50:45 +0000709 return 0;
710 if (pkey)
Raymond Hettinger43442782004-03-17 21:55:03 +0000711 *pkey = ep[i].me_key;
Guido van Rossum25831651993-05-19 14:50:45 +0000712 if (pvalue)
Raymond Hettinger43442782004-03-17 21:55:03 +0000713 *pvalue = ep[i].me_value;
Guido van Rossum25831651993-05-19 14:50:45 +0000714 return 1;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000715}
716
717/* Methods */
718
719static void
Tim Peters1f5871e2000-07-04 17:44:48 +0000720dict_dealloc(register dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000721{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000722 register dictentry *ep;
Tim Petersdea48ec2001-05-22 20:40:22 +0000723 int fill = mp->ma_fill;
Guido van Rossumff413af2002-03-28 20:34:59 +0000724 PyObject_GC_UnTrack(mp);
Guido van Rossumd724b232000-03-13 16:01:29 +0000725 Py_TRASHCAN_SAFE_BEGIN(mp)
Tim Petersdea48ec2001-05-22 20:40:22 +0000726 for (ep = mp->ma_table; fill > 0; ep++) {
727 if (ep->me_key) {
728 --fill;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000729 Py_DECREF(ep->me_key);
Tim Petersdea48ec2001-05-22 20:40:22 +0000730 Py_XDECREF(ep->me_value);
Guido van Rossum255443b1998-04-10 22:47:14 +0000731 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000732 }
Tim Petersdea48ec2001-05-22 20:40:22 +0000733 if (mp->ma_table != mp->ma_smalltable)
Guido van Rossumb18618d2000-05-03 23:44:39 +0000734 PyMem_DEL(mp->ma_table);
Raymond Hettinger43442782004-03-17 21:55:03 +0000735 if (num_free_dicts < MAXFREEDICTS && mp->ob_type == &PyDict_Type)
736 free_dicts[num_free_dicts++] = mp;
737 else
738 mp->ob_type->tp_free((PyObject *)mp);
Guido van Rossumd724b232000-03-13 16:01:29 +0000739 Py_TRASHCAN_SAFE_END(mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000740}
741
742static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000743dict_print(register dictobject *mp, register FILE *fp, register int flags)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000744{
745 register int i;
746 register int any;
Guido van Rossum255443b1998-04-10 22:47:14 +0000747
748 i = Py_ReprEnter((PyObject*)mp);
749 if (i != 0) {
750 if (i < 0)
751 return i;
752 fprintf(fp, "{...}");
753 return 0;
754 }
755
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000756 fprintf(fp, "{");
757 any = 0;
Tim Petersafb6ae82001-06-04 21:00:21 +0000758 for (i = 0; i <= mp->ma_mask; i++) {
Tim Peters23cf6be2001-06-02 08:02:56 +0000759 dictentry *ep = mp->ma_table + i;
760 PyObject *pvalue = ep->me_value;
761 if (pvalue != NULL) {
762 /* Prevent PyObject_Repr from deleting value during
763 key format */
764 Py_INCREF(pvalue);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000765 if (any++ > 0)
766 fprintf(fp, ", ");
Guido van Rossum255443b1998-04-10 22:47:14 +0000767 if (PyObject_Print((PyObject *)ep->me_key, fp, 0)!=0) {
Tim Peters23cf6be2001-06-02 08:02:56 +0000768 Py_DECREF(pvalue);
Guido van Rossum255443b1998-04-10 22:47:14 +0000769 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000770 return -1;
Guido van Rossum255443b1998-04-10 22:47:14 +0000771 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000772 fprintf(fp, ": ");
Tim Peters19b77cf2001-06-02 08:27:39 +0000773 if (PyObject_Print(pvalue, fp, 0) != 0) {
Tim Peters23cf6be2001-06-02 08:02:56 +0000774 Py_DECREF(pvalue);
Guido van Rossum255443b1998-04-10 22:47:14 +0000775 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000776 return -1;
Guido van Rossum255443b1998-04-10 22:47:14 +0000777 }
Tim Peters23cf6be2001-06-02 08:02:56 +0000778 Py_DECREF(pvalue);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000779 }
780 }
781 fprintf(fp, "}");
Guido van Rossum255443b1998-04-10 22:47:14 +0000782 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000783 return 0;
784}
785
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000786static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000787dict_repr(dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000788{
Tim Petersc6057842001-06-16 07:52:53 +0000789 int i;
Tim Petersa7259592001-06-16 05:11:17 +0000790 PyObject *s, *temp, *colon = NULL;
791 PyObject *pieces = NULL, *result = NULL;
792 PyObject *key, *value;
Guido van Rossum255443b1998-04-10 22:47:14 +0000793
Tim Petersa7259592001-06-16 05:11:17 +0000794 i = Py_ReprEnter((PyObject *)mp);
Guido van Rossum255443b1998-04-10 22:47:14 +0000795 if (i != 0) {
Tim Petersa7259592001-06-16 05:11:17 +0000796 return i > 0 ? PyString_FromString("{...}") : NULL;
Guido van Rossum255443b1998-04-10 22:47:14 +0000797 }
798
Tim Petersa7259592001-06-16 05:11:17 +0000799 if (mp->ma_used == 0) {
800 result = PyString_FromString("{}");
801 goto Done;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000802 }
Tim Petersa7259592001-06-16 05:11:17 +0000803
804 pieces = PyList_New(0);
805 if (pieces == NULL)
806 goto Done;
807
808 colon = PyString_FromString(": ");
809 if (colon == NULL)
810 goto Done;
811
812 /* Do repr() on each key+value pair, and insert ": " between them.
813 Note that repr may mutate the dict. */
Tim Petersc6057842001-06-16 07:52:53 +0000814 i = 0;
815 while (PyDict_Next((PyObject *)mp, &i, &key, &value)) {
Tim Petersa7259592001-06-16 05:11:17 +0000816 int status;
817 /* Prevent repr from deleting value during key format. */
818 Py_INCREF(value);
819 s = PyObject_Repr(key);
820 PyString_Concat(&s, colon);
821 PyString_ConcatAndDel(&s, PyObject_Repr(value));
822 Py_DECREF(value);
823 if (s == NULL)
824 goto Done;
825 status = PyList_Append(pieces, s);
826 Py_DECREF(s); /* append created a new ref */
827 if (status < 0)
828 goto Done;
829 }
830
831 /* Add "{}" decorations to the first and last items. */
832 assert(PyList_GET_SIZE(pieces) > 0);
833 s = PyString_FromString("{");
834 if (s == NULL)
835 goto Done;
836 temp = PyList_GET_ITEM(pieces, 0);
837 PyString_ConcatAndDel(&s, temp);
838 PyList_SET_ITEM(pieces, 0, s);
839 if (s == NULL)
840 goto Done;
841
842 s = PyString_FromString("}");
843 if (s == NULL)
844 goto Done;
845 temp = PyList_GET_ITEM(pieces, PyList_GET_SIZE(pieces) - 1);
846 PyString_ConcatAndDel(&temp, s);
847 PyList_SET_ITEM(pieces, PyList_GET_SIZE(pieces) - 1, temp);
848 if (temp == NULL)
849 goto Done;
850
851 /* Paste them all together with ", " between. */
852 s = PyString_FromString(", ");
853 if (s == NULL)
854 goto Done;
855 result = _PyString_Join(s, pieces);
Tim Peters0ab085c2001-09-14 00:25:33 +0000856 Py_DECREF(s);
Tim Petersa7259592001-06-16 05:11:17 +0000857
858Done:
859 Py_XDECREF(pieces);
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000860 Py_XDECREF(colon);
Tim Petersa7259592001-06-16 05:11:17 +0000861 Py_ReprLeave((PyObject *)mp);
862 return result;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000863}
864
865static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000866dict_length(dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000867{
868 return mp->ma_used;
869}
870
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000871static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000872dict_subscript(dictobject *mp, register PyObject *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000873{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000874 PyObject *v;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000875 long hash;
Tim Petersdea48ec2001-05-22 20:40:22 +0000876 assert(mp->ma_table != NULL);
Tim Peters0ab085c2001-09-14 00:25:33 +0000877 if (!PyString_CheckExact(key) ||
Tim Peters1f7df352002-03-29 03:29:08 +0000878 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000879 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +0000880 if (hash == -1)
881 return NULL;
882 }
Fred Drake1bff34a2000-08-31 19:31:38 +0000883 v = (mp->ma_lookup)(mp, key, hash) -> me_value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000884 if (v == NULL)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000885 PyErr_SetObject(PyExc_KeyError, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000886 else
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000887 Py_INCREF(v);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000888 return v;
889}
890
891static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000892dict_ass_sub(dictobject *mp, PyObject *v, PyObject *w)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000893{
894 if (w == NULL)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000895 return PyDict_DelItem((PyObject *)mp, v);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000896 else
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000897 return PyDict_SetItem((PyObject *)mp, v, w);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000898}
899
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000900static PyMappingMethods dict_as_mapping = {
901 (inquiry)dict_length, /*mp_length*/
902 (binaryfunc)dict_subscript, /*mp_subscript*/
903 (objobjargproc)dict_ass_sub, /*mp_ass_subscript*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000904};
905
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000906static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +0000907dict_keys(register dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000908{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000909 register PyObject *v;
Raymond Hettinger43442782004-03-17 21:55:03 +0000910 register int i, j;
911 dictentry *ep;
912 int mask, n;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000913
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000914 again:
915 n = mp->ma_used;
916 v = PyList_New(n);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000917 if (v == NULL)
918 return NULL;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000919 if (n != mp->ma_used) {
920 /* Durnit. The allocations caused the dict to resize.
921 * Just start over, this shouldn't normally happen.
922 */
923 Py_DECREF(v);
924 goto again;
925 }
Raymond Hettinger43442782004-03-17 21:55:03 +0000926 ep = mp->ma_table;
927 mask = mp->ma_mask;
928 for (i = 0, j = 0; i <= mask; i++) {
929 if (ep[i].me_value != NULL) {
930 PyObject *key = ep[i].me_key;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000931 Py_INCREF(key);
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000932 PyList_SET_ITEM(v, j, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000933 j++;
934 }
935 }
Raymond Hettinger43442782004-03-17 21:55:03 +0000936 assert(j == n);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000937 return v;
938}
939
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000940static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +0000941dict_values(register dictobject *mp)
Guido van Rossum25831651993-05-19 14:50:45 +0000942{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000943 register PyObject *v;
Raymond Hettinger43442782004-03-17 21:55:03 +0000944 register int i, j;
945 dictentry *ep;
946 int mask, n;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000947
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000948 again:
949 n = mp->ma_used;
950 v = PyList_New(n);
Guido van Rossum25831651993-05-19 14:50:45 +0000951 if (v == NULL)
952 return NULL;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000953 if (n != mp->ma_used) {
954 /* Durnit. The allocations caused the dict to resize.
955 * Just start over, this shouldn't normally happen.
956 */
957 Py_DECREF(v);
958 goto again;
959 }
Raymond Hettinger43442782004-03-17 21:55:03 +0000960 ep = mp->ma_table;
961 mask = mp->ma_mask;
962 for (i = 0, j = 0; i <= mask; i++) {
963 if (ep[i].me_value != NULL) {
964 PyObject *value = ep[i].me_value;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000965 Py_INCREF(value);
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000966 PyList_SET_ITEM(v, j, value);
Guido van Rossum25831651993-05-19 14:50:45 +0000967 j++;
968 }
969 }
Raymond Hettinger43442782004-03-17 21:55:03 +0000970 assert(j == n);
Guido van Rossum25831651993-05-19 14:50:45 +0000971 return v;
972}
973
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000974static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +0000975dict_items(register dictobject *mp)
Guido van Rossum25831651993-05-19 14:50:45 +0000976{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000977 register PyObject *v;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000978 register int i, j, n;
Raymond Hettinger43442782004-03-17 21:55:03 +0000979 int mask;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000980 PyObject *item, *key, *value;
Raymond Hettinger43442782004-03-17 21:55:03 +0000981 dictentry *ep;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000982
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000983 /* Preallocate the list of tuples, to avoid allocations during
984 * the loop over the items, which could trigger GC, which
985 * could resize the dict. :-(
986 */
987 again:
988 n = mp->ma_used;
989 v = PyList_New(n);
Guido van Rossum25831651993-05-19 14:50:45 +0000990 if (v == NULL)
991 return NULL;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000992 for (i = 0; i < n; i++) {
993 item = PyTuple_New(2);
994 if (item == NULL) {
995 Py_DECREF(v);
996 return NULL;
997 }
998 PyList_SET_ITEM(v, i, item);
999 }
1000 if (n != mp->ma_used) {
1001 /* Durnit. The allocations caused the dict to resize.
1002 * Just start over, this shouldn't normally happen.
1003 */
1004 Py_DECREF(v);
1005 goto again;
1006 }
1007 /* Nothing we do below makes any function calls. */
Raymond Hettinger43442782004-03-17 21:55:03 +00001008 ep = mp->ma_table;
1009 mask = mp->ma_mask;
1010 for (i = 0, j = 0; i <= mask; i++) {
Raymond Hettinger06905122004-03-19 10:30:00 +00001011 if ((value=ep[i].me_value) != NULL) {
Raymond Hettinger43442782004-03-17 21:55:03 +00001012 key = ep[i].me_key;
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001013 item = PyList_GET_ITEM(v, j);
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001014 Py_INCREF(key);
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001015 PyTuple_SET_ITEM(item, 0, key);
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001016 Py_INCREF(value);
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001017 PyTuple_SET_ITEM(item, 1, value);
Guido van Rossum25831651993-05-19 14:50:45 +00001018 j++;
1019 }
1020 }
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001021 assert(j == n);
Guido van Rossum25831651993-05-19 14:50:45 +00001022 return v;
1023}
1024
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001025static PyObject *
Tim Petersbca1cbc2002-12-09 22:56:13 +00001026dict_fromkeys(PyObject *cls, PyObject *args)
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001027{
1028 PyObject *seq;
1029 PyObject *value = Py_None;
1030 PyObject *it; /* iter(seq) */
1031 PyObject *key;
1032 PyObject *d;
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001033 int status;
1034
Raymond Hettingerea3fdf42002-12-29 16:33:45 +00001035 if (!PyArg_UnpackTuple(args, "fromkeys", 1, 2, &seq, &value))
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001036 return NULL;
1037
1038 d = PyObject_CallObject(cls, NULL);
1039 if (d == NULL)
1040 return NULL;
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001041
1042 it = PyObject_GetIter(seq);
1043 if (it == NULL){
1044 Py_DECREF(d);
1045 return NULL;
1046 }
1047
1048 for (;;) {
1049 key = PyIter_Next(it);
1050 if (key == NULL) {
1051 if (PyErr_Occurred())
1052 goto Fail;
1053 break;
1054 }
Raymond Hettingere03e5b12002-12-07 08:10:51 +00001055 status = PyObject_SetItem(d, key, value);
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001056 Py_DECREF(key);
1057 if (status < 0)
1058 goto Fail;
1059 }
1060
1061 Py_DECREF(it);
1062 return d;
1063
1064Fail:
1065 Py_DECREF(it);
1066 Py_DECREF(d);
1067 return NULL;
1068}
1069
Raymond Hettinger31017ae2004-03-04 08:25:44 +00001070static int
1071dict_update_common(PyObject *self, PyObject *args, PyObject *kwds, char *methname)
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001072{
Raymond Hettinger31017ae2004-03-04 08:25:44 +00001073 PyObject *arg = NULL;
1074 int result = 0;
1075
1076 if (!PyArg_UnpackTuple(args, methname, 0, 1, &arg))
1077 result = -1;
1078
1079 else if (arg != NULL) {
1080 if (PyObject_HasAttrString(arg, "keys"))
1081 result = PyDict_Merge(self, arg, 1);
1082 else
1083 result = PyDict_MergeFromSeq2(self, arg, 1);
1084 }
1085 if (result == 0 && kwds != NULL)
1086 result = PyDict_Merge(self, kwds, 1);
1087 return result;
1088}
1089
1090static PyObject *
1091dict_update(PyObject *self, PyObject *args, PyObject *kwds)
1092{
Raymond Hettinger7892b1c2004-04-12 18:10:01 +00001093 if (dict_update_common(self, args, kwds, "update") != -1)
1094 Py_RETURN_NONE;
1095 return NULL;
Tim Peters6d6c1a32001-08-02 04:15:00 +00001096}
1097
Guido van Rossum05ac6de2001-08-10 20:28:28 +00001098/* Update unconditionally replaces existing items.
1099 Merge has a 3rd argument 'override'; if set, it acts like Update,
Tim Peters1fc240e2001-10-26 05:06:50 +00001100 otherwise it leaves existing items unchanged.
1101
1102 PyDict_{Update,Merge} update/merge from a mapping object.
1103
Tim Petersf582b822001-12-11 18:51:08 +00001104 PyDict_MergeFromSeq2 updates/merges from any iterable object
Tim Peters1fc240e2001-10-26 05:06:50 +00001105 producing iterable objects of length 2.
1106*/
1107
Tim Petersf582b822001-12-11 18:51:08 +00001108int
Tim Peters1fc240e2001-10-26 05:06:50 +00001109PyDict_MergeFromSeq2(PyObject *d, PyObject *seq2, int override)
1110{
1111 PyObject *it; /* iter(seq2) */
1112 int i; /* index into seq2 of current element */
1113 PyObject *item; /* seq2[i] */
1114 PyObject *fast; /* item as a 2-tuple or 2-list */
1115
1116 assert(d != NULL);
1117 assert(PyDict_Check(d));
1118 assert(seq2 != NULL);
1119
1120 it = PyObject_GetIter(seq2);
1121 if (it == NULL)
1122 return -1;
1123
1124 for (i = 0; ; ++i) {
1125 PyObject *key, *value;
1126 int n;
1127
1128 fast = NULL;
1129 item = PyIter_Next(it);
1130 if (item == NULL) {
1131 if (PyErr_Occurred())
1132 goto Fail;
1133 break;
1134 }
1135
1136 /* Convert item to sequence, and verify length 2. */
1137 fast = PySequence_Fast(item, "");
1138 if (fast == NULL) {
1139 if (PyErr_ExceptionMatches(PyExc_TypeError))
1140 PyErr_Format(PyExc_TypeError,
1141 "cannot convert dictionary update "
1142 "sequence element #%d to a sequence",
1143 i);
1144 goto Fail;
1145 }
1146 n = PySequence_Fast_GET_SIZE(fast);
1147 if (n != 2) {
1148 PyErr_Format(PyExc_ValueError,
1149 "dictionary update sequence element #%d "
1150 "has length %d; 2 is required",
1151 i, n);
1152 goto Fail;
1153 }
1154
1155 /* Update/merge with this (key, value) pair. */
1156 key = PySequence_Fast_GET_ITEM(fast, 0);
1157 value = PySequence_Fast_GET_ITEM(fast, 1);
1158 if (override || PyDict_GetItem(d, key) == NULL) {
1159 int status = PyDict_SetItem(d, key, value);
1160 if (status < 0)
1161 goto Fail;
1162 }
1163 Py_DECREF(fast);
1164 Py_DECREF(item);
1165 }
1166
1167 i = 0;
1168 goto Return;
1169Fail:
1170 Py_XDECREF(item);
1171 Py_XDECREF(fast);
1172 i = -1;
1173Return:
1174 Py_DECREF(it);
1175 return i;
1176}
1177
Tim Peters6d6c1a32001-08-02 04:15:00 +00001178int
1179PyDict_Update(PyObject *a, PyObject *b)
1180{
Guido van Rossum05ac6de2001-08-10 20:28:28 +00001181 return PyDict_Merge(a, b, 1);
1182}
1183
1184int
1185PyDict_Merge(PyObject *a, PyObject *b, int override)
1186{
Tim Peters6d6c1a32001-08-02 04:15:00 +00001187 register PyDictObject *mp, *other;
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001188 register int i;
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001189 dictentry *entry;
Tim Peters6d6c1a32001-08-02 04:15:00 +00001190
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001191 /* We accept for the argument either a concrete dictionary object,
1192 * or an abstract "mapping" object. For the former, we can do
1193 * things quite efficiently. For the latter, we only require that
1194 * PyMapping_Keys() and PyObject_GetItem() be supported.
1195 */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001196 if (a == NULL || !PyDict_Check(a) || b == NULL) {
1197 PyErr_BadInternalCall();
1198 return -1;
1199 }
1200 mp = (dictobject*)a;
1201 if (PyDict_Check(b)) {
1202 other = (dictobject*)b;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001203 if (other == mp || other->ma_used == 0)
1204 /* a.update(a) or a.update({}); nothing to do */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001205 return 0;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001206 /* Do one big resize at the start, rather than
1207 * incrementally resizing as we insert new items. Expect
1208 * that there will be no (or few) overlapping keys.
1209 */
1210 if ((mp->ma_fill + other->ma_used)*3 >= (mp->ma_mask+1)*2) {
Raymond Hettingerc8d22902003-05-07 00:49:40 +00001211 if (dictresize(mp, (mp->ma_used + other->ma_used)*2) != 0)
Tim Peters6d6c1a32001-08-02 04:15:00 +00001212 return -1;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001213 }
1214 for (i = 0; i <= other->ma_mask; i++) {
1215 entry = &other->ma_table[i];
Guido van Rossum05ac6de2001-08-10 20:28:28 +00001216 if (entry->me_value != NULL &&
1217 (override ||
1218 PyDict_GetItem(a, entry->me_key) == NULL)) {
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001219 Py_INCREF(entry->me_key);
1220 Py_INCREF(entry->me_value);
1221 insertdict(mp, entry->me_key, entry->me_hash,
1222 entry->me_value);
1223 }
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001224 }
1225 }
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001226 else {
1227 /* Do it the generic, slower way */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001228 PyObject *keys = PyMapping_Keys(b);
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001229 PyObject *iter;
1230 PyObject *key, *value;
1231 int status;
1232
1233 if (keys == NULL)
1234 /* Docstring says this is equivalent to E.keys() so
1235 * if E doesn't have a .keys() method we want
1236 * AttributeError to percolate up. Might as well
1237 * do the same for any other error.
1238 */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001239 return -1;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001240
1241 iter = PyObject_GetIter(keys);
1242 Py_DECREF(keys);
1243 if (iter == NULL)
Tim Peters6d6c1a32001-08-02 04:15:00 +00001244 return -1;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001245
1246 for (key = PyIter_Next(iter); key; key = PyIter_Next(iter)) {
Guido van Rossum05ac6de2001-08-10 20:28:28 +00001247 if (!override && PyDict_GetItem(a, key) != NULL) {
1248 Py_DECREF(key);
1249 continue;
1250 }
Tim Peters6d6c1a32001-08-02 04:15:00 +00001251 value = PyObject_GetItem(b, key);
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001252 if (value == NULL) {
1253 Py_DECREF(iter);
1254 Py_DECREF(key);
Tim Peters6d6c1a32001-08-02 04:15:00 +00001255 return -1;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001256 }
Guido van Rossum05ac6de2001-08-10 20:28:28 +00001257 status = PyDict_SetItem(a, key, value);
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001258 Py_DECREF(key);
1259 Py_DECREF(value);
1260 if (status < 0) {
1261 Py_DECREF(iter);
Tim Peters6d6c1a32001-08-02 04:15:00 +00001262 return -1;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001263 }
1264 }
1265 Py_DECREF(iter);
1266 if (PyErr_Occurred())
1267 /* Iterator completed, via error */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001268 return -1;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001269 }
Tim Peters6d6c1a32001-08-02 04:15:00 +00001270 return 0;
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001271}
1272
1273static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001274dict_copy(register dictobject *mp)
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001275{
Jeremy Hyltona12c7a72000-03-30 22:27:31 +00001276 return PyDict_Copy((PyObject*)mp);
1277}
1278
1279PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001280PyDict_Copy(PyObject *o)
Jeremy Hyltona12c7a72000-03-30 22:27:31 +00001281{
Raymond Hettingerebedb2f2004-03-08 04:19:01 +00001282 PyObject *copy;
Jeremy Hyltona12c7a72000-03-30 22:27:31 +00001283
1284 if (o == NULL || !PyDict_Check(o)) {
1285 PyErr_BadInternalCall();
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001286 return NULL;
Jeremy Hyltona12c7a72000-03-30 22:27:31 +00001287 }
Raymond Hettingerebedb2f2004-03-08 04:19:01 +00001288 copy = PyDict_New();
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001289 if (copy == NULL)
1290 return NULL;
Raymond Hettingerebedb2f2004-03-08 04:19:01 +00001291 if (PyDict_Merge(copy, o, 1) == 0)
1292 return copy;
1293 Py_DECREF(copy);
1294 return copy;
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001295}
1296
Guido van Rossum4199fac1993-11-05 10:18:44 +00001297int
Tim Peters1f5871e2000-07-04 17:44:48 +00001298PyDict_Size(PyObject *mp)
Guido van Rossum4199fac1993-11-05 10:18:44 +00001299{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001300 if (mp == NULL || !PyDict_Check(mp)) {
1301 PyErr_BadInternalCall();
Jeremy Hylton7083bb72004-02-17 20:10:11 +00001302 return -1;
Guido van Rossum4199fac1993-11-05 10:18:44 +00001303 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001304 return ((dictobject *)mp)->ma_used;
Guido van Rossum4199fac1993-11-05 10:18:44 +00001305}
1306
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001307PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001308PyDict_Keys(PyObject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001309{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001310 if (mp == NULL || !PyDict_Check(mp)) {
1311 PyErr_BadInternalCall();
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001312 return NULL;
1313 }
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001314 return dict_keys((dictobject *)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001315}
1316
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001317PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001318PyDict_Values(PyObject *mp)
Guido van Rossum25831651993-05-19 14:50:45 +00001319{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001320 if (mp == NULL || !PyDict_Check(mp)) {
1321 PyErr_BadInternalCall();
Guido van Rossum25831651993-05-19 14:50:45 +00001322 return NULL;
1323 }
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001324 return dict_values((dictobject *)mp);
Guido van Rossum25831651993-05-19 14:50:45 +00001325}
1326
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001327PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001328PyDict_Items(PyObject *mp)
Guido van Rossum25831651993-05-19 14:50:45 +00001329{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001330 if (mp == NULL || !PyDict_Check(mp)) {
1331 PyErr_BadInternalCall();
Guido van Rossum25831651993-05-19 14:50:45 +00001332 return NULL;
1333 }
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001334 return dict_items((dictobject *)mp);
Guido van Rossum25831651993-05-19 14:50:45 +00001335}
1336
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001337/* Subroutine which returns the smallest key in a for which b's value
1338 is different or absent. The value is returned too, through the
Tim Peters95bf9392001-05-10 08:32:44 +00001339 pval argument. Both are NULL if no key in a is found for which b's status
1340 differs. The refcounts on (and only on) non-NULL *pval and function return
1341 values must be decremented by the caller (characterize() increments them
1342 to ensure that mutating comparison and PyDict_GetItem calls can't delete
1343 them before the caller is done looking at them). */
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001344
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001345static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001346characterize(dictobject *a, dictobject *b, PyObject **pval)
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001347{
Tim Peters95bf9392001-05-10 08:32:44 +00001348 PyObject *akey = NULL; /* smallest key in a s.t. a[akey] != b[akey] */
1349 PyObject *aval = NULL; /* a[akey] */
Guido van Rossumb9324202001-01-18 00:39:02 +00001350 int i, cmp;
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001351
Tim Petersafb6ae82001-06-04 21:00:21 +00001352 for (i = 0; i <= a->ma_mask; i++) {
Tim Peters95bf9392001-05-10 08:32:44 +00001353 PyObject *thiskey, *thisaval, *thisbval;
1354 if (a->ma_table[i].me_value == NULL)
1355 continue;
1356 thiskey = a->ma_table[i].me_key;
1357 Py_INCREF(thiskey); /* keep alive across compares */
1358 if (akey != NULL) {
1359 cmp = PyObject_RichCompareBool(akey, thiskey, Py_LT);
1360 if (cmp < 0) {
1361 Py_DECREF(thiskey);
1362 goto Fail;
1363 }
1364 if (cmp > 0 ||
Tim Petersafb6ae82001-06-04 21:00:21 +00001365 i > a->ma_mask ||
Tim Peters95bf9392001-05-10 08:32:44 +00001366 a->ma_table[i].me_value == NULL)
1367 {
1368 /* Not the *smallest* a key; or maybe it is
1369 * but the compare shrunk the dict so we can't
1370 * find its associated value anymore; or
1371 * maybe it is but the compare deleted the
1372 * a[thiskey] entry.
1373 */
1374 Py_DECREF(thiskey);
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001375 continue;
Guido van Rossumb9324202001-01-18 00:39:02 +00001376 }
Tim Peters95bf9392001-05-10 08:32:44 +00001377 }
1378
1379 /* Compare a[thiskey] to b[thiskey]; cmp <- true iff equal. */
1380 thisaval = a->ma_table[i].me_value;
1381 assert(thisaval);
1382 Py_INCREF(thisaval); /* keep alive */
1383 thisbval = PyDict_GetItem((PyObject *)b, thiskey);
1384 if (thisbval == NULL)
1385 cmp = 0;
1386 else {
1387 /* both dicts have thiskey: same values? */
1388 cmp = PyObject_RichCompareBool(
1389 thisaval, thisbval, Py_EQ);
1390 if (cmp < 0) {
1391 Py_DECREF(thiskey);
1392 Py_DECREF(thisaval);
1393 goto Fail;
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001394 }
1395 }
Tim Peters95bf9392001-05-10 08:32:44 +00001396 if (cmp == 0) {
1397 /* New winner. */
1398 Py_XDECREF(akey);
1399 Py_XDECREF(aval);
1400 akey = thiskey;
1401 aval = thisaval;
1402 }
1403 else {
1404 Py_DECREF(thiskey);
1405 Py_DECREF(thisaval);
1406 }
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001407 }
Tim Peters95bf9392001-05-10 08:32:44 +00001408 *pval = aval;
1409 return akey;
1410
1411Fail:
1412 Py_XDECREF(akey);
1413 Py_XDECREF(aval);
1414 *pval = NULL;
1415 return NULL;
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001416}
1417
1418static int
Tim Peters1f5871e2000-07-04 17:44:48 +00001419dict_compare(dictobject *a, dictobject *b)
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001420{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001421 PyObject *adiff, *bdiff, *aval, *bval;
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001422 int res;
1423
1424 /* Compare lengths first */
1425 if (a->ma_used < b->ma_used)
1426 return -1; /* a is shorter */
1427 else if (a->ma_used > b->ma_used)
1428 return 1; /* b is shorter */
Tim Peters95bf9392001-05-10 08:32:44 +00001429
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001430 /* Same length -- check all keys */
Tim Peters95bf9392001-05-10 08:32:44 +00001431 bdiff = bval = NULL;
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001432 adiff = characterize(a, b, &aval);
Tim Peters95bf9392001-05-10 08:32:44 +00001433 if (adiff == NULL) {
1434 assert(!aval);
Tim Peters3918fb22001-05-10 18:58:31 +00001435 /* Either an error, or a is a subset with the same length so
Tim Peters95bf9392001-05-10 08:32:44 +00001436 * must be equal.
1437 */
1438 res = PyErr_Occurred() ? -1 : 0;
1439 goto Finished;
1440 }
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001441 bdiff = characterize(b, a, &bval);
Tim Peters95bf9392001-05-10 08:32:44 +00001442 if (bdiff == NULL && PyErr_Occurred()) {
1443 assert(!bval);
1444 res = -1;
1445 goto Finished;
1446 }
1447 res = 0;
1448 if (bdiff) {
1449 /* bdiff == NULL "should be" impossible now, but perhaps
1450 * the last comparison done by the characterize() on a had
1451 * the side effect of making the dicts equal!
1452 */
1453 res = PyObject_Compare(adiff, bdiff);
1454 }
1455 if (res == 0 && bval != NULL)
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001456 res = PyObject_Compare(aval, bval);
Tim Peters95bf9392001-05-10 08:32:44 +00001457
1458Finished:
1459 Py_XDECREF(adiff);
1460 Py_XDECREF(bdiff);
1461 Py_XDECREF(aval);
1462 Py_XDECREF(bval);
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001463 return res;
1464}
1465
Tim Peterse63415e2001-05-08 04:38:29 +00001466/* Return 1 if dicts equal, 0 if not, -1 if error.
1467 * Gets out as soon as any difference is detected.
1468 * Uses only Py_EQ comparison.
1469 */
1470static int
1471dict_equal(dictobject *a, dictobject *b)
1472{
1473 int i;
1474
1475 if (a->ma_used != b->ma_used)
1476 /* can't be equal if # of entries differ */
1477 return 0;
Tim Peterseb28ef22001-06-02 05:27:19 +00001478
Tim Peterse63415e2001-05-08 04:38:29 +00001479 /* Same # of entries -- check all of 'em. Exit early on any diff. */
Tim Petersafb6ae82001-06-04 21:00:21 +00001480 for (i = 0; i <= a->ma_mask; i++) {
Tim Peterse63415e2001-05-08 04:38:29 +00001481 PyObject *aval = a->ma_table[i].me_value;
1482 if (aval != NULL) {
1483 int cmp;
1484 PyObject *bval;
1485 PyObject *key = a->ma_table[i].me_key;
1486 /* temporarily bump aval's refcount to ensure it stays
1487 alive until we're done with it */
1488 Py_INCREF(aval);
1489 bval = PyDict_GetItem((PyObject *)b, key);
1490 if (bval == NULL) {
1491 Py_DECREF(aval);
1492 return 0;
1493 }
1494 cmp = PyObject_RichCompareBool(aval, bval, Py_EQ);
1495 Py_DECREF(aval);
1496 if (cmp <= 0) /* error or not equal */
1497 return cmp;
1498 }
1499 }
1500 return 1;
1501 }
1502
1503static PyObject *
1504dict_richcompare(PyObject *v, PyObject *w, int op)
1505{
1506 int cmp;
1507 PyObject *res;
1508
1509 if (!PyDict_Check(v) || !PyDict_Check(w)) {
1510 res = Py_NotImplemented;
1511 }
1512 else if (op == Py_EQ || op == Py_NE) {
1513 cmp = dict_equal((dictobject *)v, (dictobject *)w);
1514 if (cmp < 0)
1515 return NULL;
1516 res = (cmp == (op == Py_EQ)) ? Py_True : Py_False;
1517 }
Tim Peters4fa58bf2001-05-10 21:45:19 +00001518 else
1519 res = Py_NotImplemented;
Tim Peterse63415e2001-05-08 04:38:29 +00001520 Py_INCREF(res);
1521 return res;
1522 }
1523
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001524static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001525dict_has_key(register dictobject *mp, PyObject *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001526{
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001527 long hash;
1528 register long ok;
Tim Peters0ab085c2001-09-14 00:25:33 +00001529 if (!PyString_CheckExact(key) ||
Tim Peters1f7df352002-03-29 03:29:08 +00001530 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001531 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +00001532 if (hash == -1)
1533 return NULL;
1534 }
Tim Petersdea48ec2001-05-22 20:40:22 +00001535 ok = (mp->ma_lookup)(mp, key, hash)->me_value != NULL;
Guido van Rossum77f6a652002-04-03 22:41:51 +00001536 return PyBool_FromLong(ok);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001537}
1538
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001539static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001540dict_get(register dictobject *mp, PyObject *args)
Barry Warsawc38c5da1997-10-06 17:49:20 +00001541{
1542 PyObject *key;
Barry Warsaw320ac331997-10-20 17:26:25 +00001543 PyObject *failobj = Py_None;
Barry Warsawc38c5da1997-10-06 17:49:20 +00001544 PyObject *val = NULL;
1545 long hash;
1546
Raymond Hettingerea3fdf42002-12-29 16:33:45 +00001547 if (!PyArg_UnpackTuple(args, "get", 1, 2, &key, &failobj))
Barry Warsawc38c5da1997-10-06 17:49:20 +00001548 return NULL;
1549
Tim Peters0ab085c2001-09-14 00:25:33 +00001550 if (!PyString_CheckExact(key) ||
Tim Peters1f7df352002-03-29 03:29:08 +00001551 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
Barry Warsawc38c5da1997-10-06 17:49:20 +00001552 hash = PyObject_Hash(key);
1553 if (hash == -1)
1554 return NULL;
1555 }
Fred Drake1bff34a2000-08-31 19:31:38 +00001556 val = (mp->ma_lookup)(mp, key, hash)->me_value;
Barry Warsaw320ac331997-10-20 17:26:25 +00001557
Barry Warsawc38c5da1997-10-06 17:49:20 +00001558 if (val == NULL)
1559 val = failobj;
1560 Py_INCREF(val);
1561 return val;
1562}
1563
1564
1565static PyObject *
Guido van Rossum164452c2000-08-08 16:12:54 +00001566dict_setdefault(register dictobject *mp, PyObject *args)
1567{
1568 PyObject *key;
1569 PyObject *failobj = Py_None;
1570 PyObject *val = NULL;
1571 long hash;
1572
Raymond Hettingerea3fdf42002-12-29 16:33:45 +00001573 if (!PyArg_UnpackTuple(args, "setdefault", 1, 2, &key, &failobj))
Guido van Rossum164452c2000-08-08 16:12:54 +00001574 return NULL;
Guido van Rossum164452c2000-08-08 16:12:54 +00001575
Tim Peters0ab085c2001-09-14 00:25:33 +00001576 if (!PyString_CheckExact(key) ||
Tim Peters1f7df352002-03-29 03:29:08 +00001577 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
Guido van Rossum164452c2000-08-08 16:12:54 +00001578 hash = PyObject_Hash(key);
1579 if (hash == -1)
1580 return NULL;
1581 }
Fred Drake1bff34a2000-08-31 19:31:38 +00001582 val = (mp->ma_lookup)(mp, key, hash)->me_value;
Guido van Rossum164452c2000-08-08 16:12:54 +00001583 if (val == NULL) {
1584 val = failobj;
1585 if (PyDict_SetItem((PyObject*)mp, key, failobj))
1586 val = NULL;
1587 }
1588 Py_XINCREF(val);
1589 return val;
1590}
1591
1592
1593static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001594dict_clear(register dictobject *mp)
Guido van Rossumfb8f1ca1997-03-21 21:55:12 +00001595{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001596 PyDict_Clear((PyObject *)mp);
Raymond Hettinger7892b1c2004-04-12 18:10:01 +00001597 Py_RETURN_NONE;
Guido van Rossumfb8f1ca1997-03-21 21:55:12 +00001598}
1599
Guido van Rossumba6ab842000-12-12 22:02:18 +00001600static PyObject *
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001601dict_pop(dictobject *mp, PyObject *args)
Guido van Rossume027d982002-04-12 15:11:59 +00001602{
1603 long hash;
1604 dictentry *ep;
1605 PyObject *old_value, *old_key;
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001606 PyObject *key, *deflt = NULL;
Guido van Rossume027d982002-04-12 15:11:59 +00001607
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001608 if(!PyArg_UnpackTuple(args, "pop", 1, 2, &key, &deflt))
1609 return NULL;
Guido van Rossume027d982002-04-12 15:11:59 +00001610 if (mp->ma_used == 0) {
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001611 if (deflt) {
1612 Py_INCREF(deflt);
1613 return deflt;
1614 }
Guido van Rossume027d982002-04-12 15:11:59 +00001615 PyErr_SetString(PyExc_KeyError,
1616 "pop(): dictionary is empty");
1617 return NULL;
1618 }
1619 if (!PyString_CheckExact(key) ||
1620 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
1621 hash = PyObject_Hash(key);
1622 if (hash == -1)
1623 return NULL;
1624 }
1625 ep = (mp->ma_lookup)(mp, key, hash);
1626 if (ep->me_value == NULL) {
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001627 if (deflt) {
1628 Py_INCREF(deflt);
1629 return deflt;
1630 }
Guido van Rossume027d982002-04-12 15:11:59 +00001631 PyErr_SetObject(PyExc_KeyError, key);
1632 return NULL;
1633 }
1634 old_key = ep->me_key;
1635 Py_INCREF(dummy);
1636 ep->me_key = dummy;
1637 old_value = ep->me_value;
1638 ep->me_value = NULL;
1639 mp->ma_used--;
1640 Py_DECREF(old_key);
1641 return old_value;
1642}
1643
1644static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001645dict_popitem(dictobject *mp)
Guido van Rossumba6ab842000-12-12 22:02:18 +00001646{
1647 int i = 0;
1648 dictentry *ep;
1649 PyObject *res;
1650
Tim Petersf4b33f62001-06-02 05:42:29 +00001651 /* Allocate the result tuple before checking the size. Believe it
1652 * or not, this allocation could trigger a garbage collection which
1653 * could empty the dict, so if we checked the size first and that
1654 * happened, the result would be an infinite loop (searching for an
1655 * entry that no longer exists). Note that the usual popitem()
1656 * idiom is "while d: k, v = d.popitem()". so needing to throw the
1657 * tuple away if the dict *is* empty isn't a significant
1658 * inefficiency -- possible, but unlikely in practice.
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001659 */
1660 res = PyTuple_New(2);
1661 if (res == NULL)
1662 return NULL;
Guido van Rossume04eaec2001-04-16 00:02:32 +00001663 if (mp->ma_used == 0) {
1664 Py_DECREF(res);
1665 PyErr_SetString(PyExc_KeyError,
1666 "popitem(): dictionary is empty");
1667 return NULL;
1668 }
Guido van Rossumba6ab842000-12-12 22:02:18 +00001669 /* Set ep to "the first" dict entry with a value. We abuse the hash
1670 * field of slot 0 to hold a search finger:
1671 * If slot 0 has a value, use slot 0.
1672 * Else slot 0 is being used to hold a search finger,
1673 * and we use its hash value as the first index to look.
1674 */
1675 ep = &mp->ma_table[0];
1676 if (ep->me_value == NULL) {
1677 i = (int)ep->me_hash;
Tim Petersdea48ec2001-05-22 20:40:22 +00001678 /* The hash field may be a real hash value, or it may be a
1679 * legit search finger, or it may be a once-legit search
1680 * finger that's out of bounds now because it wrapped around
1681 * or the table shrunk -- simply make sure it's in bounds now.
Guido van Rossumba6ab842000-12-12 22:02:18 +00001682 */
Tim Petersafb6ae82001-06-04 21:00:21 +00001683 if (i > mp->ma_mask || i < 1)
Guido van Rossumba6ab842000-12-12 22:02:18 +00001684 i = 1; /* skip slot 0 */
1685 while ((ep = &mp->ma_table[i])->me_value == NULL) {
1686 i++;
Tim Petersafb6ae82001-06-04 21:00:21 +00001687 if (i > mp->ma_mask)
Guido van Rossumba6ab842000-12-12 22:02:18 +00001688 i = 1;
1689 }
1690 }
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001691 PyTuple_SET_ITEM(res, 0, ep->me_key);
1692 PyTuple_SET_ITEM(res, 1, ep->me_value);
1693 Py_INCREF(dummy);
1694 ep->me_key = dummy;
1695 ep->me_value = NULL;
1696 mp->ma_used--;
1697 assert(mp->ma_table[0].me_value == NULL);
1698 mp->ma_table[0].me_hash = i + 1; /* next place to start */
Guido van Rossumba6ab842000-12-12 22:02:18 +00001699 return res;
1700}
1701
Jeremy Hylton8caad492000-06-23 14:18:11 +00001702static int
1703dict_traverse(PyObject *op, visitproc visit, void *arg)
1704{
1705 int i = 0, err;
1706 PyObject *pk;
1707 PyObject *pv;
1708
1709 while (PyDict_Next(op, &i, &pk, &pv)) {
1710 err = visit(pk, arg);
1711 if (err)
1712 return err;
1713 err = visit(pv, arg);
1714 if (err)
1715 return err;
1716 }
1717 return 0;
1718}
1719
1720static int
1721dict_tp_clear(PyObject *op)
1722{
1723 PyDict_Clear(op);
1724 return 0;
1725}
1726
Tim Petersf7f88b12000-12-13 23:18:45 +00001727
Raymond Hettinger019a1482004-03-18 02:41:19 +00001728extern PyTypeObject PyDictIterKey_Type; /* Forward */
1729extern PyTypeObject PyDictIterValue_Type; /* Forward */
1730extern PyTypeObject PyDictIterItem_Type; /* Forward */
1731static PyObject *dictiter_new(dictobject *, PyTypeObject *);
Guido van Rossum09e563a2001-05-01 12:10:21 +00001732
1733static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001734dict_iterkeys(dictobject *dict)
Guido van Rossum09e563a2001-05-01 12:10:21 +00001735{
Raymond Hettinger019a1482004-03-18 02:41:19 +00001736 return dictiter_new(dict, &PyDictIterKey_Type);
Guido van Rossum09e563a2001-05-01 12:10:21 +00001737}
1738
1739static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001740dict_itervalues(dictobject *dict)
Guido van Rossum09e563a2001-05-01 12:10:21 +00001741{
Raymond Hettinger019a1482004-03-18 02:41:19 +00001742 return dictiter_new(dict, &PyDictIterValue_Type);
Guido van Rossum09e563a2001-05-01 12:10:21 +00001743}
1744
1745static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001746dict_iteritems(dictobject *dict)
Guido van Rossum09e563a2001-05-01 12:10:21 +00001747{
Raymond Hettinger019a1482004-03-18 02:41:19 +00001748 return dictiter_new(dict, &PyDictIterItem_Type);
Guido van Rossum09e563a2001-05-01 12:10:21 +00001749}
1750
1751
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001752PyDoc_STRVAR(has_key__doc__,
Raymond Hettinger574aa322003-09-01 22:12:08 +00001753"D.has_key(k) -> True if D has a key k, else False");
Tim Petersf7f88b12000-12-13 23:18:45 +00001754
Raymond Hettinger8f5cdaa2003-12-13 11:26:12 +00001755PyDoc_STRVAR(contains__doc__,
1756"D.__contains__(k) -> True if D has a key k, else False");
1757
1758PyDoc_STRVAR(getitem__doc__, "x.__getitem__(y) <==> x[y]");
1759
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001760PyDoc_STRVAR(get__doc__,
Guido van Rossumefae8862002-09-04 11:29:45 +00001761"D.get(k[,d]) -> D[k] if k in D, else d. d defaults to None.");
Tim Petersf7f88b12000-12-13 23:18:45 +00001762
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001763PyDoc_STRVAR(setdefault_doc__,
Guido van Rossumefae8862002-09-04 11:29:45 +00001764"D.setdefault(k[,d]) -> D.get(k,d), also set D[k]=d if k not in D");
Tim Petersf7f88b12000-12-13 23:18:45 +00001765
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001766PyDoc_STRVAR(pop__doc__,
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001767"D.pop(k[,d]) -> v, remove specified key and return the corresponding value\n\
1768If key is not found, d is returned if given, otherwise KeyError is raised");
Guido van Rossume027d982002-04-12 15:11:59 +00001769
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001770PyDoc_STRVAR(popitem__doc__,
Tim Petersf7f88b12000-12-13 23:18:45 +00001771"D.popitem() -> (k, v), remove and return some (key, value) pair as a\n\
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +000017722-tuple; but raise KeyError if D is empty");
Tim Petersf7f88b12000-12-13 23:18:45 +00001773
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001774PyDoc_STRVAR(keys__doc__,
1775"D.keys() -> list of D's keys");
Tim Petersf7f88b12000-12-13 23:18:45 +00001776
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001777PyDoc_STRVAR(items__doc__,
1778"D.items() -> list of D's (key, value) pairs, as 2-tuples");
Tim Petersf7f88b12000-12-13 23:18:45 +00001779
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001780PyDoc_STRVAR(values__doc__,
1781"D.values() -> list of D's values");
Tim Petersf7f88b12000-12-13 23:18:45 +00001782
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001783PyDoc_STRVAR(update__doc__,
Walter Dörwaldd70ad8a2004-05-28 20:59:21 +00001784"D.update(E, **F) -> None. Update D from E and F: for k in E: D[k] = E[k]\n\
1785(if E has keys else: for (k, v) in E: D[k] = v) then: for k in F: D[k] = F[k]");
Tim Petersf7f88b12000-12-13 23:18:45 +00001786
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001787PyDoc_STRVAR(fromkeys__doc__,
1788"dict.fromkeys(S[,v]) -> New dict with keys from S and values equal to v.\n\
1789v defaults to None.");
1790
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001791PyDoc_STRVAR(clear__doc__,
1792"D.clear() -> None. Remove all items from D.");
Tim Petersf7f88b12000-12-13 23:18:45 +00001793
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001794PyDoc_STRVAR(copy__doc__,
1795"D.copy() -> a shallow copy of D");
Tim Petersf7f88b12000-12-13 23:18:45 +00001796
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001797PyDoc_STRVAR(iterkeys__doc__,
1798"D.iterkeys() -> an iterator over the keys of D");
Guido van Rossum09e563a2001-05-01 12:10:21 +00001799
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001800PyDoc_STRVAR(itervalues__doc__,
1801"D.itervalues() -> an iterator over the values of D");
Guido van Rossum09e563a2001-05-01 12:10:21 +00001802
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001803PyDoc_STRVAR(iteritems__doc__,
1804"D.iteritems() -> an iterator over the (key, value) items of D");
Guido van Rossum09e563a2001-05-01 12:10:21 +00001805
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001806static PyMethodDef mapp_methods[] = {
Raymond Hettinger8f5cdaa2003-12-13 11:26:12 +00001807 {"__contains__",(PyCFunction)dict_has_key, METH_O | METH_COEXIST,
1808 contains__doc__},
Raymond Hettinger0c669672003-12-13 13:31:55 +00001809 {"__getitem__", (PyCFunction)dict_subscript, METH_O | METH_COEXIST,
Raymond Hettinger8f5cdaa2003-12-13 11:26:12 +00001810 getitem__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001811 {"has_key", (PyCFunction)dict_has_key, METH_O,
Tim Petersf7f88b12000-12-13 23:18:45 +00001812 has_key__doc__},
1813 {"get", (PyCFunction)dict_get, METH_VARARGS,
1814 get__doc__},
1815 {"setdefault", (PyCFunction)dict_setdefault, METH_VARARGS,
1816 setdefault_doc__},
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001817 {"pop", (PyCFunction)dict_pop, METH_VARARGS,
Just van Rossuma797d812002-11-23 09:45:04 +00001818 pop__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001819 {"popitem", (PyCFunction)dict_popitem, METH_NOARGS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001820 popitem__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001821 {"keys", (PyCFunction)dict_keys, METH_NOARGS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001822 keys__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001823 {"items", (PyCFunction)dict_items, METH_NOARGS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001824 items__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001825 {"values", (PyCFunction)dict_values, METH_NOARGS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001826 values__doc__},
Raymond Hettinger31017ae2004-03-04 08:25:44 +00001827 {"update", (PyCFunction)dict_update, METH_VARARGS | METH_KEYWORDS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001828 update__doc__},
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001829 {"fromkeys", (PyCFunction)dict_fromkeys, METH_VARARGS | METH_CLASS,
1830 fromkeys__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001831 {"clear", (PyCFunction)dict_clear, METH_NOARGS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001832 clear__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001833 {"copy", (PyCFunction)dict_copy, METH_NOARGS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001834 copy__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001835 {"iterkeys", (PyCFunction)dict_iterkeys, METH_NOARGS,
Guido van Rossum09e563a2001-05-01 12:10:21 +00001836 iterkeys__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001837 {"itervalues", (PyCFunction)dict_itervalues, METH_NOARGS,
Guido van Rossum09e563a2001-05-01 12:10:21 +00001838 itervalues__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001839 {"iteritems", (PyCFunction)dict_iteritems, METH_NOARGS,
Guido van Rossum09e563a2001-05-01 12:10:21 +00001840 iteritems__doc__},
Tim Petersf7f88b12000-12-13 23:18:45 +00001841 {NULL, NULL} /* sentinel */
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001842};
1843
Raymond Hettingerbc0f2ab2003-11-25 21:12:14 +00001844int
1845PyDict_Contains(PyObject *op, PyObject *key)
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001846{
1847 long hash;
Raymond Hettingerbc0f2ab2003-11-25 21:12:14 +00001848 dictobject *mp = (dictobject *)op;
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001849
Tim Peters0ab085c2001-09-14 00:25:33 +00001850 if (!PyString_CheckExact(key) ||
Tim Peters1f7df352002-03-29 03:29:08 +00001851 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001852 hash = PyObject_Hash(key);
1853 if (hash == -1)
1854 return -1;
1855 }
Tim Petersdea48ec2001-05-22 20:40:22 +00001856 return (mp->ma_lookup)(mp, key, hash)->me_value != NULL;
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001857}
1858
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001859/* Hack to implement "key in dict" */
1860static PySequenceMethods dict_as_sequence = {
1861 0, /* sq_length */
1862 0, /* sq_concat */
1863 0, /* sq_repeat */
1864 0, /* sq_item */
1865 0, /* sq_slice */
1866 0, /* sq_ass_item */
1867 0, /* sq_ass_slice */
Raymond Hettingerbc0f2ab2003-11-25 21:12:14 +00001868 (objobjproc)PyDict_Contains, /* sq_contains */
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001869 0, /* sq_inplace_concat */
1870 0, /* sq_inplace_repeat */
1871};
1872
Guido van Rossum09e563a2001-05-01 12:10:21 +00001873static PyObject *
Tim Peters6d6c1a32001-08-02 04:15:00 +00001874dict_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
1875{
1876 PyObject *self;
1877
1878 assert(type != NULL && type->tp_alloc != NULL);
1879 self = type->tp_alloc(type, 0);
1880 if (self != NULL) {
1881 PyDictObject *d = (PyDictObject *)self;
1882 /* It's guaranteed that tp->alloc zeroed out the struct. */
1883 assert(d->ma_table == NULL && d->ma_fill == 0 && d->ma_used == 0);
1884 INIT_NONZERO_DICT_SLOTS(d);
1885 d->ma_lookup = lookdict_string;
1886#ifdef SHOW_CONVERSION_COUNTS
1887 ++created;
1888#endif
1889 }
1890 return self;
1891}
1892
Tim Peters25786c02001-09-02 08:22:48 +00001893static int
1894dict_init(PyObject *self, PyObject *args, PyObject *kwds)
1895{
Raymond Hettinger31017ae2004-03-04 08:25:44 +00001896 return dict_update_common(self, args, kwds, "dict");
Tim Peters25786c02001-09-02 08:22:48 +00001897}
1898
Guido van Rossumdbb53d92001-12-03 16:32:18 +00001899static long
1900dict_nohash(PyObject *self)
1901{
1902 PyErr_SetString(PyExc_TypeError, "dict objects are unhashable");
1903 return -1;
1904}
1905
Tim Peters6d6c1a32001-08-02 04:15:00 +00001906static PyObject *
Guido van Rossum09e563a2001-05-01 12:10:21 +00001907dict_iter(dictobject *dict)
1908{
Raymond Hettinger019a1482004-03-18 02:41:19 +00001909 return dictiter_new(dict, &PyDictIterKey_Type);
Guido van Rossum09e563a2001-05-01 12:10:21 +00001910}
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00001911
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001912PyDoc_STRVAR(dictionary_doc,
Tim Petersa427a2b2001-10-29 22:25:45 +00001913"dict() -> new empty dictionary.\n"
1914"dict(mapping) -> new dictionary initialized from a mapping object's\n"
Tim Peters1fc240e2001-10-26 05:06:50 +00001915" (key, value) pairs.\n"
Tim Petersa427a2b2001-10-29 22:25:45 +00001916"dict(seq) -> new dictionary initialized as if via:\n"
Tim Peters4d859532001-10-27 18:27:48 +00001917" d = {}\n"
1918" for k, v in seq:\n"
Just van Rossuma797d812002-11-23 09:45:04 +00001919" d[k] = v\n"
1920"dict(**kwargs) -> new dictionary initialized with the name=value pairs\n"
1921" in the keyword argument list. For example: dict(one=1, two=2)");
Tim Peters25786c02001-09-02 08:22:48 +00001922
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001923PyTypeObject PyDict_Type = {
1924 PyObject_HEAD_INIT(&PyType_Type)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001925 0,
Tim Petersa427a2b2001-10-29 22:25:45 +00001926 "dict",
Neil Schemenauere83c00e2001-08-29 23:54:21 +00001927 sizeof(dictobject),
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001928 0,
Guido van Rossumb9324202001-01-18 00:39:02 +00001929 (destructor)dict_dealloc, /* tp_dealloc */
1930 (printfunc)dict_print, /* tp_print */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001931 0, /* tp_getattr */
Guido van Rossumb9324202001-01-18 00:39:02 +00001932 0, /* tp_setattr */
Tim Peters4fa58bf2001-05-10 21:45:19 +00001933 (cmpfunc)dict_compare, /* tp_compare */
Guido van Rossumb9324202001-01-18 00:39:02 +00001934 (reprfunc)dict_repr, /* tp_repr */
1935 0, /* tp_as_number */
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001936 &dict_as_sequence, /* tp_as_sequence */
Guido van Rossumb9324202001-01-18 00:39:02 +00001937 &dict_as_mapping, /* tp_as_mapping */
Guido van Rossumdbb53d92001-12-03 16:32:18 +00001938 dict_nohash, /* tp_hash */
Guido van Rossumb9324202001-01-18 00:39:02 +00001939 0, /* tp_call */
1940 0, /* tp_str */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001941 PyObject_GenericGetAttr, /* tp_getattro */
Guido van Rossumb9324202001-01-18 00:39:02 +00001942 0, /* tp_setattro */
1943 0, /* tp_as_buffer */
Neil Schemenauere83c00e2001-08-29 23:54:21 +00001944 Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
Tim Peters6d6c1a32001-08-02 04:15:00 +00001945 Py_TPFLAGS_BASETYPE, /* tp_flags */
Tim Peters25786c02001-09-02 08:22:48 +00001946 dictionary_doc, /* tp_doc */
Guido van Rossumb9324202001-01-18 00:39:02 +00001947 (traverseproc)dict_traverse, /* tp_traverse */
1948 (inquiry)dict_tp_clear, /* tp_clear */
Tim Peterse63415e2001-05-08 04:38:29 +00001949 dict_richcompare, /* tp_richcompare */
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00001950 0, /* tp_weaklistoffset */
Guido van Rossum09e563a2001-05-01 12:10:21 +00001951 (getiterfunc)dict_iter, /* tp_iter */
Guido van Rossum213c7a62001-04-23 14:08:49 +00001952 0, /* tp_iternext */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001953 mapp_methods, /* tp_methods */
1954 0, /* tp_members */
1955 0, /* tp_getset */
1956 0, /* tp_base */
1957 0, /* tp_dict */
1958 0, /* tp_descr_get */
1959 0, /* tp_descr_set */
1960 0, /* tp_dictoffset */
Tim Peters25786c02001-09-02 08:22:48 +00001961 (initproc)dict_init, /* tp_init */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001962 PyType_GenericAlloc, /* tp_alloc */
1963 dict_new, /* tp_new */
Neil Schemenauer6189b892002-04-12 02:43:00 +00001964 PyObject_GC_Del, /* tp_free */
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001965};
1966
Guido van Rossum3cca2451997-05-16 14:23:33 +00001967/* For backward compatibility with old dictionary interface */
1968
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001969PyObject *
Martin v. Löwis32b4a1b2002-12-11 13:21:12 +00001970PyDict_GetItemString(PyObject *v, const char *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001971{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001972 PyObject *kv, *rv;
1973 kv = PyString_FromString(key);
1974 if (kv == NULL)
1975 return NULL;
Guido van Rossum3cca2451997-05-16 14:23:33 +00001976 rv = PyDict_GetItem(v, kv);
1977 Py_DECREF(kv);
1978 return rv;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001979}
1980
1981int
Martin v. Löwis32b4a1b2002-12-11 13:21:12 +00001982PyDict_SetItemString(PyObject *v, const char *key, PyObject *item)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001983{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001984 PyObject *kv;
1985 int err;
1986 kv = PyString_FromString(key);
1987 if (kv == NULL)
Guido van Rossum037b2201997-05-20 18:35:19 +00001988 return -1;
Guido van Rossum4f3bf1e1997-09-29 23:31:11 +00001989 PyString_InternInPlace(&kv); /* XXX Should we really? */
Guido van Rossum3cca2451997-05-16 14:23:33 +00001990 err = PyDict_SetItem(v, kv, item);
1991 Py_DECREF(kv);
1992 return err;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001993}
1994
1995int
Martin v. Löwis32b4a1b2002-12-11 13:21:12 +00001996PyDict_DelItemString(PyObject *v, const char *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001997{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001998 PyObject *kv;
1999 int err;
2000 kv = PyString_FromString(key);
2001 if (kv == NULL)
Guido van Rossum037b2201997-05-20 18:35:19 +00002002 return -1;
Guido van Rossum3cca2451997-05-16 14:23:33 +00002003 err = PyDict_DelItem(v, kv);
2004 Py_DECREF(kv);
2005 return err;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00002006}
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002007
Raymond Hettinger019a1482004-03-18 02:41:19 +00002008/* Dictionary iterator types */
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002009
2010typedef struct {
2011 PyObject_HEAD
Guido van Rossum2147df72002-07-16 20:30:22 +00002012 dictobject *di_dict; /* Set to NULL when iterator is exhausted */
Guido van Rossumb1f35bf2001-05-02 15:13:44 +00002013 int di_used;
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002014 int di_pos;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002015 PyObject* di_result; /* reusable result tuple for iteritems */
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002016 long len;
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002017} dictiterobject;
2018
2019static PyObject *
Raymond Hettinger019a1482004-03-18 02:41:19 +00002020dictiter_new(dictobject *dict, PyTypeObject *itertype)
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002021{
2022 dictiterobject *di;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002023 di = PyObject_New(dictiterobject, itertype);
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002024 if (di == NULL)
2025 return NULL;
2026 Py_INCREF(dict);
2027 di->di_dict = dict;
Guido van Rossumb1f35bf2001-05-02 15:13:44 +00002028 di->di_used = dict->ma_used;
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002029 di->di_pos = 0;
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002030 di->len = dict->ma_used;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002031 if (itertype == &PyDictIterItem_Type) {
2032 di->di_result = PyTuple_Pack(2, Py_None, Py_None);
2033 if (di->di_result == NULL) {
2034 Py_DECREF(di);
2035 return NULL;
2036 }
2037 }
2038 else
2039 di->di_result = NULL;
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002040 return (PyObject *)di;
2041}
2042
2043static void
2044dictiter_dealloc(dictiterobject *di)
2045{
Guido van Rossum2147df72002-07-16 20:30:22 +00002046 Py_XDECREF(di->di_dict);
Raymond Hettinger019a1482004-03-18 02:41:19 +00002047 Py_XDECREF(di->di_result);
Neil Schemenauer6189b892002-04-12 02:43:00 +00002048 PyObject_Del(di);
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002049}
2050
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002051static int
2052dictiter_len(dictiterobject *di)
2053{
Raymond Hettinger7892b1c2004-04-12 18:10:01 +00002054 if (di->di_dict != NULL && di->di_used == di->di_dict->ma_used)
2055 return di->len;
2056 return 0;
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002057}
2058
2059static PySequenceMethods dictiter_as_sequence = {
2060 (inquiry)dictiter_len, /* sq_length */
2061 0, /* sq_concat */
2062};
2063
Raymond Hettinger019a1482004-03-18 02:41:19 +00002064static PyObject *dictiter_iternextkey(dictiterobject *di)
Guido van Rossum213c7a62001-04-23 14:08:49 +00002065{
Raymond Hettinger019a1482004-03-18 02:41:19 +00002066 PyObject *key;
2067 register int i, mask;
2068 register dictentry *ep;
2069 dictobject *d = di->di_dict;
Guido van Rossum213c7a62001-04-23 14:08:49 +00002070
Raymond Hettinger019a1482004-03-18 02:41:19 +00002071 if (d == NULL)
Guido van Rossum2147df72002-07-16 20:30:22 +00002072 return NULL;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002073 assert (PyDict_Check(d));
Guido van Rossum2147df72002-07-16 20:30:22 +00002074
Raymond Hettinger019a1482004-03-18 02:41:19 +00002075 if (di->di_used != d->ma_used) {
Guido van Rossum213c7a62001-04-23 14:08:49 +00002076 PyErr_SetString(PyExc_RuntimeError,
2077 "dictionary changed size during iteration");
Guido van Rossum2147df72002-07-16 20:30:22 +00002078 di->di_used = -1; /* Make this state sticky */
Guido van Rossum213c7a62001-04-23 14:08:49 +00002079 return NULL;
2080 }
Guido van Rossum2147df72002-07-16 20:30:22 +00002081
Raymond Hettinger019a1482004-03-18 02:41:19 +00002082 i = di->di_pos;
2083 if (i < 0)
2084 goto fail;
2085 ep = d->ma_table;
2086 mask = d->ma_mask;
2087 while (i <= mask && ep[i].me_value == NULL)
2088 i++;
2089 di->di_pos = i+1;
2090 if (i > mask)
2091 goto fail;
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002092 di->len--;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002093 key = ep[i].me_key;
2094 Py_INCREF(key);
2095 return key;
2096
2097fail:
2098 Py_DECREF(d);
Guido van Rossum2147df72002-07-16 20:30:22 +00002099 di->di_dict = NULL;
Guido van Rossum213c7a62001-04-23 14:08:49 +00002100 return NULL;
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002101}
2102
Raymond Hettinger019a1482004-03-18 02:41:19 +00002103PyTypeObject PyDictIterKey_Type = {
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002104 PyObject_HEAD_INIT(&PyType_Type)
2105 0, /* ob_size */
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002106 "dictionary-keyiterator", /* tp_name */
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002107 sizeof(dictiterobject), /* tp_basicsize */
2108 0, /* tp_itemsize */
2109 /* methods */
2110 (destructor)dictiter_dealloc, /* tp_dealloc */
2111 0, /* tp_print */
Tim Peters6d6c1a32001-08-02 04:15:00 +00002112 0, /* tp_getattr */
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002113 0, /* tp_setattr */
2114 0, /* tp_compare */
2115 0, /* tp_repr */
2116 0, /* tp_as_number */
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002117 &dictiter_as_sequence, /* tp_as_sequence */
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002118 0, /* tp_as_mapping */
2119 0, /* tp_hash */
2120 0, /* tp_call */
2121 0, /* tp_str */
Tim Peters6d6c1a32001-08-02 04:15:00 +00002122 PyObject_GenericGetAttr, /* tp_getattro */
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002123 0, /* tp_setattro */
2124 0, /* tp_as_buffer */
2125 Py_TPFLAGS_DEFAULT, /* tp_flags */
2126 0, /* tp_doc */
2127 0, /* tp_traverse */
2128 0, /* tp_clear */
2129 0, /* tp_richcompare */
2130 0, /* tp_weaklistoffset */
Raymond Hettinger1da1dbf2003-03-17 19:46:11 +00002131 PyObject_SelfIter, /* tp_iter */
Raymond Hettinger019a1482004-03-18 02:41:19 +00002132 (iternextfunc)dictiter_iternextkey, /* tp_iternext */
2133};
2134
2135static PyObject *dictiter_iternextvalue(dictiterobject *di)
2136{
2137 PyObject *value;
2138 register int i, mask;
2139 register dictentry *ep;
2140 dictobject *d = di->di_dict;
2141
2142 if (d == NULL)
2143 return NULL;
2144 assert (PyDict_Check(d));
2145
2146 if (di->di_used != d->ma_used) {
2147 PyErr_SetString(PyExc_RuntimeError,
2148 "dictionary changed size during iteration");
2149 di->di_used = -1; /* Make this state sticky */
2150 return NULL;
2151 }
2152
2153 i = di->di_pos;
Guido van Rossum09240f62004-03-20 19:11:58 +00002154 mask = d->ma_mask;
2155 if (i < 0 || i > mask)
Raymond Hettinger019a1482004-03-18 02:41:19 +00002156 goto fail;
2157 ep = d->ma_table;
Guido van Rossum09240f62004-03-20 19:11:58 +00002158 while ((value=ep[i].me_value) == NULL) {
Raymond Hettinger019a1482004-03-18 02:41:19 +00002159 i++;
Guido van Rossum09240f62004-03-20 19:11:58 +00002160 if (i > mask)
2161 goto fail;
2162 }
Raymond Hettinger019a1482004-03-18 02:41:19 +00002163 di->di_pos = i+1;
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002164 di->len--;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002165 Py_INCREF(value);
2166 return value;
2167
2168fail:
2169 Py_DECREF(d);
2170 di->di_dict = NULL;
2171 return NULL;
2172}
2173
2174PyTypeObject PyDictIterValue_Type = {
2175 PyObject_HEAD_INIT(&PyType_Type)
2176 0, /* ob_size */
2177 "dictionary-valueiterator", /* tp_name */
2178 sizeof(dictiterobject), /* tp_basicsize */
2179 0, /* tp_itemsize */
2180 /* methods */
2181 (destructor)dictiter_dealloc, /* tp_dealloc */
2182 0, /* tp_print */
2183 0, /* tp_getattr */
2184 0, /* tp_setattr */
2185 0, /* tp_compare */
2186 0, /* tp_repr */
2187 0, /* tp_as_number */
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002188 &dictiter_as_sequence, /* tp_as_sequence */
Raymond Hettinger019a1482004-03-18 02:41:19 +00002189 0, /* tp_as_mapping */
2190 0, /* tp_hash */
2191 0, /* tp_call */
2192 0, /* tp_str */
2193 PyObject_GenericGetAttr, /* tp_getattro */
2194 0, /* tp_setattro */
2195 0, /* tp_as_buffer */
2196 Py_TPFLAGS_DEFAULT, /* tp_flags */
2197 0, /* tp_doc */
2198 0, /* tp_traverse */
2199 0, /* tp_clear */
2200 0, /* tp_richcompare */
2201 0, /* tp_weaklistoffset */
2202 PyObject_SelfIter, /* tp_iter */
2203 (iternextfunc)dictiter_iternextvalue, /* tp_iternext */
2204};
2205
2206static PyObject *dictiter_iternextitem(dictiterobject *di)
2207{
2208 PyObject *key, *value, *result = di->di_result;
2209 register int i, mask;
2210 register dictentry *ep;
2211 dictobject *d = di->di_dict;
2212
2213 if (d == NULL)
2214 return NULL;
2215 assert (PyDict_Check(d));
2216
2217 if (di->di_used != d->ma_used) {
2218 PyErr_SetString(PyExc_RuntimeError,
2219 "dictionary changed size during iteration");
2220 di->di_used = -1; /* Make this state sticky */
2221 return NULL;
2222 }
2223
2224 i = di->di_pos;
2225 if (i < 0)
2226 goto fail;
2227 ep = d->ma_table;
2228 mask = d->ma_mask;
2229 while (i <= mask && ep[i].me_value == NULL)
2230 i++;
2231 di->di_pos = i+1;
2232 if (i > mask)
2233 goto fail;
2234
2235 if (result->ob_refcnt == 1) {
2236 Py_INCREF(result);
2237 Py_DECREF(PyTuple_GET_ITEM(result, 0));
2238 Py_DECREF(PyTuple_GET_ITEM(result, 1));
2239 } else {
2240 result = PyTuple_New(2);
2241 if (result == NULL)
2242 return NULL;
2243 }
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002244 di->len--;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002245 key = ep[i].me_key;
2246 value = ep[i].me_value;
2247 Py_INCREF(key);
2248 Py_INCREF(value);
2249 PyTuple_SET_ITEM(result, 0, key);
2250 PyTuple_SET_ITEM(result, 1, value);
2251 return result;
2252
2253fail:
2254 Py_DECREF(d);
2255 di->di_dict = NULL;
2256 return NULL;
2257}
2258
2259PyTypeObject PyDictIterItem_Type = {
2260 PyObject_HEAD_INIT(&PyType_Type)
2261 0, /* ob_size */
2262 "dictionary-itemiterator", /* tp_name */
2263 sizeof(dictiterobject), /* tp_basicsize */
2264 0, /* tp_itemsize */
2265 /* methods */
2266 (destructor)dictiter_dealloc, /* tp_dealloc */
2267 0, /* tp_print */
2268 0, /* tp_getattr */
2269 0, /* tp_setattr */
2270 0, /* tp_compare */
2271 0, /* tp_repr */
2272 0, /* tp_as_number */
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002273 &dictiter_as_sequence, /* tp_as_sequence */
Raymond Hettinger019a1482004-03-18 02:41:19 +00002274 0, /* tp_as_mapping */
2275 0, /* tp_hash */
2276 0, /* tp_call */
2277 0, /* tp_str */
2278 PyObject_GenericGetAttr, /* tp_getattro */
2279 0, /* tp_setattro */
2280 0, /* tp_as_buffer */
2281 Py_TPFLAGS_DEFAULT, /* tp_flags */
2282 0, /* tp_doc */
2283 0, /* tp_traverse */
2284 0, /* tp_clear */
2285 0, /* tp_richcompare */
2286 0, /* tp_weaklistoffset */
2287 PyObject_SelfIter, /* tp_iter */
2288 (iternextfunc)dictiter_iternextitem, /* tp_iternext */
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002289};