blob: 924928fab0c0e547a34d7b9d7ad880939cbb9326 [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
Guido van Rossumc0b618a1997-05-02 03:12:38 +00004#include "Python.h"
Guido van Rossum4b1302b1993-03-27 18:11:32 +00005
6
7/*
Guido van Rossuma9e7a811997-05-13 21:02:11 +00008 * MINSIZE is the minimum size of a dictionary.
Guido van Rossum16e93a81997-01-28 00:00:11 +00009 */
10
11#define MINSIZE 4
12
Fred Drake1bff34a2000-08-31 19:31:38 +000013/* define this out if you don't want conversion statistics on exit */
14#undef SHOW_CONVERSION_COUNTS
15
Guido van Rossum16e93a81997-01-28 00:00:11 +000016/*
17Table of irreducible polynomials to efficiently cycle through
18GF(2^n)-{0}, 2<=n<=30.
Guido van Rossum4b1302b1993-03-27 18:11:32 +000019*/
Guido van Rossum16e93a81997-01-28 00:00:11 +000020static long polys[] = {
Guido van Rossum9e5656c1997-01-29 04:45:16 +000021 4 + 3,
22 8 + 3,
23 16 + 3,
24 32 + 5,
25 64 + 3,
26 128 + 3,
27 256 + 29,
28 512 + 17,
29 1024 + 9,
30 2048 + 5,
31 4096 + 83,
32 8192 + 27,
33 16384 + 43,
34 32768 + 3,
35 65536 + 45,
36 131072 + 9,
37 262144 + 39,
38 524288 + 39,
39 1048576 + 9,
40 2097152 + 5,
41 4194304 + 3,
42 8388608 + 33,
43 16777216 + 27,
44 33554432 + 9,
45 67108864 + 71,
46 134217728 + 39,
47 268435456 + 9,
48 536870912 + 5,
49 1073741824 + 83,
50 0
Guido van Rossum4b1302b1993-03-27 18:11:32 +000051};
52
53/* Object used as dummy key to fill deleted entries */
Guido van Rossuma9e7a811997-05-13 21:02:11 +000054static PyObject *dummy; /* Initialized by first call to newdictobject() */
Guido van Rossum4b1302b1993-03-27 18:11:32 +000055
56/*
Guido van Rossum2bc13791999-03-24 19:06:42 +000057Invariant for entries: when in use, me_value is not NULL and me_key is
58not NULL and not dummy; when not in use, me_value is NULL and me_key
Guido van Rossum4b1302b1993-03-27 18:11:32 +000059is either NULL or dummy. A dummy key value cannot be replaced by
60NULL, since otherwise other keys may be lost.
61*/
62typedef struct {
63 long me_hash;
Guido van Rossumc0b618a1997-05-02 03:12:38 +000064 PyObject *me_key;
65 PyObject *me_value;
Guido van Rossum36488841997-04-11 19:14:07 +000066#ifdef USE_CACHE_ALIGNED
67 long aligner;
68#endif
Guido van Rossuma9e7a811997-05-13 21:02:11 +000069} dictentry;
Guido van Rossum4b1302b1993-03-27 18:11:32 +000070
71/*
72To ensure the lookup algorithm terminates, the table size must be a
73prime number and there must be at least one NULL key in the table.
74The value ma_fill is the number of non-NULL keys; ma_used is the number
75of non-NULL, non-dummy keys.
76To avoid slowing down lookups on a near-full table, we resize the table
77when it is more than half filled.
78*/
Fred Drake1bff34a2000-08-31 19:31:38 +000079typedef struct dictobject dictobject;
80struct dictobject {
Guido van Rossumc0b618a1997-05-02 03:12:38 +000081 PyObject_HEAD
Guido van Rossum4b1302b1993-03-27 18:11:32 +000082 int ma_fill;
83 int ma_used;
84 int ma_size;
Guido van Rossum16e93a81997-01-28 00:00:11 +000085 int ma_poly;
Guido van Rossuma9e7a811997-05-13 21:02:11 +000086 dictentry *ma_table;
Fred Drake1bff34a2000-08-31 19:31:38 +000087 dictentry *(*ma_lookup)(dictobject *mp, PyObject *key, long hash);
88};
89
90/* forward declarations */
91static dictentry *
92lookdict_string(dictobject *mp, PyObject *key, long hash);
93
94#ifdef SHOW_CONVERSION_COUNTS
95static long created = 0L;
96static long converted = 0L;
97
98static void
99show_counts(void)
100{
101 fprintf(stderr, "created %ld string dicts\n", created);
102 fprintf(stderr, "converted %ld to normal dicts\n", converted);
103 fprintf(stderr, "%.2f%% conversion rate\n", (100.0*converted)/created);
104}
105#endif
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000106
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000107PyObject *
Thomas Wouters78890102000-07-22 19:25:51 +0000108PyDict_New(void)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000109{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000110 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000111 if (dummy == NULL) { /* Auto-initialize dummy */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000112 dummy = PyString_FromString("<dummy key>");
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000113 if (dummy == NULL)
114 return NULL;
Fred Drake1bff34a2000-08-31 19:31:38 +0000115#ifdef SHOW_CONVERSION_COUNTS
116 Py_AtExit(show_counts);
117#endif
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000118 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000119 mp = PyObject_NEW(dictobject, &PyDict_Type);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000120 if (mp == NULL)
121 return NULL;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000122 mp->ma_size = 0;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000123 mp->ma_poly = 0;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000124 mp->ma_table = NULL;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000125 mp->ma_fill = 0;
126 mp->ma_used = 0;
Fred Drake1bff34a2000-08-31 19:31:38 +0000127 mp->ma_lookup = lookdict_string;
128#ifdef SHOW_CONVERSION_COUNTS
129 ++created;
130#endif
Jeremy Hyltonc5007aa2000-06-30 05:02:53 +0000131 PyObject_GC_Init(mp);
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000132 return (PyObject *)mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000133}
134
135/*
136The basic lookup function used by all operations.
Guido van Rossum16e93a81997-01-28 00:00:11 +0000137This is based on Algorithm D from Knuth Vol. 3, Sec. 6.4.
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000138Open addressing is preferred over chaining since the link overhead for
139chaining would be substantial (100% with typical malloc overhead).
Guido van Rossum16e93a81997-01-28 00:00:11 +0000140However, instead of going through the table at constant steps, we cycle
141through the values of GF(2^n)-{0}. This avoids modulo computations, being
142much cheaper on RISC machines, without leading to clustering.
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000143
Guido van Rossum2bc13791999-03-24 19:06:42 +0000144The initial probe index is computed as hash mod the table size.
Guido van Rossum16e93a81997-01-28 00:00:11 +0000145Subsequent probe indices use the values of x^i in GF(2^n) as an offset,
Guido van Rossum2bc13791999-03-24 19:06:42 +0000146where x is a root. The initial value is derived from hash, too.
147
148All arithmetic on hash should ignore overflow.
Guido van Rossum16e93a81997-01-28 00:00:11 +0000149
150(This version is due to Reimer Behrends, some ideas are also due to
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000151Jyrki Alakuijala and Vladimir Marangozov.)
Fred Drake1bff34a2000-08-31 19:31:38 +0000152
153This function must never return NULL; failures are indicated by returning
154a dictentry* for which the me_value field is NULL. Exceptions are never
155reported by this function, and outstanding exceptions are maintained.
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000156*/
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000157static dictentry *
Tim Peters1f5871e2000-07-04 17:44:48 +0000158lookdict(dictobject *mp, PyObject *key, register long hash)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000159{
Guido van Rossum16e93a81997-01-28 00:00:11 +0000160 register int i;
161 register unsigned incr;
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000162 register dictentry *freeslot;
Guido van Rossum2095d241997-04-09 19:41:24 +0000163 register unsigned int mask = mp->ma_size-1;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000164 dictentry *ep0 = mp->ma_table;
165 register dictentry *ep;
Fred Drakec88b99c2000-08-31 19:04:07 +0000166 register int restore_error = 0;
167 register int checked_error = 0;
168 register int cmp;
169 PyObject *err_type, *err_value, *err_tb;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000170 /* We must come up with (i, incr) such that 0 <= i < ma_size
171 and 0 < incr < ma_size and both are a function of hash */
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000172 i = (~hash) & mask;
173 /* We use ~hash instead of hash, as degenerate hash functions, such
Guido van Rossum16e93a81997-01-28 00:00:11 +0000174 as for ints <sigh>, can have lots of leading zeros. It's not
175 really a performance risk, but better safe than sorry. */
Guido van Rossumefb46091997-01-29 15:53:56 +0000176 ep = &ep0[i];
Guido van Rossumc1c7b1a1998-10-06 16:01:14 +0000177 if (ep->me_key == NULL || ep->me_key == key)
Guido van Rossum7d181591997-01-16 21:06:45 +0000178 return ep;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000179 if (ep->me_key == dummy)
Guido van Rossum7d181591997-01-16 21:06:45 +0000180 freeslot = ep;
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000181 else {
Fred Drakec88b99c2000-08-31 19:04:07 +0000182 if (ep->me_hash == hash) {
183 /* error can't have been checked yet */
184 checked_error = 1;
185 if (PyErr_Occurred()) {
186 restore_error = 1;
187 PyErr_Fetch(&err_type, &err_value, &err_tb);
188 }
189 cmp = PyObject_Compare(ep->me_key, key);
190 if (PyErr_Occurred())
191 PyErr_Clear();
192 else if (cmp == 0) {
193 if (restore_error)
194 PyErr_Restore(err_type, err_value,
195 err_tb);
196 return ep;
197 }
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000198 }
199 freeslot = NULL;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000200 }
Guido van Rossum2bc13791999-03-24 19:06:42 +0000201 /* Derive incr from hash, just to make it more arbitrary. Note that
Guido van Rossum16e93a81997-01-28 00:00:11 +0000202 incr must not be 0, or we will get into an infinite loop.*/
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000203 incr = (hash ^ ((unsigned long)hash >> 3)) & mask;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000204 if (!incr)
205 incr = mask;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000206 for (;;) {
Guido van Rossumefb46091997-01-29 15:53:56 +0000207 ep = &ep0[(i+incr)&mask];
Guido van Rossum16e93a81997-01-28 00:00:11 +0000208 if (ep->me_key == NULL) {
Fred Drakec88b99c2000-08-31 19:04:07 +0000209 if (restore_error)
210 PyErr_Restore(err_type, err_value, err_tb);
Guido van Rossum16e93a81997-01-28 00:00:11 +0000211 if (freeslot != NULL)
212 return freeslot;
213 else
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000214 return ep;
215 }
Guido van Rossum16e93a81997-01-28 00:00:11 +0000216 if (ep->me_key == dummy) {
217 if (freeslot == NULL)
218 freeslot = ep;
219 }
Fred Drakec88b99c2000-08-31 19:04:07 +0000220 else if (ep->me_key == key) {
221 if (restore_error)
222 PyErr_Restore(err_type, err_value, err_tb);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000223 return ep;
Fred Drakec88b99c2000-08-31 19:04:07 +0000224 }
225 else if (ep->me_hash == hash) {
226 if (!checked_error) {
227 checked_error = 1;
228 if (PyErr_Occurred()) {
229 restore_error = 1;
230 PyErr_Fetch(&err_type, &err_value,
231 &err_tb);
232 }
233 }
234 cmp = PyObject_Compare(ep->me_key, key);
235 if (PyErr_Occurred())
236 PyErr_Clear();
237 else if (cmp == 0) {
238 if (restore_error)
239 PyErr_Restore(err_type, err_value,
240 err_tb);
241 return ep;
242 }
Guido van Rossum16e93a81997-01-28 00:00:11 +0000243 }
244 /* Cycle through GF(2^n)-{0} */
245 incr = incr << 1;
246 if (incr > mask)
Thomas Wouters7e474022000-07-16 12:04:32 +0000247 incr ^= mp->ma_poly; /* This will implicitly clear
Guido van Rossumf05fc711998-11-16 22:46:30 +0000248 the highest bit */
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000249 }
250}
251
252/*
Fred Drake1bff34a2000-08-31 19:31:38 +0000253 * Hacked up version of lookdict which can assume keys are always strings;
254 * this assumption allows testing for errors during PyObject_Compare() to
255 * be dropped; string-string comparisons never raise exceptions. This also
256 * means we don't need to go through PyObject_Compare(); we can always use
257 * the tp_compare slot of the string type object directly.
258 *
259 * This really only becomes meaningful if proper error handling in lookdict()
260 * is too expensive.
261 */
262static dictentry *
263lookdict_string(dictobject *mp, PyObject *key, register long hash)
264{
265 register int i;
266 register unsigned incr;
267 register dictentry *freeslot;
268 register unsigned int mask = mp->ma_size-1;
269 dictentry *ep0 = mp->ma_table;
270 register dictentry *ep;
271 cmpfunc compare = PyString_Type.tp_compare;
272
273 /* make sure this function doesn't have to handle non-string keys */
274 if (!PyString_Check(key)) {
275#ifdef SHOW_CONVERSION_COUNTS
276 ++converted;
277#endif
278 mp->ma_lookup = lookdict;
279 return lookdict(mp, key, hash);
280 }
281 /* We must come up with (i, incr) such that 0 <= i < ma_size
282 and 0 < incr < ma_size and both are a function of hash */
283 i = (~hash) & mask;
284 /* We use ~hash instead of hash, as degenerate hash functions, such
285 as for ints <sigh>, can have lots of leading zeros. It's not
286 really a performance risk, but better safe than sorry. */
287 ep = &ep0[i];
288 if (ep->me_key == NULL || ep->me_key == key)
289 return ep;
290 if (ep->me_key == dummy)
291 freeslot = ep;
292 else {
293 if (ep->me_hash == hash
294 && compare(ep->me_key, key) == 0) {
295 return ep;
296 }
297 freeslot = NULL;
298 }
299 /* Derive incr from hash, just to make it more arbitrary. Note that
300 incr must not be 0, or we will get into an infinite loop.*/
301 incr = (hash ^ ((unsigned long)hash >> 3)) & mask;
302 if (!incr)
303 incr = mask;
304 for (;;) {
305 ep = &ep0[(i+incr)&mask];
306 if (ep->me_key == NULL) {
307 if (freeslot != NULL)
308 return freeslot;
309 else
310 return ep;
311 }
312 if (ep->me_key == dummy) {
313 if (freeslot == NULL)
314 freeslot = ep;
315 }
316 else if (ep->me_key == key
317 || (ep->me_hash == hash
318 && compare(ep->me_key, key) == 0)) {
319 return ep;
320 }
321 /* Cycle through GF(2^n)-{0} */
322 incr = incr << 1;
323 if (incr > mask)
324 incr ^= mp->ma_poly; /* This will implicitly clear
325 the highest bit */
326 }
327}
328
329/*
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000330Internal routine to insert a new item into the table.
331Used both by the internal resize routine and by the public insert routine.
332Eats a reference to key and one to value.
333*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000334static void
Tim Peters1f5871e2000-07-04 17:44:48 +0000335insertdict(register dictobject *mp, PyObject *key, long hash, PyObject *value)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000336{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000337 PyObject *old_value;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000338 register dictentry *ep;
Fred Drake1bff34a2000-08-31 19:31:38 +0000339 ep = (mp->ma_lookup)(mp, key, hash);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000340 if (ep->me_value != NULL) {
Guido van Rossumd7047b31995-01-02 19:07:15 +0000341 old_value = ep->me_value;
342 ep->me_value = value;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000343 Py_DECREF(old_value); /* which **CAN** re-enter */
344 Py_DECREF(key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000345 }
346 else {
347 if (ep->me_key == NULL)
348 mp->ma_fill++;
349 else
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000350 Py_DECREF(ep->me_key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000351 ep->me_key = key;
352 ep->me_hash = hash;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000353 ep->me_value = value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000354 mp->ma_used++;
355 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000356}
357
358/*
359Restructure the table by allocating a new table and reinserting all
360items again. When entries have been deleted, the new table may
361actually be smaller than the old one.
362*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000363static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000364dictresize(dictobject *mp, int minused)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000365{
366 register int oldsize = mp->ma_size;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000367 register int newsize, newpoly;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000368 register dictentry *oldtable = mp->ma_table;
369 register dictentry *newtable;
370 register dictentry *ep;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000371 register int i;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000372 for (i = 0, newsize = MINSIZE; ; i++, newsize <<= 1) {
373 if (i > sizeof(polys)/sizeof(polys[0])) {
374 /* Ran out of polynomials */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000375 PyErr_NoMemory();
Guido van Rossum1d5735e1994-08-30 08:27:36 +0000376 return -1;
377 }
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000378 if (newsize > minused) {
Guido van Rossum16e93a81997-01-28 00:00:11 +0000379 newpoly = polys[i];
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000380 break;
381 }
382 }
Guido van Rossumb18618d2000-05-03 23:44:39 +0000383 newtable = PyMem_NEW(dictentry, newsize);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000384 if (newtable == NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000385 PyErr_NoMemory();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000386 return -1;
387 }
Guido van Rossum0fd00331998-07-16 15:06:13 +0000388 memset(newtable, '\0', sizeof(dictentry) * newsize);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000389 mp->ma_size = newsize;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000390 mp->ma_poly = newpoly;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000391 mp->ma_table = newtable;
392 mp->ma_fill = 0;
393 mp->ma_used = 0;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000394
395 /* Make two passes, so we can avoid decrefs
396 (and possible side effects) till the table is copied */
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000397 for (i = 0, ep = oldtable; i < oldsize; i++, ep++) {
398 if (ep->me_value != NULL)
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000399 insertdict(mp,ep->me_key,ep->me_hash,ep->me_value);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000400 }
Guido van Rossumd7047b31995-01-02 19:07:15 +0000401 for (i = 0, ep = oldtable; i < oldsize; i++, ep++) {
Guido van Rossum255443b1998-04-10 22:47:14 +0000402 if (ep->me_value == NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000403 Py_XDECREF(ep->me_key);
Guido van Rossum255443b1998-04-10 22:47:14 +0000404 }
Guido van Rossumd7047b31995-01-02 19:07:15 +0000405 }
406
Guido van Rossumb18618d2000-05-03 23:44:39 +0000407 if (oldtable != NULL)
408 PyMem_DEL(oldtable);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000409 return 0;
410}
411
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000412PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000413PyDict_GetItem(PyObject *op, PyObject *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000414{
415 long hash;
Fred Drake1bff34a2000-08-31 19:31:38 +0000416 dictobject *mp = (dictobject *)op;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000417 if (!PyDict_Check(op)) {
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000418 return NULL;
419 }
Fred Drake1bff34a2000-08-31 19:31:38 +0000420 if (mp->ma_table == NULL)
Guido van Rossumd7047b31995-01-02 19:07:15 +0000421 return NULL;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000422#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000423 if (!PyString_Check(key) ||
424 (hash = ((PyStringObject *) key)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000425#endif
Guido van Rossumca756f21997-01-23 19:39:29 +0000426 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000427 hash = PyObject_Hash(key);
Guido van Rossum474b19e1998-05-14 01:00:51 +0000428 if (hash == -1) {
429 PyErr_Clear();
Guido van Rossumca756f21997-01-23 19:39:29 +0000430 return NULL;
Guido van Rossum474b19e1998-05-14 01:00:51 +0000431 }
Guido van Rossumca756f21997-01-23 19:39:29 +0000432 }
Fred Drake1bff34a2000-08-31 19:31:38 +0000433 return (mp->ma_lookup)(mp, key, hash)->me_value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000434}
435
436int
Tim Peters1f5871e2000-07-04 17:44:48 +0000437PyDict_SetItem(register PyObject *op, PyObject *key, PyObject *value)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000438{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000439 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000440 register long hash;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000441 if (!PyDict_Check(op)) {
442 PyErr_BadInternalCall();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000443 return -1;
444 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000445 mp = (dictobject *)op;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000446#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000447 if (PyString_Check(key)) {
Guido van Rossum2a61e741997-01-18 07:55:05 +0000448#ifdef INTERN_STRINGS
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000449 if (((PyStringObject *)key)->ob_sinterned != NULL) {
450 key = ((PyStringObject *)key)->ob_sinterned;
451 hash = ((PyStringObject *)key)->ob_shash;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000452 }
453 else
454#endif
455 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000456 hash = ((PyStringObject *)key)->ob_shash;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000457 if (hash == -1)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000458 hash = PyObject_Hash(key);
Guido van Rossum2a61e741997-01-18 07:55:05 +0000459 }
460 }
461 else
462#endif
463 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000464 hash = PyObject_Hash(key);
Guido van Rossum2a61e741997-01-18 07:55:05 +0000465 if (hash == -1)
466 return -1;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000467 }
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000468 /* if fill >= 2/3 size, double in size */
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000469 if (mp->ma_fill*3 >= mp->ma_size*2) {
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000470 if (dictresize(mp, mp->ma_used*2) != 0) {
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000471 if (mp->ma_fill+1 > mp->ma_size)
472 return -1;
473 }
474 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000475 Py_INCREF(value);
476 Py_INCREF(key);
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000477 insertdict(mp, key, hash, value);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000478 return 0;
479}
480
481int
Tim Peters1f5871e2000-07-04 17:44:48 +0000482PyDict_DelItem(PyObject *op, PyObject *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000483{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000484 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000485 register long hash;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000486 register dictentry *ep;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000487 PyObject *old_value, *old_key;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000488
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000489 if (!PyDict_Check(op)) {
490 PyErr_BadInternalCall();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000491 return -1;
492 }
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000493#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000494 if (!PyString_Check(key) ||
495 (hash = ((PyStringObject *) key)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000496#endif
Guido van Rossumca756f21997-01-23 19:39:29 +0000497 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000498 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +0000499 if (hash == -1)
500 return -1;
501 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000502 mp = (dictobject *)op;
503 if (((dictobject *)op)->ma_table == NULL)
Guido van Rossumefc87131995-01-02 19:42:39 +0000504 goto empty;
Fred Drake1bff34a2000-08-31 19:31:38 +0000505 ep = (mp->ma_lookup)(mp, key, hash);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000506 if (ep->me_value == NULL) {
Guido van Rossumefc87131995-01-02 19:42:39 +0000507 empty:
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000508 PyErr_SetObject(PyExc_KeyError, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000509 return -1;
510 }
Guido van Rossumd7047b31995-01-02 19:07:15 +0000511 old_key = ep->me_key;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000512 Py_INCREF(dummy);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000513 ep->me_key = dummy;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000514 old_value = ep->me_value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000515 ep->me_value = NULL;
516 mp->ma_used--;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000517 Py_DECREF(old_value);
518 Py_DECREF(old_key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000519 return 0;
520}
521
Guido van Rossum25831651993-05-19 14:50:45 +0000522void
Tim Peters1f5871e2000-07-04 17:44:48 +0000523PyDict_Clear(PyObject *op)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000524{
Guido van Rossumd7047b31995-01-02 19:07:15 +0000525 int i, n;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000526 register dictentry *table;
527 dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000528 if (!PyDict_Check(op))
Guido van Rossum25831651993-05-19 14:50:45 +0000529 return;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000530 mp = (dictobject *)op;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000531 table = mp->ma_table;
532 if (table == NULL)
533 return;
534 n = mp->ma_size;
535 mp->ma_size = mp->ma_used = mp->ma_fill = 0;
536 mp->ma_table = NULL;
537 for (i = 0; i < n; i++) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000538 Py_XDECREF(table[i].me_key);
539 Py_XDECREF(table[i].me_value);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000540 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000541 PyMem_DEL(table);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000542}
543
Guido van Rossum25831651993-05-19 14:50:45 +0000544int
Tim Peters1f5871e2000-07-04 17:44:48 +0000545PyDict_Next(PyObject *op, int *ppos, PyObject **pkey, PyObject **pvalue)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000546{
Guido van Rossum25831651993-05-19 14:50:45 +0000547 int i;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000548 register dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000549 if (!PyDict_Check(op))
Guido van Rossum25831651993-05-19 14:50:45 +0000550 return 0;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000551 mp = (dictobject *)op;
Guido van Rossum25831651993-05-19 14:50:45 +0000552 i = *ppos;
553 if (i < 0)
554 return 0;
555 while (i < mp->ma_size && mp->ma_table[i].me_value == NULL)
556 i++;
557 *ppos = i+1;
558 if (i >= mp->ma_size)
559 return 0;
560 if (pkey)
561 *pkey = mp->ma_table[i].me_key;
562 if (pvalue)
563 *pvalue = mp->ma_table[i].me_value;
564 return 1;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000565}
566
567/* Methods */
568
569static void
Tim Peters1f5871e2000-07-04 17:44:48 +0000570dict_dealloc(register dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000571{
572 register int i;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000573 register dictentry *ep;
Guido van Rossumd724b232000-03-13 16:01:29 +0000574 Py_TRASHCAN_SAFE_BEGIN(mp)
Jeremy Hyltonc5007aa2000-06-30 05:02:53 +0000575 PyObject_GC_Fini(mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000576 for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) {
Guido van Rossum255443b1998-04-10 22:47:14 +0000577 if (ep->me_key != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000578 Py_DECREF(ep->me_key);
Guido van Rossum255443b1998-04-10 22:47:14 +0000579 }
580 if (ep->me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000581 Py_DECREF(ep->me_value);
Guido van Rossum255443b1998-04-10 22:47:14 +0000582 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000583 }
Guido van Rossumb18618d2000-05-03 23:44:39 +0000584 if (mp->ma_table != NULL)
585 PyMem_DEL(mp->ma_table);
Guido van Rossum4cc6ac72000-07-01 01:00:38 +0000586 mp = (dictobject *) PyObject_AS_GC(mp);
Guido van Rossumb18618d2000-05-03 23:44:39 +0000587 PyObject_DEL(mp);
Guido van Rossumd724b232000-03-13 16:01:29 +0000588 Py_TRASHCAN_SAFE_END(mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000589}
590
591static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000592dict_print(register dictobject *mp, register FILE *fp, register int flags)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000593{
594 register int i;
595 register int any;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000596 register dictentry *ep;
Guido van Rossum255443b1998-04-10 22:47:14 +0000597
598 i = Py_ReprEnter((PyObject*)mp);
599 if (i != 0) {
600 if (i < 0)
601 return i;
602 fprintf(fp, "{...}");
603 return 0;
604 }
605
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000606 fprintf(fp, "{");
607 any = 0;
608 for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) {
609 if (ep->me_value != NULL) {
610 if (any++ > 0)
611 fprintf(fp, ", ");
Guido van Rossum255443b1998-04-10 22:47:14 +0000612 if (PyObject_Print((PyObject *)ep->me_key, fp, 0)!=0) {
613 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000614 return -1;
Guido van Rossum255443b1998-04-10 22:47:14 +0000615 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000616 fprintf(fp, ": ");
Guido van Rossum255443b1998-04-10 22:47:14 +0000617 if (PyObject_Print(ep->me_value, fp, 0) != 0) {
618 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000619 return -1;
Guido van Rossum255443b1998-04-10 22:47:14 +0000620 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000621 }
622 }
623 fprintf(fp, "}");
Guido van Rossum255443b1998-04-10 22:47:14 +0000624 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000625 return 0;
626}
627
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000628static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000629dict_repr(dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000630{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000631 auto PyObject *v;
632 PyObject *sepa, *colon;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000633 register int i;
634 register int any;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000635 register dictentry *ep;
Guido van Rossum255443b1998-04-10 22:47:14 +0000636
637 i = Py_ReprEnter((PyObject*)mp);
638 if (i != 0) {
639 if (i > 0)
640 return PyString_FromString("{...}");
641 return NULL;
642 }
643
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000644 v = PyString_FromString("{");
645 sepa = PyString_FromString(", ");
646 colon = PyString_FromString(": ");
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000647 any = 0;
Guido van Rossum1d5735e1994-08-30 08:27:36 +0000648 for (i = 0, ep = mp->ma_table; i < mp->ma_size && v; i++, ep++) {
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000649 if (ep->me_value != NULL) {
650 if (any++)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000651 PyString_Concat(&v, sepa);
652 PyString_ConcatAndDel(&v, PyObject_Repr(ep->me_key));
653 PyString_Concat(&v, colon);
654 PyString_ConcatAndDel(&v, PyObject_Repr(ep->me_value));
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000655 }
656 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000657 PyString_ConcatAndDel(&v, PyString_FromString("}"));
Guido van Rossum255443b1998-04-10 22:47:14 +0000658 Py_ReprLeave((PyObject*)mp);
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000659 Py_XDECREF(sepa);
660 Py_XDECREF(colon);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000661 return v;
662}
663
664static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000665dict_length(dictobject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000666{
667 return mp->ma_used;
668}
669
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000670static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000671dict_subscript(dictobject *mp, register PyObject *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000672{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000673 PyObject *v;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000674 long hash;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000675 if (mp->ma_table == NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000676 PyErr_SetObject(PyExc_KeyError, key);
Guido van Rossumd7047b31995-01-02 19:07:15 +0000677 return NULL;
678 }
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000679#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000680 if (!PyString_Check(key) ||
681 (hash = ((PyStringObject *) key)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000682#endif
Guido van Rossumca756f21997-01-23 19:39:29 +0000683 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000684 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +0000685 if (hash == -1)
686 return NULL;
687 }
Fred Drake1bff34a2000-08-31 19:31:38 +0000688 v = (mp->ma_lookup)(mp, key, hash) -> me_value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000689 if (v == NULL)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000690 PyErr_SetObject(PyExc_KeyError, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000691 else
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000692 Py_INCREF(v);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000693 return v;
694}
695
696static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000697dict_ass_sub(dictobject *mp, PyObject *v, PyObject *w)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000698{
699 if (w == NULL)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000700 return PyDict_DelItem((PyObject *)mp, v);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000701 else
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000702 return PyDict_SetItem((PyObject *)mp, v, w);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000703}
704
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000705static PyMappingMethods dict_as_mapping = {
706 (inquiry)dict_length, /*mp_length*/
707 (binaryfunc)dict_subscript, /*mp_subscript*/
708 (objobjargproc)dict_ass_sub, /*mp_ass_subscript*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000709};
710
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000711static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000712dict_keys(register dictobject *mp, PyObject *args)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000713{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000714 register PyObject *v;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000715 register int i, j;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000716 if (!PyArg_NoArgs(args))
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000717 return NULL;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000718 v = PyList_New(mp->ma_used);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000719 if (v == NULL)
720 return NULL;
721 for (i = 0, j = 0; i < mp->ma_size; i++) {
722 if (mp->ma_table[i].me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000723 PyObject *key = mp->ma_table[i].me_key;
724 Py_INCREF(key);
725 PyList_SetItem(v, j, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000726 j++;
727 }
728 }
729 return v;
730}
731
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000732static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000733dict_values(register dictobject *mp, PyObject *args)
Guido van Rossum25831651993-05-19 14:50:45 +0000734{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000735 register PyObject *v;
Guido van Rossum25831651993-05-19 14:50:45 +0000736 register int i, j;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000737 if (!PyArg_NoArgs(args))
Guido van Rossum25831651993-05-19 14:50:45 +0000738 return NULL;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000739 v = PyList_New(mp->ma_used);
Guido van Rossum25831651993-05-19 14:50:45 +0000740 if (v == NULL)
741 return NULL;
742 for (i = 0, j = 0; i < mp->ma_size; i++) {
743 if (mp->ma_table[i].me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000744 PyObject *value = mp->ma_table[i].me_value;
745 Py_INCREF(value);
746 PyList_SetItem(v, j, value);
Guido van Rossum25831651993-05-19 14:50:45 +0000747 j++;
748 }
749 }
750 return v;
751}
752
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000753static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000754dict_items(register dictobject *mp, PyObject *args)
Guido van Rossum25831651993-05-19 14:50:45 +0000755{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000756 register PyObject *v;
Guido van Rossum25831651993-05-19 14:50:45 +0000757 register int i, j;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000758 if (!PyArg_NoArgs(args))
Guido van Rossum25831651993-05-19 14:50:45 +0000759 return NULL;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000760 v = PyList_New(mp->ma_used);
Guido van Rossum25831651993-05-19 14:50:45 +0000761 if (v == NULL)
762 return NULL;
763 for (i = 0, j = 0; i < mp->ma_size; i++) {
764 if (mp->ma_table[i].me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000765 PyObject *key = mp->ma_table[i].me_key;
766 PyObject *value = mp->ma_table[i].me_value;
767 PyObject *item = PyTuple_New(2);
Guido van Rossum25831651993-05-19 14:50:45 +0000768 if (item == NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000769 Py_DECREF(v);
Guido van Rossum25831651993-05-19 14:50:45 +0000770 return NULL;
771 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000772 Py_INCREF(key);
773 PyTuple_SetItem(item, 0, key);
774 Py_INCREF(value);
775 PyTuple_SetItem(item, 1, value);
776 PyList_SetItem(v, j, item);
Guido van Rossum25831651993-05-19 14:50:45 +0000777 j++;
778 }
779 }
780 return v;
781}
782
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000783static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000784dict_update(register dictobject *mp, PyObject *args)
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000785{
786 register int i;
787 dictobject *other;
788 dictentry *entry;
789 if (!PyArg_Parse(args, "O!", &PyDict_Type, &other))
790 return NULL;
791 if (other == mp)
Guido van Rossuma8d51311997-06-02 17:13:37 +0000792 goto done; /* a.update(a); nothing to do */
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000793 /* Do one big resize at the start, rather than incrementally
794 resizing as we insert new items. Expect that there will be
795 no (or few) overlapping keys. */
796 if ((mp->ma_fill + other->ma_used)*3 >= mp->ma_size*2) {
797 if (dictresize(mp, (mp->ma_used + other->ma_used)*3/2) != 0)
798 return NULL;
799 }
800 for (i = 0; i < other->ma_size; i++) {
801 entry = &other->ma_table[i];
802 if (entry->me_value != NULL) {
803 Py_INCREF(entry->me_key);
804 Py_INCREF(entry->me_value);
805 insertdict(mp, entry->me_key, entry->me_hash,
806 entry->me_value);
807 }
808 }
809 done:
810 Py_INCREF(Py_None);
811 return Py_None;
812}
813
814static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000815dict_copy(register dictobject *mp, PyObject *args)
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000816{
Jeremy Hyltona12c7a72000-03-30 22:27:31 +0000817 if (!PyArg_Parse(args, ""))
818 return NULL;
819 return PyDict_Copy((PyObject*)mp);
820}
821
822PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000823PyDict_Copy(PyObject *o)
Jeremy Hyltona12c7a72000-03-30 22:27:31 +0000824{
825 register dictobject *mp;
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000826 register int i;
827 dictobject *copy;
828 dictentry *entry;
Jeremy Hyltona12c7a72000-03-30 22:27:31 +0000829
830 if (o == NULL || !PyDict_Check(o)) {
831 PyErr_BadInternalCall();
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000832 return NULL;
Jeremy Hyltona12c7a72000-03-30 22:27:31 +0000833 }
834 mp = (dictobject *)o;
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000835 copy = (dictobject *)PyDict_New();
836 if (copy == NULL)
837 return NULL;
838 if (mp->ma_used > 0) {
839 if (dictresize(copy, mp->ma_used*3/2) != 0)
840 return NULL;
841 for (i = 0; i < mp->ma_size; i++) {
842 entry = &mp->ma_table[i];
843 if (entry->me_value != NULL) {
844 Py_INCREF(entry->me_key);
845 Py_INCREF(entry->me_value);
846 insertdict(copy, entry->me_key, entry->me_hash,
847 entry->me_value);
848 }
849 }
850 }
851 return (PyObject *)copy;
852}
853
Guido van Rossum4199fac1993-11-05 10:18:44 +0000854int
Tim Peters1f5871e2000-07-04 17:44:48 +0000855PyDict_Size(PyObject *mp)
Guido van Rossum4199fac1993-11-05 10:18:44 +0000856{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000857 if (mp == NULL || !PyDict_Check(mp)) {
858 PyErr_BadInternalCall();
Guido van Rossumb376a4a1993-11-23 17:53:17 +0000859 return 0;
Guido van Rossum4199fac1993-11-05 10:18:44 +0000860 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000861 return ((dictobject *)mp)->ma_used;
Guido van Rossum4199fac1993-11-05 10:18:44 +0000862}
863
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000864PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000865PyDict_Keys(PyObject *mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000866{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000867 if (mp == NULL || !PyDict_Check(mp)) {
868 PyErr_BadInternalCall();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000869 return NULL;
870 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000871 return dict_keys((dictobject *)mp, (PyObject *)NULL);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000872}
873
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000874PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000875PyDict_Values(PyObject *mp)
Guido van Rossum25831651993-05-19 14:50:45 +0000876{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000877 if (mp == NULL || !PyDict_Check(mp)) {
878 PyErr_BadInternalCall();
Guido van Rossum25831651993-05-19 14:50:45 +0000879 return NULL;
880 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000881 return dict_values((dictobject *)mp, (PyObject *)NULL);
Guido van Rossum25831651993-05-19 14:50:45 +0000882}
883
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000884PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000885PyDict_Items(PyObject *mp)
Guido van Rossum25831651993-05-19 14:50:45 +0000886{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000887 if (mp == NULL || !PyDict_Check(mp)) {
888 PyErr_BadInternalCall();
Guido van Rossum25831651993-05-19 14:50:45 +0000889 return NULL;
890 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000891 return dict_items((dictobject *)mp, (PyObject *)NULL);
Guido van Rossum25831651993-05-19 14:50:45 +0000892}
893
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000894#define NEWCMP
895
896#ifdef NEWCMP
897
898/* Subroutine which returns the smallest key in a for which b's value
899 is different or absent. The value is returned too, through the
900 pval argument. No reference counts are incremented. */
901
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000902static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +0000903characterize(dictobject *a, dictobject *b, PyObject **pval)
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000904{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000905 PyObject *diff = NULL;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000906 int i;
907
908 *pval = NULL;
909 for (i = 0; i < a->ma_size; i++) {
910 if (a->ma_table[i].me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000911 PyObject *key = a->ma_table[i].me_key;
912 PyObject *aval, *bval;
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000913 /* XXX What if PyObject_Compare raises an exception? */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000914 if (diff != NULL && PyObject_Compare(key, diff) > 0)
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000915 continue;
916 aval = a->ma_table[i].me_value;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000917 bval = PyDict_GetItem((PyObject *)b, key);
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000918 /* XXX What if PyObject_Compare raises an exception? */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000919 if (bval == NULL || PyObject_Compare(aval, bval) != 0)
920 {
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000921 diff = key;
922 *pval = aval;
923 }
924 }
925 }
926 return diff;
927}
928
929static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000930dict_compare(dictobject *a, dictobject *b)
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000931{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000932 PyObject *adiff, *bdiff, *aval, *bval;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000933 int res;
934
935 /* Compare lengths first */
936 if (a->ma_used < b->ma_used)
937 return -1; /* a is shorter */
938 else if (a->ma_used > b->ma_used)
939 return 1; /* b is shorter */
940 /* Same length -- check all keys */
941 adiff = characterize(a, b, &aval);
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000942 if (PyErr_Occurred())
943 return -1;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000944 if (adiff == NULL)
945 return 0; /* a is a subset with the same length */
946 bdiff = characterize(b, a, &bval);
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000947 if (PyErr_Occurred())
948 return -1;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000949 /* bdiff == NULL would be impossible now */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000950 res = PyObject_Compare(adiff, bdiff);
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000951 if (res == 0)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000952 res = PyObject_Compare(aval, bval);
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000953 return res;
954}
955
956#else /* !NEWCMP */
957
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000958static int
Tim Peters1f5871e2000-07-04 17:44:48 +0000959dict_compare(dictobject *a, dictobject *b)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000960{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000961 PyObject *akeys, *bkeys;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000962 int i, n, res;
963 if (a == b)
964 return 0;
965 if (a->ma_used == 0) {
966 if (b->ma_used != 0)
967 return -1;
968 else
969 return 0;
970 }
971 else {
972 if (b->ma_used == 0)
973 return 1;
974 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000975 akeys = dict_keys(a, (PyObject *)NULL);
976 bkeys = dict_keys(b, (PyObject *)NULL);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000977 if (akeys == NULL || bkeys == NULL) {
978 /* Oops, out of memory -- what to do? */
979 /* For now, sort on address! */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000980 Py_XDECREF(akeys);
981 Py_XDECREF(bkeys);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000982 if (a < b)
983 return -1;
984 else
985 return 1;
986 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000987 PyList_Sort(akeys);
988 PyList_Sort(bkeys);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000989 n = a->ma_used < b->ma_used ? a->ma_used : b->ma_used; /* smallest */
990 res = 0;
991 for (i = 0; i < n; i++) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000992 PyObject *akey, *bkey, *aval, *bval;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000993 long ahash, bhash;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000994 akey = PyList_GetItem(akeys, i);
995 bkey = PyList_GetItem(bkeys, i);
996 res = PyObject_Compare(akey, bkey);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000997 if (res != 0)
998 break;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000999#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001000 if (!PyString_Check(akey) ||
1001 (ahash = ((PyStringObject *) akey)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +00001002#endif
Guido van Rossumca756f21997-01-23 19:39:29 +00001003 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001004 ahash = PyObject_Hash(akey);
Guido van Rossumca756f21997-01-23 19:39:29 +00001005 if (ahash == -1)
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001006 PyErr_Clear(); /* Don't want errors here */
Guido van Rossumca756f21997-01-23 19:39:29 +00001007 }
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +00001008#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001009 if (!PyString_Check(bkey) ||
1010 (bhash = ((PyStringObject *) bkey)->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 bhash = PyObject_Hash(bkey);
Guido van Rossumca756f21997-01-23 19:39:29 +00001014 if (bhash == -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 }
Fred Drake1bff34a2000-08-31 19:31:38 +00001017 aval = (a->ma_lookup)(a, akey, ahash) -> me_value;
1018 bval = (b->ma_lookup)(b, bkey, bhash) -> me_value;
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001019 res = PyObject_Compare(aval, bval);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001020 if (res != 0)
1021 break;
1022 }
1023 if (res == 0) {
1024 if (a->ma_used < b->ma_used)
1025 res = -1;
1026 else if (a->ma_used > b->ma_used)
1027 res = 1;
1028 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001029 Py_DECREF(akeys);
1030 Py_DECREF(bkeys);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001031 return res;
1032}
1033
Guido van Rossuma0a69b81996-12-05 21:55:55 +00001034#endif /* !NEWCMP */
1035
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001036static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001037dict_has_key(register dictobject *mp, PyObject *args)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001038{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001039 PyObject *key;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001040 long hash;
1041 register long ok;
Fred Drake52fccfd2000-02-23 15:47:16 +00001042 if (!PyArg_ParseTuple(args, "O:has_key", &key))
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001043 return NULL;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +00001044#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001045 if (!PyString_Check(key) ||
1046 (hash = ((PyStringObject *) key)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +00001047#endif
Guido van Rossumca756f21997-01-23 19:39:29 +00001048 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001049 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +00001050 if (hash == -1)
1051 return NULL;
1052 }
Fred Drake1bff34a2000-08-31 19:31:38 +00001053 ok = (mp->ma_size != 0
1054 && (mp->ma_lookup)(mp, key, hash)->me_value != NULL);
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001055 return PyInt_FromLong(ok);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001056}
1057
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001058static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001059dict_get(register dictobject *mp, PyObject *args)
Barry Warsawc38c5da1997-10-06 17:49:20 +00001060{
1061 PyObject *key;
Barry Warsaw320ac331997-10-20 17:26:25 +00001062 PyObject *failobj = Py_None;
Barry Warsawc38c5da1997-10-06 17:49:20 +00001063 PyObject *val = NULL;
1064 long hash;
1065
Fred Drake52fccfd2000-02-23 15:47:16 +00001066 if (!PyArg_ParseTuple(args, "O|O:get", &key, &failobj))
Barry Warsawc38c5da1997-10-06 17:49:20 +00001067 return NULL;
Guido van Rossum6fcfa721997-10-20 20:10:00 +00001068 if (mp->ma_table == NULL)
1069 goto finally;
Barry Warsawc38c5da1997-10-06 17:49:20 +00001070
Barry Warsawc38c5da1997-10-06 17:49:20 +00001071#ifdef CACHE_HASH
1072 if (!PyString_Check(key) ||
1073 (hash = ((PyStringObject *) key)->ob_shash) == -1)
1074#endif
1075 {
1076 hash = PyObject_Hash(key);
1077 if (hash == -1)
1078 return NULL;
1079 }
Fred Drake1bff34a2000-08-31 19:31:38 +00001080 val = (mp->ma_lookup)(mp, key, hash)->me_value;
Barry Warsaw320ac331997-10-20 17:26:25 +00001081
Guido van Rossum6fcfa721997-10-20 20:10:00 +00001082 finally:
Barry Warsawc38c5da1997-10-06 17:49:20 +00001083 if (val == NULL)
1084 val = failobj;
1085 Py_INCREF(val);
1086 return val;
1087}
1088
1089
1090static PyObject *
Guido van Rossum164452c2000-08-08 16:12:54 +00001091dict_setdefault(register dictobject *mp, PyObject *args)
1092{
1093 PyObject *key;
1094 PyObject *failobj = Py_None;
1095 PyObject *val = NULL;
1096 long hash;
1097
1098 if (!PyArg_ParseTuple(args, "O|O:setdefault", &key, &failobj))
1099 return NULL;
1100 if (mp->ma_table == NULL)
1101 goto finally;
1102
1103#ifdef CACHE_HASH
1104 if (!PyString_Check(key) ||
1105 (hash = ((PyStringObject *) key)->ob_shash) == -1)
1106#endif
1107 {
1108 hash = PyObject_Hash(key);
1109 if (hash == -1)
1110 return NULL;
1111 }
Fred Drake1bff34a2000-08-31 19:31:38 +00001112 val = (mp->ma_lookup)(mp, key, hash)->me_value;
Guido van Rossum164452c2000-08-08 16:12:54 +00001113
1114 finally:
1115 if (val == NULL) {
1116 val = failobj;
1117 if (PyDict_SetItem((PyObject*)mp, key, failobj))
1118 val = NULL;
1119 }
1120 Py_XINCREF(val);
1121 return val;
1122}
1123
1124
1125static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001126dict_clear(register dictobject *mp, PyObject *args)
Guido van Rossumfb8f1ca1997-03-21 21:55:12 +00001127{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001128 if (!PyArg_NoArgs(args))
Guido van Rossumfb8f1ca1997-03-21 21:55:12 +00001129 return NULL;
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001130 PyDict_Clear((PyObject *)mp);
1131 Py_INCREF(Py_None);
1132 return Py_None;
Guido van Rossumfb8f1ca1997-03-21 21:55:12 +00001133}
1134
Guido van Rossumba6ab842000-12-12 22:02:18 +00001135static PyObject *
1136dict_popitem(dictobject *mp, PyObject *args)
1137{
1138 int i = 0;
1139 dictentry *ep;
1140 PyObject *res;
1141
1142 if (!PyArg_NoArgs(args))
1143 return NULL;
1144 if (mp->ma_used == 0) {
1145 PyErr_SetString(PyExc_KeyError,
1146 "popitem(): dictionary is empty");
1147 return NULL;
1148 }
1149 /* Set ep to "the first" dict entry with a value. We abuse the hash
1150 * field of slot 0 to hold a search finger:
1151 * If slot 0 has a value, use slot 0.
1152 * Else slot 0 is being used to hold a search finger,
1153 * and we use its hash value as the first index to look.
1154 */
1155 ep = &mp->ma_table[0];
1156 if (ep->me_value == NULL) {
1157 i = (int)ep->me_hash;
1158 /* The hash field may be uninitialized trash, or it
1159 * may be a real hash value, or it may be a legit
1160 * search finger, or it may be a once-legit search
1161 * finger that's out of bounds now because it
1162 * wrapped around or the table shrunk -- simply
1163 * make sure it's in bounds now.
1164 */
1165 if (i >= mp->ma_size || i < 1)
1166 i = 1; /* skip slot 0 */
1167 while ((ep = &mp->ma_table[i])->me_value == NULL) {
1168 i++;
1169 if (i >= mp->ma_size)
1170 i = 1;
1171 }
1172 }
1173 res = PyTuple_New(2);
1174 if (res != NULL) {
1175 PyTuple_SET_ITEM(res, 0, ep->me_key);
1176 PyTuple_SET_ITEM(res, 1, ep->me_value);
1177 Py_INCREF(dummy);
1178 ep->me_key = dummy;
1179 ep->me_value = NULL;
1180 mp->ma_used--;
1181 assert(mp->ma_table[0].me_value == NULL);
1182 mp->ma_table[0].me_hash = i + 1; /* next place to start */
1183 }
1184 return res;
1185}
1186
Jeremy Hylton8caad492000-06-23 14:18:11 +00001187static int
1188dict_traverse(PyObject *op, visitproc visit, void *arg)
1189{
1190 int i = 0, err;
1191 PyObject *pk;
1192 PyObject *pv;
1193
1194 while (PyDict_Next(op, &i, &pk, &pv)) {
1195 err = visit(pk, arg);
1196 if (err)
1197 return err;
1198 err = visit(pv, arg);
1199 if (err)
1200 return err;
1201 }
1202 return 0;
1203}
1204
1205static int
1206dict_tp_clear(PyObject *op)
1207{
1208 PyDict_Clear(op);
1209 return 0;
1210}
1211
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001212static PyMethodDef mapp_methods[] = {
Fred Drake52fccfd2000-02-23 15:47:16 +00001213 {"has_key", (PyCFunction)dict_has_key, METH_VARARGS},
Guido van Rossum5d8123f1997-07-13 03:58:01 +00001214 {"keys", (PyCFunction)dict_keys},
1215 {"items", (PyCFunction)dict_items},
1216 {"values", (PyCFunction)dict_values},
Guido van Rossuma8d51311997-06-02 17:13:37 +00001217 {"update", (PyCFunction)dict_update},
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001218 {"clear", (PyCFunction)dict_clear},
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001219 {"copy", (PyCFunction)dict_copy},
Fred Drake52fccfd2000-02-23 15:47:16 +00001220 {"get", (PyCFunction)dict_get, METH_VARARGS},
Guido van Rossum164452c2000-08-08 16:12:54 +00001221 {"setdefault", (PyCFunction)dict_setdefault, METH_VARARGS},
Guido van Rossumba6ab842000-12-12 22:02:18 +00001222 {"popitem", (PyCFunction)dict_popitem},
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001223 {NULL, NULL} /* sentinel */
1224};
1225
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001226static PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001227dict_getattr(dictobject *mp, char *name)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001228{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001229 return Py_FindMethod(mapp_methods, (PyObject *)mp, name);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001230}
1231
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001232PyTypeObject PyDict_Type = {
1233 PyObject_HEAD_INIT(&PyType_Type)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001234 0,
Guido van Rossum9bfef441993-03-29 10:43:31 +00001235 "dictionary",
Jeremy Hyltonc5007aa2000-06-30 05:02:53 +00001236 sizeof(dictobject) + PyGC_HEAD_SIZE,
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001237 0,
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001238 (destructor)dict_dealloc, /*tp_dealloc*/
1239 (printfunc)dict_print, /*tp_print*/
1240 (getattrfunc)dict_getattr, /*tp_getattr*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001241 0, /*tp_setattr*/
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001242 (cmpfunc)dict_compare, /*tp_compare*/
1243 (reprfunc)dict_repr, /*tp_repr*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001244 0, /*tp_as_number*/
1245 0, /*tp_as_sequence*/
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001246 &dict_as_mapping, /*tp_as_mapping*/
Jeremy Hylton8caad492000-06-23 14:18:11 +00001247 0, /* tp_hash */
1248 0, /* tp_call */
1249 0, /* tp_str */
1250 0, /* tp_getattro */
1251 0, /* tp_setattro */
1252 0, /* tp_as_buffer */
Jeremy Hyltond08b4c42000-06-23 19:37:02 +00001253 Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC, /*tp_flags*/
Jeremy Hylton8caad492000-06-23 14:18:11 +00001254 0, /* tp_doc */
1255 (traverseproc)dict_traverse, /* tp_traverse */
1256 (inquiry)dict_tp_clear, /* tp_clear */
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001257};
1258
Guido van Rossum3cca2451997-05-16 14:23:33 +00001259/* For backward compatibility with old dictionary interface */
1260
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001261PyObject *
Tim Peters1f5871e2000-07-04 17:44:48 +00001262PyDict_GetItemString(PyObject *v, char *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001263{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001264 PyObject *kv, *rv;
1265 kv = PyString_FromString(key);
1266 if (kv == NULL)
1267 return NULL;
Guido van Rossum3cca2451997-05-16 14:23:33 +00001268 rv = PyDict_GetItem(v, kv);
1269 Py_DECREF(kv);
1270 return rv;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001271}
1272
1273int
Tim Peters1f5871e2000-07-04 17:44:48 +00001274PyDict_SetItemString(PyObject *v, char *key, PyObject *item)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001275{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001276 PyObject *kv;
1277 int err;
1278 kv = PyString_FromString(key);
1279 if (kv == NULL)
Guido van Rossum037b2201997-05-20 18:35:19 +00001280 return -1;
Guido van Rossum4f3bf1e1997-09-29 23:31:11 +00001281 PyString_InternInPlace(&kv); /* XXX Should we really? */
Guido van Rossum3cca2451997-05-16 14:23:33 +00001282 err = PyDict_SetItem(v, kv, item);
1283 Py_DECREF(kv);
1284 return err;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001285}
1286
1287int
Tim Peters1f5871e2000-07-04 17:44:48 +00001288PyDict_DelItemString(PyObject *v, char *key)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001289{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001290 PyObject *kv;
1291 int err;
1292 kv = PyString_FromString(key);
1293 if (kv == NULL)
Guido van Rossum037b2201997-05-20 18:35:19 +00001294 return -1;
Guido van Rossum3cca2451997-05-16 14:23:33 +00001295 err = PyDict_DelItem(v, kv);
1296 Py_DECREF(kv);
1297 return err;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001298}