blob: f5e532028629bbd191cc3d130be9a57490fc3e08 [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,
Tim Peters60b29962006-01-01 01:19:23 +00005 describing explorations into dictionary design and optimization.
Raymond Hettinger930427b2003-05-03 06:51:59 +00006 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 */
Raymond Hettingerf81e4502005-08-17 02:19:36 +0000116static PyObject *dummy = NULL; /* 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{
Martin v. Löwis18e16552006-02-15 17:27:45 +0000220 register Py_ssize_t i;
221 register size_t 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{
Martin v. Löwis18e16552006-02-15 17:27:45 +0000331 register Py_ssize_t i;
332 register size_t 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
Tim Peters60b29962006-01-01 01:19:23 +0000522 * dictionary if it's merely replacing the value for an existing key.
523 * This means that it's safe to loop over a dictionary with PyDict_Next()
524 * and occasionally replace a value -- but you can't insert new keys or
525 * remove them.
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000526 */
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
Tim Peters60b29962006-01-01 01:19:23 +0000557 * (if ma_fill is much larger than ma_used, meaning a lot of dict
Raymond Hettinger3539f6b2003-05-05 22:22:10 +0000558 * keys have been * deleted).
Tim Peters60b29962006-01-01 01:19:23 +0000559 *
Raymond Hettinger3539f6b2003-05-05 22:22:10 +0000560 * 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.
Tim Peters60b29962006-01-01 01:19:23 +0000564 *
565 * Very large dictionaries (over 50K items) use doubling instead.
Raymond Hettinger3539f6b2003-05-05 22:22:10 +0000566 * 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;
Raymond Hettingerf81e4502005-08-17 02:19:36 +0000570 return dictresize(mp, (mp->ma_used>50000 ? mp->ma_used*2 : mp->ma_used*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
Martin v. Löwis18e16552006-02-15 17:27:45 +0000693PyDict_Next(PyObject *op, Py_ssize_t *ppos, PyObject **pkey, PyObject **pvalue)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000694{
Martin v. Löwis18e16552006-02-15 17:27:45 +0000695 register Py_ssize_t i;
696 register int mask;
Raymond Hettinger43442782004-03-17 21:55:03 +0000697 register dictentry *ep;
698
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000699 if (!PyDict_Check(op))
Guido van Rossum25831651993-05-19 14:50:45 +0000700 return 0;
Guido van Rossum25831651993-05-19 14:50:45 +0000701 i = *ppos;
702 if (i < 0)
703 return 0;
Raymond Hettinger43442782004-03-17 21:55:03 +0000704 ep = ((dictobject *)op)->ma_table;
705 mask = ((dictobject *)op)->ma_mask;
706 while (i <= mask && ep[i].me_value == NULL)
Guido van Rossum25831651993-05-19 14:50:45 +0000707 i++;
708 *ppos = i+1;
Raymond Hettinger43442782004-03-17 21:55:03 +0000709 if (i > mask)
Guido van Rossum25831651993-05-19 14:50:45 +0000710 return 0;
711 if (pkey)
Raymond Hettinger43442782004-03-17 21:55:03 +0000712 *pkey = ep[i].me_key;
Guido van Rossum25831651993-05-19 14:50:45 +0000713 if (pvalue)
Raymond Hettinger43442782004-03-17 21:55:03 +0000714 *pvalue = ep[i].me_value;
Guido van Rossum25831651993-05-19 14:50:45 +0000715 return 1;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000716}
717
718/* Methods */
719
720static void
Tim Peters1f5871e2000-07-04 17:44:48 +0000721dict_dealloc(register dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000722{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000723 register dictentry *ep;
Tim Petersdea48ec2001-05-22 20:40:22 +0000724 int fill = mp->ma_fill;
Guido van Rossumff413af2002-03-28 20:34:59 +0000725 PyObject_GC_UnTrack(mp);
Guido van Rossumd724b232000-03-13 16:01:29 +0000726 Py_TRASHCAN_SAFE_BEGIN(mp)
Tim Petersdea48ec2001-05-22 20:40:22 +0000727 for (ep = mp->ma_table; fill > 0; ep++) {
728 if (ep->me_key) {
729 --fill;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000730 Py_DECREF(ep->me_key);
Tim Petersdea48ec2001-05-22 20:40:22 +0000731 Py_XDECREF(ep->me_value);
Guido van Rossum255443b1998-04-10 22:47:14 +0000732 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000733 }
Tim Petersdea48ec2001-05-22 20:40:22 +0000734 if (mp->ma_table != mp->ma_smalltable)
Guido van Rossumb18618d2000-05-03 23:44:39 +0000735 PyMem_DEL(mp->ma_table);
Raymond Hettinger43442782004-03-17 21:55:03 +0000736 if (num_free_dicts < MAXFREEDICTS && mp->ob_type == &PyDict_Type)
737 free_dicts[num_free_dicts++] = mp;
Tim Peters60b29962006-01-01 01:19:23 +0000738 else
Raymond Hettinger43442782004-03-17 21:55:03 +0000739 mp->ob_type->tp_free((PyObject *)mp);
Guido van Rossumd724b232000-03-13 16:01:29 +0000740 Py_TRASHCAN_SAFE_END(mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000741}
742
743static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000744dict_print(register dictobject *mp, register FILE *fp, register int flags)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000745{
746 register int i;
747 register int any;
Guido van Rossum255443b1998-04-10 22:47:14 +0000748
749 i = Py_ReprEnter((PyObject*)mp);
750 if (i != 0) {
751 if (i < 0)
752 return i;
753 fprintf(fp, "{...}");
754 return 0;
755 }
756
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000757 fprintf(fp, "{");
758 any = 0;
Tim Petersafb6ae82001-06-04 21:00:21 +0000759 for (i = 0; i <= mp->ma_mask; i++) {
Tim Peters23cf6be2001-06-02 08:02:56 +0000760 dictentry *ep = mp->ma_table + i;
761 PyObject *pvalue = ep->me_value;
762 if (pvalue != NULL) {
763 /* Prevent PyObject_Repr from deleting value during
764 key format */
765 Py_INCREF(pvalue);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000766 if (any++ > 0)
767 fprintf(fp, ", ");
Guido van Rossum255443b1998-04-10 22:47:14 +0000768 if (PyObject_Print((PyObject *)ep->me_key, fp, 0)!=0) {
Tim Peters23cf6be2001-06-02 08:02:56 +0000769 Py_DECREF(pvalue);
Guido van Rossum255443b1998-04-10 22:47:14 +0000770 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000771 return -1;
Guido van Rossum255443b1998-04-10 22:47:14 +0000772 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000773 fprintf(fp, ": ");
Tim Peters19b77cf2001-06-02 08:27:39 +0000774 if (PyObject_Print(pvalue, fp, 0) != 0) {
Tim Peters23cf6be2001-06-02 08:02:56 +0000775 Py_DECREF(pvalue);
Guido van Rossum255443b1998-04-10 22:47:14 +0000776 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000777 return -1;
Guido van Rossum255443b1998-04-10 22:47:14 +0000778 }
Tim Peters23cf6be2001-06-02 08:02:56 +0000779 Py_DECREF(pvalue);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000780 }
781 }
782 fprintf(fp, "}");
Guido van Rossum255443b1998-04-10 22:47:14 +0000783 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000784 return 0;
785}
786
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000787static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000788dict_repr(dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000789{
Martin v. Löwis18e16552006-02-15 17:27:45 +0000790 Py_ssize_t i;
Tim Petersa7259592001-06-16 05:11:17 +0000791 PyObject *s, *temp, *colon = NULL;
792 PyObject *pieces = NULL, *result = NULL;
793 PyObject *key, *value;
Guido van Rossum255443b1998-04-10 22:47:14 +0000794
Tim Petersa7259592001-06-16 05:11:17 +0000795 i = Py_ReprEnter((PyObject *)mp);
Guido van Rossum255443b1998-04-10 22:47:14 +0000796 if (i != 0) {
Tim Petersa7259592001-06-16 05:11:17 +0000797 return i > 0 ? PyString_FromString("{...}") : NULL;
Guido van Rossum255443b1998-04-10 22:47:14 +0000798 }
799
Tim Petersa7259592001-06-16 05:11:17 +0000800 if (mp->ma_used == 0) {
801 result = PyString_FromString("{}");
802 goto Done;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000803 }
Tim Petersa7259592001-06-16 05:11:17 +0000804
805 pieces = PyList_New(0);
806 if (pieces == NULL)
807 goto Done;
808
809 colon = PyString_FromString(": ");
810 if (colon == NULL)
811 goto Done;
812
813 /* Do repr() on each key+value pair, and insert ": " between them.
814 Note that repr may mutate the dict. */
Tim Petersc6057842001-06-16 07:52:53 +0000815 i = 0;
816 while (PyDict_Next((PyObject *)mp, &i, &key, &value)) {
Tim Petersa7259592001-06-16 05:11:17 +0000817 int status;
818 /* Prevent repr from deleting value during key format. */
819 Py_INCREF(value);
820 s = PyObject_Repr(key);
821 PyString_Concat(&s, colon);
822 PyString_ConcatAndDel(&s, PyObject_Repr(value));
823 Py_DECREF(value);
824 if (s == NULL)
825 goto Done;
826 status = PyList_Append(pieces, s);
827 Py_DECREF(s); /* append created a new ref */
828 if (status < 0)
829 goto Done;
830 }
831
832 /* Add "{}" decorations to the first and last items. */
833 assert(PyList_GET_SIZE(pieces) > 0);
834 s = PyString_FromString("{");
835 if (s == NULL)
836 goto Done;
837 temp = PyList_GET_ITEM(pieces, 0);
838 PyString_ConcatAndDel(&s, temp);
839 PyList_SET_ITEM(pieces, 0, s);
840 if (s == NULL)
841 goto Done;
842
843 s = PyString_FromString("}");
844 if (s == NULL)
845 goto Done;
846 temp = PyList_GET_ITEM(pieces, PyList_GET_SIZE(pieces) - 1);
847 PyString_ConcatAndDel(&temp, s);
848 PyList_SET_ITEM(pieces, PyList_GET_SIZE(pieces) - 1, temp);
849 if (temp == NULL)
850 goto Done;
851
852 /* Paste them all together with ", " between. */
853 s = PyString_FromString(", ");
854 if (s == NULL)
855 goto Done;
856 result = _PyString_Join(s, pieces);
Tim Peters0ab085c2001-09-14 00:25:33 +0000857 Py_DECREF(s);
Tim Petersa7259592001-06-16 05:11:17 +0000858
859Done:
860 Py_XDECREF(pieces);
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000861 Py_XDECREF(colon);
Tim Petersa7259592001-06-16 05:11:17 +0000862 Py_ReprLeave((PyObject *)mp);
863 return result;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000864}
865
Martin v. Löwis18e16552006-02-15 17:27:45 +0000866static Py_ssize_t
Tim Peters1f5871e2000-07-04 17:44:48 +0000867dict_length(dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000868{
869 return mp->ma_used;
870}
871
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000872static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000873dict_subscript(dictobject *mp, register PyObject *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000874{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000875 PyObject *v;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000876 long hash;
Tim Petersdea48ec2001-05-22 20:40:22 +0000877 assert(mp->ma_table != NULL);
Tim Peters0ab085c2001-09-14 00:25:33 +0000878 if (!PyString_CheckExact(key) ||
Tim Peters1f7df352002-03-29 03:29:08 +0000879 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000880 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +0000881 if (hash == -1)
882 return NULL;
883 }
Fred Drake1bff34a2000-08-31 19:31:38 +0000884 v = (mp->ma_lookup)(mp, key, hash) -> me_value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000885 if (v == NULL)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000886 PyErr_SetObject(PyExc_KeyError, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000887 else
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000888 Py_INCREF(v);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000889 return v;
890}
891
892static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000893dict_ass_sub(dictobject *mp, PyObject *v, PyObject *w)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000894{
895 if (w == NULL)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000896 return PyDict_DelItem((PyObject *)mp, v);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000897 else
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000898 return PyDict_SetItem((PyObject *)mp, v, w);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000899}
900
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000901static PyMappingMethods dict_as_mapping = {
Martin v. Löwis18e16552006-02-15 17:27:45 +0000902 (lenfunc)dict_length, /*mp_length*/
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000903 (binaryfunc)dict_subscript, /*mp_subscript*/
904 (objobjargproc)dict_ass_sub, /*mp_ass_subscript*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000905};
906
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000907static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +0000908dict_keys(register dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000909{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000910 register PyObject *v;
Raymond Hettinger43442782004-03-17 21:55:03 +0000911 register int i, j;
912 dictentry *ep;
913 int mask, n;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000914
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000915 again:
916 n = mp->ma_used;
917 v = PyList_New(n);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000918 if (v == NULL)
919 return NULL;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000920 if (n != mp->ma_used) {
921 /* Durnit. The allocations caused the dict to resize.
922 * Just start over, this shouldn't normally happen.
923 */
924 Py_DECREF(v);
925 goto again;
926 }
Raymond Hettinger43442782004-03-17 21:55:03 +0000927 ep = mp->ma_table;
928 mask = mp->ma_mask;
929 for (i = 0, j = 0; i <= mask; i++) {
930 if (ep[i].me_value != NULL) {
931 PyObject *key = ep[i].me_key;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000932 Py_INCREF(key);
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000933 PyList_SET_ITEM(v, j, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000934 j++;
935 }
936 }
Raymond Hettinger43442782004-03-17 21:55:03 +0000937 assert(j == n);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000938 return v;
939}
940
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000941static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +0000942dict_values(register dictobject *mp)
Guido van Rossum25831651993-05-19 14:50:45 +0000943{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000944 register PyObject *v;
Raymond Hettinger43442782004-03-17 21:55:03 +0000945 register int i, j;
946 dictentry *ep;
947 int mask, n;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000948
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000949 again:
950 n = mp->ma_used;
951 v = PyList_New(n);
Guido van Rossum25831651993-05-19 14:50:45 +0000952 if (v == NULL)
953 return NULL;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000954 if (n != mp->ma_used) {
955 /* Durnit. The allocations caused the dict to resize.
956 * Just start over, this shouldn't normally happen.
957 */
958 Py_DECREF(v);
959 goto again;
960 }
Raymond Hettinger43442782004-03-17 21:55:03 +0000961 ep = mp->ma_table;
962 mask = mp->ma_mask;
963 for (i = 0, j = 0; i <= mask; i++) {
964 if (ep[i].me_value != NULL) {
965 PyObject *value = ep[i].me_value;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000966 Py_INCREF(value);
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000967 PyList_SET_ITEM(v, j, value);
Guido van Rossum25831651993-05-19 14:50:45 +0000968 j++;
969 }
970 }
Raymond Hettinger43442782004-03-17 21:55:03 +0000971 assert(j == n);
Guido van Rossum25831651993-05-19 14:50:45 +0000972 return v;
973}
974
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000975static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +0000976dict_items(register dictobject *mp)
Guido van Rossum25831651993-05-19 14:50:45 +0000977{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000978 register PyObject *v;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000979 register int i, j, n;
Raymond Hettinger43442782004-03-17 21:55:03 +0000980 int mask;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000981 PyObject *item, *key, *value;
Raymond Hettinger43442782004-03-17 21:55:03 +0000982 dictentry *ep;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000983
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000984 /* Preallocate the list of tuples, to avoid allocations during
985 * the loop over the items, which could trigger GC, which
986 * could resize the dict. :-(
987 */
988 again:
989 n = mp->ma_used;
990 v = PyList_New(n);
Guido van Rossum25831651993-05-19 14:50:45 +0000991 if (v == NULL)
992 return NULL;
Guido van Rossuma4dd0112001-04-15 22:16:26 +0000993 for (i = 0; i < n; i++) {
994 item = PyTuple_New(2);
995 if (item == NULL) {
996 Py_DECREF(v);
997 return NULL;
998 }
999 PyList_SET_ITEM(v, i, item);
1000 }
1001 if (n != mp->ma_used) {
1002 /* Durnit. The allocations caused the dict to resize.
1003 * Just start over, this shouldn't normally happen.
1004 */
1005 Py_DECREF(v);
1006 goto again;
1007 }
1008 /* Nothing we do below makes any function calls. */
Raymond Hettinger43442782004-03-17 21:55:03 +00001009 ep = mp->ma_table;
1010 mask = mp->ma_mask;
1011 for (i = 0, j = 0; i <= mask; i++) {
Raymond Hettinger06905122004-03-19 10:30:00 +00001012 if ((value=ep[i].me_value) != NULL) {
Raymond Hettinger43442782004-03-17 21:55:03 +00001013 key = ep[i].me_key;
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001014 item = PyList_GET_ITEM(v, j);
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001015 Py_INCREF(key);
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001016 PyTuple_SET_ITEM(item, 0, key);
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001017 Py_INCREF(value);
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001018 PyTuple_SET_ITEM(item, 1, value);
Guido van Rossum25831651993-05-19 14:50:45 +00001019 j++;
1020 }
1021 }
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001022 assert(j == n);
Guido van Rossum25831651993-05-19 14:50:45 +00001023 return v;
1024}
1025
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001026static PyObject *
Tim Petersbca1cbc2002-12-09 22:56:13 +00001027dict_fromkeys(PyObject *cls, PyObject *args)
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001028{
1029 PyObject *seq;
1030 PyObject *value = Py_None;
1031 PyObject *it; /* iter(seq) */
1032 PyObject *key;
1033 PyObject *d;
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001034 int status;
1035
Raymond Hettingerea3fdf42002-12-29 16:33:45 +00001036 if (!PyArg_UnpackTuple(args, "fromkeys", 1, 2, &seq, &value))
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001037 return NULL;
1038
1039 d = PyObject_CallObject(cls, NULL);
1040 if (d == NULL)
1041 return NULL;
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001042
1043 it = PyObject_GetIter(seq);
1044 if (it == NULL){
1045 Py_DECREF(d);
1046 return NULL;
1047 }
1048
1049 for (;;) {
1050 key = PyIter_Next(it);
1051 if (key == NULL) {
1052 if (PyErr_Occurred())
1053 goto Fail;
1054 break;
1055 }
Raymond Hettingere03e5b12002-12-07 08:10:51 +00001056 status = PyObject_SetItem(d, key, value);
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001057 Py_DECREF(key);
1058 if (status < 0)
1059 goto Fail;
1060 }
1061
1062 Py_DECREF(it);
1063 return d;
1064
1065Fail:
1066 Py_DECREF(it);
1067 Py_DECREF(d);
1068 return NULL;
1069}
1070
Raymond Hettinger31017ae2004-03-04 08:25:44 +00001071static int
1072dict_update_common(PyObject *self, PyObject *args, PyObject *kwds, char *methname)
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001073{
Raymond Hettinger31017ae2004-03-04 08:25:44 +00001074 PyObject *arg = NULL;
1075 int result = 0;
1076
1077 if (!PyArg_UnpackTuple(args, methname, 0, 1, &arg))
1078 result = -1;
1079
1080 else if (arg != NULL) {
1081 if (PyObject_HasAttrString(arg, "keys"))
1082 result = PyDict_Merge(self, arg, 1);
1083 else
1084 result = PyDict_MergeFromSeq2(self, arg, 1);
1085 }
1086 if (result == 0 && kwds != NULL)
1087 result = PyDict_Merge(self, kwds, 1);
1088 return result;
1089}
1090
1091static PyObject *
1092dict_update(PyObject *self, PyObject *args, PyObject *kwds)
1093{
Raymond Hettinger7892b1c2004-04-12 18:10:01 +00001094 if (dict_update_common(self, args, kwds, "update") != -1)
1095 Py_RETURN_NONE;
1096 return NULL;
Tim Peters6d6c1a32001-08-02 04:15:00 +00001097}
1098
Guido van Rossum05ac6de2001-08-10 20:28:28 +00001099/* Update unconditionally replaces existing items.
1100 Merge has a 3rd argument 'override'; if set, it acts like Update,
Tim Peters1fc240e2001-10-26 05:06:50 +00001101 otherwise it leaves existing items unchanged.
1102
1103 PyDict_{Update,Merge} update/merge from a mapping object.
1104
Tim Petersf582b822001-12-11 18:51:08 +00001105 PyDict_MergeFromSeq2 updates/merges from any iterable object
Tim Peters1fc240e2001-10-26 05:06:50 +00001106 producing iterable objects of length 2.
1107*/
1108
Tim Petersf582b822001-12-11 18:51:08 +00001109int
Tim Peters1fc240e2001-10-26 05:06:50 +00001110PyDict_MergeFromSeq2(PyObject *d, PyObject *seq2, int override)
1111{
1112 PyObject *it; /* iter(seq2) */
Martin v. Löwis18e16552006-02-15 17:27:45 +00001113 int i; /* index into seq2 of current element */
Tim Peters1fc240e2001-10-26 05:06:50 +00001114 PyObject *item; /* seq2[i] */
1115 PyObject *fast; /* item as a 2-tuple or 2-list */
1116
1117 assert(d != NULL);
1118 assert(PyDict_Check(d));
1119 assert(seq2 != NULL);
1120
1121 it = PyObject_GetIter(seq2);
1122 if (it == NULL)
1123 return -1;
1124
1125 for (i = 0; ; ++i) {
1126 PyObject *key, *value;
Martin v. Löwis18e16552006-02-15 17:27:45 +00001127 Py_ssize_t n;
Tim Peters1fc240e2001-10-26 05:06:50 +00001128
1129 fast = NULL;
1130 item = PyIter_Next(it);
1131 if (item == NULL) {
1132 if (PyErr_Occurred())
1133 goto Fail;
1134 break;
1135 }
1136
1137 /* Convert item to sequence, and verify length 2. */
1138 fast = PySequence_Fast(item, "");
1139 if (fast == NULL) {
1140 if (PyErr_ExceptionMatches(PyExc_TypeError))
1141 PyErr_Format(PyExc_TypeError,
1142 "cannot convert dictionary update "
1143 "sequence element #%d to a sequence",
1144 i);
1145 goto Fail;
1146 }
1147 n = PySequence_Fast_GET_SIZE(fast);
1148 if (n != 2) {
1149 PyErr_Format(PyExc_ValueError,
1150 "dictionary update sequence element #%d "
Martin v. Löwis2c95cc62006-02-16 06:54:25 +00001151 "has length %zd; 2 is required",
Martin v. Löwise0e89f72006-02-16 06:59:22 +00001152 i, n);
Tim Peters1fc240e2001-10-26 05:06:50 +00001153 goto Fail;
1154 }
1155
1156 /* Update/merge with this (key, value) pair. */
1157 key = PySequence_Fast_GET_ITEM(fast, 0);
1158 value = PySequence_Fast_GET_ITEM(fast, 1);
1159 if (override || PyDict_GetItem(d, key) == NULL) {
1160 int status = PyDict_SetItem(d, key, value);
1161 if (status < 0)
1162 goto Fail;
1163 }
1164 Py_DECREF(fast);
1165 Py_DECREF(item);
1166 }
1167
1168 i = 0;
1169 goto Return;
1170Fail:
1171 Py_XDECREF(item);
1172 Py_XDECREF(fast);
1173 i = -1;
1174Return:
1175 Py_DECREF(it);
1176 return i;
1177}
1178
Tim Peters6d6c1a32001-08-02 04:15:00 +00001179int
1180PyDict_Update(PyObject *a, PyObject *b)
1181{
Guido van Rossum05ac6de2001-08-10 20:28:28 +00001182 return PyDict_Merge(a, b, 1);
1183}
1184
1185int
1186PyDict_Merge(PyObject *a, PyObject *b, int override)
1187{
Tim Peters6d6c1a32001-08-02 04:15:00 +00001188 register PyDictObject *mp, *other;
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001189 register int i;
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001190 dictentry *entry;
Tim Peters6d6c1a32001-08-02 04:15:00 +00001191
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001192 /* We accept for the argument either a concrete dictionary object,
1193 * or an abstract "mapping" object. For the former, we can do
1194 * things quite efficiently. For the latter, we only require that
1195 * PyMapping_Keys() and PyObject_GetItem() be supported.
1196 */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001197 if (a == NULL || !PyDict_Check(a) || b == NULL) {
1198 PyErr_BadInternalCall();
1199 return -1;
1200 }
1201 mp = (dictobject*)a;
1202 if (PyDict_Check(b)) {
1203 other = (dictobject*)b;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001204 if (other == mp || other->ma_used == 0)
1205 /* a.update(a) or a.update({}); nothing to do */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001206 return 0;
Raymond Hettinger186e7392005-05-14 18:08:25 +00001207 if (mp->ma_used == 0)
1208 /* Since the target dict is empty, PyDict_GetItem()
1209 * always returns NULL. Setting override to 1
1210 * skips the unnecessary test.
1211 */
1212 override = 1;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001213 /* Do one big resize at the start, rather than
1214 * incrementally resizing as we insert new items. Expect
1215 * that there will be no (or few) overlapping keys.
1216 */
1217 if ((mp->ma_fill + other->ma_used)*3 >= (mp->ma_mask+1)*2) {
Raymond Hettingerc8d22902003-05-07 00:49:40 +00001218 if (dictresize(mp, (mp->ma_used + other->ma_used)*2) != 0)
Tim Peters6d6c1a32001-08-02 04:15:00 +00001219 return -1;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001220 }
1221 for (i = 0; i <= other->ma_mask; i++) {
1222 entry = &other->ma_table[i];
Guido van Rossum05ac6de2001-08-10 20:28:28 +00001223 if (entry->me_value != NULL &&
1224 (override ||
1225 PyDict_GetItem(a, entry->me_key) == NULL)) {
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001226 Py_INCREF(entry->me_key);
1227 Py_INCREF(entry->me_value);
1228 insertdict(mp, entry->me_key, entry->me_hash,
1229 entry->me_value);
1230 }
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001231 }
1232 }
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001233 else {
1234 /* Do it the generic, slower way */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001235 PyObject *keys = PyMapping_Keys(b);
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001236 PyObject *iter;
1237 PyObject *key, *value;
1238 int status;
1239
1240 if (keys == NULL)
1241 /* Docstring says this is equivalent to E.keys() so
1242 * if E doesn't have a .keys() method we want
1243 * AttributeError to percolate up. Might as well
1244 * do the same for any other error.
1245 */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001246 return -1;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001247
1248 iter = PyObject_GetIter(keys);
1249 Py_DECREF(keys);
1250 if (iter == NULL)
Tim Peters6d6c1a32001-08-02 04:15:00 +00001251 return -1;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001252
1253 for (key = PyIter_Next(iter); key; key = PyIter_Next(iter)) {
Guido van Rossum05ac6de2001-08-10 20:28:28 +00001254 if (!override && PyDict_GetItem(a, key) != NULL) {
1255 Py_DECREF(key);
1256 continue;
1257 }
Tim Peters6d6c1a32001-08-02 04:15:00 +00001258 value = PyObject_GetItem(b, key);
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001259 if (value == NULL) {
1260 Py_DECREF(iter);
1261 Py_DECREF(key);
Tim Peters6d6c1a32001-08-02 04:15:00 +00001262 return -1;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001263 }
Guido van Rossum05ac6de2001-08-10 20:28:28 +00001264 status = PyDict_SetItem(a, key, value);
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001265 Py_DECREF(key);
1266 Py_DECREF(value);
1267 if (status < 0) {
1268 Py_DECREF(iter);
Tim Peters6d6c1a32001-08-02 04:15:00 +00001269 return -1;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001270 }
1271 }
1272 Py_DECREF(iter);
1273 if (PyErr_Occurred())
1274 /* Iterator completed, via error */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001275 return -1;
Barry Warsaw66a0d1d2001-06-26 20:08:32 +00001276 }
Tim Peters6d6c1a32001-08-02 04:15:00 +00001277 return 0;
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001278}
1279
1280static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001281dict_copy(register dictobject *mp)
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001282{
Jeremy Hyltona12c7a72000-03-30 22:27:31 +00001283 return PyDict_Copy((PyObject*)mp);
1284}
1285
1286PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001287PyDict_Copy(PyObject *o)
Jeremy Hyltona12c7a72000-03-30 22:27:31 +00001288{
Raymond Hettingerebedb2f2004-03-08 04:19:01 +00001289 PyObject *copy;
Jeremy Hyltona12c7a72000-03-30 22:27:31 +00001290
1291 if (o == NULL || !PyDict_Check(o)) {
1292 PyErr_BadInternalCall();
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001293 return NULL;
Jeremy Hyltona12c7a72000-03-30 22:27:31 +00001294 }
Raymond Hettingerebedb2f2004-03-08 04:19:01 +00001295 copy = PyDict_New();
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001296 if (copy == NULL)
1297 return NULL;
Raymond Hettingerebedb2f2004-03-08 04:19:01 +00001298 if (PyDict_Merge(copy, o, 1) == 0)
1299 return copy;
1300 Py_DECREF(copy);
Raymond Hettinger1356f782005-04-15 15:58:42 +00001301 return NULL;
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001302}
1303
Martin v. Löwis18e16552006-02-15 17:27:45 +00001304Py_ssize_t
Tim Peters1f5871e2000-07-04 17:44:48 +00001305PyDict_Size(PyObject *mp)
Guido van Rossum4199fac1993-11-05 10:18:44 +00001306{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001307 if (mp == NULL || !PyDict_Check(mp)) {
1308 PyErr_BadInternalCall();
Jeremy Hylton7083bb72004-02-17 20:10:11 +00001309 return -1;
Guido van Rossum4199fac1993-11-05 10:18:44 +00001310 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001311 return ((dictobject *)mp)->ma_used;
Guido van Rossum4199fac1993-11-05 10:18:44 +00001312}
1313
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001314PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001315PyDict_Keys(PyObject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001316{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001317 if (mp == NULL || !PyDict_Check(mp)) {
1318 PyErr_BadInternalCall();
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001319 return NULL;
1320 }
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001321 return dict_keys((dictobject *)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001322}
1323
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001324PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001325PyDict_Values(PyObject *mp)
Guido van Rossum25831651993-05-19 14:50:45 +00001326{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001327 if (mp == NULL || !PyDict_Check(mp)) {
1328 PyErr_BadInternalCall();
Guido van Rossum25831651993-05-19 14:50:45 +00001329 return NULL;
1330 }
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001331 return dict_values((dictobject *)mp);
Guido van Rossum25831651993-05-19 14:50:45 +00001332}
1333
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001334PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001335PyDict_Items(PyObject *mp)
Guido van Rossum25831651993-05-19 14:50:45 +00001336{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001337 if (mp == NULL || !PyDict_Check(mp)) {
1338 PyErr_BadInternalCall();
Guido van Rossum25831651993-05-19 14:50:45 +00001339 return NULL;
1340 }
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001341 return dict_items((dictobject *)mp);
Guido van Rossum25831651993-05-19 14:50:45 +00001342}
1343
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001344/* Subroutine which returns the smallest key in a for which b's value
1345 is different or absent. The value is returned too, through the
Tim Peters95bf9392001-05-10 08:32:44 +00001346 pval argument. Both are NULL if no key in a is found for which b's status
1347 differs. The refcounts on (and only on) non-NULL *pval and function return
1348 values must be decremented by the caller (characterize() increments them
1349 to ensure that mutating comparison and PyDict_GetItem calls can't delete
1350 them before the caller is done looking at them). */
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001351
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001352static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001353characterize(dictobject *a, dictobject *b, PyObject **pval)
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001354{
Tim Peters95bf9392001-05-10 08:32:44 +00001355 PyObject *akey = NULL; /* smallest key in a s.t. a[akey] != b[akey] */
1356 PyObject *aval = NULL; /* a[akey] */
Guido van Rossumb9324202001-01-18 00:39:02 +00001357 int i, cmp;
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001358
Tim Petersafb6ae82001-06-04 21:00:21 +00001359 for (i = 0; i <= a->ma_mask; i++) {
Tim Peters95bf9392001-05-10 08:32:44 +00001360 PyObject *thiskey, *thisaval, *thisbval;
1361 if (a->ma_table[i].me_value == NULL)
1362 continue;
1363 thiskey = a->ma_table[i].me_key;
1364 Py_INCREF(thiskey); /* keep alive across compares */
1365 if (akey != NULL) {
1366 cmp = PyObject_RichCompareBool(akey, thiskey, Py_LT);
1367 if (cmp < 0) {
1368 Py_DECREF(thiskey);
1369 goto Fail;
1370 }
1371 if (cmp > 0 ||
Tim Petersafb6ae82001-06-04 21:00:21 +00001372 i > a->ma_mask ||
Tim Peters95bf9392001-05-10 08:32:44 +00001373 a->ma_table[i].me_value == NULL)
1374 {
1375 /* Not the *smallest* a key; or maybe it is
1376 * but the compare shrunk the dict so we can't
1377 * find its associated value anymore; or
1378 * maybe it is but the compare deleted the
1379 * a[thiskey] entry.
1380 */
1381 Py_DECREF(thiskey);
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001382 continue;
Guido van Rossumb9324202001-01-18 00:39:02 +00001383 }
Tim Peters95bf9392001-05-10 08:32:44 +00001384 }
1385
1386 /* Compare a[thiskey] to b[thiskey]; cmp <- true iff equal. */
1387 thisaval = a->ma_table[i].me_value;
1388 assert(thisaval);
1389 Py_INCREF(thisaval); /* keep alive */
1390 thisbval = PyDict_GetItem((PyObject *)b, thiskey);
1391 if (thisbval == NULL)
1392 cmp = 0;
1393 else {
1394 /* both dicts have thiskey: same values? */
1395 cmp = PyObject_RichCompareBool(
1396 thisaval, thisbval, Py_EQ);
1397 if (cmp < 0) {
1398 Py_DECREF(thiskey);
1399 Py_DECREF(thisaval);
1400 goto Fail;
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001401 }
1402 }
Tim Peters95bf9392001-05-10 08:32:44 +00001403 if (cmp == 0) {
1404 /* New winner. */
1405 Py_XDECREF(akey);
1406 Py_XDECREF(aval);
1407 akey = thiskey;
1408 aval = thisaval;
1409 }
1410 else {
1411 Py_DECREF(thiskey);
1412 Py_DECREF(thisaval);
1413 }
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001414 }
Tim Peters95bf9392001-05-10 08:32:44 +00001415 *pval = aval;
1416 return akey;
1417
1418Fail:
1419 Py_XDECREF(akey);
1420 Py_XDECREF(aval);
1421 *pval = NULL;
1422 return NULL;
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001423}
1424
1425static int
Tim Peters1f5871e2000-07-04 17:44:48 +00001426dict_compare(dictobject *a, dictobject *b)
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001427{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001428 PyObject *adiff, *bdiff, *aval, *bval;
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001429 int res;
1430
1431 /* Compare lengths first */
1432 if (a->ma_used < b->ma_used)
1433 return -1; /* a is shorter */
1434 else if (a->ma_used > b->ma_used)
1435 return 1; /* b is shorter */
Tim Peters95bf9392001-05-10 08:32:44 +00001436
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001437 /* Same length -- check all keys */
Tim Peters95bf9392001-05-10 08:32:44 +00001438 bdiff = bval = NULL;
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001439 adiff = characterize(a, b, &aval);
Tim Peters95bf9392001-05-10 08:32:44 +00001440 if (adiff == NULL) {
1441 assert(!aval);
Tim Peters3918fb22001-05-10 18:58:31 +00001442 /* Either an error, or a is a subset with the same length so
Tim Peters95bf9392001-05-10 08:32:44 +00001443 * must be equal.
1444 */
1445 res = PyErr_Occurred() ? -1 : 0;
1446 goto Finished;
1447 }
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001448 bdiff = characterize(b, a, &bval);
Tim Peters95bf9392001-05-10 08:32:44 +00001449 if (bdiff == NULL && PyErr_Occurred()) {
1450 assert(!bval);
1451 res = -1;
1452 goto Finished;
1453 }
1454 res = 0;
1455 if (bdiff) {
1456 /* bdiff == NULL "should be" impossible now, but perhaps
1457 * the last comparison done by the characterize() on a had
1458 * the side effect of making the dicts equal!
1459 */
1460 res = PyObject_Compare(adiff, bdiff);
1461 }
1462 if (res == 0 && bval != NULL)
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001463 res = PyObject_Compare(aval, bval);
Tim Peters95bf9392001-05-10 08:32:44 +00001464
1465Finished:
1466 Py_XDECREF(adiff);
1467 Py_XDECREF(bdiff);
1468 Py_XDECREF(aval);
1469 Py_XDECREF(bval);
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001470 return res;
1471}
1472
Tim Peterse63415e2001-05-08 04:38:29 +00001473/* Return 1 if dicts equal, 0 if not, -1 if error.
1474 * Gets out as soon as any difference is detected.
1475 * Uses only Py_EQ comparison.
1476 */
1477static int
1478dict_equal(dictobject *a, dictobject *b)
1479{
1480 int i;
1481
1482 if (a->ma_used != b->ma_used)
1483 /* can't be equal if # of entries differ */
1484 return 0;
Tim Peterseb28ef22001-06-02 05:27:19 +00001485
Tim Peterse63415e2001-05-08 04:38:29 +00001486 /* Same # of entries -- check all of 'em. Exit early on any diff. */
Tim Petersafb6ae82001-06-04 21:00:21 +00001487 for (i = 0; i <= a->ma_mask; i++) {
Tim Peterse63415e2001-05-08 04:38:29 +00001488 PyObject *aval = a->ma_table[i].me_value;
1489 if (aval != NULL) {
1490 int cmp;
1491 PyObject *bval;
1492 PyObject *key = a->ma_table[i].me_key;
1493 /* temporarily bump aval's refcount to ensure it stays
1494 alive until we're done with it */
1495 Py_INCREF(aval);
1496 bval = PyDict_GetItem((PyObject *)b, key);
1497 if (bval == NULL) {
1498 Py_DECREF(aval);
1499 return 0;
1500 }
1501 cmp = PyObject_RichCompareBool(aval, bval, Py_EQ);
1502 Py_DECREF(aval);
1503 if (cmp <= 0) /* error or not equal */
1504 return cmp;
1505 }
1506 }
1507 return 1;
1508 }
1509
1510static PyObject *
1511dict_richcompare(PyObject *v, PyObject *w, int op)
1512{
1513 int cmp;
1514 PyObject *res;
1515
1516 if (!PyDict_Check(v) || !PyDict_Check(w)) {
1517 res = Py_NotImplemented;
1518 }
1519 else if (op == Py_EQ || op == Py_NE) {
1520 cmp = dict_equal((dictobject *)v, (dictobject *)w);
1521 if (cmp < 0)
1522 return NULL;
1523 res = (cmp == (op == Py_EQ)) ? Py_True : Py_False;
1524 }
Tim Peters4fa58bf2001-05-10 21:45:19 +00001525 else
1526 res = Py_NotImplemented;
Tim Peterse63415e2001-05-08 04:38:29 +00001527 Py_INCREF(res);
1528 return res;
1529 }
1530
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001531static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001532dict_has_key(register dictobject *mp, PyObject *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001533{
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001534 long hash;
1535 register long ok;
Tim Peters0ab085c2001-09-14 00:25:33 +00001536 if (!PyString_CheckExact(key) ||
Tim Peters1f7df352002-03-29 03:29:08 +00001537 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001538 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +00001539 if (hash == -1)
1540 return NULL;
1541 }
Tim Petersdea48ec2001-05-22 20:40:22 +00001542 ok = (mp->ma_lookup)(mp, key, hash)->me_value != NULL;
Guido van Rossum77f6a652002-04-03 22:41:51 +00001543 return PyBool_FromLong(ok);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001544}
1545
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001546static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001547dict_get(register dictobject *mp, PyObject *args)
Barry Warsawc38c5da1997-10-06 17:49:20 +00001548{
1549 PyObject *key;
Barry Warsaw320ac331997-10-20 17:26:25 +00001550 PyObject *failobj = Py_None;
Barry Warsawc38c5da1997-10-06 17:49:20 +00001551 PyObject *val = NULL;
1552 long hash;
1553
Raymond Hettingerea3fdf42002-12-29 16:33:45 +00001554 if (!PyArg_UnpackTuple(args, "get", 1, 2, &key, &failobj))
Barry Warsawc38c5da1997-10-06 17:49:20 +00001555 return NULL;
1556
Tim Peters0ab085c2001-09-14 00:25:33 +00001557 if (!PyString_CheckExact(key) ||
Tim Peters1f7df352002-03-29 03:29:08 +00001558 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
Barry Warsawc38c5da1997-10-06 17:49:20 +00001559 hash = PyObject_Hash(key);
1560 if (hash == -1)
1561 return NULL;
1562 }
Fred Drake1bff34a2000-08-31 19:31:38 +00001563 val = (mp->ma_lookup)(mp, key, hash)->me_value;
Barry Warsaw320ac331997-10-20 17:26:25 +00001564
Barry Warsawc38c5da1997-10-06 17:49:20 +00001565 if (val == NULL)
1566 val = failobj;
1567 Py_INCREF(val);
1568 return val;
1569}
1570
1571
1572static PyObject *
Guido van Rossum164452c2000-08-08 16:12:54 +00001573dict_setdefault(register dictobject *mp, PyObject *args)
1574{
1575 PyObject *key;
1576 PyObject *failobj = Py_None;
1577 PyObject *val = NULL;
1578 long hash;
1579
Raymond Hettingerea3fdf42002-12-29 16:33:45 +00001580 if (!PyArg_UnpackTuple(args, "setdefault", 1, 2, &key, &failobj))
Guido van Rossum164452c2000-08-08 16:12:54 +00001581 return NULL;
Guido van Rossum164452c2000-08-08 16:12:54 +00001582
Tim Peters0ab085c2001-09-14 00:25:33 +00001583 if (!PyString_CheckExact(key) ||
Tim Peters1f7df352002-03-29 03:29:08 +00001584 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
Guido van Rossum164452c2000-08-08 16:12:54 +00001585 hash = PyObject_Hash(key);
1586 if (hash == -1)
1587 return NULL;
1588 }
Fred Drake1bff34a2000-08-31 19:31:38 +00001589 val = (mp->ma_lookup)(mp, key, hash)->me_value;
Guido van Rossum164452c2000-08-08 16:12:54 +00001590 if (val == NULL) {
1591 val = failobj;
1592 if (PyDict_SetItem((PyObject*)mp, key, failobj))
1593 val = NULL;
1594 }
1595 Py_XINCREF(val);
1596 return val;
1597}
1598
1599
1600static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001601dict_clear(register dictobject *mp)
Guido van Rossumfb8f1ca1997-03-21 21:55:12 +00001602{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001603 PyDict_Clear((PyObject *)mp);
Raymond Hettinger7892b1c2004-04-12 18:10:01 +00001604 Py_RETURN_NONE;
Guido van Rossumfb8f1ca1997-03-21 21:55:12 +00001605}
1606
Guido van Rossumba6ab842000-12-12 22:02:18 +00001607static PyObject *
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001608dict_pop(dictobject *mp, PyObject *args)
Guido van Rossume027d982002-04-12 15:11:59 +00001609{
1610 long hash;
1611 dictentry *ep;
1612 PyObject *old_value, *old_key;
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001613 PyObject *key, *deflt = NULL;
Guido van Rossume027d982002-04-12 15:11:59 +00001614
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001615 if(!PyArg_UnpackTuple(args, "pop", 1, 2, &key, &deflt))
1616 return NULL;
Guido van Rossume027d982002-04-12 15:11:59 +00001617 if (mp->ma_used == 0) {
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001618 if (deflt) {
1619 Py_INCREF(deflt);
1620 return deflt;
1621 }
Guido van Rossume027d982002-04-12 15:11:59 +00001622 PyErr_SetString(PyExc_KeyError,
1623 "pop(): dictionary is empty");
1624 return NULL;
1625 }
1626 if (!PyString_CheckExact(key) ||
1627 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
1628 hash = PyObject_Hash(key);
1629 if (hash == -1)
1630 return NULL;
1631 }
1632 ep = (mp->ma_lookup)(mp, key, hash);
1633 if (ep->me_value == NULL) {
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001634 if (deflt) {
1635 Py_INCREF(deflt);
1636 return deflt;
1637 }
Guido van Rossume027d982002-04-12 15:11:59 +00001638 PyErr_SetObject(PyExc_KeyError, key);
1639 return NULL;
1640 }
1641 old_key = ep->me_key;
1642 Py_INCREF(dummy);
1643 ep->me_key = dummy;
1644 old_value = ep->me_value;
1645 ep->me_value = NULL;
1646 mp->ma_used--;
1647 Py_DECREF(old_key);
1648 return old_value;
1649}
1650
1651static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001652dict_popitem(dictobject *mp)
Guido van Rossumba6ab842000-12-12 22:02:18 +00001653{
1654 int i = 0;
1655 dictentry *ep;
1656 PyObject *res;
1657
Tim Petersf4b33f62001-06-02 05:42:29 +00001658 /* Allocate the result tuple before checking the size. Believe it
1659 * or not, this allocation could trigger a garbage collection which
1660 * could empty the dict, so if we checked the size first and that
1661 * happened, the result would be an infinite loop (searching for an
1662 * entry that no longer exists). Note that the usual popitem()
1663 * idiom is "while d: k, v = d.popitem()". so needing to throw the
1664 * tuple away if the dict *is* empty isn't a significant
1665 * inefficiency -- possible, but unlikely in practice.
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001666 */
1667 res = PyTuple_New(2);
1668 if (res == NULL)
1669 return NULL;
Guido van Rossume04eaec2001-04-16 00:02:32 +00001670 if (mp->ma_used == 0) {
1671 Py_DECREF(res);
1672 PyErr_SetString(PyExc_KeyError,
1673 "popitem(): dictionary is empty");
1674 return NULL;
1675 }
Guido van Rossumba6ab842000-12-12 22:02:18 +00001676 /* Set ep to "the first" dict entry with a value. We abuse the hash
1677 * field of slot 0 to hold a search finger:
1678 * If slot 0 has a value, use slot 0.
1679 * Else slot 0 is being used to hold a search finger,
1680 * and we use its hash value as the first index to look.
1681 */
1682 ep = &mp->ma_table[0];
1683 if (ep->me_value == NULL) {
1684 i = (int)ep->me_hash;
Tim Petersdea48ec2001-05-22 20:40:22 +00001685 /* The hash field may be a real hash value, or it may be a
1686 * legit search finger, or it may be a once-legit search
1687 * finger that's out of bounds now because it wrapped around
1688 * or the table shrunk -- simply make sure it's in bounds now.
Guido van Rossumba6ab842000-12-12 22:02:18 +00001689 */
Tim Petersafb6ae82001-06-04 21:00:21 +00001690 if (i > mp->ma_mask || i < 1)
Guido van Rossumba6ab842000-12-12 22:02:18 +00001691 i = 1; /* skip slot 0 */
1692 while ((ep = &mp->ma_table[i])->me_value == NULL) {
1693 i++;
Tim Petersafb6ae82001-06-04 21:00:21 +00001694 if (i > mp->ma_mask)
Guido van Rossumba6ab842000-12-12 22:02:18 +00001695 i = 1;
1696 }
1697 }
Guido van Rossuma4dd0112001-04-15 22:16:26 +00001698 PyTuple_SET_ITEM(res, 0, ep->me_key);
1699 PyTuple_SET_ITEM(res, 1, ep->me_value);
1700 Py_INCREF(dummy);
1701 ep->me_key = dummy;
1702 ep->me_value = NULL;
1703 mp->ma_used--;
1704 assert(mp->ma_table[0].me_value == NULL);
1705 mp->ma_table[0].me_hash = i + 1; /* next place to start */
Guido van Rossumba6ab842000-12-12 22:02:18 +00001706 return res;
1707}
1708
Jeremy Hylton8caad492000-06-23 14:18:11 +00001709static int
1710dict_traverse(PyObject *op, visitproc visit, void *arg)
1711{
Martin v. Löwis18e16552006-02-15 17:27:45 +00001712 Py_ssize_t i = 0;
1713 int err;
Jeremy Hylton8caad492000-06-23 14:18:11 +00001714 PyObject *pk;
1715 PyObject *pv;
1716
1717 while (PyDict_Next(op, &i, &pk, &pv)) {
1718 err = visit(pk, arg);
1719 if (err)
1720 return err;
1721 err = visit(pv, arg);
1722 if (err)
1723 return err;
1724 }
1725 return 0;
1726}
1727
1728static int
1729dict_tp_clear(PyObject *op)
1730{
1731 PyDict_Clear(op);
1732 return 0;
1733}
1734
Tim Petersf7f88b12000-12-13 23:18:45 +00001735
Raymond Hettinger019a1482004-03-18 02:41:19 +00001736extern PyTypeObject PyDictIterKey_Type; /* Forward */
1737extern PyTypeObject PyDictIterValue_Type; /* Forward */
1738extern PyTypeObject PyDictIterItem_Type; /* Forward */
1739static PyObject *dictiter_new(dictobject *, PyTypeObject *);
Guido van Rossum09e563a2001-05-01 12:10:21 +00001740
1741static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001742dict_iterkeys(dictobject *dict)
Guido van Rossum09e563a2001-05-01 12:10:21 +00001743{
Raymond Hettinger019a1482004-03-18 02:41:19 +00001744 return dictiter_new(dict, &PyDictIterKey_Type);
Guido van Rossum09e563a2001-05-01 12:10:21 +00001745}
1746
1747static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001748dict_itervalues(dictobject *dict)
Guido van Rossum09e563a2001-05-01 12:10:21 +00001749{
Raymond Hettinger019a1482004-03-18 02:41:19 +00001750 return dictiter_new(dict, &PyDictIterValue_Type);
Guido van Rossum09e563a2001-05-01 12:10:21 +00001751}
1752
1753static PyObject *
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001754dict_iteritems(dictobject *dict)
Guido van Rossum09e563a2001-05-01 12:10:21 +00001755{
Raymond Hettinger019a1482004-03-18 02:41:19 +00001756 return dictiter_new(dict, &PyDictIterItem_Type);
Guido van Rossum09e563a2001-05-01 12:10:21 +00001757}
1758
1759
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001760PyDoc_STRVAR(has_key__doc__,
Raymond Hettinger574aa322003-09-01 22:12:08 +00001761"D.has_key(k) -> True if D has a key k, else False");
Tim Petersf7f88b12000-12-13 23:18:45 +00001762
Raymond Hettinger8f5cdaa2003-12-13 11:26:12 +00001763PyDoc_STRVAR(contains__doc__,
1764"D.__contains__(k) -> True if D has a key k, else False");
1765
1766PyDoc_STRVAR(getitem__doc__, "x.__getitem__(y) <==> x[y]");
1767
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001768PyDoc_STRVAR(get__doc__,
Guido van Rossumefae8862002-09-04 11:29:45 +00001769"D.get(k[,d]) -> D[k] if k in D, else d. d defaults to None.");
Tim Petersf7f88b12000-12-13 23:18:45 +00001770
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001771PyDoc_STRVAR(setdefault_doc__,
Guido van Rossumefae8862002-09-04 11:29:45 +00001772"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 +00001773
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001774PyDoc_STRVAR(pop__doc__,
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001775"D.pop(k[,d]) -> v, remove specified key and return the corresponding value\n\
1776If key is not found, d is returned if given, otherwise KeyError is raised");
Guido van Rossume027d982002-04-12 15:11:59 +00001777
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001778PyDoc_STRVAR(popitem__doc__,
Tim Petersf7f88b12000-12-13 23:18:45 +00001779"D.popitem() -> (k, v), remove and return some (key, value) pair as a\n\
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +000017802-tuple; but raise KeyError if D is empty");
Tim Petersf7f88b12000-12-13 23:18:45 +00001781
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001782PyDoc_STRVAR(keys__doc__,
1783"D.keys() -> list of D's keys");
Tim Petersf7f88b12000-12-13 23:18:45 +00001784
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001785PyDoc_STRVAR(items__doc__,
1786"D.items() -> list of D's (key, value) pairs, as 2-tuples");
Tim Petersf7f88b12000-12-13 23:18:45 +00001787
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001788PyDoc_STRVAR(values__doc__,
1789"D.values() -> list of D's values");
Tim Petersf7f88b12000-12-13 23:18:45 +00001790
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001791PyDoc_STRVAR(update__doc__,
Walter Dörwaldd70ad8a2004-05-28 20:59:21 +00001792"D.update(E, **F) -> None. Update D from E and F: for k in E: D[k] = E[k]\n\
1793(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 +00001794
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001795PyDoc_STRVAR(fromkeys__doc__,
1796"dict.fromkeys(S[,v]) -> New dict with keys from S and values equal to v.\n\
1797v defaults to None.");
1798
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001799PyDoc_STRVAR(clear__doc__,
1800"D.clear() -> None. Remove all items from D.");
Tim Petersf7f88b12000-12-13 23:18:45 +00001801
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001802PyDoc_STRVAR(copy__doc__,
1803"D.copy() -> a shallow copy of D");
Tim Petersf7f88b12000-12-13 23:18:45 +00001804
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001805PyDoc_STRVAR(iterkeys__doc__,
1806"D.iterkeys() -> an iterator over the keys of D");
Guido van Rossum09e563a2001-05-01 12:10:21 +00001807
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001808PyDoc_STRVAR(itervalues__doc__,
1809"D.itervalues() -> an iterator over the values of D");
Guido van Rossum09e563a2001-05-01 12:10:21 +00001810
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001811PyDoc_STRVAR(iteritems__doc__,
1812"D.iteritems() -> an iterator over the (key, value) items of D");
Guido van Rossum09e563a2001-05-01 12:10:21 +00001813
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001814static PyMethodDef mapp_methods[] = {
Raymond Hettinger8f5cdaa2003-12-13 11:26:12 +00001815 {"__contains__",(PyCFunction)dict_has_key, METH_O | METH_COEXIST,
1816 contains__doc__},
Raymond Hettinger0c669672003-12-13 13:31:55 +00001817 {"__getitem__", (PyCFunction)dict_subscript, METH_O | METH_COEXIST,
Raymond Hettinger8f5cdaa2003-12-13 11:26:12 +00001818 getitem__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001819 {"has_key", (PyCFunction)dict_has_key, METH_O,
Tim Petersf7f88b12000-12-13 23:18:45 +00001820 has_key__doc__},
1821 {"get", (PyCFunction)dict_get, METH_VARARGS,
1822 get__doc__},
1823 {"setdefault", (PyCFunction)dict_setdefault, METH_VARARGS,
1824 setdefault_doc__},
Raymond Hettingera3e1e4c2003-03-06 23:54:28 +00001825 {"pop", (PyCFunction)dict_pop, METH_VARARGS,
Just van Rossuma797d812002-11-23 09:45:04 +00001826 pop__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001827 {"popitem", (PyCFunction)dict_popitem, METH_NOARGS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001828 popitem__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001829 {"keys", (PyCFunction)dict_keys, METH_NOARGS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001830 keys__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001831 {"items", (PyCFunction)dict_items, METH_NOARGS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001832 items__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001833 {"values", (PyCFunction)dict_values, METH_NOARGS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001834 values__doc__},
Raymond Hettinger31017ae2004-03-04 08:25:44 +00001835 {"update", (PyCFunction)dict_update, METH_VARARGS | METH_KEYWORDS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001836 update__doc__},
Raymond Hettingere33d3df2002-11-27 07:29:33 +00001837 {"fromkeys", (PyCFunction)dict_fromkeys, METH_VARARGS | METH_CLASS,
1838 fromkeys__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001839 {"clear", (PyCFunction)dict_clear, METH_NOARGS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001840 clear__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001841 {"copy", (PyCFunction)dict_copy, METH_NOARGS,
Tim Petersf7f88b12000-12-13 23:18:45 +00001842 copy__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001843 {"iterkeys", (PyCFunction)dict_iterkeys, METH_NOARGS,
Guido van Rossum09e563a2001-05-01 12:10:21 +00001844 iterkeys__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001845 {"itervalues", (PyCFunction)dict_itervalues, METH_NOARGS,
Guido van Rossum09e563a2001-05-01 12:10:21 +00001846 itervalues__doc__},
Martin v. Löwise3eb1f22001-08-16 13:15:00 +00001847 {"iteritems", (PyCFunction)dict_iteritems, METH_NOARGS,
Guido van Rossum09e563a2001-05-01 12:10:21 +00001848 iteritems__doc__},
Tim Petersf7f88b12000-12-13 23:18:45 +00001849 {NULL, NULL} /* sentinel */
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001850};
1851
Raymond Hettingerbc0f2ab2003-11-25 21:12:14 +00001852int
1853PyDict_Contains(PyObject *op, PyObject *key)
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001854{
1855 long hash;
Raymond Hettingerbc0f2ab2003-11-25 21:12:14 +00001856 dictobject *mp = (dictobject *)op;
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001857
Tim Peters0ab085c2001-09-14 00:25:33 +00001858 if (!PyString_CheckExact(key) ||
Tim Peters1f7df352002-03-29 03:29:08 +00001859 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001860 hash = PyObject_Hash(key);
1861 if (hash == -1)
1862 return -1;
1863 }
Tim Petersdea48ec2001-05-22 20:40:22 +00001864 return (mp->ma_lookup)(mp, key, hash)->me_value != NULL;
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001865}
1866
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001867/* Hack to implement "key in dict" */
1868static PySequenceMethods dict_as_sequence = {
1869 0, /* sq_length */
1870 0, /* sq_concat */
1871 0, /* sq_repeat */
1872 0, /* sq_item */
1873 0, /* sq_slice */
1874 0, /* sq_ass_item */
1875 0, /* sq_ass_slice */
Raymond Hettingerbc0f2ab2003-11-25 21:12:14 +00001876 (objobjproc)PyDict_Contains, /* sq_contains */
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001877 0, /* sq_inplace_concat */
1878 0, /* sq_inplace_repeat */
1879};
1880
Guido van Rossum09e563a2001-05-01 12:10:21 +00001881static PyObject *
Tim Peters6d6c1a32001-08-02 04:15:00 +00001882dict_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
1883{
1884 PyObject *self;
1885
1886 assert(type != NULL && type->tp_alloc != NULL);
1887 self = type->tp_alloc(type, 0);
1888 if (self != NULL) {
1889 PyDictObject *d = (PyDictObject *)self;
1890 /* It's guaranteed that tp->alloc zeroed out the struct. */
1891 assert(d->ma_table == NULL && d->ma_fill == 0 && d->ma_used == 0);
1892 INIT_NONZERO_DICT_SLOTS(d);
1893 d->ma_lookup = lookdict_string;
1894#ifdef SHOW_CONVERSION_COUNTS
1895 ++created;
1896#endif
1897 }
1898 return self;
1899}
1900
Tim Peters25786c02001-09-02 08:22:48 +00001901static int
1902dict_init(PyObject *self, PyObject *args, PyObject *kwds)
1903{
Raymond Hettinger31017ae2004-03-04 08:25:44 +00001904 return dict_update_common(self, args, kwds, "dict");
Tim Peters25786c02001-09-02 08:22:48 +00001905}
1906
Guido van Rossumdbb53d92001-12-03 16:32:18 +00001907static long
1908dict_nohash(PyObject *self)
1909{
1910 PyErr_SetString(PyExc_TypeError, "dict objects are unhashable");
1911 return -1;
1912}
1913
Tim Peters6d6c1a32001-08-02 04:15:00 +00001914static PyObject *
Guido van Rossum09e563a2001-05-01 12:10:21 +00001915dict_iter(dictobject *dict)
1916{
Raymond Hettinger019a1482004-03-18 02:41:19 +00001917 return dictiter_new(dict, &PyDictIterKey_Type);
Guido van Rossum09e563a2001-05-01 12:10:21 +00001918}
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00001919
Martin v. Löwis14f8b4c2002-06-13 20:33:02 +00001920PyDoc_STRVAR(dictionary_doc,
Tim Petersa427a2b2001-10-29 22:25:45 +00001921"dict() -> new empty dictionary.\n"
1922"dict(mapping) -> new dictionary initialized from a mapping object's\n"
Tim Peters1fc240e2001-10-26 05:06:50 +00001923" (key, value) pairs.\n"
Tim Petersa427a2b2001-10-29 22:25:45 +00001924"dict(seq) -> new dictionary initialized as if via:\n"
Tim Peters4d859532001-10-27 18:27:48 +00001925" d = {}\n"
1926" for k, v in seq:\n"
Just van Rossuma797d812002-11-23 09:45:04 +00001927" d[k] = v\n"
1928"dict(**kwargs) -> new dictionary initialized with the name=value pairs\n"
1929" in the keyword argument list. For example: dict(one=1, two=2)");
Tim Peters25786c02001-09-02 08:22:48 +00001930
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001931PyTypeObject PyDict_Type = {
1932 PyObject_HEAD_INIT(&PyType_Type)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001933 0,
Tim Petersa427a2b2001-10-29 22:25:45 +00001934 "dict",
Neil Schemenauere83c00e2001-08-29 23:54:21 +00001935 sizeof(dictobject),
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001936 0,
Guido van Rossumb9324202001-01-18 00:39:02 +00001937 (destructor)dict_dealloc, /* tp_dealloc */
1938 (printfunc)dict_print, /* tp_print */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001939 0, /* tp_getattr */
Guido van Rossumb9324202001-01-18 00:39:02 +00001940 0, /* tp_setattr */
Tim Peters4fa58bf2001-05-10 21:45:19 +00001941 (cmpfunc)dict_compare, /* tp_compare */
Guido van Rossumb9324202001-01-18 00:39:02 +00001942 (reprfunc)dict_repr, /* tp_repr */
1943 0, /* tp_as_number */
Guido van Rossum0dbb4fb2001-04-20 16:50:40 +00001944 &dict_as_sequence, /* tp_as_sequence */
Guido van Rossumb9324202001-01-18 00:39:02 +00001945 &dict_as_mapping, /* tp_as_mapping */
Guido van Rossumdbb53d92001-12-03 16:32:18 +00001946 dict_nohash, /* tp_hash */
Guido van Rossumb9324202001-01-18 00:39:02 +00001947 0, /* tp_call */
1948 0, /* tp_str */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001949 PyObject_GenericGetAttr, /* tp_getattro */
Guido van Rossumb9324202001-01-18 00:39:02 +00001950 0, /* tp_setattro */
1951 0, /* tp_as_buffer */
Neil Schemenauere83c00e2001-08-29 23:54:21 +00001952 Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
Tim Peters6d6c1a32001-08-02 04:15:00 +00001953 Py_TPFLAGS_BASETYPE, /* tp_flags */
Tim Peters25786c02001-09-02 08:22:48 +00001954 dictionary_doc, /* tp_doc */
Guido van Rossumb9324202001-01-18 00:39:02 +00001955 (traverseproc)dict_traverse, /* tp_traverse */
1956 (inquiry)dict_tp_clear, /* tp_clear */
Tim Peterse63415e2001-05-08 04:38:29 +00001957 dict_richcompare, /* tp_richcompare */
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00001958 0, /* tp_weaklistoffset */
Guido van Rossum09e563a2001-05-01 12:10:21 +00001959 (getiterfunc)dict_iter, /* tp_iter */
Guido van Rossum213c7a62001-04-23 14:08:49 +00001960 0, /* tp_iternext */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001961 mapp_methods, /* tp_methods */
1962 0, /* tp_members */
1963 0, /* tp_getset */
1964 0, /* tp_base */
1965 0, /* tp_dict */
1966 0, /* tp_descr_get */
1967 0, /* tp_descr_set */
1968 0, /* tp_dictoffset */
Tim Peters25786c02001-09-02 08:22:48 +00001969 (initproc)dict_init, /* tp_init */
Tim Peters6d6c1a32001-08-02 04:15:00 +00001970 PyType_GenericAlloc, /* tp_alloc */
1971 dict_new, /* tp_new */
Neil Schemenauer6189b892002-04-12 02:43:00 +00001972 PyObject_GC_Del, /* tp_free */
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001973};
1974
Guido van Rossum3cca2451997-05-16 14:23:33 +00001975/* For backward compatibility with old dictionary interface */
1976
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001977PyObject *
Martin v. Löwis32b4a1b2002-12-11 13:21:12 +00001978PyDict_GetItemString(PyObject *v, const char *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001979{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001980 PyObject *kv, *rv;
1981 kv = PyString_FromString(key);
1982 if (kv == NULL)
1983 return NULL;
Guido van Rossum3cca2451997-05-16 14:23:33 +00001984 rv = PyDict_GetItem(v, kv);
1985 Py_DECREF(kv);
1986 return rv;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001987}
1988
1989int
Martin v. Löwis32b4a1b2002-12-11 13:21:12 +00001990PyDict_SetItemString(PyObject *v, const char *key, PyObject *item)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001991{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001992 PyObject *kv;
1993 int err;
1994 kv = PyString_FromString(key);
1995 if (kv == NULL)
Guido van Rossum037b2201997-05-20 18:35:19 +00001996 return -1;
Guido van Rossum4f3bf1e1997-09-29 23:31:11 +00001997 PyString_InternInPlace(&kv); /* XXX Should we really? */
Guido van Rossum3cca2451997-05-16 14:23:33 +00001998 err = PyDict_SetItem(v, kv, item);
1999 Py_DECREF(kv);
2000 return err;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00002001}
2002
2003int
Martin v. Löwis32b4a1b2002-12-11 13:21:12 +00002004PyDict_DelItemString(PyObject *v, const char *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00002005{
Guido van Rossum3cca2451997-05-16 14:23:33 +00002006 PyObject *kv;
2007 int err;
2008 kv = PyString_FromString(key);
2009 if (kv == NULL)
Guido van Rossum037b2201997-05-20 18:35:19 +00002010 return -1;
Guido van Rossum3cca2451997-05-16 14:23:33 +00002011 err = PyDict_DelItem(v, kv);
2012 Py_DECREF(kv);
2013 return err;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00002014}
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002015
Raymond Hettinger019a1482004-03-18 02:41:19 +00002016/* Dictionary iterator types */
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002017
2018typedef struct {
2019 PyObject_HEAD
Guido van Rossum2147df72002-07-16 20:30:22 +00002020 dictobject *di_dict; /* Set to NULL when iterator is exhausted */
Guido van Rossumb1f35bf2001-05-02 15:13:44 +00002021 int di_used;
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002022 int di_pos;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002023 PyObject* di_result; /* reusable result tuple for iteritems */
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002024 long len;
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002025} dictiterobject;
2026
2027static PyObject *
Raymond Hettinger019a1482004-03-18 02:41:19 +00002028dictiter_new(dictobject *dict, PyTypeObject *itertype)
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002029{
2030 dictiterobject *di;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002031 di = PyObject_New(dictiterobject, itertype);
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002032 if (di == NULL)
2033 return NULL;
2034 Py_INCREF(dict);
2035 di->di_dict = dict;
Guido van Rossumb1f35bf2001-05-02 15:13:44 +00002036 di->di_used = dict->ma_used;
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002037 di->di_pos = 0;
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002038 di->len = dict->ma_used;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002039 if (itertype == &PyDictIterItem_Type) {
2040 di->di_result = PyTuple_Pack(2, Py_None, Py_None);
2041 if (di->di_result == NULL) {
2042 Py_DECREF(di);
2043 return NULL;
2044 }
2045 }
2046 else
2047 di->di_result = NULL;
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002048 return (PyObject *)di;
2049}
2050
2051static void
2052dictiter_dealloc(dictiterobject *di)
2053{
Guido van Rossum2147df72002-07-16 20:30:22 +00002054 Py_XDECREF(di->di_dict);
Raymond Hettinger019a1482004-03-18 02:41:19 +00002055 Py_XDECREF(di->di_result);
Neil Schemenauer6189b892002-04-12 02:43:00 +00002056 PyObject_Del(di);
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002057}
2058
Raymond Hettinger6b27cda2005-09-24 21:23:05 +00002059static PyObject *
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002060dictiter_len(dictiterobject *di)
2061{
Martin v. Löwis18e16552006-02-15 17:27:45 +00002062 long len = 0;
Raymond Hettinger7892b1c2004-04-12 18:10:01 +00002063 if (di->di_dict != NULL && di->di_used == di->di_dict->ma_used)
Raymond Hettinger6b27cda2005-09-24 21:23:05 +00002064 len = di->len;
2065 return PyInt_FromLong(len);
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002066}
2067
Armin Rigof5b3e362006-02-11 21:32:43 +00002068PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
Raymond Hettinger6b27cda2005-09-24 21:23:05 +00002069
2070static PyMethodDef dictiter_methods[] = {
Armin Rigof5b3e362006-02-11 21:32:43 +00002071 {"__length_hint__", (PyCFunction)dictiter_len, METH_NOARGS, length_hint_doc},
Raymond Hettinger6b27cda2005-09-24 21:23:05 +00002072 {NULL, NULL} /* sentinel */
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002073};
2074
Raymond Hettinger019a1482004-03-18 02:41:19 +00002075static PyObject *dictiter_iternextkey(dictiterobject *di)
Guido van Rossum213c7a62001-04-23 14:08:49 +00002076{
Raymond Hettinger019a1482004-03-18 02:41:19 +00002077 PyObject *key;
2078 register int i, mask;
2079 register dictentry *ep;
2080 dictobject *d = di->di_dict;
Guido van Rossum213c7a62001-04-23 14:08:49 +00002081
Raymond Hettinger019a1482004-03-18 02:41:19 +00002082 if (d == NULL)
Guido van Rossum2147df72002-07-16 20:30:22 +00002083 return NULL;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002084 assert (PyDict_Check(d));
Guido van Rossum2147df72002-07-16 20:30:22 +00002085
Raymond Hettinger019a1482004-03-18 02:41:19 +00002086 if (di->di_used != d->ma_used) {
Guido van Rossum213c7a62001-04-23 14:08:49 +00002087 PyErr_SetString(PyExc_RuntimeError,
2088 "dictionary changed size during iteration");
Guido van Rossum2147df72002-07-16 20:30:22 +00002089 di->di_used = -1; /* Make this state sticky */
Guido van Rossum213c7a62001-04-23 14:08:49 +00002090 return NULL;
2091 }
Guido van Rossum2147df72002-07-16 20:30:22 +00002092
Raymond Hettinger019a1482004-03-18 02:41:19 +00002093 i = di->di_pos;
2094 if (i < 0)
2095 goto fail;
2096 ep = d->ma_table;
2097 mask = d->ma_mask;
2098 while (i <= mask && ep[i].me_value == NULL)
2099 i++;
2100 di->di_pos = i+1;
2101 if (i > mask)
2102 goto fail;
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002103 di->len--;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002104 key = ep[i].me_key;
2105 Py_INCREF(key);
2106 return key;
2107
2108fail:
2109 Py_DECREF(d);
Guido van Rossum2147df72002-07-16 20:30:22 +00002110 di->di_dict = NULL;
Guido van Rossum213c7a62001-04-23 14:08:49 +00002111 return NULL;
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002112}
2113
Raymond Hettinger019a1482004-03-18 02:41:19 +00002114PyTypeObject PyDictIterKey_Type = {
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002115 PyObject_HEAD_INIT(&PyType_Type)
2116 0, /* ob_size */
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002117 "dictionary-keyiterator", /* tp_name */
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002118 sizeof(dictiterobject), /* tp_basicsize */
2119 0, /* tp_itemsize */
2120 /* methods */
2121 (destructor)dictiter_dealloc, /* tp_dealloc */
2122 0, /* tp_print */
Tim Peters6d6c1a32001-08-02 04:15:00 +00002123 0, /* tp_getattr */
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002124 0, /* tp_setattr */
2125 0, /* tp_compare */
2126 0, /* tp_repr */
2127 0, /* tp_as_number */
Raymond Hettinger6b27cda2005-09-24 21:23:05 +00002128 0, /* tp_as_sequence */
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002129 0, /* tp_as_mapping */
2130 0, /* tp_hash */
2131 0, /* tp_call */
2132 0, /* tp_str */
Tim Peters6d6c1a32001-08-02 04:15:00 +00002133 PyObject_GenericGetAttr, /* tp_getattro */
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002134 0, /* tp_setattro */
2135 0, /* tp_as_buffer */
2136 Py_TPFLAGS_DEFAULT, /* tp_flags */
2137 0, /* tp_doc */
2138 0, /* tp_traverse */
2139 0, /* tp_clear */
2140 0, /* tp_richcompare */
2141 0, /* tp_weaklistoffset */
Raymond Hettinger1da1dbf2003-03-17 19:46:11 +00002142 PyObject_SelfIter, /* tp_iter */
Raymond Hettinger019a1482004-03-18 02:41:19 +00002143 (iternextfunc)dictiter_iternextkey, /* tp_iternext */
Raymond Hettinger6b27cda2005-09-24 21:23:05 +00002144 dictiter_methods, /* tp_methods */
2145 0,
Raymond Hettinger019a1482004-03-18 02:41:19 +00002146};
2147
2148static PyObject *dictiter_iternextvalue(dictiterobject *di)
2149{
2150 PyObject *value;
2151 register int i, mask;
2152 register dictentry *ep;
2153 dictobject *d = di->di_dict;
2154
2155 if (d == NULL)
2156 return NULL;
2157 assert (PyDict_Check(d));
2158
2159 if (di->di_used != d->ma_used) {
2160 PyErr_SetString(PyExc_RuntimeError,
2161 "dictionary changed size during iteration");
2162 di->di_used = -1; /* Make this state sticky */
2163 return NULL;
2164 }
2165
2166 i = di->di_pos;
Guido van Rossum09240f62004-03-20 19:11:58 +00002167 mask = d->ma_mask;
2168 if (i < 0 || i > mask)
Raymond Hettinger019a1482004-03-18 02:41:19 +00002169 goto fail;
2170 ep = d->ma_table;
Guido van Rossum09240f62004-03-20 19:11:58 +00002171 while ((value=ep[i].me_value) == NULL) {
Raymond Hettinger019a1482004-03-18 02:41:19 +00002172 i++;
Guido van Rossum09240f62004-03-20 19:11:58 +00002173 if (i > mask)
2174 goto fail;
2175 }
Raymond Hettinger019a1482004-03-18 02:41:19 +00002176 di->di_pos = i+1;
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002177 di->len--;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002178 Py_INCREF(value);
2179 return value;
2180
2181fail:
2182 Py_DECREF(d);
2183 di->di_dict = NULL;
2184 return NULL;
2185}
2186
2187PyTypeObject PyDictIterValue_Type = {
2188 PyObject_HEAD_INIT(&PyType_Type)
2189 0, /* ob_size */
2190 "dictionary-valueiterator", /* tp_name */
2191 sizeof(dictiterobject), /* tp_basicsize */
2192 0, /* tp_itemsize */
2193 /* methods */
2194 (destructor)dictiter_dealloc, /* tp_dealloc */
2195 0, /* tp_print */
2196 0, /* tp_getattr */
2197 0, /* tp_setattr */
2198 0, /* tp_compare */
2199 0, /* tp_repr */
2200 0, /* tp_as_number */
Raymond Hettinger6b27cda2005-09-24 21:23:05 +00002201 0, /* tp_as_sequence */
Raymond Hettinger019a1482004-03-18 02:41:19 +00002202 0, /* tp_as_mapping */
2203 0, /* tp_hash */
2204 0, /* tp_call */
2205 0, /* tp_str */
2206 PyObject_GenericGetAttr, /* tp_getattro */
2207 0, /* tp_setattro */
2208 0, /* tp_as_buffer */
2209 Py_TPFLAGS_DEFAULT, /* tp_flags */
2210 0, /* tp_doc */
2211 0, /* tp_traverse */
2212 0, /* tp_clear */
2213 0, /* tp_richcompare */
2214 0, /* tp_weaklistoffset */
2215 PyObject_SelfIter, /* tp_iter */
2216 (iternextfunc)dictiter_iternextvalue, /* tp_iternext */
Raymond Hettinger6b27cda2005-09-24 21:23:05 +00002217 dictiter_methods, /* tp_methods */
2218 0,
Raymond Hettinger019a1482004-03-18 02:41:19 +00002219};
2220
2221static PyObject *dictiter_iternextitem(dictiterobject *di)
2222{
2223 PyObject *key, *value, *result = di->di_result;
2224 register int i, mask;
2225 register dictentry *ep;
2226 dictobject *d = di->di_dict;
2227
2228 if (d == NULL)
2229 return NULL;
2230 assert (PyDict_Check(d));
2231
2232 if (di->di_used != d->ma_used) {
2233 PyErr_SetString(PyExc_RuntimeError,
2234 "dictionary changed size during iteration");
2235 di->di_used = -1; /* Make this state sticky */
2236 return NULL;
2237 }
2238
2239 i = di->di_pos;
2240 if (i < 0)
2241 goto fail;
2242 ep = d->ma_table;
2243 mask = d->ma_mask;
2244 while (i <= mask && ep[i].me_value == NULL)
2245 i++;
2246 di->di_pos = i+1;
2247 if (i > mask)
2248 goto fail;
2249
2250 if (result->ob_refcnt == 1) {
2251 Py_INCREF(result);
2252 Py_DECREF(PyTuple_GET_ITEM(result, 0));
2253 Py_DECREF(PyTuple_GET_ITEM(result, 1));
2254 } else {
2255 result = PyTuple_New(2);
Tim Peters60b29962006-01-01 01:19:23 +00002256 if (result == NULL)
Raymond Hettinger019a1482004-03-18 02:41:19 +00002257 return NULL;
2258 }
Raymond Hettinger0ce6dc82004-03-18 08:38:00 +00002259 di->len--;
Raymond Hettinger019a1482004-03-18 02:41:19 +00002260 key = ep[i].me_key;
2261 value = ep[i].me_value;
2262 Py_INCREF(key);
2263 Py_INCREF(value);
2264 PyTuple_SET_ITEM(result, 0, key);
2265 PyTuple_SET_ITEM(result, 1, value);
2266 return result;
2267
2268fail:
2269 Py_DECREF(d);
2270 di->di_dict = NULL;
2271 return NULL;
2272}
2273
2274PyTypeObject PyDictIterItem_Type = {
2275 PyObject_HEAD_INIT(&PyType_Type)
2276 0, /* ob_size */
2277 "dictionary-itemiterator", /* tp_name */
2278 sizeof(dictiterobject), /* tp_basicsize */
2279 0, /* tp_itemsize */
2280 /* methods */
2281 (destructor)dictiter_dealloc, /* tp_dealloc */
2282 0, /* tp_print */
2283 0, /* tp_getattr */
2284 0, /* tp_setattr */
2285 0, /* tp_compare */
2286 0, /* tp_repr */
2287 0, /* tp_as_number */
Raymond Hettinger6b27cda2005-09-24 21:23:05 +00002288 0, /* tp_as_sequence */
Raymond Hettinger019a1482004-03-18 02:41:19 +00002289 0, /* tp_as_mapping */
2290 0, /* tp_hash */
2291 0, /* tp_call */
2292 0, /* tp_str */
2293 PyObject_GenericGetAttr, /* tp_getattro */
2294 0, /* tp_setattro */
2295 0, /* tp_as_buffer */
2296 Py_TPFLAGS_DEFAULT, /* tp_flags */
2297 0, /* tp_doc */
2298 0, /* tp_traverse */
2299 0, /* tp_clear */
2300 0, /* tp_richcompare */
2301 0, /* tp_weaklistoffset */
2302 PyObject_SelfIter, /* tp_iter */
2303 (iternextfunc)dictiter_iternextitem, /* tp_iternext */
Raymond Hettinger6b27cda2005-09-24 21:23:05 +00002304 dictiter_methods, /* tp_methods */
2305 0,
Guido van Rossum59d1d2b2001-04-20 19:13:02 +00002306};