blob: fd0ad10e94e5603a3fe26afdd11249f7706d2868 [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
22/*
23Table of irreducible polynomials to efficiently cycle through
24GF(2^n)-{0}, 2<=n<=30.
Guido van Rossum4b1302b1993-03-27 18:11:32 +000025*/
Guido van Rossum16e93a81997-01-28 00:00:11 +000026static long polys[] = {
Guido van Rossum9e5656c1997-01-29 04:45:16 +000027 4 + 3,
28 8 + 3,
29 16 + 3,
30 32 + 5,
31 64 + 3,
32 128 + 3,
33 256 + 29,
34 512 + 17,
35 1024 + 9,
36 2048 + 5,
37 4096 + 83,
38 8192 + 27,
39 16384 + 43,
40 32768 + 3,
41 65536 + 45,
42 131072 + 9,
43 262144 + 39,
44 524288 + 39,
45 1048576 + 9,
46 2097152 + 5,
47 4194304 + 3,
48 8388608 + 33,
49 16777216 + 27,
50 33554432 + 9,
51 67108864 + 71,
52 134217728 + 39,
53 268435456 + 9,
54 536870912 + 5,
55 1073741824 + 83,
56 0
Guido van Rossum4b1302b1993-03-27 18:11:32 +000057};
58
59/* Object used as dummy key to fill deleted entries */
Guido van Rossuma9e7a811997-05-13 21:02:11 +000060static PyObject *dummy; /* Initialized by first call to newdictobject() */
Guido van Rossum4b1302b1993-03-27 18:11:32 +000061
62/*
Guido van Rossum2bc13791999-03-24 19:06:42 +000063Invariant for entries: when in use, me_value is not NULL and me_key is
64not NULL and not dummy; when not in use, me_value is NULL and me_key
Guido van Rossum4b1302b1993-03-27 18:11:32 +000065is either NULL or dummy. A dummy key value cannot be replaced by
66NULL, since otherwise other keys may be lost.
67*/
68typedef struct {
69 long me_hash;
Guido van Rossumc0b618a1997-05-02 03:12:38 +000070 PyObject *me_key;
71 PyObject *me_value;
Guido van Rossum36488841997-04-11 19:14:07 +000072#ifdef USE_CACHE_ALIGNED
73 long aligner;
74#endif
Guido van Rossuma9e7a811997-05-13 21:02:11 +000075} dictentry;
Guido van Rossum4b1302b1993-03-27 18:11:32 +000076
77/*
78To ensure the lookup algorithm terminates, the table size must be a
79prime number and there must be at least one NULL key in the table.
80The value ma_fill is the number of non-NULL keys; ma_used is the number
81of non-NULL, non-dummy keys.
82To avoid slowing down lookups on a near-full table, we resize the table
83when it is more than half filled.
84*/
85typedef struct {
Guido van Rossumc0b618a1997-05-02 03:12:38 +000086 PyObject_HEAD
Guido van Rossum4b1302b1993-03-27 18:11:32 +000087 int ma_fill;
88 int ma_used;
89 int ma_size;
Guido van Rossum16e93a81997-01-28 00:00:11 +000090 int ma_poly;
Guido van Rossuma9e7a811997-05-13 21:02:11 +000091 dictentry *ma_table;
92} dictobject;
Guido van Rossum4b1302b1993-03-27 18:11:32 +000093
Guido van Rossumc0b618a1997-05-02 03:12:38 +000094PyObject *
95PyDict_New()
Guido van Rossum4b1302b1993-03-27 18:11:32 +000096{
Guido van Rossuma9e7a811997-05-13 21:02:11 +000097 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +000098 if (dummy == NULL) { /* Auto-initialize dummy */
Guido van Rossumc0b618a1997-05-02 03:12:38 +000099 dummy = PyString_FromString("<dummy key>");
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000100 if (dummy == NULL)
101 return NULL;
102 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000103 mp = PyObject_NEW(dictobject, &PyDict_Type);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000104 if (mp == NULL)
105 return NULL;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000106 mp->ma_size = 0;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000107 mp->ma_poly = 0;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000108 mp->ma_table = NULL;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000109 mp->ma_fill = 0;
110 mp->ma_used = 0;
Jeremy Hyltonc5007aa2000-06-30 05:02:53 +0000111 PyObject_GC_Init(mp);
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000112 return (PyObject *)mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000113}
114
115/*
116The basic lookup function used by all operations.
Guido van Rossum16e93a81997-01-28 00:00:11 +0000117This is based on Algorithm D from Knuth Vol. 3, Sec. 6.4.
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000118Open addressing is preferred over chaining since the link overhead for
119chaining would be substantial (100% with typical malloc overhead).
Guido van Rossum16e93a81997-01-28 00:00:11 +0000120However, instead of going through the table at constant steps, we cycle
121through the values of GF(2^n)-{0}. This avoids modulo computations, being
122much cheaper on RISC machines, without leading to clustering.
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000123
Guido van Rossum2bc13791999-03-24 19:06:42 +0000124The initial probe index is computed as hash mod the table size.
Guido van Rossum16e93a81997-01-28 00:00:11 +0000125Subsequent probe indices use the values of x^i in GF(2^n) as an offset,
Guido van Rossum2bc13791999-03-24 19:06:42 +0000126where x is a root. The initial value is derived from hash, too.
127
128All arithmetic on hash should ignore overflow.
Guido van Rossum16e93a81997-01-28 00:00:11 +0000129
130(This version is due to Reimer Behrends, some ideas are also due to
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000131Jyrki Alakuijala and Vladimir Marangozov.)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000132*/
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000133static dictentry *lookdict Py_PROTO((dictobject *, PyObject *, long));
134static dictentry *
135lookdict(mp, key, hash)
136 dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000137 PyObject *key;
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000138 register long hash;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000139{
Guido van Rossum16e93a81997-01-28 00:00:11 +0000140 register int i;
141 register unsigned incr;
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000142 register dictentry *freeslot;
Guido van Rossum2095d241997-04-09 19:41:24 +0000143 register unsigned int mask = mp->ma_size-1;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000144 dictentry *ep0 = mp->ma_table;
145 register dictentry *ep;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000146 /* We must come up with (i, incr) such that 0 <= i < ma_size
147 and 0 < incr < ma_size and both are a function of hash */
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000148 i = (~hash) & mask;
149 /* We use ~hash instead of hash, as degenerate hash functions, such
Guido van Rossum16e93a81997-01-28 00:00:11 +0000150 as for ints <sigh>, can have lots of leading zeros. It's not
151 really a performance risk, but better safe than sorry. */
Guido van Rossumefb46091997-01-29 15:53:56 +0000152 ep = &ep0[i];
Guido van Rossumc1c7b1a1998-10-06 16:01:14 +0000153 if (ep->me_key == NULL || ep->me_key == key)
Guido van Rossum7d181591997-01-16 21:06:45 +0000154 return ep;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000155 if (ep->me_key == dummy)
Guido van Rossum7d181591997-01-16 21:06:45 +0000156 freeslot = ep;
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000157 else {
Guido van Rossumc1c7b1a1998-10-06 16:01:14 +0000158 if (ep->me_hash == hash &&
159 PyObject_Compare(ep->me_key, key) == 0)
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000160 {
161 return ep;
162 }
163 freeslot = NULL;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000164 }
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000165 /* XXX What if PyObject_Compare returned an exception? */
Guido van Rossum2bc13791999-03-24 19:06:42 +0000166 /* Derive incr from hash, just to make it more arbitrary. Note that
Guido van Rossum16e93a81997-01-28 00:00:11 +0000167 incr must not be 0, or we will get into an infinite loop.*/
Guido van Rossumfd7a0b81997-08-18 21:52:47 +0000168 incr = (hash ^ ((unsigned long)hash >> 3)) & mask;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000169 if (!incr)
170 incr = mask;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000171 for (;;) {
Guido van Rossumefb46091997-01-29 15:53:56 +0000172 ep = &ep0[(i+incr)&mask];
Guido van Rossum16e93a81997-01-28 00:00:11 +0000173 if (ep->me_key == NULL) {
174 if (freeslot != NULL)
175 return freeslot;
176 else
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000177 return ep;
178 }
Guido van Rossum16e93a81997-01-28 00:00:11 +0000179 if (ep->me_key == dummy) {
180 if (freeslot == NULL)
181 freeslot = ep;
182 }
183 else if (ep->me_key == key ||
184 (ep->me_hash == hash &&
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000185 PyObject_Compare(ep->me_key, key) == 0)) {
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000186 return ep;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000187 }
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000188 /* XXX What if PyObject_Compare returned an exception? */
Guido van Rossum16e93a81997-01-28 00:00:11 +0000189 /* Cycle through GF(2^n)-{0} */
190 incr = incr << 1;
191 if (incr > mask)
Guido van Rossumf05fc711998-11-16 22:46:30 +0000192 incr ^= mp->ma_poly; /* This will implicitely clear
193 the highest bit */
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000194 }
195}
196
197/*
198Internal routine to insert a new item into the table.
199Used both by the internal resize routine and by the public insert routine.
200Eats a reference to key and one to value.
201*/
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000202static void insertdict
203 Py_PROTO((dictobject *, PyObject *, long, PyObject *));
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000204static void
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000205insertdict(mp, key, hash, value)
206 register dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000207 PyObject *key;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000208 long hash;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000209 PyObject *value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000210{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000211 PyObject *old_value;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000212 register dictentry *ep;
213 ep = lookdict(mp, key, hash);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000214 if (ep->me_value != NULL) {
Guido van Rossumd7047b31995-01-02 19:07:15 +0000215 old_value = ep->me_value;
216 ep->me_value = value;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000217 Py_DECREF(old_value); /* which **CAN** re-enter */
218 Py_DECREF(key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000219 }
220 else {
221 if (ep->me_key == NULL)
222 mp->ma_fill++;
223 else
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000224 Py_DECREF(ep->me_key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000225 ep->me_key = key;
226 ep->me_hash = hash;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000227 ep->me_value = value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000228 mp->ma_used++;
229 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000230}
231
232/*
233Restructure the table by allocating a new table and reinserting all
234items again. When entries have been deleted, the new table may
235actually be smaller than the old one.
236*/
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000237static int dictresize Py_PROTO((dictobject *, int));
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000238static int
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000239dictresize(mp, minused)
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000240 dictobject *mp;
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000241 int minused;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000242{
243 register int oldsize = mp->ma_size;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000244 register int newsize, newpoly;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000245 register dictentry *oldtable = mp->ma_table;
246 register dictentry *newtable;
247 register dictentry *ep;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000248 register int i;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000249 for (i = 0, newsize = MINSIZE; ; i++, newsize <<= 1) {
250 if (i > sizeof(polys)/sizeof(polys[0])) {
251 /* Ran out of polynomials */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000252 PyErr_NoMemory();
Guido van Rossum1d5735e1994-08-30 08:27:36 +0000253 return -1;
254 }
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000255 if (newsize > minused) {
Guido van Rossum16e93a81997-01-28 00:00:11 +0000256 newpoly = polys[i];
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000257 break;
258 }
259 }
Guido van Rossumb18618d2000-05-03 23:44:39 +0000260 newtable = PyMem_NEW(dictentry, newsize);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000261 if (newtable == NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000262 PyErr_NoMemory();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000263 return -1;
264 }
Guido van Rossum0fd00331998-07-16 15:06:13 +0000265 memset(newtable, '\0', sizeof(dictentry) * newsize);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000266 mp->ma_size = newsize;
Guido van Rossum16e93a81997-01-28 00:00:11 +0000267 mp->ma_poly = newpoly;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000268 mp->ma_table = newtable;
269 mp->ma_fill = 0;
270 mp->ma_used = 0;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000271
272 /* Make two passes, so we can avoid decrefs
273 (and possible side effects) till the table is copied */
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000274 for (i = 0, ep = oldtable; i < oldsize; i++, ep++) {
275 if (ep->me_value != NULL)
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000276 insertdict(mp,ep->me_key,ep->me_hash,ep->me_value);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000277 }
Guido van Rossumd7047b31995-01-02 19:07:15 +0000278 for (i = 0, ep = oldtable; i < oldsize; i++, ep++) {
Guido van Rossum255443b1998-04-10 22:47:14 +0000279 if (ep->me_value == NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000280 Py_XDECREF(ep->me_key);
Guido van Rossum255443b1998-04-10 22:47:14 +0000281 }
Guido van Rossumd7047b31995-01-02 19:07:15 +0000282 }
283
Guido van Rossumb18618d2000-05-03 23:44:39 +0000284 if (oldtable != NULL)
285 PyMem_DEL(oldtable);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000286 return 0;
287}
288
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000289PyObject *
290PyDict_GetItem(op, key)
291 PyObject *op;
292 PyObject *key;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000293{
294 long hash;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000295 if (!PyDict_Check(op)) {
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000296 return NULL;
297 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000298 if (((dictobject *)op)->ma_table == NULL)
Guido van Rossumd7047b31995-01-02 19:07:15 +0000299 return NULL;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000300#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000301 if (!PyString_Check(key) ||
302 (hash = ((PyStringObject *) key)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000303#endif
Guido van Rossumca756f21997-01-23 19:39:29 +0000304 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000305 hash = PyObject_Hash(key);
Guido van Rossum474b19e1998-05-14 01:00:51 +0000306 if (hash == -1) {
307 PyErr_Clear();
Guido van Rossumca756f21997-01-23 19:39:29 +0000308 return NULL;
Guido van Rossum474b19e1998-05-14 01:00:51 +0000309 }
Guido van Rossumca756f21997-01-23 19:39:29 +0000310 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000311 return lookdict((dictobject *)op, key, hash) -> me_value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000312}
313
314int
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000315PyDict_SetItem(op, key, value)
316 register PyObject *op;
317 PyObject *key;
318 PyObject *value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000319{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000320 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000321 register long hash;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000322 if (!PyDict_Check(op)) {
323 PyErr_BadInternalCall();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000324 return -1;
325 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000326 mp = (dictobject *)op;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000327#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000328 if (PyString_Check(key)) {
Guido van Rossum2a61e741997-01-18 07:55:05 +0000329#ifdef INTERN_STRINGS
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000330 if (((PyStringObject *)key)->ob_sinterned != NULL) {
331 key = ((PyStringObject *)key)->ob_sinterned;
332 hash = ((PyStringObject *)key)->ob_shash;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000333 }
334 else
335#endif
336 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000337 hash = ((PyStringObject *)key)->ob_shash;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000338 if (hash == -1)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000339 hash = PyObject_Hash(key);
Guido van Rossum2a61e741997-01-18 07:55:05 +0000340 }
341 }
342 else
343#endif
344 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000345 hash = PyObject_Hash(key);
Guido van Rossum2a61e741997-01-18 07:55:05 +0000346 if (hash == -1)
347 return -1;
Guido van Rossum2a61e741997-01-18 07:55:05 +0000348 }
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000349 /* if fill >= 2/3 size, double in size */
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000350 if (mp->ma_fill*3 >= mp->ma_size*2) {
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000351 if (dictresize(mp, mp->ma_used*2) != 0) {
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000352 if (mp->ma_fill+1 > mp->ma_size)
353 return -1;
354 }
355 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000356 Py_INCREF(value);
357 Py_INCREF(key);
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000358 insertdict(mp, key, hash, value);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000359 return 0;
360}
361
362int
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000363PyDict_DelItem(op, key)
364 PyObject *op;
365 PyObject *key;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000366{
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000367 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000368 register long hash;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000369 register dictentry *ep;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000370 PyObject *old_value, *old_key;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000371
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000372 if (!PyDict_Check(op)) {
373 PyErr_BadInternalCall();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000374 return -1;
375 }
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000376#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000377 if (!PyString_Check(key) ||
378 (hash = ((PyStringObject *) key)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000379#endif
Guido van Rossumca756f21997-01-23 19:39:29 +0000380 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000381 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +0000382 if (hash == -1)
383 return -1;
384 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000385 mp = (dictobject *)op;
386 if (((dictobject *)op)->ma_table == NULL)
Guido van Rossumefc87131995-01-02 19:42:39 +0000387 goto empty;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000388 ep = lookdict(mp, key, hash);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000389 if (ep->me_value == NULL) {
Guido van Rossumefc87131995-01-02 19:42:39 +0000390 empty:
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000391 PyErr_SetObject(PyExc_KeyError, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000392 return -1;
393 }
Guido van Rossumd7047b31995-01-02 19:07:15 +0000394 old_key = ep->me_key;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000395 Py_INCREF(dummy);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000396 ep->me_key = dummy;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000397 old_value = ep->me_value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000398 ep->me_value = NULL;
399 mp->ma_used--;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000400 Py_DECREF(old_value);
401 Py_DECREF(old_key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000402 return 0;
403}
404
Guido van Rossum25831651993-05-19 14:50:45 +0000405void
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000406PyDict_Clear(op)
407 PyObject *op;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000408{
Guido van Rossumd7047b31995-01-02 19:07:15 +0000409 int i, n;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000410 register dictentry *table;
411 dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000412 if (!PyDict_Check(op))
Guido van Rossum25831651993-05-19 14:50:45 +0000413 return;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000414 mp = (dictobject *)op;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000415 table = mp->ma_table;
416 if (table == NULL)
417 return;
418 n = mp->ma_size;
419 mp->ma_size = mp->ma_used = mp->ma_fill = 0;
420 mp->ma_table = NULL;
421 for (i = 0; i < n; i++) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000422 Py_XDECREF(table[i].me_key);
423 Py_XDECREF(table[i].me_value);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000424 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000425 PyMem_DEL(table);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000426}
427
Guido van Rossum25831651993-05-19 14:50:45 +0000428int
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000429PyDict_Next(op, ppos, pkey, pvalue)
430 PyObject *op;
Guido van Rossum25831651993-05-19 14:50:45 +0000431 int *ppos;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000432 PyObject **pkey;
433 PyObject **pvalue;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000434{
Guido van Rossum25831651993-05-19 14:50:45 +0000435 int i;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000436 register dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000437 if (!PyDict_Check(op))
Guido van Rossum25831651993-05-19 14:50:45 +0000438 return 0;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000439 mp = (dictobject *)op;
Guido van Rossum25831651993-05-19 14:50:45 +0000440 i = *ppos;
441 if (i < 0)
442 return 0;
443 while (i < mp->ma_size && mp->ma_table[i].me_value == NULL)
444 i++;
445 *ppos = i+1;
446 if (i >= mp->ma_size)
447 return 0;
448 if (pkey)
449 *pkey = mp->ma_table[i].me_key;
450 if (pvalue)
451 *pvalue = mp->ma_table[i].me_value;
452 return 1;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000453}
454
455/* Methods */
456
457static void
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000458dict_dealloc(mp)
459 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000460{
461 register int i;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000462 register dictentry *ep;
Guido van Rossumd724b232000-03-13 16:01:29 +0000463 Py_TRASHCAN_SAFE_BEGIN(mp)
Jeremy Hyltonc5007aa2000-06-30 05:02:53 +0000464 PyObject_GC_Fini(mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000465 for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) {
Guido van Rossum255443b1998-04-10 22:47:14 +0000466 if (ep->me_key != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000467 Py_DECREF(ep->me_key);
Guido van Rossum255443b1998-04-10 22:47:14 +0000468 }
469 if (ep->me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000470 Py_DECREF(ep->me_value);
Guido van Rossum255443b1998-04-10 22:47:14 +0000471 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000472 }
Guido van Rossumb18618d2000-05-03 23:44:39 +0000473 if (mp->ma_table != NULL)
474 PyMem_DEL(mp->ma_table);
475 PyObject_DEL(mp);
Guido van Rossumd724b232000-03-13 16:01:29 +0000476 Py_TRASHCAN_SAFE_END(mp)
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000477}
478
479static int
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000480dict_print(mp, fp, flags)
481 register dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000482 register FILE *fp;
483 register int flags;
484{
485 register int i;
486 register int any;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000487 register dictentry *ep;
Guido van Rossum255443b1998-04-10 22:47:14 +0000488
489 i = Py_ReprEnter((PyObject*)mp);
490 if (i != 0) {
491 if (i < 0)
492 return i;
493 fprintf(fp, "{...}");
494 return 0;
495 }
496
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000497 fprintf(fp, "{");
498 any = 0;
499 for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) {
500 if (ep->me_value != NULL) {
501 if (any++ > 0)
502 fprintf(fp, ", ");
Guido van Rossum255443b1998-04-10 22:47:14 +0000503 if (PyObject_Print((PyObject *)ep->me_key, fp, 0)!=0) {
504 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000505 return -1;
Guido van Rossum255443b1998-04-10 22:47:14 +0000506 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000507 fprintf(fp, ": ");
Guido van Rossum255443b1998-04-10 22:47:14 +0000508 if (PyObject_Print(ep->me_value, fp, 0) != 0) {
509 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000510 return -1;
Guido van Rossum255443b1998-04-10 22:47:14 +0000511 }
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000512 }
513 }
514 fprintf(fp, "}");
Guido van Rossum255443b1998-04-10 22:47:14 +0000515 Py_ReprLeave((PyObject*)mp);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000516 return 0;
517}
518
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000519static PyObject *
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000520dict_repr(mp)
521 dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000522{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000523 auto PyObject *v;
524 PyObject *sepa, *colon;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000525 register int i;
526 register int any;
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000527 register dictentry *ep;
Guido van Rossum255443b1998-04-10 22:47:14 +0000528
529 i = Py_ReprEnter((PyObject*)mp);
530 if (i != 0) {
531 if (i > 0)
532 return PyString_FromString("{...}");
533 return NULL;
534 }
535
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000536 v = PyString_FromString("{");
537 sepa = PyString_FromString(", ");
538 colon = PyString_FromString(": ");
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000539 any = 0;
Guido van Rossum1d5735e1994-08-30 08:27:36 +0000540 for (i = 0, ep = mp->ma_table; i < mp->ma_size && v; i++, ep++) {
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000541 if (ep->me_value != NULL) {
542 if (any++)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000543 PyString_Concat(&v, sepa);
544 PyString_ConcatAndDel(&v, PyObject_Repr(ep->me_key));
545 PyString_Concat(&v, colon);
546 PyString_ConcatAndDel(&v, PyObject_Repr(ep->me_value));
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000547 }
548 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000549 PyString_ConcatAndDel(&v, PyString_FromString("}"));
Guido van Rossum255443b1998-04-10 22:47:14 +0000550 Py_ReprLeave((PyObject*)mp);
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000551 Py_XDECREF(sepa);
552 Py_XDECREF(colon);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000553 return v;
554}
555
556static int
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000557dict_length(mp)
558 dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000559{
560 return mp->ma_used;
561}
562
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000563static PyObject *
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000564dict_subscript(mp, key)
565 dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000566 register PyObject *key;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000567{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000568 PyObject *v;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000569 long hash;
Guido van Rossumd7047b31995-01-02 19:07:15 +0000570 if (mp->ma_table == NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000571 PyErr_SetObject(PyExc_KeyError, key);
Guido van Rossumd7047b31995-01-02 19:07:15 +0000572 return NULL;
573 }
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000574#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000575 if (!PyString_Check(key) ||
576 (hash = ((PyStringObject *) key)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000577#endif
Guido van Rossumca756f21997-01-23 19:39:29 +0000578 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000579 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +0000580 if (hash == -1)
581 return NULL;
582 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000583 v = lookdict(mp, key, hash) -> me_value;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000584 if (v == NULL)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000585 PyErr_SetObject(PyExc_KeyError, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000586 else
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000587 Py_INCREF(v);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000588 return v;
589}
590
591static int
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000592dict_ass_sub(mp, v, w)
593 dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000594 PyObject *v, *w;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000595{
596 if (w == NULL)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000597 return PyDict_DelItem((PyObject *)mp, v);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000598 else
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000599 return PyDict_SetItem((PyObject *)mp, v, w);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000600}
601
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000602static PyMappingMethods dict_as_mapping = {
603 (inquiry)dict_length, /*mp_length*/
604 (binaryfunc)dict_subscript, /*mp_subscript*/
605 (objobjargproc)dict_ass_sub, /*mp_ass_subscript*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000606};
607
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000608static PyObject *
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000609dict_keys(mp, args)
610 register dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000611 PyObject *args;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000612{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000613 register PyObject *v;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000614 register int i, j;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000615 if (!PyArg_NoArgs(args))
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000616 return NULL;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000617 v = PyList_New(mp->ma_used);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000618 if (v == NULL)
619 return NULL;
620 for (i = 0, j = 0; i < mp->ma_size; i++) {
621 if (mp->ma_table[i].me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000622 PyObject *key = mp->ma_table[i].me_key;
623 Py_INCREF(key);
624 PyList_SetItem(v, j, key);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000625 j++;
626 }
627 }
628 return v;
629}
630
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000631static PyObject *
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000632dict_values(mp, args)
633 register dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000634 PyObject *args;
Guido van Rossum25831651993-05-19 14:50:45 +0000635{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000636 register PyObject *v;
Guido van Rossum25831651993-05-19 14:50:45 +0000637 register int i, j;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000638 if (!PyArg_NoArgs(args))
Guido van Rossum25831651993-05-19 14:50:45 +0000639 return NULL;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000640 v = PyList_New(mp->ma_used);
Guido van Rossum25831651993-05-19 14:50:45 +0000641 if (v == NULL)
642 return NULL;
643 for (i = 0, j = 0; i < mp->ma_size; i++) {
644 if (mp->ma_table[i].me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000645 PyObject *value = mp->ma_table[i].me_value;
646 Py_INCREF(value);
647 PyList_SetItem(v, j, value);
Guido van Rossum25831651993-05-19 14:50:45 +0000648 j++;
649 }
650 }
651 return v;
652}
653
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000654static PyObject *
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000655dict_items(mp, args)
656 register dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000657 PyObject *args;
Guido van Rossum25831651993-05-19 14:50:45 +0000658{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000659 register PyObject *v;
Guido van Rossum25831651993-05-19 14:50:45 +0000660 register int i, j;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000661 if (!PyArg_NoArgs(args))
Guido van Rossum25831651993-05-19 14:50:45 +0000662 return NULL;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000663 v = PyList_New(mp->ma_used);
Guido van Rossum25831651993-05-19 14:50:45 +0000664 if (v == NULL)
665 return NULL;
666 for (i = 0, j = 0; i < mp->ma_size; i++) {
667 if (mp->ma_table[i].me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000668 PyObject *key = mp->ma_table[i].me_key;
669 PyObject *value = mp->ma_table[i].me_value;
670 PyObject *item = PyTuple_New(2);
Guido van Rossum25831651993-05-19 14:50:45 +0000671 if (item == NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000672 Py_DECREF(v);
Guido van Rossum25831651993-05-19 14:50:45 +0000673 return NULL;
674 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000675 Py_INCREF(key);
676 PyTuple_SetItem(item, 0, key);
677 Py_INCREF(value);
678 PyTuple_SetItem(item, 1, value);
679 PyList_SetItem(v, j, item);
Guido van Rossum25831651993-05-19 14:50:45 +0000680 j++;
681 }
682 }
683 return v;
684}
685
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000686static PyObject *
Guido van Rossuma8d51311997-06-02 17:13:37 +0000687dict_update(mp, args)
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000688 register dictobject *mp;
689 PyObject *args;
690{
691 register int i;
692 dictobject *other;
693 dictentry *entry;
694 if (!PyArg_Parse(args, "O!", &PyDict_Type, &other))
695 return NULL;
696 if (other == mp)
Guido van Rossuma8d51311997-06-02 17:13:37 +0000697 goto done; /* a.update(a); nothing to do */
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000698 /* Do one big resize at the start, rather than incrementally
699 resizing as we insert new items. Expect that there will be
700 no (or few) overlapping keys. */
701 if ((mp->ma_fill + other->ma_used)*3 >= mp->ma_size*2) {
702 if (dictresize(mp, (mp->ma_used + other->ma_used)*3/2) != 0)
703 return NULL;
704 }
705 for (i = 0; i < other->ma_size; i++) {
706 entry = &other->ma_table[i];
707 if (entry->me_value != NULL) {
708 Py_INCREF(entry->me_key);
709 Py_INCREF(entry->me_value);
710 insertdict(mp, entry->me_key, entry->me_hash,
711 entry->me_value);
712 }
713 }
714 done:
715 Py_INCREF(Py_None);
716 return Py_None;
717}
718
719static PyObject *
720dict_copy(mp, args)
721 register dictobject *mp;
722 PyObject *args;
723{
Jeremy Hyltona12c7a72000-03-30 22:27:31 +0000724 if (!PyArg_Parse(args, ""))
725 return NULL;
726 return PyDict_Copy((PyObject*)mp);
727}
728
729PyObject *
730PyDict_Copy(o)
731 PyObject *o;
732{
733 register dictobject *mp;
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000734 register int i;
735 dictobject *copy;
736 dictentry *entry;
Jeremy Hyltona12c7a72000-03-30 22:27:31 +0000737
738 if (o == NULL || !PyDict_Check(o)) {
739 PyErr_BadInternalCall();
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000740 return NULL;
Jeremy Hyltona12c7a72000-03-30 22:27:31 +0000741 }
742 mp = (dictobject *)o;
Guido van Rossume3f5b9c1997-05-28 19:15:28 +0000743 copy = (dictobject *)PyDict_New();
744 if (copy == NULL)
745 return NULL;
746 if (mp->ma_used > 0) {
747 if (dictresize(copy, mp->ma_used*3/2) != 0)
748 return NULL;
749 for (i = 0; i < mp->ma_size; i++) {
750 entry = &mp->ma_table[i];
751 if (entry->me_value != NULL) {
752 Py_INCREF(entry->me_key);
753 Py_INCREF(entry->me_value);
754 insertdict(copy, entry->me_key, entry->me_hash,
755 entry->me_value);
756 }
757 }
758 }
759 return (PyObject *)copy;
760}
761
Guido van Rossum4199fac1993-11-05 10:18:44 +0000762int
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000763PyDict_Size(mp)
764 PyObject *mp;
Guido van Rossum4199fac1993-11-05 10:18:44 +0000765{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000766 if (mp == NULL || !PyDict_Check(mp)) {
767 PyErr_BadInternalCall();
Guido van Rossumb376a4a1993-11-23 17:53:17 +0000768 return 0;
Guido van Rossum4199fac1993-11-05 10:18:44 +0000769 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000770 return ((dictobject *)mp)->ma_used;
Guido van Rossum4199fac1993-11-05 10:18:44 +0000771}
772
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000773PyObject *
774PyDict_Keys(mp)
775 PyObject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000776{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000777 if (mp == NULL || !PyDict_Check(mp)) {
778 PyErr_BadInternalCall();
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000779 return NULL;
780 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000781 return dict_keys((dictobject *)mp, (PyObject *)NULL);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000782}
783
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000784PyObject *
785PyDict_Values(mp)
786 PyObject *mp;
Guido van Rossum25831651993-05-19 14:50:45 +0000787{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000788 if (mp == NULL || !PyDict_Check(mp)) {
789 PyErr_BadInternalCall();
Guido van Rossum25831651993-05-19 14:50:45 +0000790 return NULL;
791 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000792 return dict_values((dictobject *)mp, (PyObject *)NULL);
Guido van Rossum25831651993-05-19 14:50:45 +0000793}
794
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000795PyObject *
796PyDict_Items(mp)
797 PyObject *mp;
Guido van Rossum25831651993-05-19 14:50:45 +0000798{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000799 if (mp == NULL || !PyDict_Check(mp)) {
800 PyErr_BadInternalCall();
Guido van Rossum25831651993-05-19 14:50:45 +0000801 return NULL;
802 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000803 return dict_items((dictobject *)mp, (PyObject *)NULL);
Guido van Rossum25831651993-05-19 14:50:45 +0000804}
805
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000806#define NEWCMP
807
808#ifdef NEWCMP
809
810/* Subroutine which returns the smallest key in a for which b's value
811 is different or absent. The value is returned too, through the
812 pval argument. No reference counts are incremented. */
813
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000814static PyObject *
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000815characterize(a, b, pval)
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000816 dictobject *a;
817 dictobject *b;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000818 PyObject **pval;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000819{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000820 PyObject *diff = NULL;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000821 int i;
822
823 *pval = NULL;
824 for (i = 0; i < a->ma_size; i++) {
825 if (a->ma_table[i].me_value != NULL) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000826 PyObject *key = a->ma_table[i].me_key;
827 PyObject *aval, *bval;
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000828 /* XXX What if PyObject_Compare raises an exception? */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000829 if (diff != NULL && PyObject_Compare(key, diff) > 0)
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000830 continue;
831 aval = a->ma_table[i].me_value;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000832 bval = PyDict_GetItem((PyObject *)b, key);
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000833 /* XXX What if PyObject_Compare raises an exception? */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000834 if (bval == NULL || PyObject_Compare(aval, bval) != 0)
835 {
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000836 diff = key;
837 *pval = aval;
838 }
839 }
840 }
841 return diff;
842}
843
844static int
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000845dict_compare(a, b)
846 dictobject *a, *b;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000847{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000848 PyObject *adiff, *bdiff, *aval, *bval;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000849 int res;
850
851 /* Compare lengths first */
852 if (a->ma_used < b->ma_used)
853 return -1; /* a is shorter */
854 else if (a->ma_used > b->ma_used)
855 return 1; /* b is shorter */
856 /* Same length -- check all keys */
857 adiff = characterize(a, b, &aval);
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000858 if (PyErr_Occurred())
859 return -1;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000860 if (adiff == NULL)
861 return 0; /* a is a subset with the same length */
862 bdiff = characterize(b, a, &bval);
Guido van Rossum5b2121b1997-05-23 00:01:41 +0000863 if (PyErr_Occurred())
864 return -1;
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000865 /* bdiff == NULL would be impossible now */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000866 res = PyObject_Compare(adiff, bdiff);
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000867 if (res == 0)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000868 res = PyObject_Compare(aval, bval);
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000869 return res;
870}
871
872#else /* !NEWCMP */
873
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000874static int
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000875dict_compare(a, b)
876 dictobject *a, *b;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000877{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000878 PyObject *akeys, *bkeys;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000879 int i, n, res;
880 if (a == b)
881 return 0;
882 if (a->ma_used == 0) {
883 if (b->ma_used != 0)
884 return -1;
885 else
886 return 0;
887 }
888 else {
889 if (b->ma_used == 0)
890 return 1;
891 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000892 akeys = dict_keys(a, (PyObject *)NULL);
893 bkeys = dict_keys(b, (PyObject *)NULL);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000894 if (akeys == NULL || bkeys == NULL) {
895 /* Oops, out of memory -- what to do? */
896 /* For now, sort on address! */
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000897 Py_XDECREF(akeys);
898 Py_XDECREF(bkeys);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000899 if (a < b)
900 return -1;
901 else
902 return 1;
903 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000904 PyList_Sort(akeys);
905 PyList_Sort(bkeys);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000906 n = a->ma_used < b->ma_used ? a->ma_used : b->ma_used; /* smallest */
907 res = 0;
908 for (i = 0; i < n; i++) {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000909 PyObject *akey, *bkey, *aval, *bval;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000910 long ahash, bhash;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000911 akey = PyList_GetItem(akeys, i);
912 bkey = PyList_GetItem(bkeys, i);
913 res = PyObject_Compare(akey, bkey);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000914 if (res != 0)
915 break;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000916#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000917 if (!PyString_Check(akey) ||
918 (ahash = ((PyStringObject *) akey)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000919#endif
Guido van Rossumca756f21997-01-23 19:39:29 +0000920 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000921 ahash = PyObject_Hash(akey);
Guido van Rossumca756f21997-01-23 19:39:29 +0000922 if (ahash == -1)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000923 PyErr_Clear(); /* Don't want errors here */
Guido van Rossumca756f21997-01-23 19:39:29 +0000924 }
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000925#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000926 if (!PyString_Check(bkey) ||
927 (bhash = ((PyStringObject *) bkey)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000928#endif
Guido van Rossumca756f21997-01-23 19:39:29 +0000929 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000930 bhash = PyObject_Hash(bkey);
Guido van Rossumca756f21997-01-23 19:39:29 +0000931 if (bhash == -1)
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000932 PyErr_Clear(); /* Don't want errors here */
Guido van Rossumca756f21997-01-23 19:39:29 +0000933 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000934 aval = lookdict(a, akey, ahash) -> me_value;
935 bval = lookdict(b, bkey, bhash) -> me_value;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000936 res = PyObject_Compare(aval, bval);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000937 if (res != 0)
938 break;
939 }
940 if (res == 0) {
941 if (a->ma_used < b->ma_used)
942 res = -1;
943 else if (a->ma_used > b->ma_used)
944 res = 1;
945 }
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000946 Py_DECREF(akeys);
947 Py_DECREF(bkeys);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000948 return res;
949}
950
Guido van Rossuma0a69b81996-12-05 21:55:55 +0000951#endif /* !NEWCMP */
952
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000953static PyObject *
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000954dict_has_key(mp, args)
955 register dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000956 PyObject *args;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000957{
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000958 PyObject *key;
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000959 long hash;
960 register long ok;
Fred Drake52fccfd2000-02-23 15:47:16 +0000961 if (!PyArg_ParseTuple(args, "O:has_key", &key))
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000962 return NULL;
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000963#ifdef CACHE_HASH
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000964 if (!PyString_Check(key) ||
965 (hash = ((PyStringObject *) key)->ob_shash) == -1)
Sjoerd Mullender3bb8a051993-10-22 12:04:32 +0000966#endif
Guido van Rossumca756f21997-01-23 19:39:29 +0000967 {
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000968 hash = PyObject_Hash(key);
Guido van Rossumca756f21997-01-23 19:39:29 +0000969 if (hash == -1)
970 return NULL;
971 }
Guido van Rossuma9e7a811997-05-13 21:02:11 +0000972 ok = mp->ma_size != 0 && lookdict(mp, key, hash)->me_value != NULL;
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000973 return PyInt_FromLong(ok);
Guido van Rossum4b1302b1993-03-27 18:11:32 +0000974}
975
Guido van Rossumc0b618a1997-05-02 03:12:38 +0000976static PyObject *
Barry Warsawc38c5da1997-10-06 17:49:20 +0000977dict_get(mp, args)
978 register dictobject *mp;
979 PyObject *args;
980{
981 PyObject *key;
Barry Warsaw320ac331997-10-20 17:26:25 +0000982 PyObject *failobj = Py_None;
Barry Warsawc38c5da1997-10-06 17:49:20 +0000983 PyObject *val = NULL;
984 long hash;
985
Fred Drake52fccfd2000-02-23 15:47:16 +0000986 if (!PyArg_ParseTuple(args, "O|O:get", &key, &failobj))
Barry Warsawc38c5da1997-10-06 17:49:20 +0000987 return NULL;
Guido van Rossum6fcfa721997-10-20 20:10:00 +0000988 if (mp->ma_table == NULL)
989 goto finally;
Barry Warsawc38c5da1997-10-06 17:49:20 +0000990
Barry Warsawc38c5da1997-10-06 17:49:20 +0000991#ifdef CACHE_HASH
992 if (!PyString_Check(key) ||
993 (hash = ((PyStringObject *) key)->ob_shash) == -1)
994#endif
995 {
996 hash = PyObject_Hash(key);
997 if (hash == -1)
998 return NULL;
999 }
1000 val = lookdict(mp, key, hash)->me_value;
Barry Warsaw320ac331997-10-20 17:26:25 +00001001
Guido van Rossum6fcfa721997-10-20 20:10:00 +00001002 finally:
Barry Warsawc38c5da1997-10-06 17:49:20 +00001003 if (val == NULL)
1004 val = failobj;
1005 Py_INCREF(val);
1006 return val;
1007}
1008
1009
1010static PyObject *
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001011dict_clear(mp, args)
1012 register dictobject *mp;
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001013 PyObject *args;
Guido van Rossumfb8f1ca1997-03-21 21:55:12 +00001014{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001015 if (!PyArg_NoArgs(args))
Guido van Rossumfb8f1ca1997-03-21 21:55:12 +00001016 return NULL;
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001017 PyDict_Clear((PyObject *)mp);
1018 Py_INCREF(Py_None);
1019 return Py_None;
Guido van Rossumfb8f1ca1997-03-21 21:55:12 +00001020}
1021
Jeremy Hylton8caad492000-06-23 14:18:11 +00001022static int
1023dict_traverse(PyObject *op, visitproc visit, void *arg)
1024{
1025 int i = 0, err;
1026 PyObject *pk;
1027 PyObject *pv;
1028
1029 while (PyDict_Next(op, &i, &pk, &pv)) {
1030 err = visit(pk, arg);
1031 if (err)
1032 return err;
1033 err = visit(pv, arg);
1034 if (err)
1035 return err;
1036 }
1037 return 0;
1038}
1039
1040static int
1041dict_tp_clear(PyObject *op)
1042{
1043 PyDict_Clear(op);
1044 return 0;
1045}
1046
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001047static PyMethodDef mapp_methods[] = {
Fred Drake52fccfd2000-02-23 15:47:16 +00001048 {"has_key", (PyCFunction)dict_has_key, METH_VARARGS},
Guido van Rossum5d8123f1997-07-13 03:58:01 +00001049 {"keys", (PyCFunction)dict_keys},
1050 {"items", (PyCFunction)dict_items},
1051 {"values", (PyCFunction)dict_values},
Guido van Rossuma8d51311997-06-02 17:13:37 +00001052 {"update", (PyCFunction)dict_update},
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001053 {"clear", (PyCFunction)dict_clear},
Guido van Rossume3f5b9c1997-05-28 19:15:28 +00001054 {"copy", (PyCFunction)dict_copy},
Fred Drake52fccfd2000-02-23 15:47:16 +00001055 {"get", (PyCFunction)dict_get, METH_VARARGS},
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001056 {NULL, NULL} /* sentinel */
1057};
1058
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001059static PyObject *
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001060dict_getattr(mp, name)
1061 dictobject *mp;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001062 char *name;
1063{
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001064 return Py_FindMethod(mapp_methods, (PyObject *)mp, name);
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001065}
1066
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001067PyTypeObject PyDict_Type = {
1068 PyObject_HEAD_INIT(&PyType_Type)
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001069 0,
Guido van Rossum9bfef441993-03-29 10:43:31 +00001070 "dictionary",
Jeremy Hyltonc5007aa2000-06-30 05:02:53 +00001071 sizeof(dictobject) + PyGC_HEAD_SIZE,
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001072 0,
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001073 (destructor)dict_dealloc, /*tp_dealloc*/
1074 (printfunc)dict_print, /*tp_print*/
1075 (getattrfunc)dict_getattr, /*tp_getattr*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001076 0, /*tp_setattr*/
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001077 (cmpfunc)dict_compare, /*tp_compare*/
1078 (reprfunc)dict_repr, /*tp_repr*/
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001079 0, /*tp_as_number*/
1080 0, /*tp_as_sequence*/
Guido van Rossuma9e7a811997-05-13 21:02:11 +00001081 &dict_as_mapping, /*tp_as_mapping*/
Jeremy Hylton8caad492000-06-23 14:18:11 +00001082 0, /* tp_hash */
1083 0, /* tp_call */
1084 0, /* tp_str */
1085 0, /* tp_getattro */
1086 0, /* tp_setattro */
1087 0, /* tp_as_buffer */
Jeremy Hyltond08b4c42000-06-23 19:37:02 +00001088 Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC, /*tp_flags*/
Jeremy Hylton8caad492000-06-23 14:18:11 +00001089 0, /* tp_doc */
1090 (traverseproc)dict_traverse, /* tp_traverse */
1091 (inquiry)dict_tp_clear, /* tp_clear */
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001092};
1093
Guido van Rossum3cca2451997-05-16 14:23:33 +00001094/* For backward compatibility with old dictionary interface */
1095
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001096PyObject *
1097PyDict_GetItemString(v, key)
1098 PyObject *v;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001099 char *key;
1100{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001101 PyObject *kv, *rv;
1102 kv = PyString_FromString(key);
1103 if (kv == NULL)
1104 return NULL;
Guido van Rossum3cca2451997-05-16 14:23:33 +00001105 rv = PyDict_GetItem(v, kv);
1106 Py_DECREF(kv);
1107 return rv;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001108}
1109
1110int
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001111PyDict_SetItemString(v, key, item)
1112 PyObject *v;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001113 char *key;
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001114 PyObject *item;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001115{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001116 PyObject *kv;
1117 int err;
1118 kv = PyString_FromString(key);
1119 if (kv == NULL)
Guido van Rossum037b2201997-05-20 18:35:19 +00001120 return -1;
Guido van Rossum4f3bf1e1997-09-29 23:31:11 +00001121 PyString_InternInPlace(&kv); /* XXX Should we really? */
Guido van Rossum3cca2451997-05-16 14:23:33 +00001122 err = PyDict_SetItem(v, kv, item);
1123 Py_DECREF(kv);
1124 return err;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001125}
1126
1127int
Guido van Rossumc0b618a1997-05-02 03:12:38 +00001128PyDict_DelItemString(v, key)
1129 PyObject *v;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001130 char *key;
1131{
Guido van Rossum3cca2451997-05-16 14:23:33 +00001132 PyObject *kv;
1133 int err;
1134 kv = PyString_FromString(key);
1135 if (kv == NULL)
Guido van Rossum037b2201997-05-20 18:35:19 +00001136 return -1;
Guido van Rossum3cca2451997-05-16 14:23:33 +00001137 err = PyDict_DelItem(v, kv);
1138 Py_DECREF(kv);
1139 return err;
Guido van Rossum4b1302b1993-03-27 18:11:32 +00001140}