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 |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame^] | 18 | GF(2^n)-{0}, 2<=n<=30. A table size is always a power of 2. |
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 | /* |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame^] | 57 | There are three kinds of slots in the table: |
| 58 | |
| 59 | 1. Unused. me_key == me_value == NULL |
| 60 | Does not hold an active (key, value) pair now and never did. Unused can |
| 61 | transition to Active upon key insertion. This is the only case in which |
| 62 | me_key is NULL, and is each slot's initial state. |
| 63 | |
| 64 | 2. Active. me_key != NULL and me_key != dummy and me_value != NULL |
| 65 | Holds an active (key, value) pair. Active can transition to Dummy upon |
| 66 | key deletion. This is the only case in which me_value != NULL. |
| 67 | |
| 68 | 3. Dummy. me_key == dummy && me_value == NULL |
| 69 | Previously held an active (key, value) pair, but that was deleted and an |
| 70 | active pair has not yet overwritten the slot. Dummy can transition to |
| 71 | Active upon key insertion. Dummy slots cannot be made Unused again |
| 72 | (cannot have me_key set to NULL), else the probe sequence in case of |
| 73 | collision would have no way to know they were once active. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 74 | */ |
| 75 | typedef struct { |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame^] | 76 | long me_hash; /* cached hash code of me_key */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 77 | PyObject *me_key; |
| 78 | PyObject *me_value; |
Guido van Rossum | 3648884 | 1997-04-11 19:14:07 +0000 | [diff] [blame] | 79 | #ifdef USE_CACHE_ALIGNED |
| 80 | long aligner; |
| 81 | #endif |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 82 | } dictentry; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 83 | |
| 84 | /* |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame^] | 85 | To ensure the lookup algorithm terminates, there must be at least one Unsused |
| 86 | slot (NULL key) in the table. |
| 87 | The value ma_fill is the number of non-NULL keys (sum of Active and Dummy); |
| 88 | ma_used is the number of non-NULL, non-dummy keys (== the number of non-NULL |
| 89 | values == the number of Active items). |
| 90 | To avoid slowing down lookups on a near-full table, we resize the table when |
| 91 | it is more than half filled. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 92 | */ |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 93 | typedef struct dictobject dictobject; |
| 94 | struct dictobject { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 95 | PyObject_HEAD |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame^] | 96 | int ma_fill; /* # Active + # Dummy */ |
| 97 | int ma_used; /* # Active */ |
| 98 | int ma_size; /* total # slots in ma_table */ |
| 99 | int ma_poly; /* appopriate entry from polys vector */ |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 100 | dictentry *ma_table; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 101 | dictentry *(*ma_lookup)(dictobject *mp, PyObject *key, long hash); |
| 102 | }; |
| 103 | |
| 104 | /* forward declarations */ |
| 105 | static dictentry * |
| 106 | lookdict_string(dictobject *mp, PyObject *key, long hash); |
| 107 | |
| 108 | #ifdef SHOW_CONVERSION_COUNTS |
| 109 | static long created = 0L; |
| 110 | static long converted = 0L; |
| 111 | |
| 112 | static void |
| 113 | show_counts(void) |
| 114 | { |
| 115 | fprintf(stderr, "created %ld string dicts\n", created); |
| 116 | fprintf(stderr, "converted %ld to normal dicts\n", converted); |
| 117 | fprintf(stderr, "%.2f%% conversion rate\n", (100.0*converted)/created); |
| 118 | } |
| 119 | #endif |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 120 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 121 | PyObject * |
Thomas Wouters | 7889010 | 2000-07-22 19:25:51 +0000 | [diff] [blame] | 122 | PyDict_New(void) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 123 | { |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 124 | register dictobject *mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 125 | if (dummy == NULL) { /* Auto-initialize dummy */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 126 | dummy = PyString_FromString("<dummy key>"); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 127 | if (dummy == NULL) |
| 128 | return NULL; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 129 | #ifdef SHOW_CONVERSION_COUNTS |
| 130 | Py_AtExit(show_counts); |
| 131 | #endif |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 132 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 133 | mp = PyObject_NEW(dictobject, &PyDict_Type); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 134 | if (mp == NULL) |
| 135 | return NULL; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 136 | mp->ma_size = 0; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 137 | mp->ma_poly = 0; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 138 | mp->ma_table = NULL; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 139 | mp->ma_fill = 0; |
| 140 | mp->ma_used = 0; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 141 | mp->ma_lookup = lookdict_string; |
| 142 | #ifdef SHOW_CONVERSION_COUNTS |
| 143 | ++created; |
| 144 | #endif |
Jeremy Hylton | c5007aa | 2000-06-30 05:02:53 +0000 | [diff] [blame] | 145 | PyObject_GC_Init(mp); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 146 | return (PyObject *)mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 147 | } |
| 148 | |
| 149 | /* |
| 150 | The basic lookup function used by all operations. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 151 | 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] | 152 | Open addressing is preferred over chaining since the link overhead for |
| 153 | chaining would be substantial (100% with typical malloc overhead). |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 154 | However, instead of going through the table at constant steps, we cycle |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame^] | 155 | through the values of GF(2^n). This avoids modulo computations, being |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 156 | much cheaper on RISC machines, without leading to clustering. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 157 | |
Guido van Rossum | 2bc1379 | 1999-03-24 19:06:42 +0000 | [diff] [blame] | 158 | The initial probe index is computed as hash mod the table size. |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame^] | 159 | Subsequent probe indices use the values of x^i in GF(2^n)-{0} as an offset, |
| 160 | where x is a root. The initial offset is derived from hash, too. |
Guido van Rossum | 2bc1379 | 1999-03-24 19:06:42 +0000 | [diff] [blame] | 161 | |
| 162 | All arithmetic on hash should ignore overflow. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 163 | |
| 164 | (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] | 165 | Jyrki Alakuijala and Vladimir Marangozov.) |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 166 | |
| 167 | This function must never return NULL; failures are indicated by returning |
| 168 | a dictentry* for which the me_value field is NULL. Exceptions are never |
| 169 | reported by this function, and outstanding exceptions are maintained. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 170 | */ |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 171 | static dictentry * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 172 | lookdict(dictobject *mp, PyObject *key, register long hash) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 173 | { |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 174 | register int i; |
| 175 | register unsigned incr; |
Guido van Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 176 | register dictentry *freeslot; |
Guido van Rossum | 2095d24 | 1997-04-09 19:41:24 +0000 | [diff] [blame] | 177 | register unsigned int mask = mp->ma_size-1; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 178 | dictentry *ep0 = mp->ma_table; |
| 179 | register dictentry *ep; |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 180 | register int restore_error = 0; |
| 181 | register int checked_error = 0; |
| 182 | register int cmp; |
| 183 | PyObject *err_type, *err_value, *err_tb; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 184 | /* We must come up with (i, incr) such that 0 <= i < ma_size |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame^] | 185 | and 0 < incr < ma_size and both are a function of hash. |
| 186 | i is the initial table index and incr the initial probe offset. */ |
Guido van Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 187 | i = (~hash) & mask; |
| 188 | /* We use ~hash instead of hash, as degenerate hash functions, such |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 189 | as for ints <sigh>, can have lots of leading zeros. It's not |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame^] | 190 | really a performance risk, but better safe than sorry. |
| 191 | 12-Dec-00 tim: so ~hash produces lots of leading ones instead -- |
| 192 | what's the gain? */ |
Guido van Rossum | efb4609 | 1997-01-29 15:53:56 +0000 | [diff] [blame] | 193 | ep = &ep0[i]; |
Guido van Rossum | c1c7b1a | 1998-10-06 16:01:14 +0000 | [diff] [blame] | 194 | if (ep->me_key == NULL || ep->me_key == key) |
Guido van Rossum | 7d18159 | 1997-01-16 21:06:45 +0000 | [diff] [blame] | 195 | return ep; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 196 | if (ep->me_key == dummy) |
Guido van Rossum | 7d18159 | 1997-01-16 21:06:45 +0000 | [diff] [blame] | 197 | freeslot = ep; |
Guido van Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 198 | else { |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 199 | if (ep->me_hash == hash) { |
| 200 | /* error can't have been checked yet */ |
| 201 | checked_error = 1; |
| 202 | if (PyErr_Occurred()) { |
| 203 | restore_error = 1; |
| 204 | PyErr_Fetch(&err_type, &err_value, &err_tb); |
| 205 | } |
| 206 | cmp = PyObject_Compare(ep->me_key, key); |
| 207 | if (PyErr_Occurred()) |
| 208 | PyErr_Clear(); |
| 209 | else if (cmp == 0) { |
| 210 | if (restore_error) |
| 211 | PyErr_Restore(err_type, err_value, |
| 212 | err_tb); |
| 213 | return ep; |
| 214 | } |
Guido van Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 215 | } |
| 216 | freeslot = NULL; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 217 | } |
Guido van Rossum | 2bc1379 | 1999-03-24 19:06:42 +0000 | [diff] [blame] | 218 | /* 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] | 219 | 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] | 220 | incr = (hash ^ ((unsigned long)hash >> 3)) & mask; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 221 | if (!incr) |
| 222 | incr = mask; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 223 | for (;;) { |
Guido van Rossum | efb4609 | 1997-01-29 15:53:56 +0000 | [diff] [blame] | 224 | ep = &ep0[(i+incr)&mask]; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 225 | if (ep->me_key == NULL) { |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 226 | if (restore_error) |
| 227 | PyErr_Restore(err_type, err_value, err_tb); |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 228 | if (freeslot != NULL) |
| 229 | return freeslot; |
| 230 | else |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 231 | return ep; |
| 232 | } |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 233 | if (ep->me_key == dummy) { |
| 234 | if (freeslot == NULL) |
| 235 | freeslot = ep; |
| 236 | } |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 237 | else if (ep->me_key == key) { |
| 238 | if (restore_error) |
| 239 | PyErr_Restore(err_type, err_value, err_tb); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 240 | return ep; |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 241 | } |
| 242 | else if (ep->me_hash == hash) { |
| 243 | if (!checked_error) { |
| 244 | checked_error = 1; |
| 245 | if (PyErr_Occurred()) { |
| 246 | restore_error = 1; |
| 247 | PyErr_Fetch(&err_type, &err_value, |
| 248 | &err_tb); |
| 249 | } |
| 250 | } |
| 251 | cmp = PyObject_Compare(ep->me_key, key); |
| 252 | if (PyErr_Occurred()) |
| 253 | PyErr_Clear(); |
| 254 | else if (cmp == 0) { |
| 255 | if (restore_error) |
| 256 | PyErr_Restore(err_type, err_value, |
| 257 | err_tb); |
| 258 | return ep; |
| 259 | } |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 260 | } |
| 261 | /* Cycle through GF(2^n)-{0} */ |
| 262 | incr = incr << 1; |
| 263 | if (incr > mask) |
Thomas Wouters | 7e47402 | 2000-07-16 12:04:32 +0000 | [diff] [blame] | 264 | incr ^= mp->ma_poly; /* This will implicitly clear |
Guido van Rossum | f05fc71 | 1998-11-16 22:46:30 +0000 | [diff] [blame] | 265 | the highest bit */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 266 | } |
| 267 | } |
| 268 | |
| 269 | /* |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 270 | * Hacked up version of lookdict which can assume keys are always strings; |
| 271 | * this assumption allows testing for errors during PyObject_Compare() to |
| 272 | * be dropped; string-string comparisons never raise exceptions. This also |
| 273 | * means we don't need to go through PyObject_Compare(); we can always use |
| 274 | * the tp_compare slot of the string type object directly. |
| 275 | * |
| 276 | * This really only becomes meaningful if proper error handling in lookdict() |
| 277 | * is too expensive. |
| 278 | */ |
| 279 | static dictentry * |
| 280 | lookdict_string(dictobject *mp, PyObject *key, register long hash) |
| 281 | { |
| 282 | register int i; |
| 283 | register unsigned incr; |
| 284 | register dictentry *freeslot; |
| 285 | register unsigned int mask = mp->ma_size-1; |
| 286 | dictentry *ep0 = mp->ma_table; |
| 287 | register dictentry *ep; |
| 288 | cmpfunc compare = PyString_Type.tp_compare; |
| 289 | |
| 290 | /* make sure this function doesn't have to handle non-string keys */ |
| 291 | if (!PyString_Check(key)) { |
| 292 | #ifdef SHOW_CONVERSION_COUNTS |
| 293 | ++converted; |
| 294 | #endif |
| 295 | mp->ma_lookup = lookdict; |
| 296 | return lookdict(mp, key, hash); |
| 297 | } |
| 298 | /* We must come up with (i, incr) such that 0 <= i < ma_size |
| 299 | and 0 < incr < ma_size and both are a function of hash */ |
| 300 | i = (~hash) & mask; |
| 301 | /* We use ~hash instead of hash, as degenerate hash functions, such |
| 302 | as for ints <sigh>, can have lots of leading zeros. It's not |
| 303 | really a performance risk, but better safe than sorry. */ |
| 304 | ep = &ep0[i]; |
| 305 | if (ep->me_key == NULL || ep->me_key == key) |
| 306 | return ep; |
| 307 | if (ep->me_key == dummy) |
| 308 | freeslot = ep; |
| 309 | else { |
| 310 | if (ep->me_hash == hash |
| 311 | && compare(ep->me_key, key) == 0) { |
| 312 | return ep; |
| 313 | } |
| 314 | freeslot = NULL; |
| 315 | } |
| 316 | /* Derive incr from hash, just to make it more arbitrary. Note that |
| 317 | incr must not be 0, or we will get into an infinite loop.*/ |
| 318 | incr = (hash ^ ((unsigned long)hash >> 3)) & mask; |
| 319 | if (!incr) |
| 320 | incr = mask; |
| 321 | for (;;) { |
| 322 | ep = &ep0[(i+incr)&mask]; |
| 323 | if (ep->me_key == NULL) { |
| 324 | if (freeslot != NULL) |
| 325 | return freeslot; |
| 326 | else |
| 327 | return ep; |
| 328 | } |
| 329 | if (ep->me_key == dummy) { |
| 330 | if (freeslot == NULL) |
| 331 | freeslot = ep; |
| 332 | } |
| 333 | else if (ep->me_key == key |
| 334 | || (ep->me_hash == hash |
| 335 | && compare(ep->me_key, key) == 0)) { |
| 336 | return ep; |
| 337 | } |
| 338 | /* Cycle through GF(2^n)-{0} */ |
| 339 | incr = incr << 1; |
| 340 | if (incr > mask) |
| 341 | incr ^= mp->ma_poly; /* This will implicitly clear |
| 342 | the highest bit */ |
| 343 | } |
| 344 | } |
| 345 | |
| 346 | /* |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 347 | Internal routine to insert a new item into the table. |
| 348 | Used both by the internal resize routine and by the public insert routine. |
| 349 | Eats a reference to key and one to value. |
| 350 | */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 351 | static void |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 352 | insertdict(register dictobject *mp, PyObject *key, long hash, PyObject *value) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 353 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 354 | PyObject *old_value; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 355 | register dictentry *ep; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 356 | ep = (mp->ma_lookup)(mp, key, hash); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 357 | if (ep->me_value != NULL) { |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 358 | old_value = ep->me_value; |
| 359 | ep->me_value = value; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 360 | Py_DECREF(old_value); /* which **CAN** re-enter */ |
| 361 | Py_DECREF(key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 362 | } |
| 363 | else { |
| 364 | if (ep->me_key == NULL) |
| 365 | mp->ma_fill++; |
| 366 | else |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 367 | Py_DECREF(ep->me_key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 368 | ep->me_key = key; |
| 369 | ep->me_hash = hash; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 370 | ep->me_value = value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 371 | mp->ma_used++; |
| 372 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 373 | } |
| 374 | |
| 375 | /* |
| 376 | Restructure the table by allocating a new table and reinserting all |
| 377 | items again. When entries have been deleted, the new table may |
| 378 | actually be smaller than the old one. |
| 379 | */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 380 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 381 | dictresize(dictobject *mp, int minused) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 382 | { |
| 383 | register int oldsize = mp->ma_size; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 384 | register int newsize, newpoly; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 385 | register dictentry *oldtable = mp->ma_table; |
| 386 | register dictentry *newtable; |
| 387 | register dictentry *ep; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 388 | register int i; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 389 | for (i = 0, newsize = MINSIZE; ; i++, newsize <<= 1) { |
| 390 | if (i > sizeof(polys)/sizeof(polys[0])) { |
| 391 | /* Ran out of polynomials */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 392 | PyErr_NoMemory(); |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 393 | return -1; |
| 394 | } |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 395 | if (newsize > minused) { |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 396 | newpoly = polys[i]; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 397 | break; |
| 398 | } |
| 399 | } |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 400 | newtable = PyMem_NEW(dictentry, newsize); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 401 | if (newtable == NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 402 | PyErr_NoMemory(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 403 | return -1; |
| 404 | } |
Guido van Rossum | 0fd0033 | 1998-07-16 15:06:13 +0000 | [diff] [blame] | 405 | memset(newtable, '\0', sizeof(dictentry) * newsize); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 406 | mp->ma_size = newsize; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 407 | mp->ma_poly = newpoly; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 408 | mp->ma_table = newtable; |
| 409 | mp->ma_fill = 0; |
| 410 | mp->ma_used = 0; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 411 | |
| 412 | /* Make two passes, so we can avoid decrefs |
| 413 | (and possible side effects) till the table is copied */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 414 | for (i = 0, ep = oldtable; i < oldsize; i++, ep++) { |
| 415 | if (ep->me_value != NULL) |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 416 | insertdict(mp,ep->me_key,ep->me_hash,ep->me_value); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 417 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 418 | for (i = 0, ep = oldtable; i < oldsize; i++, ep++) { |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 419 | if (ep->me_value == NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 420 | Py_XDECREF(ep->me_key); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 421 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 422 | } |
| 423 | |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 424 | if (oldtable != NULL) |
| 425 | PyMem_DEL(oldtable); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 426 | return 0; |
| 427 | } |
| 428 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 429 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 430 | PyDict_GetItem(PyObject *op, PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 431 | { |
| 432 | long hash; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 433 | dictobject *mp = (dictobject *)op; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 434 | if (!PyDict_Check(op)) { |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 435 | return NULL; |
| 436 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 437 | if (mp->ma_table == NULL) |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 438 | return NULL; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 439 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 440 | if (!PyString_Check(key) || |
| 441 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 442 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 443 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 444 | hash = PyObject_Hash(key); |
Guido van Rossum | 474b19e | 1998-05-14 01:00:51 +0000 | [diff] [blame] | 445 | if (hash == -1) { |
| 446 | PyErr_Clear(); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 447 | return NULL; |
Guido van Rossum | 474b19e | 1998-05-14 01:00:51 +0000 | [diff] [blame] | 448 | } |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 449 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 450 | return (mp->ma_lookup)(mp, key, hash)->me_value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 451 | } |
| 452 | |
| 453 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 454 | PyDict_SetItem(register PyObject *op, PyObject *key, PyObject *value) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 455 | { |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 456 | register dictobject *mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 457 | register long hash; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 458 | if (!PyDict_Check(op)) { |
| 459 | PyErr_BadInternalCall(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 460 | return -1; |
| 461 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 462 | mp = (dictobject *)op; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 463 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 464 | if (PyString_Check(key)) { |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 465 | #ifdef INTERN_STRINGS |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 466 | if (((PyStringObject *)key)->ob_sinterned != NULL) { |
| 467 | key = ((PyStringObject *)key)->ob_sinterned; |
| 468 | hash = ((PyStringObject *)key)->ob_shash; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 469 | } |
| 470 | else |
| 471 | #endif |
| 472 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 473 | hash = ((PyStringObject *)key)->ob_shash; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 474 | if (hash == -1) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 475 | hash = PyObject_Hash(key); |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 476 | } |
| 477 | } |
| 478 | else |
| 479 | #endif |
| 480 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 481 | hash = PyObject_Hash(key); |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 482 | if (hash == -1) |
| 483 | return -1; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 484 | } |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 485 | /* if fill >= 2/3 size, double in size */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 486 | if (mp->ma_fill*3 >= mp->ma_size*2) { |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 487 | if (dictresize(mp, mp->ma_used*2) != 0) { |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 488 | if (mp->ma_fill+1 > mp->ma_size) |
| 489 | return -1; |
| 490 | } |
| 491 | } |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 492 | Py_INCREF(value); |
| 493 | Py_INCREF(key); |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 494 | insertdict(mp, key, hash, value); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 495 | return 0; |
| 496 | } |
| 497 | |
| 498 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 499 | PyDict_DelItem(PyObject *op, PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 500 | { |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 501 | register dictobject *mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 502 | register long hash; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 503 | register dictentry *ep; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 504 | PyObject *old_value, *old_key; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 505 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 506 | if (!PyDict_Check(op)) { |
| 507 | PyErr_BadInternalCall(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 508 | return -1; |
| 509 | } |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 510 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 511 | if (!PyString_Check(key) || |
| 512 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 513 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 514 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 515 | hash = PyObject_Hash(key); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 516 | if (hash == -1) |
| 517 | return -1; |
| 518 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 519 | mp = (dictobject *)op; |
| 520 | if (((dictobject *)op)->ma_table == NULL) |
Guido van Rossum | efc8713 | 1995-01-02 19:42:39 +0000 | [diff] [blame] | 521 | goto empty; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 522 | ep = (mp->ma_lookup)(mp, key, hash); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 523 | if (ep->me_value == NULL) { |
Guido van Rossum | efc8713 | 1995-01-02 19:42:39 +0000 | [diff] [blame] | 524 | empty: |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 525 | PyErr_SetObject(PyExc_KeyError, key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 526 | return -1; |
| 527 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 528 | old_key = ep->me_key; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 529 | Py_INCREF(dummy); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 530 | ep->me_key = dummy; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 531 | old_value = ep->me_value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 532 | ep->me_value = NULL; |
| 533 | mp->ma_used--; |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame^] | 534 | Py_DECREF(old_value); |
| 535 | Py_DECREF(old_key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 536 | return 0; |
| 537 | } |
| 538 | |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 539 | void |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 540 | PyDict_Clear(PyObject *op) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 541 | { |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 542 | int i, n; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 543 | register dictentry *table; |
| 544 | dictobject *mp; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 545 | if (!PyDict_Check(op)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 546 | return; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 547 | mp = (dictobject *)op; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 548 | table = mp->ma_table; |
| 549 | if (table == NULL) |
| 550 | return; |
| 551 | n = mp->ma_size; |
| 552 | mp->ma_size = mp->ma_used = mp->ma_fill = 0; |
| 553 | mp->ma_table = NULL; |
| 554 | for (i = 0; i < n; i++) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 555 | Py_XDECREF(table[i].me_key); |
| 556 | Py_XDECREF(table[i].me_value); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 557 | } |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 558 | PyMem_DEL(table); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 559 | } |
| 560 | |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 561 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 562 | PyDict_Next(PyObject *op, int *ppos, PyObject **pkey, PyObject **pvalue) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 563 | { |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 564 | int i; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 565 | register dictobject *mp; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 566 | if (!PyDict_Check(op)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 567 | return 0; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 568 | mp = (dictobject *)op; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 569 | i = *ppos; |
| 570 | if (i < 0) |
| 571 | return 0; |
| 572 | while (i < mp->ma_size && mp->ma_table[i].me_value == NULL) |
| 573 | i++; |
| 574 | *ppos = i+1; |
| 575 | if (i >= mp->ma_size) |
| 576 | return 0; |
| 577 | if (pkey) |
| 578 | *pkey = mp->ma_table[i].me_key; |
| 579 | if (pvalue) |
| 580 | *pvalue = mp->ma_table[i].me_value; |
| 581 | return 1; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 582 | } |
| 583 | |
| 584 | /* Methods */ |
| 585 | |
| 586 | static void |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 587 | dict_dealloc(register dictobject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 588 | { |
| 589 | register int i; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 590 | register dictentry *ep; |
Guido van Rossum | d724b23 | 2000-03-13 16:01:29 +0000 | [diff] [blame] | 591 | Py_TRASHCAN_SAFE_BEGIN(mp) |
Jeremy Hylton | c5007aa | 2000-06-30 05:02:53 +0000 | [diff] [blame] | 592 | PyObject_GC_Fini(mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 593 | 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] | 594 | if (ep->me_key != NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 595 | Py_DECREF(ep->me_key); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 596 | } |
| 597 | if (ep->me_value != NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 598 | Py_DECREF(ep->me_value); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 599 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 600 | } |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 601 | if (mp->ma_table != NULL) |
| 602 | PyMem_DEL(mp->ma_table); |
Guido van Rossum | 4cc6ac7 | 2000-07-01 01:00:38 +0000 | [diff] [blame] | 603 | mp = (dictobject *) PyObject_AS_GC(mp); |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 604 | PyObject_DEL(mp); |
Guido van Rossum | d724b23 | 2000-03-13 16:01:29 +0000 | [diff] [blame] | 605 | Py_TRASHCAN_SAFE_END(mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 606 | } |
| 607 | |
| 608 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 609 | dict_print(register dictobject *mp, register FILE *fp, register int flags) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 610 | { |
| 611 | register int i; |
| 612 | register int any; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 613 | register dictentry *ep; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 614 | |
| 615 | i = Py_ReprEnter((PyObject*)mp); |
| 616 | if (i != 0) { |
| 617 | if (i < 0) |
| 618 | return i; |
| 619 | fprintf(fp, "{...}"); |
| 620 | return 0; |
| 621 | } |
| 622 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 623 | fprintf(fp, "{"); |
| 624 | any = 0; |
| 625 | for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) { |
| 626 | if (ep->me_value != NULL) { |
| 627 | if (any++ > 0) |
| 628 | fprintf(fp, ", "); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 629 | if (PyObject_Print((PyObject *)ep->me_key, fp, 0)!=0) { |
| 630 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 631 | return -1; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 632 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 633 | fprintf(fp, ": "); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 634 | if (PyObject_Print(ep->me_value, fp, 0) != 0) { |
| 635 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 636 | return -1; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 637 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 638 | } |
| 639 | } |
| 640 | fprintf(fp, "}"); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 641 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 642 | return 0; |
| 643 | } |
| 644 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 645 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 646 | dict_repr(dictobject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 647 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 648 | auto PyObject *v; |
| 649 | PyObject *sepa, *colon; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 650 | register int i; |
| 651 | register int any; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 652 | register dictentry *ep; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 653 | |
| 654 | i = Py_ReprEnter((PyObject*)mp); |
| 655 | if (i != 0) { |
| 656 | if (i > 0) |
| 657 | return PyString_FromString("{...}"); |
| 658 | return NULL; |
| 659 | } |
| 660 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 661 | v = PyString_FromString("{"); |
| 662 | sepa = PyString_FromString(", "); |
| 663 | colon = PyString_FromString(": "); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 664 | any = 0; |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 665 | 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] | 666 | if (ep->me_value != NULL) { |
| 667 | if (any++) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 668 | PyString_Concat(&v, sepa); |
| 669 | PyString_ConcatAndDel(&v, PyObject_Repr(ep->me_key)); |
| 670 | PyString_Concat(&v, colon); |
| 671 | PyString_ConcatAndDel(&v, PyObject_Repr(ep->me_value)); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 672 | } |
| 673 | } |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 674 | PyString_ConcatAndDel(&v, PyString_FromString("}")); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 675 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 676 | Py_XDECREF(sepa); |
| 677 | Py_XDECREF(colon); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 678 | return v; |
| 679 | } |
| 680 | |
| 681 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 682 | dict_length(dictobject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 683 | { |
| 684 | return mp->ma_used; |
| 685 | } |
| 686 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 687 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 688 | dict_subscript(dictobject *mp, register PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 689 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 690 | PyObject *v; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 691 | long hash; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 692 | if (mp->ma_table == NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 693 | PyErr_SetObject(PyExc_KeyError, key); |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 694 | return NULL; |
| 695 | } |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 696 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 697 | if (!PyString_Check(key) || |
| 698 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 699 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 700 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 701 | hash = PyObject_Hash(key); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 702 | if (hash == -1) |
| 703 | return NULL; |
| 704 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 705 | v = (mp->ma_lookup)(mp, key, hash) -> me_value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 706 | if (v == NULL) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 707 | PyErr_SetObject(PyExc_KeyError, key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 708 | else |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 709 | Py_INCREF(v); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 710 | return v; |
| 711 | } |
| 712 | |
| 713 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 714 | dict_ass_sub(dictobject *mp, PyObject *v, PyObject *w) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 715 | { |
| 716 | if (w == NULL) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 717 | return PyDict_DelItem((PyObject *)mp, v); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 718 | else |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 719 | return PyDict_SetItem((PyObject *)mp, v, w); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 720 | } |
| 721 | |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 722 | static PyMappingMethods dict_as_mapping = { |
| 723 | (inquiry)dict_length, /*mp_length*/ |
| 724 | (binaryfunc)dict_subscript, /*mp_subscript*/ |
| 725 | (objobjargproc)dict_ass_sub, /*mp_ass_subscript*/ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 726 | }; |
| 727 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 728 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 729 | dict_keys(register dictobject *mp, PyObject *args) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 730 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 731 | register PyObject *v; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 732 | register int i, j; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 733 | if (!PyArg_NoArgs(args)) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 734 | return NULL; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 735 | v = PyList_New(mp->ma_used); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 736 | if (v == NULL) |
| 737 | return NULL; |
| 738 | for (i = 0, j = 0; i < mp->ma_size; i++) { |
| 739 | if (mp->ma_table[i].me_value != NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 740 | PyObject *key = mp->ma_table[i].me_key; |
| 741 | Py_INCREF(key); |
| 742 | PyList_SetItem(v, j, key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 743 | j++; |
| 744 | } |
| 745 | } |
| 746 | return v; |
| 747 | } |
| 748 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 749 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 750 | dict_values(register dictobject *mp, PyObject *args) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 751 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 752 | register PyObject *v; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 753 | register int i, j; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 754 | if (!PyArg_NoArgs(args)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 755 | return NULL; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 756 | v = PyList_New(mp->ma_used); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 757 | if (v == NULL) |
| 758 | return NULL; |
| 759 | for (i = 0, j = 0; i < mp->ma_size; i++) { |
| 760 | if (mp->ma_table[i].me_value != NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 761 | PyObject *value = mp->ma_table[i].me_value; |
| 762 | Py_INCREF(value); |
| 763 | PyList_SetItem(v, j, value); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 764 | j++; |
| 765 | } |
| 766 | } |
| 767 | return v; |
| 768 | } |
| 769 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 770 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 771 | dict_items(register dictobject *mp, PyObject *args) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 772 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 773 | register PyObject *v; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 774 | register int i, j; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 775 | if (!PyArg_NoArgs(args)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 776 | return NULL; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 777 | v = PyList_New(mp->ma_used); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 778 | if (v == NULL) |
| 779 | return NULL; |
| 780 | for (i = 0, j = 0; i < mp->ma_size; i++) { |
| 781 | if (mp->ma_table[i].me_value != NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 782 | PyObject *key = mp->ma_table[i].me_key; |
| 783 | PyObject *value = mp->ma_table[i].me_value; |
| 784 | PyObject *item = PyTuple_New(2); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 785 | if (item == NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 786 | Py_DECREF(v); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 787 | return NULL; |
| 788 | } |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 789 | Py_INCREF(key); |
| 790 | PyTuple_SetItem(item, 0, key); |
| 791 | Py_INCREF(value); |
| 792 | PyTuple_SetItem(item, 1, value); |
| 793 | PyList_SetItem(v, j, item); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 794 | j++; |
| 795 | } |
| 796 | } |
| 797 | return v; |
| 798 | } |
| 799 | |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 800 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 801 | dict_update(register dictobject *mp, PyObject *args) |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 802 | { |
| 803 | register int i; |
| 804 | dictobject *other; |
| 805 | dictentry *entry; |
| 806 | if (!PyArg_Parse(args, "O!", &PyDict_Type, &other)) |
| 807 | return NULL; |
| 808 | if (other == mp) |
Guido van Rossum | a8d5131 | 1997-06-02 17:13:37 +0000 | [diff] [blame] | 809 | goto done; /* a.update(a); nothing to do */ |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 810 | /* Do one big resize at the start, rather than incrementally |
| 811 | resizing as we insert new items. Expect that there will be |
| 812 | no (or few) overlapping keys. */ |
| 813 | if ((mp->ma_fill + other->ma_used)*3 >= mp->ma_size*2) { |
| 814 | if (dictresize(mp, (mp->ma_used + other->ma_used)*3/2) != 0) |
| 815 | return NULL; |
| 816 | } |
| 817 | for (i = 0; i < other->ma_size; i++) { |
| 818 | entry = &other->ma_table[i]; |
| 819 | if (entry->me_value != NULL) { |
| 820 | Py_INCREF(entry->me_key); |
| 821 | Py_INCREF(entry->me_value); |
| 822 | insertdict(mp, entry->me_key, entry->me_hash, |
| 823 | entry->me_value); |
| 824 | } |
| 825 | } |
| 826 | done: |
| 827 | Py_INCREF(Py_None); |
| 828 | return Py_None; |
| 829 | } |
| 830 | |
| 831 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 832 | dict_copy(register dictobject *mp, PyObject *args) |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 833 | { |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 834 | if (!PyArg_Parse(args, "")) |
| 835 | return NULL; |
| 836 | return PyDict_Copy((PyObject*)mp); |
| 837 | } |
| 838 | |
| 839 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 840 | PyDict_Copy(PyObject *o) |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 841 | { |
| 842 | register dictobject *mp; |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 843 | register int i; |
| 844 | dictobject *copy; |
| 845 | dictentry *entry; |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 846 | |
| 847 | if (o == NULL || !PyDict_Check(o)) { |
| 848 | PyErr_BadInternalCall(); |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 849 | return NULL; |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 850 | } |
| 851 | mp = (dictobject *)o; |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 852 | copy = (dictobject *)PyDict_New(); |
| 853 | if (copy == NULL) |
| 854 | return NULL; |
| 855 | if (mp->ma_used > 0) { |
| 856 | if (dictresize(copy, mp->ma_used*3/2) != 0) |
| 857 | return NULL; |
| 858 | for (i = 0; i < mp->ma_size; i++) { |
| 859 | entry = &mp->ma_table[i]; |
| 860 | if (entry->me_value != NULL) { |
| 861 | Py_INCREF(entry->me_key); |
| 862 | Py_INCREF(entry->me_value); |
| 863 | insertdict(copy, entry->me_key, entry->me_hash, |
| 864 | entry->me_value); |
| 865 | } |
| 866 | } |
| 867 | } |
| 868 | return (PyObject *)copy; |
| 869 | } |
| 870 | |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 871 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 872 | PyDict_Size(PyObject *mp) |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 873 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 874 | if (mp == NULL || !PyDict_Check(mp)) { |
| 875 | PyErr_BadInternalCall(); |
Guido van Rossum | b376a4a | 1993-11-23 17:53:17 +0000 | [diff] [blame] | 876 | return 0; |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 877 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 878 | return ((dictobject *)mp)->ma_used; |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 879 | } |
| 880 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 881 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 882 | PyDict_Keys(PyObject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 883 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 884 | if (mp == NULL || !PyDict_Check(mp)) { |
| 885 | PyErr_BadInternalCall(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 886 | return NULL; |
| 887 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 888 | return dict_keys((dictobject *)mp, (PyObject *)NULL); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 889 | } |
| 890 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 891 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 892 | PyDict_Values(PyObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 893 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 894 | if (mp == NULL || !PyDict_Check(mp)) { |
| 895 | PyErr_BadInternalCall(); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 896 | return NULL; |
| 897 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 898 | return dict_values((dictobject *)mp, (PyObject *)NULL); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 899 | } |
| 900 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 901 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 902 | PyDict_Items(PyObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 903 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 904 | if (mp == NULL || !PyDict_Check(mp)) { |
| 905 | PyErr_BadInternalCall(); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 906 | return NULL; |
| 907 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 908 | return dict_items((dictobject *)mp, (PyObject *)NULL); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 909 | } |
| 910 | |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 911 | #define NEWCMP |
| 912 | |
| 913 | #ifdef NEWCMP |
| 914 | |
| 915 | /* Subroutine which returns the smallest key in a for which b's value |
| 916 | is different or absent. The value is returned too, through the |
| 917 | pval argument. No reference counts are incremented. */ |
| 918 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 919 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 920 | characterize(dictobject *a, dictobject *b, PyObject **pval) |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 921 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 922 | PyObject *diff = NULL; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 923 | int i; |
| 924 | |
| 925 | *pval = NULL; |
| 926 | for (i = 0; i < a->ma_size; i++) { |
| 927 | if (a->ma_table[i].me_value != NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 928 | PyObject *key = a->ma_table[i].me_key; |
| 929 | PyObject *aval, *bval; |
Guido van Rossum | 5b2121b | 1997-05-23 00:01:41 +0000 | [diff] [blame] | 930 | /* XXX What if PyObject_Compare raises an exception? */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 931 | if (diff != NULL && PyObject_Compare(key, diff) > 0) |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 932 | continue; |
| 933 | aval = a->ma_table[i].me_value; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 934 | bval = PyDict_GetItem((PyObject *)b, key); |
Guido van Rossum | 5b2121b | 1997-05-23 00:01:41 +0000 | [diff] [blame] | 935 | /* XXX What if PyObject_Compare raises an exception? */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 936 | if (bval == NULL || PyObject_Compare(aval, bval) != 0) |
| 937 | { |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 938 | diff = key; |
| 939 | *pval = aval; |
| 940 | } |
| 941 | } |
| 942 | } |
| 943 | return diff; |
| 944 | } |
| 945 | |
| 946 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 947 | dict_compare(dictobject *a, dictobject *b) |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 948 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 949 | PyObject *adiff, *bdiff, *aval, *bval; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 950 | int res; |
| 951 | |
| 952 | /* Compare lengths first */ |
| 953 | if (a->ma_used < b->ma_used) |
| 954 | return -1; /* a is shorter */ |
| 955 | else if (a->ma_used > b->ma_used) |
| 956 | return 1; /* b is shorter */ |
| 957 | /* Same length -- check all keys */ |
| 958 | adiff = characterize(a, b, &aval); |
Guido van Rossum | 5b2121b | 1997-05-23 00:01:41 +0000 | [diff] [blame] | 959 | if (PyErr_Occurred()) |
| 960 | return -1; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 961 | if (adiff == NULL) |
| 962 | return 0; /* a is a subset with the same length */ |
| 963 | bdiff = characterize(b, a, &bval); |
Guido van Rossum | 5b2121b | 1997-05-23 00:01:41 +0000 | [diff] [blame] | 964 | if (PyErr_Occurred()) |
| 965 | return -1; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 966 | /* bdiff == NULL would be impossible now */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 967 | res = PyObject_Compare(adiff, bdiff); |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 968 | if (res == 0) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 969 | res = PyObject_Compare(aval, bval); |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 970 | return res; |
| 971 | } |
| 972 | |
| 973 | #else /* !NEWCMP */ |
| 974 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 975 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 976 | dict_compare(dictobject *a, dictobject *b) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 977 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 978 | PyObject *akeys, *bkeys; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 979 | int i, n, res; |
| 980 | if (a == b) |
| 981 | return 0; |
| 982 | if (a->ma_used == 0) { |
| 983 | if (b->ma_used != 0) |
| 984 | return -1; |
| 985 | else |
| 986 | return 0; |
| 987 | } |
| 988 | else { |
| 989 | if (b->ma_used == 0) |
| 990 | return 1; |
| 991 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 992 | akeys = dict_keys(a, (PyObject *)NULL); |
| 993 | bkeys = dict_keys(b, (PyObject *)NULL); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 994 | if (akeys == NULL || bkeys == NULL) { |
| 995 | /* Oops, out of memory -- what to do? */ |
| 996 | /* For now, sort on address! */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 997 | Py_XDECREF(akeys); |
| 998 | Py_XDECREF(bkeys); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 999 | if (a < b) |
| 1000 | return -1; |
| 1001 | else |
| 1002 | return 1; |
| 1003 | } |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1004 | PyList_Sort(akeys); |
| 1005 | PyList_Sort(bkeys); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1006 | n = a->ma_used < b->ma_used ? a->ma_used : b->ma_used; /* smallest */ |
| 1007 | res = 0; |
| 1008 | for (i = 0; i < n; i++) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1009 | PyObject *akey, *bkey, *aval, *bval; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1010 | long ahash, bhash; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1011 | akey = PyList_GetItem(akeys, i); |
| 1012 | bkey = PyList_GetItem(bkeys, i); |
| 1013 | res = PyObject_Compare(akey, bkey); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1014 | if (res != 0) |
| 1015 | break; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1016 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1017 | if (!PyString_Check(akey) || |
| 1018 | (ahash = ((PyStringObject *) akey)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1019 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1020 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1021 | ahash = PyObject_Hash(akey); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1022 | if (ahash == -1) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1023 | PyErr_Clear(); /* Don't want errors here */ |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1024 | } |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1025 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1026 | if (!PyString_Check(bkey) || |
| 1027 | (bhash = ((PyStringObject *) bkey)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1028 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1029 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1030 | bhash = PyObject_Hash(bkey); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1031 | if (bhash == -1) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1032 | PyErr_Clear(); /* Don't want errors here */ |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1033 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 1034 | aval = (a->ma_lookup)(a, akey, ahash) -> me_value; |
| 1035 | bval = (b->ma_lookup)(b, bkey, bhash) -> me_value; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1036 | res = PyObject_Compare(aval, bval); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1037 | if (res != 0) |
| 1038 | break; |
| 1039 | } |
| 1040 | if (res == 0) { |
| 1041 | if (a->ma_used < b->ma_used) |
| 1042 | res = -1; |
| 1043 | else if (a->ma_used > b->ma_used) |
| 1044 | res = 1; |
| 1045 | } |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1046 | Py_DECREF(akeys); |
| 1047 | Py_DECREF(bkeys); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1048 | return res; |
| 1049 | } |
| 1050 | |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1051 | #endif /* !NEWCMP */ |
| 1052 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1053 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1054 | dict_has_key(register dictobject *mp, PyObject *args) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1055 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1056 | PyObject *key; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1057 | long hash; |
| 1058 | register long ok; |
Fred Drake | 52fccfd | 2000-02-23 15:47:16 +0000 | [diff] [blame] | 1059 | if (!PyArg_ParseTuple(args, "O:has_key", &key)) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1060 | return NULL; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1061 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1062 | if (!PyString_Check(key) || |
| 1063 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1064 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1065 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1066 | hash = PyObject_Hash(key); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1067 | if (hash == -1) |
| 1068 | return NULL; |
| 1069 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 1070 | ok = (mp->ma_size != 0 |
| 1071 | && (mp->ma_lookup)(mp, key, hash)->me_value != NULL); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1072 | return PyInt_FromLong(ok); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1073 | } |
| 1074 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1075 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1076 | dict_get(register dictobject *mp, PyObject *args) |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1077 | { |
| 1078 | PyObject *key; |
Barry Warsaw | 320ac33 | 1997-10-20 17:26:25 +0000 | [diff] [blame] | 1079 | PyObject *failobj = Py_None; |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1080 | PyObject *val = NULL; |
| 1081 | long hash; |
| 1082 | |
Fred Drake | 52fccfd | 2000-02-23 15:47:16 +0000 | [diff] [blame] | 1083 | if (!PyArg_ParseTuple(args, "O|O:get", &key, &failobj)) |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1084 | return NULL; |
Guido van Rossum | 6fcfa72 | 1997-10-20 20:10:00 +0000 | [diff] [blame] | 1085 | if (mp->ma_table == NULL) |
| 1086 | goto finally; |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1087 | |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1088 | #ifdef CACHE_HASH |
| 1089 | if (!PyString_Check(key) || |
| 1090 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
| 1091 | #endif |
| 1092 | { |
| 1093 | hash = PyObject_Hash(key); |
| 1094 | if (hash == -1) |
| 1095 | return NULL; |
| 1096 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 1097 | val = (mp->ma_lookup)(mp, key, hash)->me_value; |
Barry Warsaw | 320ac33 | 1997-10-20 17:26:25 +0000 | [diff] [blame] | 1098 | |
Guido van Rossum | 6fcfa72 | 1997-10-20 20:10:00 +0000 | [diff] [blame] | 1099 | finally: |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1100 | if (val == NULL) |
| 1101 | val = failobj; |
| 1102 | Py_INCREF(val); |
| 1103 | return val; |
| 1104 | } |
| 1105 | |
| 1106 | |
| 1107 | static PyObject * |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1108 | dict_setdefault(register dictobject *mp, PyObject *args) |
| 1109 | { |
| 1110 | PyObject *key; |
| 1111 | PyObject *failobj = Py_None; |
| 1112 | PyObject *val = NULL; |
| 1113 | long hash; |
| 1114 | |
| 1115 | if (!PyArg_ParseTuple(args, "O|O:setdefault", &key, &failobj)) |
| 1116 | return NULL; |
| 1117 | if (mp->ma_table == NULL) |
| 1118 | goto finally; |
| 1119 | |
| 1120 | #ifdef CACHE_HASH |
| 1121 | if (!PyString_Check(key) || |
| 1122 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
| 1123 | #endif |
| 1124 | { |
| 1125 | hash = PyObject_Hash(key); |
| 1126 | if (hash == -1) |
| 1127 | return NULL; |
| 1128 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 1129 | val = (mp->ma_lookup)(mp, key, hash)->me_value; |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1130 | |
| 1131 | finally: |
| 1132 | if (val == NULL) { |
| 1133 | val = failobj; |
| 1134 | if (PyDict_SetItem((PyObject*)mp, key, failobj)) |
| 1135 | val = NULL; |
| 1136 | } |
| 1137 | Py_XINCREF(val); |
| 1138 | return val; |
| 1139 | } |
| 1140 | |
| 1141 | |
| 1142 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1143 | dict_clear(register dictobject *mp, PyObject *args) |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 1144 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1145 | if (!PyArg_NoArgs(args)) |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 1146 | return NULL; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1147 | PyDict_Clear((PyObject *)mp); |
| 1148 | Py_INCREF(Py_None); |
| 1149 | return Py_None; |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 1150 | } |
| 1151 | |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1152 | static PyObject * |
| 1153 | dict_popitem(dictobject *mp, PyObject *args) |
| 1154 | { |
| 1155 | int i = 0; |
| 1156 | dictentry *ep; |
| 1157 | PyObject *res; |
| 1158 | |
| 1159 | if (!PyArg_NoArgs(args)) |
| 1160 | return NULL; |
| 1161 | if (mp->ma_used == 0) { |
| 1162 | PyErr_SetString(PyExc_KeyError, |
| 1163 | "popitem(): dictionary is empty"); |
| 1164 | return NULL; |
| 1165 | } |
| 1166 | /* Set ep to "the first" dict entry with a value. We abuse the hash |
| 1167 | * field of slot 0 to hold a search finger: |
| 1168 | * If slot 0 has a value, use slot 0. |
| 1169 | * Else slot 0 is being used to hold a search finger, |
| 1170 | * and we use its hash value as the first index to look. |
| 1171 | */ |
| 1172 | ep = &mp->ma_table[0]; |
| 1173 | if (ep->me_value == NULL) { |
| 1174 | i = (int)ep->me_hash; |
| 1175 | /* The hash field may be uninitialized trash, or it |
| 1176 | * may be a real hash value, or it may be a legit |
| 1177 | * search finger, or it may be a once-legit search |
| 1178 | * finger that's out of bounds now because it |
| 1179 | * wrapped around or the table shrunk -- simply |
| 1180 | * make sure it's in bounds now. |
| 1181 | */ |
| 1182 | if (i >= mp->ma_size || i < 1) |
| 1183 | i = 1; /* skip slot 0 */ |
| 1184 | while ((ep = &mp->ma_table[i])->me_value == NULL) { |
| 1185 | i++; |
| 1186 | if (i >= mp->ma_size) |
| 1187 | i = 1; |
| 1188 | } |
| 1189 | } |
| 1190 | res = PyTuple_New(2); |
| 1191 | if (res != NULL) { |
| 1192 | PyTuple_SET_ITEM(res, 0, ep->me_key); |
| 1193 | PyTuple_SET_ITEM(res, 1, ep->me_value); |
| 1194 | Py_INCREF(dummy); |
| 1195 | ep->me_key = dummy; |
| 1196 | ep->me_value = NULL; |
| 1197 | mp->ma_used--; |
| 1198 | assert(mp->ma_table[0].me_value == NULL); |
| 1199 | mp->ma_table[0].me_hash = i + 1; /* next place to start */ |
| 1200 | } |
| 1201 | return res; |
| 1202 | } |
| 1203 | |
Jeremy Hylton | 8caad49 | 2000-06-23 14:18:11 +0000 | [diff] [blame] | 1204 | static int |
| 1205 | dict_traverse(PyObject *op, visitproc visit, void *arg) |
| 1206 | { |
| 1207 | int i = 0, err; |
| 1208 | PyObject *pk; |
| 1209 | PyObject *pv; |
| 1210 | |
| 1211 | while (PyDict_Next(op, &i, &pk, &pv)) { |
| 1212 | err = visit(pk, arg); |
| 1213 | if (err) |
| 1214 | return err; |
| 1215 | err = visit(pv, arg); |
| 1216 | if (err) |
| 1217 | return err; |
| 1218 | } |
| 1219 | return 0; |
| 1220 | } |
| 1221 | |
| 1222 | static int |
| 1223 | dict_tp_clear(PyObject *op) |
| 1224 | { |
| 1225 | PyDict_Clear(op); |
| 1226 | return 0; |
| 1227 | } |
| 1228 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1229 | static PyMethodDef mapp_methods[] = { |
Fred Drake | 52fccfd | 2000-02-23 15:47:16 +0000 | [diff] [blame] | 1230 | {"has_key", (PyCFunction)dict_has_key, METH_VARARGS}, |
Guido van Rossum | 5d8123f | 1997-07-13 03:58:01 +0000 | [diff] [blame] | 1231 | {"keys", (PyCFunction)dict_keys}, |
| 1232 | {"items", (PyCFunction)dict_items}, |
| 1233 | {"values", (PyCFunction)dict_values}, |
Guido van Rossum | a8d5131 | 1997-06-02 17:13:37 +0000 | [diff] [blame] | 1234 | {"update", (PyCFunction)dict_update}, |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1235 | {"clear", (PyCFunction)dict_clear}, |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1236 | {"copy", (PyCFunction)dict_copy}, |
Fred Drake | 52fccfd | 2000-02-23 15:47:16 +0000 | [diff] [blame] | 1237 | {"get", (PyCFunction)dict_get, METH_VARARGS}, |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1238 | {"setdefault", (PyCFunction)dict_setdefault, METH_VARARGS}, |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1239 | {"popitem", (PyCFunction)dict_popitem}, |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1240 | {NULL, NULL} /* sentinel */ |
| 1241 | }; |
| 1242 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1243 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1244 | dict_getattr(dictobject *mp, char *name) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1245 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1246 | return Py_FindMethod(mapp_methods, (PyObject *)mp, name); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1247 | } |
| 1248 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1249 | PyTypeObject PyDict_Type = { |
| 1250 | PyObject_HEAD_INIT(&PyType_Type) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1251 | 0, |
Guido van Rossum | 9bfef44 | 1993-03-29 10:43:31 +0000 | [diff] [blame] | 1252 | "dictionary", |
Jeremy Hylton | c5007aa | 2000-06-30 05:02:53 +0000 | [diff] [blame] | 1253 | sizeof(dictobject) + PyGC_HEAD_SIZE, |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1254 | 0, |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1255 | (destructor)dict_dealloc, /*tp_dealloc*/ |
| 1256 | (printfunc)dict_print, /*tp_print*/ |
| 1257 | (getattrfunc)dict_getattr, /*tp_getattr*/ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1258 | 0, /*tp_setattr*/ |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1259 | (cmpfunc)dict_compare, /*tp_compare*/ |
| 1260 | (reprfunc)dict_repr, /*tp_repr*/ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1261 | 0, /*tp_as_number*/ |
| 1262 | 0, /*tp_as_sequence*/ |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1263 | &dict_as_mapping, /*tp_as_mapping*/ |
Jeremy Hylton | 8caad49 | 2000-06-23 14:18:11 +0000 | [diff] [blame] | 1264 | 0, /* tp_hash */ |
| 1265 | 0, /* tp_call */ |
| 1266 | 0, /* tp_str */ |
| 1267 | 0, /* tp_getattro */ |
| 1268 | 0, /* tp_setattro */ |
| 1269 | 0, /* tp_as_buffer */ |
Jeremy Hylton | d08b4c4 | 2000-06-23 19:37:02 +0000 | [diff] [blame] | 1270 | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC, /*tp_flags*/ |
Jeremy Hylton | 8caad49 | 2000-06-23 14:18:11 +0000 | [diff] [blame] | 1271 | 0, /* tp_doc */ |
| 1272 | (traverseproc)dict_traverse, /* tp_traverse */ |
| 1273 | (inquiry)dict_tp_clear, /* tp_clear */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1274 | }; |
| 1275 | |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1276 | /* For backward compatibility with old dictionary interface */ |
| 1277 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1278 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1279 | PyDict_GetItemString(PyObject *v, char *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1280 | { |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1281 | PyObject *kv, *rv; |
| 1282 | kv = PyString_FromString(key); |
| 1283 | if (kv == NULL) |
| 1284 | return NULL; |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1285 | rv = PyDict_GetItem(v, kv); |
| 1286 | Py_DECREF(kv); |
| 1287 | return rv; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1288 | } |
| 1289 | |
| 1290 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1291 | PyDict_SetItemString(PyObject *v, char *key, PyObject *item) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1292 | { |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1293 | PyObject *kv; |
| 1294 | int err; |
| 1295 | kv = PyString_FromString(key); |
| 1296 | if (kv == NULL) |
Guido van Rossum | 037b220 | 1997-05-20 18:35:19 +0000 | [diff] [blame] | 1297 | return -1; |
Guido van Rossum | 4f3bf1e | 1997-09-29 23:31:11 +0000 | [diff] [blame] | 1298 | PyString_InternInPlace(&kv); /* XXX Should we really? */ |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1299 | err = PyDict_SetItem(v, kv, item); |
| 1300 | Py_DECREF(kv); |
| 1301 | return err; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1302 | } |
| 1303 | |
| 1304 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1305 | PyDict_DelItemString(PyObject *v, char *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1306 | { |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1307 | PyObject *kv; |
| 1308 | int err; |
| 1309 | kv = PyString_FromString(key); |
| 1310 | if (kv == NULL) |
Guido van Rossum | 037b220 | 1997-05-20 18:35:19 +0000 | [diff] [blame] | 1311 | return -1; |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1312 | err = PyDict_DelItem(v, kv); |
| 1313 | Py_DECREF(kv); |
| 1314 | return err; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1315 | } |