Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1 | |
Guido van Rossum | 2bc1379 | 1999-03-24 19:06:42 +0000 | [diff] [blame] | 2 | /* Dictionary object implementation using a hash table */ |
Guido van Rossum | 9bfef44 | 1993-03-29 10:43:31 +0000 | [diff] [blame] | 3 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 4 | #include "Python.h" |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 5 | |
| 6 | |
| 7 | /* |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 8 | * MINSIZE is the minimum size of a dictionary. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 9 | */ |
| 10 | |
| 11 | #define MINSIZE 4 |
| 12 | |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 13 | /* define this out if you don't want conversion statistics on exit */ |
| 14 | #undef SHOW_CONVERSION_COUNTS |
| 15 | |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 16 | /* |
| 17 | Table of irreducible polynomials to efficiently cycle through |
| 18 | GF(2^n)-{0}, 2<=n<=30. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 19 | */ |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 20 | static long polys[] = { |
Guido van Rossum | 9e5656c | 1997-01-29 04:45:16 +0000 | [diff] [blame] | 21 | 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 Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 51 | }; |
| 52 | |
| 53 | /* Object used as dummy key to fill deleted entries */ |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 54 | static PyObject *dummy; /* Initialized by first call to newdictobject() */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 55 | |
| 56 | /* |
Guido van Rossum | 2bc1379 | 1999-03-24 19:06:42 +0000 | [diff] [blame] | 57 | Invariant for entries: when in use, me_value is not NULL and me_key is |
| 58 | not NULL and not dummy; when not in use, me_value is NULL and me_key |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 59 | is either NULL or dummy. A dummy key value cannot be replaced by |
| 60 | NULL, since otherwise other keys may be lost. |
| 61 | */ |
| 62 | typedef struct { |
| 63 | long me_hash; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 64 | PyObject *me_key; |
| 65 | PyObject *me_value; |
Guido van Rossum | 3648884 | 1997-04-11 19:14:07 +0000 | [diff] [blame] | 66 | #ifdef USE_CACHE_ALIGNED |
| 67 | long aligner; |
| 68 | #endif |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 69 | } dictentry; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 70 | |
| 71 | /* |
| 72 | To ensure the lookup algorithm terminates, the table size must be a |
| 73 | prime number and there must be at least one NULL key in the table. |
| 74 | The value ma_fill is the number of non-NULL keys; ma_used is the number |
| 75 | of non-NULL, non-dummy keys. |
| 76 | To avoid slowing down lookups on a near-full table, we resize the table |
| 77 | when it is more than half filled. |
| 78 | */ |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 79 | typedef struct dictobject dictobject; |
| 80 | struct dictobject { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 81 | PyObject_HEAD |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 82 | int ma_fill; |
| 83 | int ma_used; |
| 84 | int ma_size; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 85 | int ma_poly; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 86 | dictentry *ma_table; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 87 | dictentry *(*ma_lookup)(dictobject *mp, PyObject *key, long hash); |
| 88 | }; |
| 89 | |
| 90 | /* forward declarations */ |
| 91 | static dictentry * |
| 92 | lookdict_string(dictobject *mp, PyObject *key, long hash); |
| 93 | |
| 94 | #ifdef SHOW_CONVERSION_COUNTS |
| 95 | static long created = 0L; |
| 96 | static long converted = 0L; |
| 97 | |
| 98 | static void |
| 99 | show_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 Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 106 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 107 | PyObject * |
Thomas Wouters | 7889010 | 2000-07-22 19:25:51 +0000 | [diff] [blame] | 108 | PyDict_New(void) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 109 | { |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 110 | register dictobject *mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 111 | if (dummy == NULL) { /* Auto-initialize dummy */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 112 | dummy = PyString_FromString("<dummy key>"); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 113 | if (dummy == NULL) |
| 114 | return NULL; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 115 | #ifdef SHOW_CONVERSION_COUNTS |
| 116 | Py_AtExit(show_counts); |
| 117 | #endif |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 118 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 119 | mp = PyObject_NEW(dictobject, &PyDict_Type); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 120 | if (mp == NULL) |
| 121 | return NULL; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 122 | mp->ma_size = 0; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 123 | mp->ma_poly = 0; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 124 | mp->ma_table = NULL; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 125 | mp->ma_fill = 0; |
| 126 | mp->ma_used = 0; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 127 | mp->ma_lookup = lookdict_string; |
| 128 | #ifdef SHOW_CONVERSION_COUNTS |
| 129 | ++created; |
| 130 | #endif |
Jeremy Hylton | c5007aa | 2000-06-30 05:02:53 +0000 | [diff] [blame] | 131 | PyObject_GC_Init(mp); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 132 | return (PyObject *)mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 133 | } |
| 134 | |
| 135 | /* |
| 136 | The basic lookup function used by all operations. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 137 | This is based on Algorithm D from Knuth Vol. 3, Sec. 6.4. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 138 | Open addressing is preferred over chaining since the link overhead for |
| 139 | chaining would be substantial (100% with typical malloc overhead). |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 140 | However, instead of going through the table at constant steps, we cycle |
| 141 | through the values of GF(2^n)-{0}. This avoids modulo computations, being |
| 142 | much cheaper on RISC machines, without leading to clustering. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 143 | |
Guido van Rossum | 2bc1379 | 1999-03-24 19:06:42 +0000 | [diff] [blame] | 144 | The initial probe index is computed as hash mod the table size. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 145 | Subsequent probe indices use the values of x^i in GF(2^n) as an offset, |
Guido van Rossum | 2bc1379 | 1999-03-24 19:06:42 +0000 | [diff] [blame] | 146 | where x is a root. The initial value is derived from hash, too. |
| 147 | |
| 148 | All arithmetic on hash should ignore overflow. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 149 | |
| 150 | (This version is due to Reimer Behrends, some ideas are also due to |
Guido van Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 151 | Jyrki Alakuijala and Vladimir Marangozov.) |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 152 | |
| 153 | This function must never return NULL; failures are indicated by returning |
| 154 | a dictentry* for which the me_value field is NULL. Exceptions are never |
| 155 | reported by this function, and outstanding exceptions are maintained. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 156 | */ |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 157 | static dictentry * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 158 | lookdict(dictobject *mp, PyObject *key, register long hash) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 159 | { |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 160 | register int i; |
| 161 | register unsigned incr; |
Guido van Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 162 | register dictentry *freeslot; |
Guido van Rossum | 2095d24 | 1997-04-09 19:41:24 +0000 | [diff] [blame] | 163 | register unsigned int mask = mp->ma_size-1; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 164 | dictentry *ep0 = mp->ma_table; |
| 165 | register dictentry *ep; |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 166 | 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 Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 170 | /* 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 Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 172 | i = (~hash) & mask; |
| 173 | /* We use ~hash instead of hash, as degenerate hash functions, such |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 174 | 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 Rossum | efb4609 | 1997-01-29 15:53:56 +0000 | [diff] [blame] | 176 | ep = &ep0[i]; |
Guido van Rossum | c1c7b1a | 1998-10-06 16:01:14 +0000 | [diff] [blame] | 177 | if (ep->me_key == NULL || ep->me_key == key) |
Guido van Rossum | 7d18159 | 1997-01-16 21:06:45 +0000 | [diff] [blame] | 178 | return ep; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 179 | if (ep->me_key == dummy) |
Guido van Rossum | 7d18159 | 1997-01-16 21:06:45 +0000 | [diff] [blame] | 180 | freeslot = ep; |
Guido van Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 181 | else { |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 182 | 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 Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 198 | } |
| 199 | freeslot = NULL; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 200 | } |
Guido van Rossum | 2bc1379 | 1999-03-24 19:06:42 +0000 | [diff] [blame] | 201 | /* Derive incr from hash, just to make it more arbitrary. Note that |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 202 | incr must not be 0, or we will get into an infinite loop.*/ |
Guido van Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 203 | incr = (hash ^ ((unsigned long)hash >> 3)) & mask; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 204 | if (!incr) |
| 205 | incr = mask; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 206 | for (;;) { |
Guido van Rossum | efb4609 | 1997-01-29 15:53:56 +0000 | [diff] [blame] | 207 | ep = &ep0[(i+incr)&mask]; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 208 | if (ep->me_key == NULL) { |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 209 | if (restore_error) |
| 210 | PyErr_Restore(err_type, err_value, err_tb); |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 211 | if (freeslot != NULL) |
| 212 | return freeslot; |
| 213 | else |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 214 | return ep; |
| 215 | } |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 216 | if (ep->me_key == dummy) { |
| 217 | if (freeslot == NULL) |
| 218 | freeslot = ep; |
| 219 | } |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 220 | else if (ep->me_key == key) { |
| 221 | if (restore_error) |
| 222 | PyErr_Restore(err_type, err_value, err_tb); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 223 | return ep; |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 224 | } |
| 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 Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 243 | } |
| 244 | /* Cycle through GF(2^n)-{0} */ |
| 245 | incr = incr << 1; |
| 246 | if (incr > mask) |
Thomas Wouters | 7e47402 | 2000-07-16 12:04:32 +0000 | [diff] [blame] | 247 | incr ^= mp->ma_poly; /* This will implicitly clear |
Guido van Rossum | f05fc71 | 1998-11-16 22:46:30 +0000 | [diff] [blame] | 248 | the highest bit */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 249 | } |
| 250 | } |
| 251 | |
| 252 | /* |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 253 | * 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 | */ |
| 262 | static dictentry * |
| 263 | lookdict_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 Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 330 | Internal routine to insert a new item into the table. |
| 331 | Used both by the internal resize routine and by the public insert routine. |
| 332 | Eats a reference to key and one to value. |
| 333 | */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 334 | static void |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 335 | insertdict(register dictobject *mp, PyObject *key, long hash, PyObject *value) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 336 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 337 | PyObject *old_value; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 338 | register dictentry *ep; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 339 | ep = (mp->ma_lookup)(mp, key, hash); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 340 | if (ep->me_value != NULL) { |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 341 | old_value = ep->me_value; |
| 342 | ep->me_value = value; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 343 | Py_DECREF(old_value); /* which **CAN** re-enter */ |
| 344 | Py_DECREF(key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 345 | } |
| 346 | else { |
| 347 | if (ep->me_key == NULL) |
| 348 | mp->ma_fill++; |
| 349 | else |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 350 | Py_DECREF(ep->me_key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 351 | ep->me_key = key; |
| 352 | ep->me_hash = hash; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 353 | ep->me_value = value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 354 | mp->ma_used++; |
| 355 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 356 | } |
| 357 | |
| 358 | /* |
| 359 | Restructure the table by allocating a new table and reinserting all |
| 360 | items again. When entries have been deleted, the new table may |
| 361 | actually be smaller than the old one. |
| 362 | */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 363 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 364 | dictresize(dictobject *mp, int minused) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 365 | { |
| 366 | register int oldsize = mp->ma_size; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 367 | register int newsize, newpoly; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 368 | register dictentry *oldtable = mp->ma_table; |
| 369 | register dictentry *newtable; |
| 370 | register dictentry *ep; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 371 | register int i; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 372 | for (i = 0, newsize = MINSIZE; ; i++, newsize <<= 1) { |
| 373 | if (i > sizeof(polys)/sizeof(polys[0])) { |
| 374 | /* Ran out of polynomials */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 375 | PyErr_NoMemory(); |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 376 | return -1; |
| 377 | } |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 378 | if (newsize > minused) { |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 379 | newpoly = polys[i]; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 380 | break; |
| 381 | } |
| 382 | } |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 383 | newtable = PyMem_NEW(dictentry, newsize); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 384 | if (newtable == NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 385 | PyErr_NoMemory(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 386 | return -1; |
| 387 | } |
Guido van Rossum | 0fd0033 | 1998-07-16 15:06:13 +0000 | [diff] [blame] | 388 | memset(newtable, '\0', sizeof(dictentry) * newsize); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 389 | mp->ma_size = newsize; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 390 | mp->ma_poly = newpoly; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 391 | mp->ma_table = newtable; |
| 392 | mp->ma_fill = 0; |
| 393 | mp->ma_used = 0; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 394 | |
| 395 | /* Make two passes, so we can avoid decrefs |
| 396 | (and possible side effects) till the table is copied */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 397 | for (i = 0, ep = oldtable; i < oldsize; i++, ep++) { |
| 398 | if (ep->me_value != NULL) |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 399 | insertdict(mp,ep->me_key,ep->me_hash,ep->me_value); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 400 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 401 | for (i = 0, ep = oldtable; i < oldsize; i++, ep++) { |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 402 | if (ep->me_value == NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 403 | Py_XDECREF(ep->me_key); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 404 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 405 | } |
| 406 | |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 407 | if (oldtable != NULL) |
| 408 | PyMem_DEL(oldtable); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 409 | return 0; |
| 410 | } |
| 411 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 412 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 413 | PyDict_GetItem(PyObject *op, PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 414 | { |
| 415 | long hash; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 416 | dictobject *mp = (dictobject *)op; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 417 | if (!PyDict_Check(op)) { |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 418 | return NULL; |
| 419 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 420 | if (mp->ma_table == NULL) |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 421 | return NULL; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 422 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 423 | if (!PyString_Check(key) || |
| 424 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 425 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 426 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 427 | hash = PyObject_Hash(key); |
Guido van Rossum | 474b19e | 1998-05-14 01:00:51 +0000 | [diff] [blame] | 428 | if (hash == -1) { |
| 429 | PyErr_Clear(); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 430 | return NULL; |
Guido van Rossum | 474b19e | 1998-05-14 01:00:51 +0000 | [diff] [blame] | 431 | } |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 432 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 433 | return (mp->ma_lookup)(mp, key, hash)->me_value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 434 | } |
| 435 | |
| 436 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 437 | PyDict_SetItem(register PyObject *op, PyObject *key, PyObject *value) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 438 | { |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 439 | register dictobject *mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 440 | register long hash; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 441 | if (!PyDict_Check(op)) { |
| 442 | PyErr_BadInternalCall(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 443 | return -1; |
| 444 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 445 | mp = (dictobject *)op; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 446 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 447 | if (PyString_Check(key)) { |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 448 | #ifdef INTERN_STRINGS |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 449 | if (((PyStringObject *)key)->ob_sinterned != NULL) { |
| 450 | key = ((PyStringObject *)key)->ob_sinterned; |
| 451 | hash = ((PyStringObject *)key)->ob_shash; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 452 | } |
| 453 | else |
| 454 | #endif |
| 455 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 456 | hash = ((PyStringObject *)key)->ob_shash; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 457 | if (hash == -1) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 458 | hash = PyObject_Hash(key); |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 459 | } |
| 460 | } |
| 461 | else |
| 462 | #endif |
| 463 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 464 | hash = PyObject_Hash(key); |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 465 | if (hash == -1) |
| 466 | return -1; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 467 | } |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 468 | /* if fill >= 2/3 size, double in size */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 469 | if (mp->ma_fill*3 >= mp->ma_size*2) { |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 470 | if (dictresize(mp, mp->ma_used*2) != 0) { |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 471 | if (mp->ma_fill+1 > mp->ma_size) |
| 472 | return -1; |
| 473 | } |
| 474 | } |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 475 | Py_INCREF(value); |
| 476 | Py_INCREF(key); |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 477 | insertdict(mp, key, hash, value); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 478 | return 0; |
| 479 | } |
| 480 | |
| 481 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 482 | PyDict_DelItem(PyObject *op, PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 483 | { |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 484 | register dictobject *mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 485 | register long hash; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 486 | register dictentry *ep; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 487 | PyObject *old_value, *old_key; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 488 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 489 | if (!PyDict_Check(op)) { |
| 490 | PyErr_BadInternalCall(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 491 | return -1; |
| 492 | } |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 493 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 494 | if (!PyString_Check(key) || |
| 495 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 496 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 497 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 498 | hash = PyObject_Hash(key); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 499 | if (hash == -1) |
| 500 | return -1; |
| 501 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 502 | mp = (dictobject *)op; |
| 503 | if (((dictobject *)op)->ma_table == NULL) |
Guido van Rossum | efc8713 | 1995-01-02 19:42:39 +0000 | [diff] [blame] | 504 | goto empty; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 505 | ep = (mp->ma_lookup)(mp, key, hash); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 506 | if (ep->me_value == NULL) { |
Guido van Rossum | efc8713 | 1995-01-02 19:42:39 +0000 | [diff] [blame] | 507 | empty: |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 508 | PyErr_SetObject(PyExc_KeyError, key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 509 | return -1; |
| 510 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 511 | old_key = ep->me_key; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 512 | Py_INCREF(dummy); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 513 | ep->me_key = dummy; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 514 | old_value = ep->me_value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 515 | ep->me_value = NULL; |
| 516 | mp->ma_used--; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 517 | Py_DECREF(old_value); |
| 518 | Py_DECREF(old_key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 519 | return 0; |
| 520 | } |
| 521 | |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 522 | void |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 523 | PyDict_Clear(PyObject *op) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 524 | { |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 525 | int i, n; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 526 | register dictentry *table; |
| 527 | dictobject *mp; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 528 | if (!PyDict_Check(op)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 529 | return; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 530 | mp = (dictobject *)op; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 531 | 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 Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 538 | Py_XDECREF(table[i].me_key); |
| 539 | Py_XDECREF(table[i].me_value); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 540 | } |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 541 | PyMem_DEL(table); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 542 | } |
| 543 | |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 544 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 545 | PyDict_Next(PyObject *op, int *ppos, PyObject **pkey, PyObject **pvalue) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 546 | { |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 547 | int i; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 548 | register dictobject *mp; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 549 | if (!PyDict_Check(op)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 550 | return 0; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 551 | mp = (dictobject *)op; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 552 | 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 Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 565 | } |
| 566 | |
| 567 | /* Methods */ |
| 568 | |
| 569 | static void |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 570 | dict_dealloc(register dictobject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 571 | { |
| 572 | register int i; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 573 | register dictentry *ep; |
Guido van Rossum | d724b23 | 2000-03-13 16:01:29 +0000 | [diff] [blame] | 574 | Py_TRASHCAN_SAFE_BEGIN(mp) |
Jeremy Hylton | c5007aa | 2000-06-30 05:02:53 +0000 | [diff] [blame] | 575 | PyObject_GC_Fini(mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 576 | for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) { |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 577 | if (ep->me_key != NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 578 | Py_DECREF(ep->me_key); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 579 | } |
| 580 | if (ep->me_value != NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 581 | Py_DECREF(ep->me_value); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 582 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 583 | } |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 584 | if (mp->ma_table != NULL) |
| 585 | PyMem_DEL(mp->ma_table); |
Guido van Rossum | 4cc6ac7 | 2000-07-01 01:00:38 +0000 | [diff] [blame] | 586 | mp = (dictobject *) PyObject_AS_GC(mp); |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 587 | PyObject_DEL(mp); |
Guido van Rossum | d724b23 | 2000-03-13 16:01:29 +0000 | [diff] [blame] | 588 | Py_TRASHCAN_SAFE_END(mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 589 | } |
| 590 | |
| 591 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 592 | dict_print(register dictobject *mp, register FILE *fp, register int flags) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 593 | { |
| 594 | register int i; |
| 595 | register int any; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 596 | register dictentry *ep; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 597 | |
| 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 Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 606 | 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 Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 612 | if (PyObject_Print((PyObject *)ep->me_key, fp, 0)!=0) { |
| 613 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 614 | return -1; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 615 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 616 | fprintf(fp, ": "); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 617 | if (PyObject_Print(ep->me_value, fp, 0) != 0) { |
| 618 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 619 | return -1; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 620 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 621 | } |
| 622 | } |
| 623 | fprintf(fp, "}"); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 624 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 625 | return 0; |
| 626 | } |
| 627 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 628 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 629 | dict_repr(dictobject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 630 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 631 | auto PyObject *v; |
| 632 | PyObject *sepa, *colon; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 633 | register int i; |
| 634 | register int any; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 635 | register dictentry *ep; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 636 | |
| 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 Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 644 | v = PyString_FromString("{"); |
| 645 | sepa = PyString_FromString(", "); |
| 646 | colon = PyString_FromString(": "); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 647 | any = 0; |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 648 | for (i = 0, ep = mp->ma_table; i < mp->ma_size && v; i++, ep++) { |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 649 | if (ep->me_value != NULL) { |
| 650 | if (any++) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 651 | 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 Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 655 | } |
| 656 | } |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 657 | PyString_ConcatAndDel(&v, PyString_FromString("}")); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 658 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 659 | Py_XDECREF(sepa); |
| 660 | Py_XDECREF(colon); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 661 | return v; |
| 662 | } |
| 663 | |
| 664 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 665 | dict_length(dictobject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 666 | { |
| 667 | return mp->ma_used; |
| 668 | } |
| 669 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 670 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 671 | dict_subscript(dictobject *mp, register PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 672 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 673 | PyObject *v; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 674 | long hash; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 675 | if (mp->ma_table == NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 676 | PyErr_SetObject(PyExc_KeyError, key); |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 677 | return NULL; |
| 678 | } |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 679 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 680 | if (!PyString_Check(key) || |
| 681 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 682 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 683 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 684 | hash = PyObject_Hash(key); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 685 | if (hash == -1) |
| 686 | return NULL; |
| 687 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 688 | v = (mp->ma_lookup)(mp, key, hash) -> me_value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 689 | if (v == NULL) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 690 | PyErr_SetObject(PyExc_KeyError, key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 691 | else |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 692 | Py_INCREF(v); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 693 | return v; |
| 694 | } |
| 695 | |
| 696 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 697 | dict_ass_sub(dictobject *mp, PyObject *v, PyObject *w) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 698 | { |
| 699 | if (w == NULL) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 700 | return PyDict_DelItem((PyObject *)mp, v); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 701 | else |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 702 | return PyDict_SetItem((PyObject *)mp, v, w); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 703 | } |
| 704 | |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 705 | static 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 Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 709 | }; |
| 710 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 711 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 712 | dict_keys(register dictobject *mp, PyObject *args) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 713 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 714 | register PyObject *v; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 715 | register int i, j; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 716 | if (!PyArg_NoArgs(args)) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 717 | return NULL; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 718 | v = PyList_New(mp->ma_used); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 719 | 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 Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 723 | PyObject *key = mp->ma_table[i].me_key; |
| 724 | Py_INCREF(key); |
| 725 | PyList_SetItem(v, j, key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 726 | j++; |
| 727 | } |
| 728 | } |
| 729 | return v; |
| 730 | } |
| 731 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 732 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 733 | dict_values(register dictobject *mp, PyObject *args) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 734 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 735 | register PyObject *v; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 736 | register int i, j; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 737 | if (!PyArg_NoArgs(args)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 738 | return NULL; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 739 | v = PyList_New(mp->ma_used); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 740 | 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 Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 744 | PyObject *value = mp->ma_table[i].me_value; |
| 745 | Py_INCREF(value); |
| 746 | PyList_SetItem(v, j, value); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 747 | j++; |
| 748 | } |
| 749 | } |
| 750 | return v; |
| 751 | } |
| 752 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 753 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 754 | dict_items(register dictobject *mp, PyObject *args) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 755 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 756 | register PyObject *v; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 757 | register int i, j; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 758 | if (!PyArg_NoArgs(args)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 759 | return NULL; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 760 | v = PyList_New(mp->ma_used); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 761 | 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 Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 765 | 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 Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 768 | if (item == NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 769 | Py_DECREF(v); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 770 | return NULL; |
| 771 | } |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 772 | 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 Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 777 | j++; |
| 778 | } |
| 779 | } |
| 780 | return v; |
| 781 | } |
| 782 | |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 783 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 784 | dict_update(register dictobject *mp, PyObject *args) |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 785 | { |
| 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 Rossum | a8d5131 | 1997-06-02 17:13:37 +0000 | [diff] [blame] | 792 | goto done; /* a.update(a); nothing to do */ |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 793 | /* 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 | |
| 814 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 815 | dict_copy(register dictobject *mp, PyObject *args) |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 816 | { |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 817 | if (!PyArg_Parse(args, "")) |
| 818 | return NULL; |
| 819 | return PyDict_Copy((PyObject*)mp); |
| 820 | } |
| 821 | |
| 822 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 823 | PyDict_Copy(PyObject *o) |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 824 | { |
| 825 | register dictobject *mp; |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 826 | register int i; |
| 827 | dictobject *copy; |
| 828 | dictentry *entry; |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 829 | |
| 830 | if (o == NULL || !PyDict_Check(o)) { |
| 831 | PyErr_BadInternalCall(); |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 832 | return NULL; |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 833 | } |
| 834 | mp = (dictobject *)o; |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 835 | 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 Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 854 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 855 | PyDict_Size(PyObject *mp) |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 856 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 857 | if (mp == NULL || !PyDict_Check(mp)) { |
| 858 | PyErr_BadInternalCall(); |
Guido van Rossum | b376a4a | 1993-11-23 17:53:17 +0000 | [diff] [blame] | 859 | return 0; |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 860 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 861 | return ((dictobject *)mp)->ma_used; |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 862 | } |
| 863 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 864 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 865 | PyDict_Keys(PyObject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 866 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 867 | if (mp == NULL || !PyDict_Check(mp)) { |
| 868 | PyErr_BadInternalCall(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 869 | return NULL; |
| 870 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 871 | return dict_keys((dictobject *)mp, (PyObject *)NULL); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 872 | } |
| 873 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 874 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 875 | PyDict_Values(PyObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 876 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 877 | if (mp == NULL || !PyDict_Check(mp)) { |
| 878 | PyErr_BadInternalCall(); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 879 | return NULL; |
| 880 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 881 | return dict_values((dictobject *)mp, (PyObject *)NULL); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 882 | } |
| 883 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 884 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 885 | PyDict_Items(PyObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 886 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 887 | if (mp == NULL || !PyDict_Check(mp)) { |
| 888 | PyErr_BadInternalCall(); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 889 | return NULL; |
| 890 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 891 | return dict_items((dictobject *)mp, (PyObject *)NULL); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 892 | } |
| 893 | |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 894 | #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 Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 902 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 903 | characterize(dictobject *a, dictobject *b, PyObject **pval) |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 904 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 905 | PyObject *diff = NULL; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 906 | 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 Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 911 | PyObject *key = a->ma_table[i].me_key; |
| 912 | PyObject *aval, *bval; |
Guido van Rossum | 5b2121b | 1997-05-23 00:01:41 +0000 | [diff] [blame] | 913 | /* XXX What if PyObject_Compare raises an exception? */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 914 | if (diff != NULL && PyObject_Compare(key, diff) > 0) |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 915 | continue; |
| 916 | aval = a->ma_table[i].me_value; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 917 | bval = PyDict_GetItem((PyObject *)b, key); |
Guido van Rossum | 5b2121b | 1997-05-23 00:01:41 +0000 | [diff] [blame] | 918 | /* XXX What if PyObject_Compare raises an exception? */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 919 | if (bval == NULL || PyObject_Compare(aval, bval) != 0) |
| 920 | { |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 921 | diff = key; |
| 922 | *pval = aval; |
| 923 | } |
| 924 | } |
| 925 | } |
| 926 | return diff; |
| 927 | } |
| 928 | |
| 929 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 930 | dict_compare(dictobject *a, dictobject *b) |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 931 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 932 | PyObject *adiff, *bdiff, *aval, *bval; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 933 | 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 Rossum | 5b2121b | 1997-05-23 00:01:41 +0000 | [diff] [blame] | 942 | if (PyErr_Occurred()) |
| 943 | return -1; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 944 | if (adiff == NULL) |
| 945 | return 0; /* a is a subset with the same length */ |
| 946 | bdiff = characterize(b, a, &bval); |
Guido van Rossum | 5b2121b | 1997-05-23 00:01:41 +0000 | [diff] [blame] | 947 | if (PyErr_Occurred()) |
| 948 | return -1; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 949 | /* bdiff == NULL would be impossible now */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 950 | res = PyObject_Compare(adiff, bdiff); |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 951 | if (res == 0) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 952 | res = PyObject_Compare(aval, bval); |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 953 | return res; |
| 954 | } |
| 955 | |
| 956 | #else /* !NEWCMP */ |
| 957 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 958 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 959 | dict_compare(dictobject *a, dictobject *b) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 960 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 961 | PyObject *akeys, *bkeys; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 962 | 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 Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 975 | akeys = dict_keys(a, (PyObject *)NULL); |
| 976 | bkeys = dict_keys(b, (PyObject *)NULL); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 977 | if (akeys == NULL || bkeys == NULL) { |
| 978 | /* Oops, out of memory -- what to do? */ |
| 979 | /* For now, sort on address! */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 980 | Py_XDECREF(akeys); |
| 981 | Py_XDECREF(bkeys); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 982 | if (a < b) |
| 983 | return -1; |
| 984 | else |
| 985 | return 1; |
| 986 | } |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 987 | PyList_Sort(akeys); |
| 988 | PyList_Sort(bkeys); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 989 | 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 Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 992 | PyObject *akey, *bkey, *aval, *bval; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 993 | long ahash, bhash; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 994 | akey = PyList_GetItem(akeys, i); |
| 995 | bkey = PyList_GetItem(bkeys, i); |
| 996 | res = PyObject_Compare(akey, bkey); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 997 | if (res != 0) |
| 998 | break; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 999 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1000 | if (!PyString_Check(akey) || |
| 1001 | (ahash = ((PyStringObject *) akey)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1002 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1003 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1004 | ahash = PyObject_Hash(akey); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1005 | if (ahash == -1) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1006 | PyErr_Clear(); /* Don't want errors here */ |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1007 | } |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1008 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1009 | if (!PyString_Check(bkey) || |
| 1010 | (bhash = ((PyStringObject *) bkey)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1011 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1012 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1013 | bhash = PyObject_Hash(bkey); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1014 | if (bhash == -1) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1015 | PyErr_Clear(); /* Don't want errors here */ |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1016 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 1017 | aval = (a->ma_lookup)(a, akey, ahash) -> me_value; |
| 1018 | bval = (b->ma_lookup)(b, bkey, bhash) -> me_value; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1019 | res = PyObject_Compare(aval, bval); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1020 | 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 Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1029 | Py_DECREF(akeys); |
| 1030 | Py_DECREF(bkeys); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1031 | return res; |
| 1032 | } |
| 1033 | |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1034 | #endif /* !NEWCMP */ |
| 1035 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1036 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1037 | dict_has_key(register dictobject *mp, PyObject *args) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1038 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1039 | PyObject *key; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1040 | long hash; |
| 1041 | register long ok; |
Fred Drake | 52fccfd | 2000-02-23 15:47:16 +0000 | [diff] [blame] | 1042 | if (!PyArg_ParseTuple(args, "O:has_key", &key)) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1043 | return NULL; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1044 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1045 | if (!PyString_Check(key) || |
| 1046 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1047 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1048 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1049 | hash = PyObject_Hash(key); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1050 | if (hash == -1) |
| 1051 | return NULL; |
| 1052 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 1053 | ok = (mp->ma_size != 0 |
| 1054 | && (mp->ma_lookup)(mp, key, hash)->me_value != NULL); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1055 | return PyInt_FromLong(ok); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1056 | } |
| 1057 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1058 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1059 | dict_get(register dictobject *mp, PyObject *args) |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1060 | { |
| 1061 | PyObject *key; |
Barry Warsaw | 320ac33 | 1997-10-20 17:26:25 +0000 | [diff] [blame] | 1062 | PyObject *failobj = Py_None; |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1063 | PyObject *val = NULL; |
| 1064 | long hash; |
| 1065 | |
Fred Drake | 52fccfd | 2000-02-23 15:47:16 +0000 | [diff] [blame] | 1066 | if (!PyArg_ParseTuple(args, "O|O:get", &key, &failobj)) |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1067 | return NULL; |
Guido van Rossum | 6fcfa72 | 1997-10-20 20:10:00 +0000 | [diff] [blame] | 1068 | if (mp->ma_table == NULL) |
| 1069 | goto finally; |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1070 | |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1071 | #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 Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 1080 | val = (mp->ma_lookup)(mp, key, hash)->me_value; |
Barry Warsaw | 320ac33 | 1997-10-20 17:26:25 +0000 | [diff] [blame] | 1081 | |
Guido van Rossum | 6fcfa72 | 1997-10-20 20:10:00 +0000 | [diff] [blame] | 1082 | finally: |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1083 | if (val == NULL) |
| 1084 | val = failobj; |
| 1085 | Py_INCREF(val); |
| 1086 | return val; |
| 1087 | } |
| 1088 | |
| 1089 | |
| 1090 | static PyObject * |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1091 | dict_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 Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 1112 | val = (mp->ma_lookup)(mp, key, hash)->me_value; |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1113 | |
| 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 | |
| 1125 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1126 | dict_clear(register dictobject *mp, PyObject *args) |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 1127 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1128 | if (!PyArg_NoArgs(args)) |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 1129 | return NULL; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1130 | PyDict_Clear((PyObject *)mp); |
| 1131 | Py_INCREF(Py_None); |
| 1132 | return Py_None; |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 1133 | } |
| 1134 | |
Jeremy Hylton | 8caad49 | 2000-06-23 14:18:11 +0000 | [diff] [blame] | 1135 | static int |
| 1136 | dict_traverse(PyObject *op, visitproc visit, void *arg) |
| 1137 | { |
| 1138 | int i = 0, err; |
| 1139 | PyObject *pk; |
| 1140 | PyObject *pv; |
| 1141 | |
| 1142 | while (PyDict_Next(op, &i, &pk, &pv)) { |
| 1143 | err = visit(pk, arg); |
| 1144 | if (err) |
| 1145 | return err; |
| 1146 | err = visit(pv, arg); |
| 1147 | if (err) |
| 1148 | return err; |
| 1149 | } |
| 1150 | return 0; |
| 1151 | } |
| 1152 | |
| 1153 | static int |
| 1154 | dict_tp_clear(PyObject *op) |
| 1155 | { |
| 1156 | PyDict_Clear(op); |
| 1157 | return 0; |
| 1158 | } |
| 1159 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1160 | static PyMethodDef mapp_methods[] = { |
Fred Drake | 52fccfd | 2000-02-23 15:47:16 +0000 | [diff] [blame] | 1161 | {"has_key", (PyCFunction)dict_has_key, METH_VARARGS}, |
Guido van Rossum | 5d8123f | 1997-07-13 03:58:01 +0000 | [diff] [blame] | 1162 | {"keys", (PyCFunction)dict_keys}, |
| 1163 | {"items", (PyCFunction)dict_items}, |
| 1164 | {"values", (PyCFunction)dict_values}, |
Guido van Rossum | a8d5131 | 1997-06-02 17:13:37 +0000 | [diff] [blame] | 1165 | {"update", (PyCFunction)dict_update}, |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1166 | {"clear", (PyCFunction)dict_clear}, |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1167 | {"copy", (PyCFunction)dict_copy}, |
Fred Drake | 52fccfd | 2000-02-23 15:47:16 +0000 | [diff] [blame] | 1168 | {"get", (PyCFunction)dict_get, METH_VARARGS}, |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1169 | {"setdefault", (PyCFunction)dict_setdefault, METH_VARARGS}, |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1170 | {NULL, NULL} /* sentinel */ |
| 1171 | }; |
| 1172 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1173 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1174 | dict_getattr(dictobject *mp, char *name) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1175 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1176 | return Py_FindMethod(mapp_methods, (PyObject *)mp, name); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1177 | } |
| 1178 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1179 | PyTypeObject PyDict_Type = { |
| 1180 | PyObject_HEAD_INIT(&PyType_Type) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1181 | 0, |
Guido van Rossum | 9bfef44 | 1993-03-29 10:43:31 +0000 | [diff] [blame] | 1182 | "dictionary", |
Jeremy Hylton | c5007aa | 2000-06-30 05:02:53 +0000 | [diff] [blame] | 1183 | sizeof(dictobject) + PyGC_HEAD_SIZE, |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1184 | 0, |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1185 | (destructor)dict_dealloc, /*tp_dealloc*/ |
| 1186 | (printfunc)dict_print, /*tp_print*/ |
| 1187 | (getattrfunc)dict_getattr, /*tp_getattr*/ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1188 | 0, /*tp_setattr*/ |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1189 | (cmpfunc)dict_compare, /*tp_compare*/ |
| 1190 | (reprfunc)dict_repr, /*tp_repr*/ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1191 | 0, /*tp_as_number*/ |
| 1192 | 0, /*tp_as_sequence*/ |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1193 | &dict_as_mapping, /*tp_as_mapping*/ |
Jeremy Hylton | 8caad49 | 2000-06-23 14:18:11 +0000 | [diff] [blame] | 1194 | 0, /* tp_hash */ |
| 1195 | 0, /* tp_call */ |
| 1196 | 0, /* tp_str */ |
| 1197 | 0, /* tp_getattro */ |
| 1198 | 0, /* tp_setattro */ |
| 1199 | 0, /* tp_as_buffer */ |
Jeremy Hylton | d08b4c4 | 2000-06-23 19:37:02 +0000 | [diff] [blame] | 1200 | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC, /*tp_flags*/ |
Jeremy Hylton | 8caad49 | 2000-06-23 14:18:11 +0000 | [diff] [blame] | 1201 | 0, /* tp_doc */ |
| 1202 | (traverseproc)dict_traverse, /* tp_traverse */ |
| 1203 | (inquiry)dict_tp_clear, /* tp_clear */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1204 | }; |
| 1205 | |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1206 | /* For backward compatibility with old dictionary interface */ |
| 1207 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1208 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1209 | PyDict_GetItemString(PyObject *v, char *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1210 | { |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1211 | PyObject *kv, *rv; |
| 1212 | kv = PyString_FromString(key); |
| 1213 | if (kv == NULL) |
| 1214 | return NULL; |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1215 | rv = PyDict_GetItem(v, kv); |
| 1216 | Py_DECREF(kv); |
| 1217 | return rv; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1218 | } |
| 1219 | |
| 1220 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1221 | PyDict_SetItemString(PyObject *v, char *key, PyObject *item) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1222 | { |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1223 | PyObject *kv; |
| 1224 | int err; |
| 1225 | kv = PyString_FromString(key); |
| 1226 | if (kv == NULL) |
Guido van Rossum | 037b220 | 1997-05-20 18:35:19 +0000 | [diff] [blame] | 1227 | return -1; |
Guido van Rossum | 4f3bf1e | 1997-09-29 23:31:11 +0000 | [diff] [blame] | 1228 | PyString_InternInPlace(&kv); /* XXX Should we really? */ |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1229 | err = PyDict_SetItem(v, kv, item); |
| 1230 | Py_DECREF(kv); |
| 1231 | return err; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1232 | } |
| 1233 | |
| 1234 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1235 | PyDict_DelItemString(PyObject *v, char *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1236 | { |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1237 | PyObject *kv; |
| 1238 | int err; |
| 1239 | kv = PyString_FromString(key); |
| 1240 | if (kv == NULL) |
Guido van Rossum | 037b220 | 1997-05-20 18:35:19 +0000 | [diff] [blame] | 1241 | return -1; |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1242 | err = PyDict_DelItem(v, kv); |
| 1243 | Py_DECREF(kv); |
| 1244 | return err; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1245 | } |