blob: 37111d26d4e1282f196043107ed402cd7489e9c2 [file] [log] [blame]
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001/***********************************************************
Guido van Rossumfd71b9e2000-06-30 23:50:40 +00002Copyright (c) 2000, BeOpen.com.
3Copyright (c) 1995-2000, Corporation for National Research Initiatives.
4Copyright (c) 1990-1995, Stichting Mathematisch Centrum.
5All rights reserved.
Guido van Rossum4b1302b1993-03-27 18:11:32 +00006
Guido van Rossumfd71b9e2000-06-30 23:50:40 +00007See the file "Misc/COPYRIGHT" for information on usage and
8redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
Guido van Rossum4b1302b1993-03-27 18:11:32 +00009******************************************************************/
10
Guido van Rossum2bc13791999-03-24 19:06:42 +000011/* Dictionary object implementation using a hash table */
Guido van Rossum9bfef441993-03-29 10:43:31 +000012
Guido van Rossumc0b618a1997-05-02 03:12:38 +000013#include "Python.h"
Guido van Rossum4b1302b1993-03-27 18:11:32 +000014
15
16/*
Guido van Rossuma9e7a811997-05-13 21:02:11 +000017 * MINSIZE is the minimum size of a dictionary.
Guido van Rossum16e93a81997-01-28 00:00:11 +000018 */
19
20#define MINSIZE 4
21
Fred Drake1bff34a2000-08-31 19:31:38 +000022/* define this out if you don't want conversion statistics on exit */
23#undef SHOW_CONVERSION_COUNTS
24
Guido van Rossum16e93a81997-01-28 00:00:11 +000025/*
26Table of irreducible polynomials to efficiently cycle through
27GF(2^n)-{0}, 2<=n<=30.
Guido van Rossum4b1302b1993-03-27 18:11:32 +000028*/
Guido van Rossum16e93a81997-01-28 00:00:11 +000029static long polys[] = {
Guido van Rossum9e5656c1997-01-29 04:45:16 +000030 4 + 3,
31 8 + 3,
32 16 + 3,
33 32 + 5,
34 64 + 3,
35 128 + 3,
36 256 + 29,
37 512 + 17,
38 1024 + 9,
39 2048 + 5,
40 4096 + 83,
41 8192 + 27,
42 16384 + 43,
43 32768 + 3,
44 65536 + 45,
45 131072 + 9,
46 262144 + 39,
47 524288 + 39,
48 1048576 + 9,
49 2097152 + 5,
50 4194304 + 3,
51 8388608 + 33,
52 16777216 + 27,
53 33554432 + 9,
54 67108864 + 71,
55 134217728 + 39,
56 268435456 + 9,
57 536870912 + 5,
58 1073741824 + 83,
59 0
Guido van Rossum4b1302b1993-03-27 18:11:32 +000060};
61
62/* Object used as dummy key to fill deleted entries */
Guido van Rossuma9e7a811997-05-13 21:02:11 +000063static PyObject *dummy; /* Initialized by first call to newdictobject() */
Guido van Rossum4b1302b1993-03-27 18:11:32 +000064
65/*
Guido van Rossum2bc13791999-03-24 19:06:42 +000066Invariant for entries: when in use, me_value is not NULL and me_key is
67not NULL and not dummy; when not in use, me_value is NULL and me_key
Guido van Rossum4b1302b1993-03-27 18:11:32 +000068is either NULL or dummy. A dummy key value cannot be replaced by
69NULL, since otherwise other keys may be lost.
70*/
71typedef struct {
72 long me_hash;
Guido van Rossumc0b618a1997-05-02 03:12:38 +000073 PyObject *me_key;
74 PyObject *me_value;
Guido van Rossum36488841997-04-11 19:14:07 +000075#ifdef USE_CACHE_ALIGNED
76 long aligner;
77#endif
Guido van Rossuma9e7a811997-05-13 21:02:11 +000078} dictentry;
Guido van Rossum4b1302b1993-03-27 18:11:32 +000079
80/*
81To ensure the lookup algorithm terminates, the table size must be a
82prime number and there must be at least one NULL key in the table.
83The value ma_fill is the number of non-NULL keys; ma_used is the number
84of non-NULL, non-dummy keys.
85To avoid slowing down lookups on a near-full table, we resize the table
86when it is more than half filled.
87*/
Fred Drake1bff34a2000-08-31 19:31:38 +000088typedef struct dictobject dictobject;
89struct dictobject {
Guido van Rossumc0b618a1997-05-02 03:12:38 +000090 PyObject_HEAD
Guido van Rossum4b1302b1993-03-27 18:11:32 +000091 int ma_fill;
92 int ma_used;
93 int ma_size;
Guido van Rossum16e93a81997-01-28 00:00:11 +000094 int ma_poly;
Guido van Rossuma9e7a811997-05-13 21:02:11 +000095 dictentry *ma_table;
Fred Drake1bff34a2000-08-31 19:31:38 +000096 dictentry *(*ma_lookup)(dictobject *mp, PyObject *key, long hash);
97};
98
99/* forward declarations */
100static dictentry *
101lookdict_string(dictobject *mp, PyObject *key, long hash);
102
103#ifdef SHOW_CONVERSION_COUNTS
104static long created = 0L;
105static long converted = 0L;
106
107static void
108show_counts(void)
109{
110 fprintf(stderr, "created %ld string dicts\n", created);
111 fprintf(stderr, "converted %ld to normal dicts\n", converted);
112 fprintf(stderr, "%.2f%% conversion rate\n", (100.0*converted)/created);
113}
114#endif
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000115
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000116PyObject *
Thomas Wouters78890102000-07-22 19:25:51 +0000117PyDict_New(void)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000118{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000119 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000120 if (dummy == NULL) { /* Auto-initialize dummy */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000121 dummy = PyString_FromString("<dummy key>");
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000122 if (dummy == NULL)
123 return NULL;
Fred Drake1bff34a2000-08-31 19:31:38 +0000124#ifdef SHOW_CONVERSION_COUNTS
125 Py_AtExit(show_counts);
126#endif
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000127 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000128 mp = PyObject_NEW(dictobject, &PyDict_Type);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000129 if (mp == NULL)
130 return NULL;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000131 mp->ma_size = 0;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000132 mp->ma_poly = 0;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000133 mp->ma_table = NULL;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000134 mp->ma_fill = 0;
135 mp->ma_used = 0;
Fred Drake1bff34a2000-08-31 19:31:38 +0000136 mp->ma_lookup = lookdict_string;
137#ifdef SHOW_CONVERSION_COUNTS
138 ++created;
139#endif
Jeremy Hyltonc5007aa2000-06-30 05:02:53 +0000140 PyObject_GC_Init(mp);
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000141 return (PyObject *)mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000142}
143
144/*
145The basic lookup function used by all operations.
Guido van Rossum16e93a81997-01-28 00:00:11 +0000146This is based on Algorithm D from Knuth Vol. 3, Sec. 6.4.
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000147Open addressing is preferred over chaining since the link overhead for
148chaining would be substantial (100% with typical malloc overhead).
Guido van Rossum16e93a81997-01-28 00:00:11 +0000149However, instead of going through the table at constant steps, we cycle
150through the values of GF(2^n)-{0}. This avoids modulo computations, being
151much cheaper on RISC machines, without leading to clustering.
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000152
Guido van Rossum2bc13791999-03-24 19:06:42 +0000153The initial probe index is computed as hash mod the table size.
Guido van Rossum16e93a81997-01-28 00:00:11 +0000154Subsequent probe indices use the values of x^i in GF(2^n) as an offset,
Guido van Rossum2bc13791999-03-24 19:06:42 +0000155where x is a root. The initial value is derived from hash, too.
156
157All arithmetic on hash should ignore overflow.
Guido van Rossum16e93a81997-01-28 00:00:11 +0000158
159(This version is due to Reimer Behrends, some ideas are also due to
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000160Jyrki Alakuijala and Vladimir Marangozov.)
Fred Drake1bff34a2000-08-31 19:31:38 +0000161
162This function must never return NULL; failures are indicated by returning
163a dictentry* for which the me_value field is NULL. Exceptions are never
164reported by this function, and outstanding exceptions are maintained.
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000165*/
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000166static dictentry *
Tim Peters1f5871e2000-07-04 17:44:48 +0000167lookdict(dictobject *mp, PyObject *key, register long hash)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000168{
Guido van Rossum16e93a81997-01-28 00:00:11 +0000169 register int i;
170 register unsigned incr;
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000171 register dictentry *freeslot;
Guido van Rossum2095d241997-04-09 19:41:24 +0000172 register unsigned int mask = mp->ma_size-1;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000173 dictentry *ep0 = mp->ma_table;
174 register dictentry *ep;
Fred Drakec88b99c2000-08-31 19:04:07 +0000175 register int restore_error = 0;
176 register int checked_error = 0;
177 register int cmp;
178 PyObject *err_type, *err_value, *err_tb;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000179 /* We must come up with (i, incr) such that 0 <= i < ma_size
180 and 0 < incr < ma_size and both are a function of hash */
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000181 i = (~hash) & mask;
182 /* We use ~hash instead of hash, as degenerate hash functions, such
Guido van Rossum16e93a81997-01-28 00:00:11 +0000183 as for ints <sigh>, can have lots of leading zeros. It's not
184 really a performance risk, but better safe than sorry. */
Guido van Rossumefb46091997-01-29 15:53:56 +0000185 ep = &ep0[i];
Guido van Rossumc1c7b1a1998-10-06 16:01:14 +0000186 if (ep->me_key == NULL || ep->me_key == key)
Guido van Rossum7d181591997-01-16 21:06:45 +0000187 return ep;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000188 if (ep->me_key == dummy)
Guido van Rossum7d181591997-01-16 21:06:45 +0000189 freeslot = ep;
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000190 else {
Fred Drakec88b99c2000-08-31 19:04:07 +0000191 if (ep->me_hash == hash) {
192 /* error can't have been checked yet */
193 checked_error = 1;
194 if (PyErr_Occurred()) {
195 restore_error = 1;
196 PyErr_Fetch(&err_type, &err_value, &err_tb);
197 }
198 cmp = PyObject_Compare(ep->me_key, key);
199 if (PyErr_Occurred())
200 PyErr_Clear();
201 else if (cmp == 0) {
202 if (restore_error)
203 PyErr_Restore(err_type, err_value,
204 err_tb);
205 return ep;
206 }
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000207 }
208 freeslot = NULL;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000209 }
Guido van Rossum2bc13791999-03-24 19:06:42 +0000210 /* Derive incr from hash, just to make it more arbitrary. Note that
Guido van Rossum16e93a81997-01-28 00:00:11 +0000211 incr must not be 0, or we will get into an infinite loop.*/
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000212 incr = (hash ^ ((unsigned long)hash >> 3)) & mask;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000213 if (!incr)
214 incr = mask;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000215 for (;;) {
Guido van Rossumefb46091997-01-29 15:53:56 +0000216 ep = &ep0[(i+incr)&mask];
Guido van Rossum16e93a81997-01-28 00:00:11 +0000217 if (ep->me_key == NULL) {
Fred Drakec88b99c2000-08-31 19:04:07 +0000218 if (restore_error)
219 PyErr_Restore(err_type, err_value, err_tb);
Guido van Rossum16e93a81997-01-28 00:00:11 +0000220 if (freeslot != NULL)
221 return freeslot;
222 else
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000223 return ep;
224 }
Guido van Rossum16e93a81997-01-28 00:00:11 +0000225 if (ep->me_key == dummy) {
226 if (freeslot == NULL)
227 freeslot = ep;
228 }
Fred Drakec88b99c2000-08-31 19:04:07 +0000229 else if (ep->me_key == key) {
230 if (restore_error)
231 PyErr_Restore(err_type, err_value, err_tb);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000232 return ep;
Fred Drakec88b99c2000-08-31 19:04:07 +0000233 }
234 else if (ep->me_hash == hash) {
235 if (!checked_error) {
236 checked_error = 1;
237 if (PyErr_Occurred()) {
238 restore_error = 1;
239 PyErr_Fetch(&err_type, &err_value,
240 &err_tb);
241 }
242 }
243 cmp = PyObject_Compare(ep->me_key, key);
244 if (PyErr_Occurred())
245 PyErr_Clear();
246 else if (cmp == 0) {
247 if (restore_error)
248 PyErr_Restore(err_type, err_value,
249 err_tb);
250 return ep;
251 }
Guido van Rossum16e93a81997-01-28 00:00:11 +0000252 }
253 /* Cycle through GF(2^n)-{0} */
254 incr = incr << 1;
255 if (incr > mask)
Thomas Wouters7e474022000-07-16 12:04:32 +0000256 incr ^= mp->ma_poly; /* This will implicitly clear
Guido van Rossumf05fc711998-11-16 22:46:30 +0000257 the highest bit */
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000258 }
259}
260
261/*
Fred Drake1bff34a2000-08-31 19:31:38 +0000262 * Hacked up version of lookdict which can assume keys are always strings;
263 * this assumption allows testing for errors during PyObject_Compare() to
264 * be dropped; string-string comparisons never raise exceptions. This also
265 * means we don't need to go through PyObject_Compare(); we can always use
266 * the tp_compare slot of the string type object directly.
267 *
268 * This really only becomes meaningful if proper error handling in lookdict()
269 * is too expensive.
270 */
271static dictentry *
272lookdict_string(dictobject *mp, PyObject *key, register long hash)
273{
274 register int i;
275 register unsigned incr;
276 register dictentry *freeslot;
277 register unsigned int mask = mp->ma_size-1;
278 dictentry *ep0 = mp->ma_table;
279 register dictentry *ep;
280 cmpfunc compare = PyString_Type.tp_compare;
281
282 /* make sure this function doesn't have to handle non-string keys */
283 if (!PyString_Check(key)) {
284#ifdef SHOW_CONVERSION_COUNTS
285 ++converted;
286#endif
287 mp->ma_lookup = lookdict;
288 return lookdict(mp, key, hash);
289 }
290 /* We must come up with (i, incr) such that 0 <= i < ma_size
291 and 0 < incr < ma_size and both are a function of hash */
292 i = (~hash) & mask;
293 /* We use ~hash instead of hash, as degenerate hash functions, such
294 as for ints <sigh>, can have lots of leading zeros. It's not
295 really a performance risk, but better safe than sorry. */
296 ep = &ep0[i];
297 if (ep->me_key == NULL || ep->me_key == key)
298 return ep;
299 if (ep->me_key == dummy)
300 freeslot = ep;
301 else {
302 if (ep->me_hash == hash
303 && compare(ep->me_key, key) == 0) {
304 return ep;
305 }
306 freeslot = NULL;
307 }
308 /* Derive incr from hash, just to make it more arbitrary. Note that
309 incr must not be 0, or we will get into an infinite loop.*/
310 incr = (hash ^ ((unsigned long)hash >> 3)) & mask;
311 if (!incr)
312 incr = mask;
313 for (;;) {
314 ep = &ep0[(i+incr)&mask];
315 if (ep->me_key == NULL) {
316 if (freeslot != NULL)
317 return freeslot;
318 else
319 return ep;
320 }
321 if (ep->me_key == dummy) {
322 if (freeslot == NULL)
323 freeslot = ep;
324 }
325 else if (ep->me_key == key
326 || (ep->me_hash == hash
327 && compare(ep->me_key, key) == 0)) {
328 return ep;
329 }
330 /* Cycle through GF(2^n)-{0} */
331 incr = incr << 1;
332 if (incr > mask)
333 incr ^= mp->ma_poly; /* This will implicitly clear
334 the highest bit */
335 }
336}
337
338/*
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000339Internal routine to insert a new item into the table.
340Used both by the internal resize routine and by the public insert routine.
341Eats a reference to key and one to value.
342*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000343static void
Tim Peters1f5871e2000-07-04 17:44:48 +0000344insertdict(register dictobject *mp, PyObject *key, long hash, PyObject *value)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000345{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000346 PyObject *old_value;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000347 register dictentry *ep;
Fred Drake1bff34a2000-08-31 19:31:38 +0000348 ep = (mp->ma_lookup)(mp, key, hash);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000349 if (ep->me_value != NULL) {
Guido van Rossumd7047b31995-01-02 19:07:15 +0000350 old_value = ep->me_value;
351 ep->me_value = value;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000352 Py_DECREF(old_value); /* which **CAN** re-enter */
353 Py_DECREF(key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000354 }
355 else {
356 if (ep->me_key == NULL)
357 mp->ma_fill++;
358 else
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000359 Py_DECREF(ep->me_key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000360 ep->me_key = key;
361 ep->me_hash = hash;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000362 ep->me_value = value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000363 mp->ma_used++;
364 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000365}
366
367/*
368Restructure the table by allocating a new table and reinserting all
369items again. When entries have been deleted, the new table may
370actually be smaller than the old one.
371*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000372static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000373dictresize(dictobject *mp, int minused)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000374{
375 register int oldsize = mp->ma_size;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000376 register int newsize, newpoly;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000377 register dictentry *oldtable = mp->ma_table;
378 register dictentry *newtable;
379 register dictentry *ep;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000380 register int i;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000381 for (i = 0, newsize = MINSIZE; ; i++, newsize <<= 1) {
382 if (i > sizeof(polys)/sizeof(polys[0])) {
383 /* Ran out of polynomials */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000384 PyErr_NoMemory();
Guido van Rossum1d5735e1994-08-30 08:27:36 +0000385 return -1;
386 }
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000387 if (newsize > minused) {
Guido van Rossum16e93a81997-01-28 00:00:11 +0000388 newpoly = polys[i];
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000389 break;
390 }
391 }
Guido van Rossumb18618d2000-05-03 23:44:39 +0000392 newtable = PyMem_NEW(dictentry, newsize);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000393 if (newtable == NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000394 PyErr_NoMemory();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000395 return -1;
396 }
Guido van Rossum0fd00331998-07-16 15:06:13 +0000397 memset(newtable, '\0', sizeof(dictentry) * newsize);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000398 mp->ma_size = newsize;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000399 mp->ma_poly = newpoly;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000400 mp->ma_table = newtable;
401 mp->ma_fill = 0;
402 mp->ma_used = 0;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000403
404 /* Make two passes, so we can avoid decrefs
405 (and possible side effects) till the table is copied */
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000406 for (i = 0, ep = oldtable; i < oldsize; i++, ep++) {
407 if (ep->me_value != NULL)
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000408 insertdict(mp,ep->me_key,ep->me_hash,ep->me_value);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000409 }
Guido van Rossumd7047b31995-01-02 19:07:15 +0000410 for (i = 0, ep = oldtable; i < oldsize; i++, ep++) {
Guido van Rossum255443b1998-04-10 22:47:14 +0000411 if (ep->me_value == NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000412 Py_XDECREF(ep->me_key);
Guido van Rossum255443b1998-04-10 22:47:14 +0000413 }
Guido van Rossumd7047b31995-01-02 19:07:15 +0000414 }
415
Guido van Rossumb18618d2000-05-03 23:44:39 +0000416 if (oldtable != NULL)
417 PyMem_DEL(oldtable);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000418 return 0;
419}
420
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000421PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000422PyDict_GetItem(PyObject *op, PyObject *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000423{
424 long hash;
Fred Drake1bff34a2000-08-31 19:31:38 +0000425 dictobject *mp = (dictobject *)op;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000426 if (!PyDict_Check(op)) {
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000427 return NULL;
428 }
Fred Drake1bff34a2000-08-31 19:31:38 +0000429 if (mp->ma_table == NULL)
Guido van Rossumd7047b31995-01-02 19:07:15 +0000430 return NULL;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000431#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000432 if (!PyString_Check(key) ||
433 (hash = ((PyStringObject *) key)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000434#endif
Guido van Rossumca756f21997-01-23 19:39:29 +0000435 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000436 hash = PyObject_Hash(key);
Guido van Rossum474b19e1998-05-14 01:00:51 +0000437 if (hash == -1) {
438 PyErr_Clear();
Guido van Rossumca756f21997-01-23 19:39:29 +0000439 return NULL;
Guido van Rossum474b19e1998-05-14 01:00:51 +0000440 }
Guido van Rossumca756f21997-01-23 19:39:29 +0000441 }
Fred Drake1bff34a2000-08-31 19:31:38 +0000442 return (mp->ma_lookup)(mp, key, hash)->me_value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000443}
444
445int
Tim Peters1f5871e2000-07-04 17:44:48 +0000446PyDict_SetItem(register PyObject *op, PyObject *key, PyObject *value)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000447{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000448 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000449 register long hash;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000450 if (!PyDict_Check(op)) {
451 PyErr_BadInternalCall();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000452 return -1;
453 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000454 mp = (dictobject *)op;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000455#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000456 if (PyString_Check(key)) {
Guido van Rossum2a61e741997-01-18 07:55:05 +0000457#ifdef INTERN_STRINGS
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000458 if (((PyStringObject *)key)->ob_sinterned != NULL) {
459 key = ((PyStringObject *)key)->ob_sinterned;
460 hash = ((PyStringObject *)key)->ob_shash;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000461 }
462 else
463#endif
464 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000465 hash = ((PyStringObject *)key)->ob_shash;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000466 if (hash == -1)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000467 hash = PyObject_Hash(key);
Guido van Rossum2a61e741997-01-18 07:55:05 +0000468 }
469 }
470 else
471#endif
472 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000473 hash = PyObject_Hash(key);
Guido van Rossum2a61e741997-01-18 07:55:05 +0000474 if (hash == -1)
475 return -1;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000476 }
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000477 /* if fill >= 2/3 size, double in size */
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000478 if (mp->ma_fill*3 >= mp->ma_size*2) {
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000479 if (dictresize(mp, mp->ma_used*2) != 0) {
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000480 if (mp->ma_fill+1 > mp->ma_size)
481 return -1;
482 }
483 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000484 Py_INCREF(value);
485 Py_INCREF(key);
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000486 insertdict(mp, key, hash, value);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000487 return 0;
488}
489
490int
Tim Peters1f5871e2000-07-04 17:44:48 +0000491PyDict_DelItem(PyObject *op, PyObject *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000492{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000493 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000494 register long hash;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000495 register dictentry *ep;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000496 PyObject *old_value, *old_key;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000497
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000498 if (!PyDict_Check(op)) {
499 PyErr_BadInternalCall();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000500 return -1;
501 }
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000502#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000503 if (!PyString_Check(key) ||
504 (hash = ((PyStringObject *) key)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000505#endif
Guido van Rossumca756f21997-01-23 19:39:29 +0000506 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000507 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +0000508 if (hash == -1)
509 return -1;
510 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000511 mp = (dictobject *)op;
512 if (((dictobject *)op)->ma_table == NULL)
Guido van Rossumefc87131995-01-02 19:42:39 +0000513 goto empty;
Fred Drake1bff34a2000-08-31 19:31:38 +0000514 ep = (mp->ma_lookup)(mp, key, hash);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000515 if (ep->me_value == NULL) {
Guido van Rossumefc87131995-01-02 19:42:39 +0000516 empty:
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000517 PyErr_SetObject(PyExc_KeyError, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000518 return -1;
519 }
Guido van Rossumd7047b31995-01-02 19:07:15 +0000520 old_key = ep->me_key;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000521 Py_INCREF(dummy);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000522 ep->me_key = dummy;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000523 old_value = ep->me_value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000524 ep->me_value = NULL;
525 mp->ma_used--;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000526 Py_DECREF(old_value);
527 Py_DECREF(old_key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000528 return 0;
529}
530
Guido van Rossum25831651993-05-19 14:50:45 +0000531void
Tim Peters1f5871e2000-07-04 17:44:48 +0000532PyDict_Clear(PyObject *op)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000533{
Guido van Rossumd7047b31995-01-02 19:07:15 +0000534 int i, n;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000535 register dictentry *table;
536 dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000537 if (!PyDict_Check(op))
Guido van Rossum25831651993-05-19 14:50:45 +0000538 return;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000539 mp = (dictobject *)op;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000540 table = mp->ma_table;
541 if (table == NULL)
542 return;
543 n = mp->ma_size;
544 mp->ma_size = mp->ma_used = mp->ma_fill = 0;
545 mp->ma_table = NULL;
546 for (i = 0; i < n; i++) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000547 Py_XDECREF(table[i].me_key);
548 Py_XDECREF(table[i].me_value);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000549 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000550 PyMem_DEL(table);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000551}
552
Guido van Rossum25831651993-05-19 14:50:45 +0000553int
Tim Peters1f5871e2000-07-04 17:44:48 +0000554PyDict_Next(PyObject *op, int *ppos, PyObject **pkey, PyObject **pvalue)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000555{
Guido van Rossum25831651993-05-19 14:50:45 +0000556 int i;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000557 register dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000558 if (!PyDict_Check(op))
Guido van Rossum25831651993-05-19 14:50:45 +0000559 return 0;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000560 mp = (dictobject *)op;
Guido van Rossum25831651993-05-19 14:50:45 +0000561 i = *ppos;
562 if (i < 0)
563 return 0;
564 while (i < mp->ma_size && mp->ma_table[i].me_value == NULL)
565 i++;
566 *ppos = i+1;
567 if (i >= mp->ma_size)
568 return 0;
569 if (pkey)
570 *pkey = mp->ma_table[i].me_key;
571 if (pvalue)
572 *pvalue = mp->ma_table[i].me_value;
573 return 1;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000574}
575
576/* Methods */
577
578static void
Tim Peters1f5871e2000-07-04 17:44:48 +0000579dict_dealloc(register dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000580{
581 register int i;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000582 register dictentry *ep;
Guido van Rossumd724b232000-03-13 16:01:29 +0000583 Py_TRASHCAN_SAFE_BEGIN(mp)
Jeremy Hyltonc5007aa2000-06-30 05:02:53 +0000584 PyObject_GC_Fini(mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000585 for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) {
Guido van Rossum255443b1998-04-10 22:47:14 +0000586 if (ep->me_key != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000587 Py_DECREF(ep->me_key);
Guido van Rossum255443b1998-04-10 22:47:14 +0000588 }
589 if (ep->me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000590 Py_DECREF(ep->me_value);
Guido van Rossum255443b1998-04-10 22:47:14 +0000591 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000592 }
Guido van Rossumb18618d2000-05-03 23:44:39 +0000593 if (mp->ma_table != NULL)
594 PyMem_DEL(mp->ma_table);
Guido van Rossum4cc6ac72000-07-01 01:00:38 +0000595 mp = (dictobject *) PyObject_AS_GC(mp);
Guido van Rossumb18618d2000-05-03 23:44:39 +0000596 PyObject_DEL(mp);
Guido van Rossumd724b232000-03-13 16:01:29 +0000597 Py_TRASHCAN_SAFE_END(mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000598}
599
600static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000601dict_print(register dictobject *mp, register FILE *fp, register int flags)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000602{
603 register int i;
604 register int any;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000605 register dictentry *ep;
Guido van Rossum255443b1998-04-10 22:47:14 +0000606
607 i = Py_ReprEnter((PyObject*)mp);
608 if (i != 0) {
609 if (i < 0)
610 return i;
611 fprintf(fp, "{...}");
612 return 0;
613 }
614
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000615 fprintf(fp, "{");
616 any = 0;
617 for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) {
618 if (ep->me_value != NULL) {
619 if (any++ > 0)
620 fprintf(fp, ", ");
Guido van Rossum255443b1998-04-10 22:47:14 +0000621 if (PyObject_Print((PyObject *)ep->me_key, fp, 0)!=0) {
622 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000623 return -1;
Guido van Rossum255443b1998-04-10 22:47:14 +0000624 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000625 fprintf(fp, ": ");
Guido van Rossum255443b1998-04-10 22:47:14 +0000626 if (PyObject_Print(ep->me_value, fp, 0) != 0) {
627 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000628 return -1;
Guido van Rossum255443b1998-04-10 22:47:14 +0000629 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000630 }
631 }
632 fprintf(fp, "}");
Guido van Rossum255443b1998-04-10 22:47:14 +0000633 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000634 return 0;
635}
636
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000637static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000638dict_repr(dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000639{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000640 auto PyObject *v;
641 PyObject *sepa, *colon;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000642 register int i;
643 register int any;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000644 register dictentry *ep;
Guido van Rossum255443b1998-04-10 22:47:14 +0000645
646 i = Py_ReprEnter((PyObject*)mp);
647 if (i != 0) {
648 if (i > 0)
649 return PyString_FromString("{...}");
650 return NULL;
651 }
652
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000653 v = PyString_FromString("{");
654 sepa = PyString_FromString(", ");
655 colon = PyString_FromString(": ");
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000656 any = 0;
Guido van Rossum1d5735e1994-08-30 08:27:36 +0000657 for (i = 0, ep = mp->ma_table; i < mp->ma_size && v; i++, ep++) {
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000658 if (ep->me_value != NULL) {
659 if (any++)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000660 PyString_Concat(&v, sepa);
661 PyString_ConcatAndDel(&v, PyObject_Repr(ep->me_key));
662 PyString_Concat(&v, colon);
663 PyString_ConcatAndDel(&v, PyObject_Repr(ep->me_value));
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000664 }
665 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000666 PyString_ConcatAndDel(&v, PyString_FromString("}"));
Guido van Rossum255443b1998-04-10 22:47:14 +0000667 Py_ReprLeave((PyObject*)mp);
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000668 Py_XDECREF(sepa);
669 Py_XDECREF(colon);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000670 return v;
671}
672
673static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000674dict_length(dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000675{
676 return mp->ma_used;
677}
678
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000679static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000680dict_subscript(dictobject *mp, register PyObject *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000681{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000682 PyObject *v;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000683 long hash;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000684 if (mp->ma_table == NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000685 PyErr_SetObject(PyExc_KeyError, key);
Guido van Rossumd7047b31995-01-02 19:07:15 +0000686 return NULL;
687 }
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000688#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000689 if (!PyString_Check(key) ||
690 (hash = ((PyStringObject *) key)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000691#endif
Guido van Rossumca756f21997-01-23 19:39:29 +0000692 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000693 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +0000694 if (hash == -1)
695 return NULL;
696 }
Fred Drake1bff34a2000-08-31 19:31:38 +0000697 v = (mp->ma_lookup)(mp, key, hash) -> me_value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000698 if (v == NULL)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000699 PyErr_SetObject(PyExc_KeyError, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000700 else
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000701 Py_INCREF(v);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000702 return v;
703}
704
705static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000706dict_ass_sub(dictobject *mp, PyObject *v, PyObject *w)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000707{
708 if (w == NULL)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000709 return PyDict_DelItem((PyObject *)mp, v);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000710 else
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000711 return PyDict_SetItem((PyObject *)mp, v, w);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000712}
713
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000714static PyMappingMethods dict_as_mapping = {
715 (inquiry)dict_length, /*mp_length*/
716 (binaryfunc)dict_subscript, /*mp_subscript*/
717 (objobjargproc)dict_ass_sub, /*mp_ass_subscript*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000718};
719
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000720static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000721dict_keys(register dictobject *mp, PyObject *args)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000722{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000723 register PyObject *v;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000724 register int i, j;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000725 if (!PyArg_NoArgs(args))
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000726 return NULL;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000727 v = PyList_New(mp->ma_used);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000728 if (v == NULL)
729 return NULL;
730 for (i = 0, j = 0; i < mp->ma_size; i++) {
731 if (mp->ma_table[i].me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000732 PyObject *key = mp->ma_table[i].me_key;
733 Py_INCREF(key);
734 PyList_SetItem(v, j, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000735 j++;
736 }
737 }
738 return v;
739}
740
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000741static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000742dict_values(register dictobject *mp, PyObject *args)
Guido van Rossum25831651993-05-19 14:50:45 +0000743{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000744 register PyObject *v;
Guido van Rossum25831651993-05-19 14:50:45 +0000745 register int i, j;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000746 if (!PyArg_NoArgs(args))
Guido van Rossum25831651993-05-19 14:50:45 +0000747 return NULL;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000748 v = PyList_New(mp->ma_used);
Guido van Rossum25831651993-05-19 14:50:45 +0000749 if (v == NULL)
750 return NULL;
751 for (i = 0, j = 0; i < mp->ma_size; i++) {
752 if (mp->ma_table[i].me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000753 PyObject *value = mp->ma_table[i].me_value;
754 Py_INCREF(value);
755 PyList_SetItem(v, j, value);
Guido van Rossum25831651993-05-19 14:50:45 +0000756 j++;
757 }
758 }
759 return v;
760}
761
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000762static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000763dict_items(register dictobject *mp, PyObject *args)
Guido van Rossum25831651993-05-19 14:50:45 +0000764{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000765 register PyObject *v;
Guido van Rossum25831651993-05-19 14:50:45 +0000766 register int i, j;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000767 if (!PyArg_NoArgs(args))
Guido van Rossum25831651993-05-19 14:50:45 +0000768 return NULL;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000769 v = PyList_New(mp->ma_used);
Guido van Rossum25831651993-05-19 14:50:45 +0000770 if (v == NULL)
771 return NULL;
772 for (i = 0, j = 0; i < mp->ma_size; i++) {
773 if (mp->ma_table[i].me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000774 PyObject *key = mp->ma_table[i].me_key;
775 PyObject *value = mp->ma_table[i].me_value;
776 PyObject *item = PyTuple_New(2);
Guido van Rossum25831651993-05-19 14:50:45 +0000777 if (item == NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000778 Py_DECREF(v);
Guido van Rossum25831651993-05-19 14:50:45 +0000779 return NULL;
780 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000781 Py_INCREF(key);
782 PyTuple_SetItem(item, 0, key);
783 Py_INCREF(value);
784 PyTuple_SetItem(item, 1, value);
785 PyList_SetItem(v, j, item);
Guido van Rossum25831651993-05-19 14:50:45 +0000786 j++;
787 }
788 }
789 return v;
790}
791
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000792static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000793dict_update(register dictobject *mp, PyObject *args)
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000794{
795 register int i;
796 dictobject *other;
797 dictentry *entry;
798 if (!PyArg_Parse(args, "O!", &PyDict_Type, &other))
799 return NULL;
800 if (other == mp)
Guido van Rossuma8d51311997-06-02 17:13:37 +0000801 goto done; /* a.update(a); nothing to do */
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000802 /* Do one big resize at the start, rather than incrementally
803 resizing as we insert new items. Expect that there will be
804 no (or few) overlapping keys. */
805 if ((mp->ma_fill + other->ma_used)*3 >= mp->ma_size*2) {
806 if (dictresize(mp, (mp->ma_used + other->ma_used)*3/2) != 0)
807 return NULL;
808 }
809 for (i = 0; i < other->ma_size; i++) {
810 entry = &other->ma_table[i];
811 if (entry->me_value != NULL) {
812 Py_INCREF(entry->me_key);
813 Py_INCREF(entry->me_value);
814 insertdict(mp, entry->me_key, entry->me_hash,
815 entry->me_value);
816 }
817 }
818 done:
819 Py_INCREF(Py_None);
820 return Py_None;
821}
822
823static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000824dict_copy(register dictobject *mp, PyObject *args)
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000825{
Jeremy Hyltona12c7a72000-03-30 22:27:31 +0000826 if (!PyArg_Parse(args, ""))
827 return NULL;
828 return PyDict_Copy((PyObject*)mp);
829}
830
831PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000832PyDict_Copy(PyObject *o)
Jeremy Hyltona12c7a72000-03-30 22:27:31 +0000833{
834 register dictobject *mp;
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000835 register int i;
836 dictobject *copy;
837 dictentry *entry;
Jeremy Hyltona12c7a72000-03-30 22:27:31 +0000838
839 if (o == NULL || !PyDict_Check(o)) {
840 PyErr_BadInternalCall();
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000841 return NULL;
Jeremy Hyltona12c7a72000-03-30 22:27:31 +0000842 }
843 mp = (dictobject *)o;
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000844 copy = (dictobject *)PyDict_New();
845 if (copy == NULL)
846 return NULL;
847 if (mp->ma_used > 0) {
848 if (dictresize(copy, mp->ma_used*3/2) != 0)
849 return NULL;
850 for (i = 0; i < mp->ma_size; i++) {
851 entry = &mp->ma_table[i];
852 if (entry->me_value != NULL) {
853 Py_INCREF(entry->me_key);
854 Py_INCREF(entry->me_value);
855 insertdict(copy, entry->me_key, entry->me_hash,
856 entry->me_value);
857 }
858 }
859 }
860 return (PyObject *)copy;
861}
862
Guido van Rossum4199fac1993-11-05 10:18:44 +0000863int
Tim Peters1f5871e2000-07-04 17:44:48 +0000864PyDict_Size(PyObject *mp)
Guido van Rossum4199fac1993-11-05 10:18:44 +0000865{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000866 if (mp == NULL || !PyDict_Check(mp)) {
867 PyErr_BadInternalCall();
Guido van Rossumb376a4a1993-11-23 17:53:17 +0000868 return 0;
Guido van Rossum4199fac1993-11-05 10:18:44 +0000869 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000870 return ((dictobject *)mp)->ma_used;
Guido van Rossum4199fac1993-11-05 10:18:44 +0000871}
872
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000873PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000874PyDict_Keys(PyObject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000875{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000876 if (mp == NULL || !PyDict_Check(mp)) {
877 PyErr_BadInternalCall();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000878 return NULL;
879 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000880 return dict_keys((dictobject *)mp, (PyObject *)NULL);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000881}
882
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000883PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000884PyDict_Values(PyObject *mp)
Guido van Rossum25831651993-05-19 14:50:45 +0000885{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000886 if (mp == NULL || !PyDict_Check(mp)) {
887 PyErr_BadInternalCall();
Guido van Rossum25831651993-05-19 14:50:45 +0000888 return NULL;
889 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000890 return dict_values((dictobject *)mp, (PyObject *)NULL);
Guido van Rossum25831651993-05-19 14:50:45 +0000891}
892
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000893PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000894PyDict_Items(PyObject *mp)
Guido van Rossum25831651993-05-19 14:50:45 +0000895{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000896 if (mp == NULL || !PyDict_Check(mp)) {
897 PyErr_BadInternalCall();
Guido van Rossum25831651993-05-19 14:50:45 +0000898 return NULL;
899 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000900 return dict_items((dictobject *)mp, (PyObject *)NULL);
Guido van Rossum25831651993-05-19 14:50:45 +0000901}
902
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000903#define NEWCMP
904
905#ifdef NEWCMP
906
907/* Subroutine which returns the smallest key in a for which b's value
908 is different or absent. The value is returned too, through the
909 pval argument. No reference counts are incremented. */
910
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000911static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000912characterize(dictobject *a, dictobject *b, PyObject **pval)
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000913{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000914 PyObject *diff = NULL;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000915 int i;
916
917 *pval = NULL;
918 for (i = 0; i < a->ma_size; i++) {
919 if (a->ma_table[i].me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000920 PyObject *key = a->ma_table[i].me_key;
921 PyObject *aval, *bval;
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000922 /* XXX What if PyObject_Compare raises an exception? */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000923 if (diff != NULL && PyObject_Compare(key, diff) > 0)
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000924 continue;
925 aval = a->ma_table[i].me_value;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000926 bval = PyDict_GetItem((PyObject *)b, key);
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000927 /* XXX What if PyObject_Compare raises an exception? */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000928 if (bval == NULL || PyObject_Compare(aval, bval) != 0)
929 {
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000930 diff = key;
931 *pval = aval;
932 }
933 }
934 }
935 return diff;
936}
937
938static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000939dict_compare(dictobject *a, dictobject *b)
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000940{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000941 PyObject *adiff, *bdiff, *aval, *bval;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000942 int res;
943
944 /* Compare lengths first */
945 if (a->ma_used < b->ma_used)
946 return -1; /* a is shorter */
947 else if (a->ma_used > b->ma_used)
948 return 1; /* b is shorter */
949 /* Same length -- check all keys */
950 adiff = characterize(a, b, &aval);
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000951 if (PyErr_Occurred())
952 return -1;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000953 if (adiff == NULL)
954 return 0; /* a is a subset with the same length */
955 bdiff = characterize(b, a, &bval);
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000956 if (PyErr_Occurred())
957 return -1;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000958 /* bdiff == NULL would be impossible now */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000959 res = PyObject_Compare(adiff, bdiff);
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000960 if (res == 0)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000961 res = PyObject_Compare(aval, bval);
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000962 return res;
963}
964
965#else /* !NEWCMP */
966
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000967static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000968dict_compare(dictobject *a, dictobject *b)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000969{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000970 PyObject *akeys, *bkeys;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000971 int i, n, res;
972 if (a == b)
973 return 0;
974 if (a->ma_used == 0) {
975 if (b->ma_used != 0)
976 return -1;
977 else
978 return 0;
979 }
980 else {
981 if (b->ma_used == 0)
982 return 1;
983 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000984 akeys = dict_keys(a, (PyObject *)NULL);
985 bkeys = dict_keys(b, (PyObject *)NULL);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000986 if (akeys == NULL || bkeys == NULL) {
987 /* Oops, out of memory -- what to do? */
988 /* For now, sort on address! */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000989 Py_XDECREF(akeys);
990 Py_XDECREF(bkeys);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000991 if (a < b)
992 return -1;
993 else
994 return 1;
995 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000996 PyList_Sort(akeys);
997 PyList_Sort(bkeys);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000998 n = a->ma_used < b->ma_used ? a->ma_used : b->ma_used; /* smallest */
999 res = 0;
1000 for (i = 0; i < n; i++) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001001 PyObject *akey, *bkey, *aval, *bval;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001002 long ahash, bhash;
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001003 akey = PyList_GetItem(akeys, i);
1004 bkey = PyList_GetItem(bkeys, i);
1005 res = PyObject_Compare(akey, bkey);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001006 if (res != 0)
1007 break;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +00001008#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001009 if (!PyString_Check(akey) ||
1010 (ahash = ((PyStringObject *) akey)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +00001011#endif
Guido van Rossumca756f21997-01-23 19:39:29 +00001012 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001013 ahash = PyObject_Hash(akey);
Guido van Rossumca756f21997-01-23 19:39:29 +00001014 if (ahash == -1)
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001015 PyErr_Clear(); /* Don't want errors here */
Guido van Rossumca756f21997-01-23 19:39:29 +00001016 }
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +00001017#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001018 if (!PyString_Check(bkey) ||
1019 (bhash = ((PyStringObject *) bkey)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +00001020#endif
Guido van Rossumca756f21997-01-23 19:39:29 +00001021 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001022 bhash = PyObject_Hash(bkey);
Guido van Rossumca756f21997-01-23 19:39:29 +00001023 if (bhash == -1)
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001024 PyErr_Clear(); /* Don't want errors here */
Guido van Rossumca756f21997-01-23 19:39:29 +00001025 }
Fred Drake1bff34a2000-08-31 19:31:38 +00001026 aval = (a->ma_lookup)(a, akey, ahash) -> me_value;
1027 bval = (b->ma_lookup)(b, bkey, bhash) -> me_value;
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001028 res = PyObject_Compare(aval, bval);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001029 if (res != 0)
1030 break;
1031 }
1032 if (res == 0) {
1033 if (a->ma_used < b->ma_used)
1034 res = -1;
1035 else if (a->ma_used > b->ma_used)
1036 res = 1;
1037 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001038 Py_DECREF(akeys);
1039 Py_DECREF(bkeys);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001040 return res;
1041}
1042
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001043#endif /* !NEWCMP */
1044
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001045static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001046dict_has_key(register dictobject *mp, PyObject *args)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001047{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001048 PyObject *key;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001049 long hash;
1050 register long ok;
Fred Drake52fccfd2000-02-23 15:47:16 +00001051 if (!PyArg_ParseTuple(args, "O:has_key", &key))
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001052 return NULL;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +00001053#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001054 if (!PyString_Check(key) ||
1055 (hash = ((PyStringObject *) key)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +00001056#endif
Guido van Rossumca756f21997-01-23 19:39:29 +00001057 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001058 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +00001059 if (hash == -1)
1060 return NULL;
1061 }
Fred Drake1bff34a2000-08-31 19:31:38 +00001062 ok = (mp->ma_size != 0
1063 && (mp->ma_lookup)(mp, key, hash)->me_value != NULL);
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001064 return PyInt_FromLong(ok);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001065}
1066
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001067static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001068dict_get(register dictobject *mp, PyObject *args)
Barry Warsawc38c5da1997-10-06 17:49:20 +00001069{
1070 PyObject *key;
Barry Warsaw320ac331997-10-20 17:26:25 +00001071 PyObject *failobj = Py_None;
Barry Warsawc38c5da1997-10-06 17:49:20 +00001072 PyObject *val = NULL;
1073 long hash;
1074
Fred Drake52fccfd2000-02-23 15:47:16 +00001075 if (!PyArg_ParseTuple(args, "O|O:get", &key, &failobj))
Barry Warsawc38c5da1997-10-06 17:49:20 +00001076 return NULL;
Guido van Rossum6fcfa721997-10-20 20:10:00 +00001077 if (mp->ma_table == NULL)
1078 goto finally;
Barry Warsawc38c5da1997-10-06 17:49:20 +00001079
Barry Warsawc38c5da1997-10-06 17:49:20 +00001080#ifdef CACHE_HASH
1081 if (!PyString_Check(key) ||
1082 (hash = ((PyStringObject *) key)->ob_shash) == -1)
1083#endif
1084 {
1085 hash = PyObject_Hash(key);
1086 if (hash == -1)
1087 return NULL;
1088 }
Fred Drake1bff34a2000-08-31 19:31:38 +00001089 val = (mp->ma_lookup)(mp, key, hash)->me_value;
Barry Warsaw320ac331997-10-20 17:26:25 +00001090
Guido van Rossum6fcfa721997-10-20 20:10:00 +00001091 finally:
Barry Warsawc38c5da1997-10-06 17:49:20 +00001092 if (val == NULL)
1093 val = failobj;
1094 Py_INCREF(val);
1095 return val;
1096}
1097
1098
1099static PyObject *
Guido van Rossum164452c2000-08-08 16:12:54 +00001100dict_setdefault(register dictobject *mp, PyObject *args)
1101{
1102 PyObject *key;
1103 PyObject *failobj = Py_None;
1104 PyObject *val = NULL;
1105 long hash;
1106
1107 if (!PyArg_ParseTuple(args, "O|O:setdefault", &key, &failobj))
1108 return NULL;
1109 if (mp->ma_table == NULL)
1110 goto finally;
1111
1112#ifdef CACHE_HASH
1113 if (!PyString_Check(key) ||
1114 (hash = ((PyStringObject *) key)->ob_shash) == -1)
1115#endif
1116 {
1117 hash = PyObject_Hash(key);
1118 if (hash == -1)
1119 return NULL;
1120 }
Fred Drake1bff34a2000-08-31 19:31:38 +00001121 val = (mp->ma_lookup)(mp, key, hash)->me_value;
Guido van Rossum164452c2000-08-08 16:12:54 +00001122
1123 finally:
1124 if (val == NULL) {
1125 val = failobj;
1126 if (PyDict_SetItem((PyObject*)mp, key, failobj))
1127 val = NULL;
1128 }
1129 Py_XINCREF(val);
1130 return val;
1131}
1132
1133
1134static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001135dict_clear(register dictobject *mp, PyObject *args)
Guido van Rossumfb8f1ca1997-03-21 21:55:12 +00001136{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001137 if (!PyArg_NoArgs(args))
Guido van Rossumfb8f1ca1997-03-21 21:55:12 +00001138 return NULL;
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001139 PyDict_Clear((PyObject *)mp);
1140 Py_INCREF(Py_None);
1141 return Py_None;
Guido van Rossumfb8f1ca1997-03-21 21:55:12 +00001142}
1143
Jeremy Hylton8caad492000-06-23 14:18:11 +00001144static int
1145dict_traverse(PyObject *op, visitproc visit, void *arg)
1146{
1147 int i = 0, err;
1148 PyObject *pk;
1149 PyObject *pv;
1150
1151 while (PyDict_Next(op, &i, &pk, &pv)) {
1152 err = visit(pk, arg);
1153 if (err)
1154 return err;
1155 err = visit(pv, arg);
1156 if (err)
1157 return err;
1158 }
1159 return 0;
1160}
1161
1162static int
1163dict_tp_clear(PyObject *op)
1164{
1165 PyDict_Clear(op);
1166 return 0;
1167}
1168
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001169static PyMethodDef mapp_methods[] = {
Fred Drake52fccfd2000-02-23 15:47:16 +00001170 {"has_key", (PyCFunction)dict_has_key, METH_VARARGS},
Guido van Rossum5d8123f1997-07-13 03:58:01 +00001171 {"keys", (PyCFunction)dict_keys},
1172 {"items", (PyCFunction)dict_items},
1173 {"values", (PyCFunction)dict_values},
Guido van Rossuma8d51311997-06-02 17:13:37 +00001174 {"update", (PyCFunction)dict_update},
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001175 {"clear", (PyCFunction)dict_clear},
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001176 {"copy", (PyCFunction)dict_copy},
Fred Drake52fccfd2000-02-23 15:47:16 +00001177 {"get", (PyCFunction)dict_get, METH_VARARGS},
Guido van Rossum164452c2000-08-08 16:12:54 +00001178 {"setdefault", (PyCFunction)dict_setdefault, METH_VARARGS},
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001179 {NULL, NULL} /* sentinel */
1180};
1181
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001182static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001183dict_getattr(dictobject *mp, char *name)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001184{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001185 return Py_FindMethod(mapp_methods, (PyObject *)mp, name);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001186}
1187
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001188PyTypeObject PyDict_Type = {
1189 PyObject_HEAD_INIT(&PyType_Type)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001190 0,
Guido van Rossum9bfef441993-03-29 10:43:31 +00001191 "dictionary",
Jeremy Hyltonc5007aa2000-06-30 05:02:53 +00001192 sizeof(dictobject) + PyGC_HEAD_SIZE,
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001193 0,
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001194 (destructor)dict_dealloc, /*tp_dealloc*/
1195 (printfunc)dict_print, /*tp_print*/
1196 (getattrfunc)dict_getattr, /*tp_getattr*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001197 0, /*tp_setattr*/
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001198 (cmpfunc)dict_compare, /*tp_compare*/
1199 (reprfunc)dict_repr, /*tp_repr*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001200 0, /*tp_as_number*/
1201 0, /*tp_as_sequence*/
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001202 &dict_as_mapping, /*tp_as_mapping*/
Jeremy Hylton8caad492000-06-23 14:18:11 +00001203 0, /* tp_hash */
1204 0, /* tp_call */
1205 0, /* tp_str */
1206 0, /* tp_getattro */
1207 0, /* tp_setattro */
1208 0, /* tp_as_buffer */
Jeremy Hyltond08b4c42000-06-23 19:37:02 +00001209 Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC, /*tp_flags*/
Jeremy Hylton8caad492000-06-23 14:18:11 +00001210 0, /* tp_doc */
1211 (traverseproc)dict_traverse, /* tp_traverse */
1212 (inquiry)dict_tp_clear, /* tp_clear */
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001213};
1214
Guido van Rossum3cca2451997-05-16 14:23:33 +00001215/* For backward compatibility with old dictionary interface */
1216
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001217PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001218PyDict_GetItemString(PyObject *v, char *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001219{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001220 PyObject *kv, *rv;
1221 kv = PyString_FromString(key);
1222 if (kv == NULL)
1223 return NULL;
Guido van Rossum3cca2451997-05-16 14:23:33 +00001224 rv = PyDict_GetItem(v, kv);
1225 Py_DECREF(kv);
1226 return rv;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001227}
1228
1229int
Tim Peters1f5871e2000-07-04 17:44:48 +00001230PyDict_SetItemString(PyObject *v, char *key, PyObject *item)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001231{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001232 PyObject *kv;
1233 int err;
1234 kv = PyString_FromString(key);
1235 if (kv == NULL)
Guido van Rossum037b2201997-05-20 18:35:19 +00001236 return -1;
Guido van Rossum4f3bf1e1997-09-29 23:31:11 +00001237 PyString_InternInPlace(&kv); /* XXX Should we really? */
Guido van Rossum3cca2451997-05-16 14:23:33 +00001238 err = PyDict_SetItem(v, kv, item);
1239 Py_DECREF(kv);
1240 return err;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001241}
1242
1243int
Tim Peters1f5871e2000-07-04 17:44:48 +00001244PyDict_DelItemString(PyObject *v, char *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001245{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001246 PyObject *kv;
1247 int err;
1248 kv = PyString_FromString(key);
1249 if (kv == NULL)
Guido van Rossum037b2201997-05-20 18:35:19 +00001250 return -1;
Guido van Rossum3cca2451997-05-16 14:23:33 +00001251 err = PyDict_DelItem(v, kv);
1252 Py_DECREF(kv);
1253 return err;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001254}