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 | |
Raymond Hettinger | 930427b | 2003-05-03 06:51:59 +0000 | [diff] [blame] | 4 | /* The distribution includes a separate file, Objects/dictnotes.txt, |
Tim Peters | 60b2996 | 2006-01-01 01:19:23 +0000 | [diff] [blame] | 5 | describing explorations into dictionary design and optimization. |
Raymond Hettinger | 930427b | 2003-05-03 06:51:59 +0000 | [diff] [blame] | 6 | It covers typical dictionary use patterns, the parameters for |
| 7 | tuning dictionaries, and several ideas for possible optimizations. |
| 8 | */ |
| 9 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 10 | #include "Python.h" |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 11 | |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 12 | |
Georg Brandl | b9f4ad3 | 2006-10-29 18:31:42 +0000 | [diff] [blame] | 13 | /* Set a key error with the specified argument, wrapping it in a |
| 14 | * tuple automatically so that tuple keys are not unpacked as the |
| 15 | * exception arguments. */ |
| 16 | static void |
| 17 | set_key_error(PyObject *arg) |
| 18 | { |
| 19 | PyObject *tup; |
| 20 | tup = PyTuple_Pack(1, arg); |
| 21 | if (!tup) |
| 22 | return; /* caller will expect error to be set anyway */ |
| 23 | PyErr_SetObject(PyExc_KeyError, tup); |
Neal Norwitz | 7b932da | 2006-10-29 23:39:03 +0000 | [diff] [blame] | 24 | Py_DECREF(tup); |
Georg Brandl | b9f4ad3 | 2006-10-29 18:31:42 +0000 | [diff] [blame] | 25 | } |
| 26 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 27 | /* Define this out if you don't want conversion statistics on exit. */ |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 28 | #undef SHOW_CONVERSION_COUNTS |
| 29 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 30 | /* See large comment block below. This must be >= 1. */ |
| 31 | #define PERTURB_SHIFT 5 |
| 32 | |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 33 | /* |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 34 | Major subtleties ahead: Most hash schemes depend on having a "good" hash |
| 35 | function, in the sense of simulating randomness. Python doesn't: its most |
| 36 | important hash functions (for strings and ints) are very regular in common |
| 37 | cases: |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 38 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 39 | >>> map(hash, (0, 1, 2, 3)) |
| 40 | [0, 1, 2, 3] |
| 41 | >>> map(hash, ("namea", "nameb", "namec", "named")) |
| 42 | [-1658398457, -1658398460, -1658398459, -1658398462] |
| 43 | >>> |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 44 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 45 | This isn't necessarily bad! To the contrary, in a table of size 2**i, taking |
| 46 | the low-order i bits as the initial table index is extremely fast, and there |
| 47 | are no collisions at all for dicts indexed by a contiguous range of ints. |
| 48 | The same is approximately true when keys are "consecutive" strings. So this |
| 49 | gives better-than-random behavior in common cases, and that's very desirable. |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 50 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 51 | OTOH, when collisions occur, the tendency to fill contiguous slices of the |
| 52 | hash table makes a good collision resolution strategy crucial. Taking only |
| 53 | the last i bits of the hash code is also vulnerable: for example, consider |
| 54 | [i << 16 for i in range(20000)] as a set of keys. Since ints are their own |
| 55 | hash codes, and this fits in a dict of size 2**15, the last 15 bits of every |
| 56 | hash code are all 0: they *all* map to the same table index. |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 57 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 58 | But catering to unusual cases should not slow the usual ones, so we just take |
| 59 | the last i bits anyway. It's up to collision resolution to do the rest. If |
| 60 | we *usually* find the key we're looking for on the first try (and, it turns |
| 61 | out, we usually do -- the table load factor is kept under 2/3, so the odds |
| 62 | are solidly in our favor), then it makes best sense to keep the initial index |
| 63 | computation dirt cheap. |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 64 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 65 | The first half of collision resolution is to visit table indices via this |
| 66 | recurrence: |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 67 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 68 | j = ((5*j) + 1) mod 2**i |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 69 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 70 | For any initial j in range(2**i), repeating that 2**i times generates each |
| 71 | int in range(2**i) exactly once (see any text on random-number generation for |
| 72 | proof). By itself, this doesn't help much: like linear probing (setting |
| 73 | j += 1, or j -= 1, on each loop trip), it scans the table entries in a fixed |
| 74 | order. This would be bad, except that's not the only thing we do, and it's |
| 75 | actually *good* in the common cases where hash keys are consecutive. In an |
| 76 | example that's really too small to make this entirely clear, for a table of |
| 77 | size 2**3 the order of indices is: |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 78 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 79 | 0 -> 1 -> 6 -> 7 -> 4 -> 5 -> 2 -> 3 -> 0 [and here it's repeating] |
| 80 | |
| 81 | If two things come in at index 5, the first place we look after is index 2, |
| 82 | not 6, so if another comes in at index 6 the collision at 5 didn't hurt it. |
| 83 | Linear probing is deadly in this case because there the fixed probe order |
| 84 | is the *same* as the order consecutive keys are likely to arrive. But it's |
| 85 | extremely unlikely hash codes will follow a 5*j+1 recurrence by accident, |
| 86 | and certain that consecutive hash codes do not. |
| 87 | |
| 88 | The other half of the strategy is to get the other bits of the hash code |
| 89 | into play. This is done by initializing a (unsigned) vrbl "perturb" to the |
| 90 | full hash code, and changing the recurrence to: |
| 91 | |
| 92 | j = (5*j) + 1 + perturb; |
| 93 | perturb >>= PERTURB_SHIFT; |
| 94 | use j % 2**i as the next table index; |
| 95 | |
| 96 | Now the probe sequence depends (eventually) on every bit in the hash code, |
| 97 | and the pseudo-scrambling property of recurring on 5*j+1 is more valuable, |
| 98 | because it quickly magnifies small differences in the bits that didn't affect |
| 99 | the initial index. Note that because perturb is unsigned, if the recurrence |
| 100 | is executed often enough perturb eventually becomes and remains 0. At that |
| 101 | point (very rarely reached) the recurrence is on (just) 5*j+1 again, and |
| 102 | that's certain to find an empty slot eventually (since it generates every int |
| 103 | in range(2**i), and we make sure there's always at least one empty slot). |
| 104 | |
| 105 | Selecting a good value for PERTURB_SHIFT is a balancing act. You want it |
| 106 | small so that the high bits of the hash code continue to affect the probe |
| 107 | sequence across iterations; but you want it large so that in really bad cases |
| 108 | the high-order hash bits have an effect on early iterations. 5 was "the |
| 109 | best" in minimizing total collisions across experiments Tim Peters ran (on |
| 110 | both normal and pathological cases), but 4 and 6 weren't significantly worse. |
| 111 | |
| 112 | Historical: Reimer Behrends contributed the idea of using a polynomial-based |
| 113 | approach, using repeated multiplication by x in GF(2**n) where an irreducible |
| 114 | polynomial for each table size was chosen such that x was a primitive root. |
| 115 | Christian Tismer later extended that to use division by x instead, as an |
| 116 | efficient way to get the high bits of the hash code into play. This scheme |
| 117 | also gave excellent collision statistics, but was more expensive: two |
| 118 | if-tests were required inside the loop; computing "the next" index took about |
| 119 | the same number of operations but without as much potential parallelism |
| 120 | (e.g., computing 5*j can go on at the same time as computing 1+perturb in the |
| 121 | above, and then shifting perturb can be done while the table index is being |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 122 | masked); and the PyDictObject struct required a member to hold the table's |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 123 | polynomial. In Tim's experiments the current scheme ran faster, produced |
| 124 | equally good collision statistics, needed less code & used less memory. |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 125 | |
| 126 | Theoretical Python 2.5 headache: hash codes are only C "long", but |
| 127 | sizeof(Py_ssize_t) > sizeof(long) may be possible. In that case, and if a |
| 128 | dict is genuinely huge, then only the slots directly reachable via indexing |
| 129 | by a C long can be the first slot in a probe sequence. The probe sequence |
| 130 | will still eventually reach every slot in the table, but the collision rate |
| 131 | on initial probes may be much higher than this scheme was designed for. |
| 132 | Getting a hash code as fat as Py_ssize_t is the only real cure. But in |
| 133 | practice, this probably won't make a lick of difference for many years (at |
| 134 | which point everyone will have terabytes of RAM on 64-bit boxes). |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 135 | */ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 136 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 137 | /* Object used as dummy key to fill deleted entries */ |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 138 | static PyObject *dummy = NULL; /* Initialized by first call to newPyDictObject() */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 139 | |
Armin Rigo | e170937 | 2006-04-12 17:06:05 +0000 | [diff] [blame] | 140 | #ifdef Py_REF_DEBUG |
| 141 | PyObject * |
| 142 | _PyDict_Dummy(void) |
| 143 | { |
| 144 | return dummy; |
| 145 | } |
| 146 | #endif |
| 147 | |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 148 | /* forward declarations */ |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 149 | static PyDictEntry * |
| 150 | lookdict_string(PyDictObject *mp, PyObject *key, long hash); |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 151 | |
| 152 | #ifdef SHOW_CONVERSION_COUNTS |
| 153 | static long created = 0L; |
| 154 | static long converted = 0L; |
| 155 | |
| 156 | static void |
| 157 | show_counts(void) |
| 158 | { |
| 159 | fprintf(stderr, "created %ld string dicts\n", created); |
| 160 | fprintf(stderr, "converted %ld to normal dicts\n", converted); |
| 161 | fprintf(stderr, "%.2f%% conversion rate\n", (100.0*converted)/created); |
| 162 | } |
| 163 | #endif |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 164 | |
Christian Heimes | b4ee4a1 | 2008-02-07 17:15:30 +0000 | [diff] [blame] | 165 | /* Debug statistic to compare allocations with reuse through the free list */ |
| 166 | #undef SHOW_ALLOC_COUNT |
| 167 | #ifdef SHOW_ALLOC_COUNT |
| 168 | static size_t count_alloc = 0; |
| 169 | static size_t count_reuse = 0; |
| 170 | |
| 171 | static void |
| 172 | show_alloc(void) |
| 173 | { |
Christian Heimes | 09bde04 | 2008-02-24 12:26:16 +0000 | [diff] [blame] | 174 | fprintf(stderr, "Dict allocations: %" PY_FORMAT_SIZE_T "d\n", |
| 175 | count_alloc); |
| 176 | fprintf(stderr, "Dict reuse through freelist: %" PY_FORMAT_SIZE_T |
| 177 | "d\n", count_reuse); |
Christian Heimes | b4ee4a1 | 2008-02-07 17:15:30 +0000 | [diff] [blame] | 178 | fprintf(stderr, "%.2f%% reuse rate\n\n", |
| 179 | (100.0*count_reuse/(count_alloc+count_reuse))); |
| 180 | } |
| 181 | #endif |
| 182 | |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 183 | /* Initialization macros. |
| 184 | There are two ways to create a dict: PyDict_New() is the main C API |
| 185 | function, and the tp_new slot maps to dict_new(). In the latter case we |
| 186 | can save a little time over what PyDict_New does because it's guaranteed |
| 187 | that the PyDictObject struct is already zeroed out. |
| 188 | Everyone except dict_new() should use EMPTY_TO_MINSIZE (unless they have |
| 189 | an excellent reason not to). |
| 190 | */ |
| 191 | |
| 192 | #define INIT_NONZERO_DICT_SLOTS(mp) do { \ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 193 | (mp)->ma_table = (mp)->ma_smalltable; \ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 194 | (mp)->ma_mask = PyDict_MINSIZE - 1; \ |
| 195 | } while(0) |
| 196 | |
| 197 | #define EMPTY_TO_MINSIZE(mp) do { \ |
| 198 | memset((mp)->ma_smalltable, 0, sizeof((mp)->ma_smalltable)); \ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 199 | (mp)->ma_used = (mp)->ma_fill = 0; \ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 200 | INIT_NONZERO_DICT_SLOTS(mp); \ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 201 | } while(0) |
| 202 | |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 203 | /* Dictionary reuse scheme to save calls to malloc, free, and memset */ |
Christian Heimes | 5b970ad | 2008-02-06 13:33:44 +0000 | [diff] [blame] | 204 | #ifndef PyDict_MAXFREELIST |
| 205 | #define PyDict_MAXFREELIST 80 |
| 206 | #endif |
| 207 | static PyDictObject *free_list[PyDict_MAXFREELIST]; |
| 208 | static int numfree = 0; |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 209 | |
Christian Heimes | f75dbef | 2008-02-08 00:11:31 +0000 | [diff] [blame] | 210 | void |
| 211 | PyDict_Fini(void) |
| 212 | { |
Christian Heimes | 48397d6 | 2008-02-08 00:14:34 +0000 | [diff] [blame] | 213 | PyDictObject *op; |
Christian Heimes | f75dbef | 2008-02-08 00:11:31 +0000 | [diff] [blame] | 214 | |
| 215 | while (numfree) { |
Christian Heimes | 48397d6 | 2008-02-08 00:14:34 +0000 | [diff] [blame] | 216 | op = free_list[--numfree]; |
Christian Heimes | f75dbef | 2008-02-08 00:11:31 +0000 | [diff] [blame] | 217 | assert(PyDict_CheckExact(op)); |
| 218 | PyObject_GC_Del(op); |
| 219 | } |
| 220 | } |
| 221 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 222 | PyObject * |
Thomas Wouters | 7889010 | 2000-07-22 19:25:51 +0000 | [diff] [blame] | 223 | PyDict_New(void) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 224 | { |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 225 | register PyDictObject *mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 226 | if (dummy == NULL) { /* Auto-initialize dummy */ |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 227 | dummy = PyString_FromString("<dummy key>"); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 228 | if (dummy == NULL) |
| 229 | return NULL; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 230 | #ifdef SHOW_CONVERSION_COUNTS |
| 231 | Py_AtExit(show_counts); |
| 232 | #endif |
Christian Heimes | b4ee4a1 | 2008-02-07 17:15:30 +0000 | [diff] [blame] | 233 | #ifdef SHOW_ALLOC_COUNT |
| 234 | Py_AtExit(show_alloc); |
| 235 | #endif |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 236 | } |
Christian Heimes | 5b970ad | 2008-02-06 13:33:44 +0000 | [diff] [blame] | 237 | if (numfree) { |
| 238 | mp = free_list[--numfree]; |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 239 | assert (mp != NULL); |
Christian Heimes | e93237d | 2007-12-19 02:37:44 +0000 | [diff] [blame] | 240 | assert (Py_TYPE(mp) == &PyDict_Type); |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 241 | _Py_NewReference((PyObject *)mp); |
| 242 | if (mp->ma_fill) { |
| 243 | EMPTY_TO_MINSIZE(mp); |
Georg Brandl | 1e13ea9 | 2008-08-11 09:07:59 +0000 | [diff] [blame] | 244 | } else { |
| 245 | /* At least set ma_table and ma_mask; these are wrong |
| 246 | if an empty but presized dict is added to freelist */ |
| 247 | INIT_NONZERO_DICT_SLOTS(mp); |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 248 | } |
| 249 | assert (mp->ma_used == 0); |
| 250 | assert (mp->ma_table == mp->ma_smalltable); |
| 251 | assert (mp->ma_mask == PyDict_MINSIZE - 1); |
Christian Heimes | b4ee4a1 | 2008-02-07 17:15:30 +0000 | [diff] [blame] | 252 | #ifdef SHOW_ALLOC_COUNT |
| 253 | count_reuse++; |
| 254 | #endif |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 255 | } else { |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 256 | mp = PyObject_GC_New(PyDictObject, &PyDict_Type); |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 257 | if (mp == NULL) |
| 258 | return NULL; |
| 259 | EMPTY_TO_MINSIZE(mp); |
Christian Heimes | b4ee4a1 | 2008-02-07 17:15:30 +0000 | [diff] [blame] | 260 | #ifdef SHOW_ALLOC_COUNT |
| 261 | count_alloc++; |
| 262 | #endif |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 263 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 264 | mp->ma_lookup = lookdict_string; |
| 265 | #ifdef SHOW_CONVERSION_COUNTS |
| 266 | ++created; |
| 267 | #endif |
Neil Schemenauer | e83c00e | 2001-08-29 23:54:21 +0000 | [diff] [blame] | 268 | _PyObject_GC_TRACK(mp); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 269 | return (PyObject *)mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 270 | } |
| 271 | |
| 272 | /* |
| 273 | The basic lookup function used by all operations. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 274 | 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] | 275 | Open addressing is preferred over chaining since the link overhead for |
| 276 | chaining would be substantial (100% with typical malloc overhead). |
| 277 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 278 | The initial probe index is computed as hash mod the table size. Subsequent |
| 279 | probe indices are computed as explained earlier. |
Guido van Rossum | 2bc1379 | 1999-03-24 19:06:42 +0000 | [diff] [blame] | 280 | |
| 281 | All arithmetic on hash should ignore overflow. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 282 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 283 | (The details in this version are due to Tim Peters, building on many past |
| 284 | contributions by Reimer Behrends, Jyrki Alakuijala, Vladimir Marangozov and |
| 285 | Christian Tismer). |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 286 | |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 287 | lookdict() is general-purpose, and may return NULL if (and only if) a |
| 288 | comparison raises an exception (this was new in Python 2.5). |
| 289 | lookdict_string() below is specialized to string keys, comparison of which can |
| 290 | never raise an exception; that function can never return NULL. For both, when |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 291 | the key isn't found a PyDictEntry* is returned for which the me_value field is |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 292 | NULL; this is the slot in the dict at which the key would have been found, and |
| 293 | the caller can (if it wishes) add the <key, value> pair to the returned |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 294 | PyDictEntry*. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 295 | */ |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 296 | static PyDictEntry * |
| 297 | lookdict(PyDictObject *mp, PyObject *key, register long hash) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 298 | { |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 299 | register size_t i; |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 300 | register size_t perturb; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 301 | register PyDictEntry *freeslot; |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 302 | register size_t mask = (size_t)mp->ma_mask; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 303 | PyDictEntry *ep0 = mp->ma_table; |
| 304 | register PyDictEntry *ep; |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 305 | register int cmp; |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 306 | PyObject *startkey; |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 307 | |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 308 | i = (size_t)hash & mask; |
Guido van Rossum | efb4609 | 1997-01-29 15:53:56 +0000 | [diff] [blame] | 309 | ep = &ep0[i]; |
Guido van Rossum | c1c7b1a | 1998-10-06 16:01:14 +0000 | [diff] [blame] | 310 | if (ep->me_key == NULL || ep->me_key == key) |
Guido van Rossum | 7d18159 | 1997-01-16 21:06:45 +0000 | [diff] [blame] | 311 | return ep; |
Tim Peters | 7b5d0af | 2001-06-03 04:14:43 +0000 | [diff] [blame] | 312 | |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 313 | if (ep->me_key == dummy) |
Guido van Rossum | 7d18159 | 1997-01-16 21:06:45 +0000 | [diff] [blame] | 314 | freeslot = ep; |
Guido van Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 315 | else { |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 316 | if (ep->me_hash == hash) { |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 317 | startkey = ep->me_key; |
Georg Brandl | ede3a32 | 2007-11-29 18:33:01 +0000 | [diff] [blame] | 318 | Py_INCREF(startkey); |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 319 | cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); |
Georg Brandl | ede3a32 | 2007-11-29 18:33:01 +0000 | [diff] [blame] | 320 | Py_DECREF(startkey); |
Tim Peters | 7b5d0af | 2001-06-03 04:14:43 +0000 | [diff] [blame] | 321 | if (cmp < 0) |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 322 | return NULL; |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 323 | if (ep0 == mp->ma_table && ep->me_key == startkey) { |
| 324 | if (cmp > 0) |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 325 | return ep; |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 326 | } |
| 327 | else { |
| 328 | /* The compare did major nasty stuff to the |
| 329 | * dict: start over. |
| 330 | * XXX A clever adversary could prevent this |
| 331 | * XXX from terminating. |
| 332 | */ |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 333 | return lookdict(mp, key, hash); |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 334 | } |
Guido van Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 335 | } |
| 336 | freeslot = NULL; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 337 | } |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 338 | |
Tim Peters | 342c65e | 2001-05-13 06:43:53 +0000 | [diff] [blame] | 339 | /* In the loop, me_key == dummy is by far (factor of 100s) the |
| 340 | least likely outcome, so test for that last. */ |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 341 | for (perturb = hash; ; perturb >>= PERTURB_SHIFT) { |
| 342 | i = (i << 2) + i + perturb + 1; |
| 343 | ep = &ep0[i & mask]; |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 344 | if (ep->me_key == NULL) |
| 345 | return freeslot == NULL ? ep : freeslot; |
Tim Peters | 7b5d0af | 2001-06-03 04:14:43 +0000 | [diff] [blame] | 346 | if (ep->me_key == key) |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 347 | return ep; |
Tim Peters | 7b5d0af | 2001-06-03 04:14:43 +0000 | [diff] [blame] | 348 | if (ep->me_hash == hash && ep->me_key != dummy) { |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 349 | startkey = ep->me_key; |
Georg Brandl | ede3a32 | 2007-11-29 18:33:01 +0000 | [diff] [blame] | 350 | Py_INCREF(startkey); |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 351 | cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); |
Georg Brandl | ede3a32 | 2007-11-29 18:33:01 +0000 | [diff] [blame] | 352 | Py_DECREF(startkey); |
Tim Peters | 7b5d0af | 2001-06-03 04:14:43 +0000 | [diff] [blame] | 353 | if (cmp < 0) |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 354 | return NULL; |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 355 | if (ep0 == mp->ma_table && ep->me_key == startkey) { |
| 356 | if (cmp > 0) |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 357 | return ep; |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 358 | } |
| 359 | else { |
| 360 | /* The compare did major nasty stuff to the |
| 361 | * dict: start over. |
| 362 | * XXX A clever adversary could prevent this |
| 363 | * XXX from terminating. |
| 364 | */ |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 365 | return lookdict(mp, key, hash); |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 366 | } |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 367 | } |
Tim Peters | 342c65e | 2001-05-13 06:43:53 +0000 | [diff] [blame] | 368 | else if (ep->me_key == dummy && freeslot == NULL) |
| 369 | freeslot = ep; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 370 | } |
Neal Norwitz | a5ccda9 | 2006-10-28 21:16:54 +0000 | [diff] [blame] | 371 | assert(0); /* NOT REACHED */ |
| 372 | return 0; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 373 | } |
| 374 | |
| 375 | /* |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 376 | * Hacked up version of lookdict which can assume keys are always strings; |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 377 | * this assumption allows testing for errors during PyObject_RichCompareBool() |
| 378 | * to be dropped; string-string comparisons never raise exceptions. This also |
| 379 | * means we don't need to go through PyObject_RichCompareBool(); we can always |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 380 | * use _PyString_Eq() directly. |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 381 | * |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 382 | * This is valuable because dicts with only string keys are very common. |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 383 | */ |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 384 | static PyDictEntry * |
| 385 | lookdict_string(PyDictObject *mp, PyObject *key, register long hash) |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 386 | { |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 387 | register size_t i; |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 388 | register size_t perturb; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 389 | register PyDictEntry *freeslot; |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 390 | register size_t mask = (size_t)mp->ma_mask; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 391 | PyDictEntry *ep0 = mp->ma_table; |
| 392 | register PyDictEntry *ep; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 393 | |
Tim Peters | 0ab085c | 2001-09-14 00:25:33 +0000 | [diff] [blame] | 394 | /* Make sure this function doesn't have to handle non-string keys, |
| 395 | including subclasses of str; e.g., one reason to subclass |
| 396 | strings is to override __eq__, and for speed we don't cater to |
| 397 | that here. */ |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 398 | if (!PyString_CheckExact(key)) { |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 399 | #ifdef SHOW_CONVERSION_COUNTS |
| 400 | ++converted; |
| 401 | #endif |
| 402 | mp->ma_lookup = lookdict; |
| 403 | return lookdict(mp, key, hash); |
| 404 | } |
Tim Peters | 2f228e7 | 2001-05-13 00:19:31 +0000 | [diff] [blame] | 405 | i = hash & mask; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 406 | ep = &ep0[i]; |
| 407 | if (ep->me_key == NULL || ep->me_key == key) |
| 408 | return ep; |
| 409 | if (ep->me_key == dummy) |
| 410 | freeslot = ep; |
| 411 | else { |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 412 | if (ep->me_hash == hash && _PyString_Eq(ep->me_key, key)) |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 413 | return ep; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 414 | freeslot = NULL; |
| 415 | } |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 416 | |
Tim Peters | 342c65e | 2001-05-13 06:43:53 +0000 | [diff] [blame] | 417 | /* In the loop, me_key == dummy is by far (factor of 100s) the |
| 418 | least likely outcome, so test for that last. */ |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 419 | for (perturb = hash; ; perturb >>= PERTURB_SHIFT) { |
| 420 | i = (i << 2) + i + perturb + 1; |
| 421 | ep = &ep0[i & mask]; |
Tim Peters | 342c65e | 2001-05-13 06:43:53 +0000 | [diff] [blame] | 422 | if (ep->me_key == NULL) |
| 423 | return freeslot == NULL ? ep : freeslot; |
| 424 | if (ep->me_key == key |
| 425 | || (ep->me_hash == hash |
| 426 | && ep->me_key != dummy |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 427 | && _PyString_Eq(ep->me_key, key))) |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 428 | return ep; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 429 | if (ep->me_key == dummy && freeslot == NULL) |
Tim Peters | 342c65e | 2001-05-13 06:43:53 +0000 | [diff] [blame] | 430 | freeslot = ep; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 431 | } |
Neal Norwitz | a5ccda9 | 2006-10-28 21:16:54 +0000 | [diff] [blame] | 432 | assert(0); /* NOT REACHED */ |
| 433 | return 0; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 434 | } |
| 435 | |
| 436 | /* |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 437 | Internal routine to insert a new item into the table. |
| 438 | Used both by the internal resize routine and by the public insert routine. |
| 439 | Eats a reference to key and one to value. |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 440 | Returns -1 if an error occurred, or 0 on success. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 441 | */ |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 442 | static int |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 443 | insertdict(register PyDictObject *mp, PyObject *key, long hash, PyObject *value) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 444 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 445 | PyObject *old_value; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 446 | register PyDictEntry *ep; |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 447 | typedef PyDictEntry *(*lookupfunc)(PyDictObject *, PyObject *, long); |
| 448 | |
| 449 | assert(mp->ma_lookup != NULL); |
| 450 | ep = mp->ma_lookup(mp, key, hash); |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 451 | if (ep == NULL) { |
| 452 | Py_DECREF(key); |
| 453 | Py_DECREF(value); |
| 454 | return -1; |
| 455 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 456 | if (ep->me_value != NULL) { |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 457 | old_value = ep->me_value; |
| 458 | ep->me_value = value; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 459 | Py_DECREF(old_value); /* which **CAN** re-enter */ |
| 460 | Py_DECREF(key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 461 | } |
| 462 | else { |
| 463 | if (ep->me_key == NULL) |
| 464 | mp->ma_fill++; |
Raymond Hettinger | 07ead17 | 2005-02-05 23:42:57 +0000 | [diff] [blame] | 465 | else { |
| 466 | assert(ep->me_key == dummy); |
| 467 | Py_DECREF(dummy); |
| 468 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 469 | ep->me_key = key; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 470 | ep->me_hash = (Py_ssize_t)hash; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 471 | ep->me_value = value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 472 | mp->ma_used++; |
| 473 | } |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 474 | return 0; |
| 475 | } |
| 476 | |
| 477 | /* |
| 478 | Internal routine used by dictresize() to insert an item which is |
| 479 | known to be absent from the dict. This routine also assumes that |
| 480 | the dict contains no deleted entries. Besides the performance benefit, |
| 481 | using insertdict() in dictresize() is dangerous (SF bug #1456209). |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 482 | Note that no refcounts are changed by this routine; if needed, the caller |
| 483 | is responsible for incref'ing `key` and `value`. |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 484 | */ |
| 485 | static void |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 486 | insertdict_clean(register PyDictObject *mp, PyObject *key, long hash, |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 487 | PyObject *value) |
| 488 | { |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 489 | register size_t i; |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 490 | register size_t perturb; |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 491 | register size_t mask = (size_t)mp->ma_mask; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 492 | PyDictEntry *ep0 = mp->ma_table; |
| 493 | register PyDictEntry *ep; |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 494 | |
| 495 | i = hash & mask; |
| 496 | ep = &ep0[i]; |
| 497 | for (perturb = hash; ep->me_key != NULL; perturb >>= PERTURB_SHIFT) { |
| 498 | i = (i << 2) + i + perturb + 1; |
| 499 | ep = &ep0[i & mask]; |
| 500 | } |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 501 | assert(ep->me_value == NULL); |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 502 | mp->ma_fill++; |
| 503 | ep->me_key = key; |
| 504 | ep->me_hash = (Py_ssize_t)hash; |
| 505 | ep->me_value = value; |
| 506 | mp->ma_used++; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 507 | } |
| 508 | |
| 509 | /* |
| 510 | Restructure the table by allocating a new table and reinserting all |
| 511 | items again. When entries have been deleted, the new table may |
| 512 | actually be smaller than the old one. |
| 513 | */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 514 | static int |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 515 | dictresize(PyDictObject *mp, Py_ssize_t minused) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 516 | { |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 517 | Py_ssize_t newsize; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 518 | PyDictEntry *oldtable, *newtable, *ep; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 519 | Py_ssize_t i; |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 520 | int is_oldtable_malloced; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 521 | PyDictEntry small_copy[PyDict_MINSIZE]; |
Tim Peters | 91a364d | 2001-05-19 07:04:38 +0000 | [diff] [blame] | 522 | |
| 523 | assert(minused >= 0); |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 524 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 525 | /* Find the smallest table size > minused. */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 526 | for (newsize = PyDict_MINSIZE; |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 527 | newsize <= minused && newsize > 0; |
| 528 | newsize <<= 1) |
| 529 | ; |
| 530 | if (newsize <= 0) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 531 | PyErr_NoMemory(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 532 | return -1; |
| 533 | } |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 534 | |
| 535 | /* Get space for a new table. */ |
| 536 | oldtable = mp->ma_table; |
| 537 | assert(oldtable != NULL); |
| 538 | is_oldtable_malloced = oldtable != mp->ma_smalltable; |
| 539 | |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 540 | if (newsize == PyDict_MINSIZE) { |
Tim Peters | f8a548c | 2001-05-24 16:26:40 +0000 | [diff] [blame] | 541 | /* A large table is shrinking, or we can't get any smaller. */ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 542 | newtable = mp->ma_smalltable; |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 543 | if (newtable == oldtable) { |
Tim Peters | f8a548c | 2001-05-24 16:26:40 +0000 | [diff] [blame] | 544 | if (mp->ma_fill == mp->ma_used) { |
| 545 | /* No dummies, so no point doing anything. */ |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 546 | return 0; |
Tim Peters | f8a548c | 2001-05-24 16:26:40 +0000 | [diff] [blame] | 547 | } |
| 548 | /* We're not going to resize it, but rebuild the |
| 549 | table anyway to purge old dummy entries. |
| 550 | Subtle: This is *necessary* if fill==size, |
| 551 | as lookdict needs at least one virgin slot to |
| 552 | terminate failing searches. If fill < size, it's |
| 553 | merely desirable, as dummies slow searches. */ |
| 554 | assert(mp->ma_fill > mp->ma_used); |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 555 | memcpy(small_copy, oldtable, sizeof(small_copy)); |
| 556 | oldtable = small_copy; |
| 557 | } |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 558 | } |
| 559 | else { |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 560 | newtable = PyMem_NEW(PyDictEntry, newsize); |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 561 | if (newtable == NULL) { |
| 562 | PyErr_NoMemory(); |
| 563 | return -1; |
| 564 | } |
| 565 | } |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 566 | |
| 567 | /* Make the dict empty, using the new table. */ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 568 | assert(newtable != oldtable); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 569 | mp->ma_table = newtable; |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 570 | mp->ma_mask = newsize - 1; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 571 | memset(newtable, 0, sizeof(PyDictEntry) * newsize); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 572 | mp->ma_used = 0; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 573 | i = mp->ma_fill; |
| 574 | mp->ma_fill = 0; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 575 | |
Tim Peters | 1928314 | 2001-05-17 22:25:34 +0000 | [diff] [blame] | 576 | /* Copy the data over; this is refcount-neutral for active entries; |
| 577 | dummy entries aren't copied over, of course */ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 578 | for (ep = oldtable; i > 0; ep++) { |
| 579 | if (ep->me_value != NULL) { /* active entry */ |
| 580 | --i; |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 581 | insertdict_clean(mp, ep->me_key, (long)ep->me_hash, |
| 582 | ep->me_value); |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 583 | } |
Tim Peters | 1928314 | 2001-05-17 22:25:34 +0000 | [diff] [blame] | 584 | else if (ep->me_key != NULL) { /* dummy entry */ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 585 | --i; |
Tim Peters | 1928314 | 2001-05-17 22:25:34 +0000 | [diff] [blame] | 586 | assert(ep->me_key == dummy); |
| 587 | Py_DECREF(ep->me_key); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 588 | } |
Tim Peters | 1928314 | 2001-05-17 22:25:34 +0000 | [diff] [blame] | 589 | /* else key == value == NULL: nothing to do */ |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 590 | } |
| 591 | |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 592 | if (is_oldtable_malloced) |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 593 | PyMem_DEL(oldtable); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 594 | return 0; |
| 595 | } |
| 596 | |
Raymond Hettinger | fd7ed40 | 2007-12-18 21:24:09 +0000 | [diff] [blame] | 597 | /* Create a new dictionary pre-sized to hold an estimated number of elements. |
| 598 | Underestimates are okay because the dictionary will resize as necessary. |
| 599 | Overestimates just mean the dictionary will be more sparse than usual. |
| 600 | */ |
| 601 | |
| 602 | PyObject * |
| 603 | _PyDict_NewPresized(Py_ssize_t minused) |
| 604 | { |
| 605 | PyObject *op = PyDict_New(); |
| 606 | |
| 607 | if (minused>5 && op != NULL && dictresize((PyDictObject *)op, minused) == -1) { |
| 608 | Py_DECREF(op); |
| 609 | return NULL; |
| 610 | } |
| 611 | return op; |
| 612 | } |
| 613 | |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 614 | /* Note that, for historical reasons, PyDict_GetItem() suppresses all errors |
| 615 | * that may occur (originally dicts supported only string keys, and exceptions |
| 616 | * weren't possible). So, while the original intent was that a NULL return |
Andrew M. Kuchling | 0067b5f | 2006-08-04 20:37:43 +0000 | [diff] [blame] | 617 | * meant the key wasn't present, in reality it can mean that, or that an error |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 618 | * (suppressed) occurred while computing the key's hash, or that some error |
| 619 | * (suppressed) occurred when comparing keys in the dict's internal probe |
| 620 | * sequence. A nasty example of the latter is when a Python-coded comparison |
| 621 | * function hits a stack-depth error, which can cause this to return NULL |
| 622 | * even if the key is present. |
| 623 | */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 624 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 625 | PyDict_GetItem(PyObject *op, PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 626 | { |
| 627 | long hash; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 628 | PyDictObject *mp = (PyDictObject *)op; |
| 629 | PyDictEntry *ep; |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 630 | PyThreadState *tstate; |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 631 | if (!PyDict_Check(op)) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 632 | return NULL; |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 633 | if (!PyString_CheckExact(key) || |
| 634 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 635 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 636 | hash = PyObject_Hash(key); |
Guido van Rossum | 474b19e | 1998-05-14 01:00:51 +0000 | [diff] [blame] | 637 | if (hash == -1) { |
| 638 | PyErr_Clear(); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 639 | return NULL; |
Guido van Rossum | 474b19e | 1998-05-14 01:00:51 +0000 | [diff] [blame] | 640 | } |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 641 | } |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 642 | |
| 643 | /* We can arrive here with a NULL tstate during initialization: |
| 644 | try running "python -Wi" for an example related to string |
| 645 | interning. Let's just hope that no exception occurs then... */ |
Armin Rigo | acd0d6d | 2006-06-10 10:57:40 +0000 | [diff] [blame] | 646 | tstate = _PyThreadState_Current; |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 647 | if (tstate != NULL && tstate->curexc_type != NULL) { |
| 648 | /* preserve the existing exception */ |
| 649 | PyObject *err_type, *err_value, *err_tb; |
| 650 | PyErr_Fetch(&err_type, &err_value, &err_tb); |
| 651 | ep = (mp->ma_lookup)(mp, key, hash); |
| 652 | /* ignore errors */ |
| 653 | PyErr_Restore(err_type, err_value, err_tb); |
| 654 | if (ep == NULL) |
| 655 | return NULL; |
| 656 | } |
| 657 | else { |
| 658 | ep = (mp->ma_lookup)(mp, key, hash); |
| 659 | if (ep == NULL) { |
| 660 | PyErr_Clear(); |
| 661 | return NULL; |
| 662 | } |
| 663 | } |
| 664 | return ep->me_value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 665 | } |
| 666 | |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 667 | /* CAUTION: PyDict_SetItem() must guarantee that it won't resize the |
Tim Peters | 60b2996 | 2006-01-01 01:19:23 +0000 | [diff] [blame] | 668 | * dictionary if it's merely replacing the value for an existing key. |
| 669 | * This means that it's safe to loop over a dictionary with PyDict_Next() |
| 670 | * and occasionally replace a value -- but you can't insert new keys or |
| 671 | * remove them. |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 672 | */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 673 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 674 | PyDict_SetItem(register PyObject *op, PyObject *key, PyObject *value) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 675 | { |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 676 | register PyDictObject *mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 677 | register long hash; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 678 | register Py_ssize_t n_used; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 679 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 680 | if (!PyDict_Check(op)) { |
| 681 | PyErr_BadInternalCall(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 682 | return -1; |
| 683 | } |
Neal Norwitz | 48808a1 | 2006-07-21 05:29:58 +0000 | [diff] [blame] | 684 | assert(key); |
| 685 | assert(value); |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 686 | mp = (PyDictObject *)op; |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 687 | if (PyString_CheckExact(key)) { |
| 688 | hash = ((PyStringObject *)key)->ob_shash; |
Guido van Rossum | 45ec02a | 2002-08-19 21:43:18 +0000 | [diff] [blame] | 689 | if (hash == -1) |
| 690 | hash = PyObject_Hash(key); |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 691 | } |
Tim Peters | 1f7df35 | 2002-03-29 03:29:08 +0000 | [diff] [blame] | 692 | else { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 693 | hash = PyObject_Hash(key); |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 694 | if (hash == -1) |
| 695 | return -1; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 696 | } |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 697 | assert(mp->ma_fill <= mp->ma_mask); /* at least one empty slot */ |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 698 | n_used = mp->ma_used; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 699 | Py_INCREF(value); |
| 700 | Py_INCREF(key); |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 701 | if (insertdict(mp, key, hash, value) != 0) |
| 702 | return -1; |
Raymond Hettinger | 3539f6b | 2003-05-05 22:22:10 +0000 | [diff] [blame] | 703 | /* If we added a key, we can safely resize. Otherwise just return! |
| 704 | * If fill >= 2/3 size, adjust size. Normally, this doubles or |
| 705 | * quaduples the size, but it's also possible for the dict to shrink |
Tim Peters | 60b2996 | 2006-01-01 01:19:23 +0000 | [diff] [blame] | 706 | * (if ma_fill is much larger than ma_used, meaning a lot of dict |
Raymond Hettinger | 3539f6b | 2003-05-05 22:22:10 +0000 | [diff] [blame] | 707 | * keys have been * deleted). |
Tim Peters | 60b2996 | 2006-01-01 01:19:23 +0000 | [diff] [blame] | 708 | * |
Raymond Hettinger | 3539f6b | 2003-05-05 22:22:10 +0000 | [diff] [blame] | 709 | * Quadrupling the size improves average dictionary sparseness |
| 710 | * (reducing collisions) at the cost of some memory and iteration |
| 711 | * speed (which loops over every possible entry). It also halves |
Neal Norwitz | 80af59c | 2006-05-30 04:19:21 +0000 | [diff] [blame] | 712 | * the number of expensive resize operations in a growing dictionary. |
Tim Peters | 60b2996 | 2006-01-01 01:19:23 +0000 | [diff] [blame] | 713 | * |
| 714 | * Very large dictionaries (over 50K items) use doubling instead. |
Raymond Hettinger | 3539f6b | 2003-05-05 22:22:10 +0000 | [diff] [blame] | 715 | * This may help applications with severe memory constraints. |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 716 | */ |
Raymond Hettinger | 3539f6b | 2003-05-05 22:22:10 +0000 | [diff] [blame] | 717 | if (!(mp->ma_used > n_used && mp->ma_fill*3 >= (mp->ma_mask+1)*2)) |
| 718 | return 0; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 719 | return dictresize(mp, (mp->ma_used > 50000 ? 2 : 4) * mp->ma_used); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 720 | } |
| 721 | |
| 722 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 723 | PyDict_DelItem(PyObject *op, PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 724 | { |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 725 | register PyDictObject *mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 726 | register long hash; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 727 | register PyDictEntry *ep; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 728 | PyObject *old_value, *old_key; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 729 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 730 | if (!PyDict_Check(op)) { |
| 731 | PyErr_BadInternalCall(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 732 | return -1; |
| 733 | } |
Neal Norwitz | 48808a1 | 2006-07-21 05:29:58 +0000 | [diff] [blame] | 734 | assert(key); |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 735 | if (!PyString_CheckExact(key) || |
| 736 | (hash = ((PyStringObject *) key)->ob_shash) == -1) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 737 | hash = PyObject_Hash(key); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 738 | if (hash == -1) |
| 739 | return -1; |
| 740 | } |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 741 | mp = (PyDictObject *)op; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 742 | ep = (mp->ma_lookup)(mp, key, hash); |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 743 | if (ep == NULL) |
| 744 | return -1; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 745 | if (ep->me_value == NULL) { |
Georg Brandl | b9f4ad3 | 2006-10-29 18:31:42 +0000 | [diff] [blame] | 746 | set_key_error(key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 747 | return -1; |
| 748 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 749 | old_key = ep->me_key; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 750 | Py_INCREF(dummy); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 751 | ep->me_key = dummy; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 752 | old_value = ep->me_value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 753 | ep->me_value = NULL; |
| 754 | mp->ma_used--; |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame] | 755 | Py_DECREF(old_value); |
| 756 | Py_DECREF(old_key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 757 | return 0; |
| 758 | } |
| 759 | |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 760 | void |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 761 | PyDict_Clear(PyObject *op) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 762 | { |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 763 | PyDictObject *mp; |
| 764 | PyDictEntry *ep, *table; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 765 | int table_is_malloced; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 766 | Py_ssize_t fill; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 767 | PyDictEntry small_copy[PyDict_MINSIZE]; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 768 | #ifdef Py_DEBUG |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 769 | Py_ssize_t i, n; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 770 | #endif |
| 771 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 772 | if (!PyDict_Check(op)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 773 | return; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 774 | mp = (PyDictObject *)op; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 775 | #ifdef Py_DEBUG |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 776 | n = mp->ma_mask + 1; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 777 | i = 0; |
| 778 | #endif |
| 779 | |
| 780 | table = mp->ma_table; |
| 781 | assert(table != NULL); |
| 782 | table_is_malloced = table != mp->ma_smalltable; |
| 783 | |
| 784 | /* This is delicate. During the process of clearing the dict, |
| 785 | * decrefs can cause the dict to mutate. To avoid fatal confusion |
| 786 | * (voice of experience), we have to make the dict empty before |
| 787 | * clearing the slots, and never refer to anything via mp->xxx while |
| 788 | * clearing. |
| 789 | */ |
| 790 | fill = mp->ma_fill; |
| 791 | if (table_is_malloced) |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 792 | EMPTY_TO_MINSIZE(mp); |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 793 | |
| 794 | else if (fill > 0) { |
| 795 | /* It's a small table with something that needs to be cleared. |
| 796 | * Afraid the only safe way is to copy the dict entries into |
| 797 | * another small table first. |
| 798 | */ |
| 799 | memcpy(small_copy, table, sizeof(small_copy)); |
| 800 | table = small_copy; |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 801 | EMPTY_TO_MINSIZE(mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 802 | } |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 803 | /* else it's a small table that's already empty */ |
| 804 | |
| 805 | /* Now we can finally clear things. If C had refcounts, we could |
| 806 | * assert that the refcount on table is 1 now, i.e. that this function |
| 807 | * has unique access to it, so decref side-effects can't alter it. |
| 808 | */ |
| 809 | for (ep = table; fill > 0; ++ep) { |
| 810 | #ifdef Py_DEBUG |
| 811 | assert(i < n); |
| 812 | ++i; |
| 813 | #endif |
| 814 | if (ep->me_key) { |
| 815 | --fill; |
| 816 | Py_DECREF(ep->me_key); |
| 817 | Py_XDECREF(ep->me_value); |
| 818 | } |
| 819 | #ifdef Py_DEBUG |
| 820 | else |
| 821 | assert(ep->me_value == NULL); |
| 822 | #endif |
| 823 | } |
| 824 | |
| 825 | if (table_is_malloced) |
| 826 | PyMem_DEL(table); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 827 | } |
| 828 | |
Tim Peters | 080c88b | 2003-02-15 03:01:11 +0000 | [diff] [blame] | 829 | /* |
| 830 | * Iterate over a dict. Use like so: |
| 831 | * |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 832 | * Py_ssize_t i; |
Tim Peters | 080c88b | 2003-02-15 03:01:11 +0000 | [diff] [blame] | 833 | * PyObject *key, *value; |
| 834 | * i = 0; # important! i should not otherwise be changed by you |
Neal Norwitz | 0732301 | 2003-02-15 14:45:12 +0000 | [diff] [blame] | 835 | * while (PyDict_Next(yourdict, &i, &key, &value)) { |
Tim Peters | 080c88b | 2003-02-15 03:01:11 +0000 | [diff] [blame] | 836 | * Refer to borrowed references in key and value. |
| 837 | * } |
| 838 | * |
| 839 | * CAUTION: In general, it isn't safe to use PyDict_Next in a loop that |
Tim Peters | 6783070 | 2001-03-21 19:23:56 +0000 | [diff] [blame] | 840 | * mutates the dict. One exception: it is safe if the loop merely changes |
| 841 | * the values associated with the keys (but doesn't insert new keys or |
| 842 | * delete keys), via PyDict_SetItem(). |
| 843 | */ |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 844 | int |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 845 | PyDict_Next(PyObject *op, Py_ssize_t *ppos, PyObject **pkey, PyObject **pvalue) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 846 | { |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 847 | register Py_ssize_t i; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 848 | register Py_ssize_t mask; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 849 | register PyDictEntry *ep; |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 850 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 851 | if (!PyDict_Check(op)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 852 | return 0; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 853 | i = *ppos; |
| 854 | if (i < 0) |
| 855 | return 0; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 856 | ep = ((PyDictObject *)op)->ma_table; |
| 857 | mask = ((PyDictObject *)op)->ma_mask; |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 858 | while (i <= mask && ep[i].me_value == NULL) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 859 | i++; |
| 860 | *ppos = i+1; |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 861 | if (i > mask) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 862 | return 0; |
| 863 | if (pkey) |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 864 | *pkey = ep[i].me_key; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 865 | if (pvalue) |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 866 | *pvalue = ep[i].me_value; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 867 | return 1; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 868 | } |
| 869 | |
Raymond Hettinger | d6fc72a | 2007-02-19 02:03:19 +0000 | [diff] [blame] | 870 | /* Internal version of PyDict_Next that returns a hash value in addition to the key and value.*/ |
| 871 | int |
| 872 | _PyDict_Next(PyObject *op, Py_ssize_t *ppos, PyObject **pkey, PyObject **pvalue, long *phash) |
| 873 | { |
| 874 | register Py_ssize_t i; |
| 875 | register Py_ssize_t mask; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 876 | register PyDictEntry *ep; |
Raymond Hettinger | d6fc72a | 2007-02-19 02:03:19 +0000 | [diff] [blame] | 877 | |
| 878 | if (!PyDict_Check(op)) |
| 879 | return 0; |
| 880 | i = *ppos; |
| 881 | if (i < 0) |
| 882 | return 0; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 883 | ep = ((PyDictObject *)op)->ma_table; |
| 884 | mask = ((PyDictObject *)op)->ma_mask; |
Raymond Hettinger | d6fc72a | 2007-02-19 02:03:19 +0000 | [diff] [blame] | 885 | while (i <= mask && ep[i].me_value == NULL) |
| 886 | i++; |
| 887 | *ppos = i+1; |
| 888 | if (i > mask) |
| 889 | return 0; |
| 890 | *phash = (long)(ep[i].me_hash); |
| 891 | if (pkey) |
| 892 | *pkey = ep[i].me_key; |
| 893 | if (pvalue) |
| 894 | *pvalue = ep[i].me_value; |
| 895 | return 1; |
| 896 | } |
| 897 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 898 | /* Methods */ |
| 899 | |
| 900 | static void |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 901 | dict_dealloc(register PyDictObject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 902 | { |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 903 | register PyDictEntry *ep; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 904 | Py_ssize_t fill = mp->ma_fill; |
Guido van Rossum | ff413af | 2002-03-28 20:34:59 +0000 | [diff] [blame] | 905 | PyObject_GC_UnTrack(mp); |
Guido van Rossum | d724b23 | 2000-03-13 16:01:29 +0000 | [diff] [blame] | 906 | Py_TRASHCAN_SAFE_BEGIN(mp) |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 907 | for (ep = mp->ma_table; fill > 0; ep++) { |
| 908 | if (ep->me_key) { |
| 909 | --fill; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 910 | Py_DECREF(ep->me_key); |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 911 | Py_XDECREF(ep->me_value); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 912 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 913 | } |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 914 | if (mp->ma_table != mp->ma_smalltable) |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 915 | PyMem_DEL(mp->ma_table); |
Christian Heimes | 5b970ad | 2008-02-06 13:33:44 +0000 | [diff] [blame] | 916 | if (numfree < PyDict_MAXFREELIST && Py_TYPE(mp) == &PyDict_Type) |
| 917 | free_list[numfree++] = mp; |
Tim Peters | 60b2996 | 2006-01-01 01:19:23 +0000 | [diff] [blame] | 918 | else |
Christian Heimes | e93237d | 2007-12-19 02:37:44 +0000 | [diff] [blame] | 919 | Py_TYPE(mp)->tp_free((PyObject *)mp); |
Guido van Rossum | d724b23 | 2000-03-13 16:01:29 +0000 | [diff] [blame] | 920 | Py_TRASHCAN_SAFE_END(mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 921 | } |
| 922 | |
| 923 | static int |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 924 | dict_print(register PyDictObject *mp, register FILE *fp, register int flags) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 925 | { |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 926 | register Py_ssize_t i; |
| 927 | register Py_ssize_t any; |
Tim Peters | 33f4a6a | 2006-05-30 05:23:59 +0000 | [diff] [blame] | 928 | int status; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 929 | |
Tim Peters | 33f4a6a | 2006-05-30 05:23:59 +0000 | [diff] [blame] | 930 | status = Py_ReprEnter((PyObject*)mp); |
| 931 | if (status != 0) { |
| 932 | if (status < 0) |
| 933 | return status; |
Brett Cannon | 0153159 | 2007-09-17 03:28:34 +0000 | [diff] [blame] | 934 | Py_BEGIN_ALLOW_THREADS |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 935 | fprintf(fp, "{...}"); |
Brett Cannon | 0153159 | 2007-09-17 03:28:34 +0000 | [diff] [blame] | 936 | Py_END_ALLOW_THREADS |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 937 | return 0; |
| 938 | } |
| 939 | |
Brett Cannon | 0153159 | 2007-09-17 03:28:34 +0000 | [diff] [blame] | 940 | Py_BEGIN_ALLOW_THREADS |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 941 | fprintf(fp, "{"); |
Brett Cannon | 0153159 | 2007-09-17 03:28:34 +0000 | [diff] [blame] | 942 | Py_END_ALLOW_THREADS |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 943 | any = 0; |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 944 | for (i = 0; i <= mp->ma_mask; i++) { |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 945 | PyDictEntry *ep = mp->ma_table + i; |
Tim Peters | 23cf6be | 2001-06-02 08:02:56 +0000 | [diff] [blame] | 946 | PyObject *pvalue = ep->me_value; |
| 947 | if (pvalue != NULL) { |
| 948 | /* Prevent PyObject_Repr from deleting value during |
| 949 | key format */ |
| 950 | Py_INCREF(pvalue); |
Brett Cannon | 0153159 | 2007-09-17 03:28:34 +0000 | [diff] [blame] | 951 | if (any++ > 0) { |
| 952 | Py_BEGIN_ALLOW_THREADS |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 953 | fprintf(fp, ", "); |
Brett Cannon | 0153159 | 2007-09-17 03:28:34 +0000 | [diff] [blame] | 954 | Py_END_ALLOW_THREADS |
| 955 | } |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 956 | if (PyObject_Print((PyObject *)ep->me_key, fp, 0)!=0) { |
Tim Peters | 23cf6be | 2001-06-02 08:02:56 +0000 | [diff] [blame] | 957 | Py_DECREF(pvalue); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 958 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 959 | return -1; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 960 | } |
Brett Cannon | 0153159 | 2007-09-17 03:28:34 +0000 | [diff] [blame] | 961 | Py_BEGIN_ALLOW_THREADS |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 962 | fprintf(fp, ": "); |
Brett Cannon | 0153159 | 2007-09-17 03:28:34 +0000 | [diff] [blame] | 963 | Py_END_ALLOW_THREADS |
Tim Peters | 19b77cf | 2001-06-02 08:27:39 +0000 | [diff] [blame] | 964 | if (PyObject_Print(pvalue, fp, 0) != 0) { |
Tim Peters | 23cf6be | 2001-06-02 08:02:56 +0000 | [diff] [blame] | 965 | Py_DECREF(pvalue); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 966 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 967 | return -1; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 968 | } |
Tim Peters | 23cf6be | 2001-06-02 08:02:56 +0000 | [diff] [blame] | 969 | Py_DECREF(pvalue); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 970 | } |
| 971 | } |
Brett Cannon | 0153159 | 2007-09-17 03:28:34 +0000 | [diff] [blame] | 972 | Py_BEGIN_ALLOW_THREADS |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 973 | fprintf(fp, "}"); |
Brett Cannon | 0153159 | 2007-09-17 03:28:34 +0000 | [diff] [blame] | 974 | Py_END_ALLOW_THREADS |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 975 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 976 | return 0; |
| 977 | } |
| 978 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 979 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 980 | dict_repr(PyDictObject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 981 | { |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 982 | Py_ssize_t i; |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 983 | PyObject *s, *temp, *colon = NULL; |
| 984 | PyObject *pieces = NULL, *result = NULL; |
| 985 | PyObject *key, *value; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 986 | |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 987 | i = Py_ReprEnter((PyObject *)mp); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 988 | if (i != 0) { |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 989 | return i > 0 ? PyString_FromString("{...}") : NULL; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 990 | } |
| 991 | |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 992 | if (mp->ma_used == 0) { |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 993 | result = PyString_FromString("{}"); |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 994 | goto Done; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 995 | } |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 996 | |
| 997 | pieces = PyList_New(0); |
| 998 | if (pieces == NULL) |
| 999 | goto Done; |
| 1000 | |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1001 | colon = PyString_FromString(": "); |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1002 | if (colon == NULL) |
| 1003 | goto Done; |
| 1004 | |
| 1005 | /* Do repr() on each key+value pair, and insert ": " between them. |
| 1006 | Note that repr may mutate the dict. */ |
Tim Peters | c605784 | 2001-06-16 07:52:53 +0000 | [diff] [blame] | 1007 | i = 0; |
| 1008 | while (PyDict_Next((PyObject *)mp, &i, &key, &value)) { |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1009 | int status; |
| 1010 | /* Prevent repr from deleting value during key format. */ |
| 1011 | Py_INCREF(value); |
| 1012 | s = PyObject_Repr(key); |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1013 | PyString_Concat(&s, colon); |
| 1014 | PyString_ConcatAndDel(&s, PyObject_Repr(value)); |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1015 | Py_DECREF(value); |
| 1016 | if (s == NULL) |
| 1017 | goto Done; |
| 1018 | status = PyList_Append(pieces, s); |
| 1019 | Py_DECREF(s); /* append created a new ref */ |
| 1020 | if (status < 0) |
| 1021 | goto Done; |
| 1022 | } |
| 1023 | |
| 1024 | /* Add "{}" decorations to the first and last items. */ |
| 1025 | assert(PyList_GET_SIZE(pieces) > 0); |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1026 | s = PyString_FromString("{"); |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1027 | if (s == NULL) |
| 1028 | goto Done; |
| 1029 | temp = PyList_GET_ITEM(pieces, 0); |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1030 | PyString_ConcatAndDel(&s, temp); |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1031 | PyList_SET_ITEM(pieces, 0, s); |
| 1032 | if (s == NULL) |
| 1033 | goto Done; |
| 1034 | |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1035 | s = PyString_FromString("}"); |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1036 | if (s == NULL) |
| 1037 | goto Done; |
| 1038 | temp = PyList_GET_ITEM(pieces, PyList_GET_SIZE(pieces) - 1); |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1039 | PyString_ConcatAndDel(&temp, s); |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1040 | PyList_SET_ITEM(pieces, PyList_GET_SIZE(pieces) - 1, temp); |
| 1041 | if (temp == NULL) |
| 1042 | goto Done; |
| 1043 | |
| 1044 | /* Paste them all together with ", " between. */ |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1045 | s = PyString_FromString(", "); |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1046 | if (s == NULL) |
| 1047 | goto Done; |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1048 | result = _PyString_Join(s, pieces); |
Tim Peters | 0ab085c | 2001-09-14 00:25:33 +0000 | [diff] [blame] | 1049 | Py_DECREF(s); |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1050 | |
| 1051 | Done: |
| 1052 | Py_XDECREF(pieces); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1053 | Py_XDECREF(colon); |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1054 | Py_ReprLeave((PyObject *)mp); |
| 1055 | return result; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1056 | } |
| 1057 | |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 1058 | static Py_ssize_t |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1059 | dict_length(PyDictObject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1060 | { |
| 1061 | return mp->ma_used; |
| 1062 | } |
| 1063 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1064 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1065 | dict_subscript(PyDictObject *mp, register PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1066 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1067 | PyObject *v; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1068 | long hash; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1069 | PyDictEntry *ep; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 1070 | assert(mp->ma_table != NULL); |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1071 | if (!PyString_CheckExact(key) || |
| 1072 | (hash = ((PyStringObject *) key)->ob_shash) == -1) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1073 | hash = PyObject_Hash(key); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1074 | if (hash == -1) |
| 1075 | return NULL; |
| 1076 | } |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 1077 | ep = (mp->ma_lookup)(mp, key, hash); |
| 1078 | if (ep == NULL) |
| 1079 | return NULL; |
| 1080 | v = ep->me_value; |
Guido van Rossum | 1968ad3 | 2006-02-25 22:38:04 +0000 | [diff] [blame] | 1081 | if (v == NULL) { |
| 1082 | if (!PyDict_CheckExact(mp)) { |
| 1083 | /* Look up __missing__ method if we're a subclass. */ |
Guido van Rossum | 4b92a82 | 2006-02-25 23:32:30 +0000 | [diff] [blame] | 1084 | PyObject *missing; |
Guido van Rossum | 1968ad3 | 2006-02-25 22:38:04 +0000 | [diff] [blame] | 1085 | static PyObject *missing_str = NULL; |
| 1086 | if (missing_str == NULL) |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 1087 | missing_str = |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1088 | PyString_InternFromString("__missing__"); |
Christian Heimes | e93237d | 2007-12-19 02:37:44 +0000 | [diff] [blame] | 1089 | missing = _PyType_Lookup(Py_TYPE(mp), missing_str); |
Guido van Rossum | 1968ad3 | 2006-02-25 22:38:04 +0000 | [diff] [blame] | 1090 | if (missing != NULL) |
| 1091 | return PyObject_CallFunctionObjArgs(missing, |
| 1092 | (PyObject *)mp, key, NULL); |
| 1093 | } |
Georg Brandl | b9f4ad3 | 2006-10-29 18:31:42 +0000 | [diff] [blame] | 1094 | set_key_error(key); |
Guido van Rossum | 1968ad3 | 2006-02-25 22:38:04 +0000 | [diff] [blame] | 1095 | return NULL; |
| 1096 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1097 | else |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1098 | Py_INCREF(v); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1099 | return v; |
| 1100 | } |
| 1101 | |
| 1102 | static int |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1103 | dict_ass_sub(PyDictObject *mp, PyObject *v, PyObject *w) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1104 | { |
| 1105 | if (w == NULL) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1106 | return PyDict_DelItem((PyObject *)mp, v); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1107 | else |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1108 | return PyDict_SetItem((PyObject *)mp, v, w); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1109 | } |
| 1110 | |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1111 | static PyMappingMethods dict_as_mapping = { |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 1112 | (lenfunc)dict_length, /*mp_length*/ |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1113 | (binaryfunc)dict_subscript, /*mp_subscript*/ |
| 1114 | (objobjargproc)dict_ass_sub, /*mp_ass_subscript*/ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1115 | }; |
| 1116 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1117 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1118 | dict_keys(register PyDictObject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1119 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1120 | register PyObject *v; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 1121 | register Py_ssize_t i, j; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1122 | PyDictEntry *ep; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 1123 | Py_ssize_t mask, n; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1124 | |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1125 | again: |
| 1126 | n = mp->ma_used; |
| 1127 | v = PyList_New(n); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1128 | if (v == NULL) |
| 1129 | return NULL; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1130 | if (n != mp->ma_used) { |
| 1131 | /* Durnit. The allocations caused the dict to resize. |
| 1132 | * Just start over, this shouldn't normally happen. |
| 1133 | */ |
| 1134 | Py_DECREF(v); |
| 1135 | goto again; |
| 1136 | } |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 1137 | ep = mp->ma_table; |
| 1138 | mask = mp->ma_mask; |
| 1139 | for (i = 0, j = 0; i <= mask; i++) { |
| 1140 | if (ep[i].me_value != NULL) { |
| 1141 | PyObject *key = ep[i].me_key; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1142 | Py_INCREF(key); |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1143 | PyList_SET_ITEM(v, j, key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1144 | j++; |
| 1145 | } |
| 1146 | } |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 1147 | assert(j == n); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1148 | return v; |
| 1149 | } |
| 1150 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1151 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1152 | dict_values(register PyDictObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1153 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1154 | register PyObject *v; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 1155 | register Py_ssize_t i, j; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1156 | PyDictEntry *ep; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 1157 | Py_ssize_t mask, n; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1158 | |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1159 | again: |
| 1160 | n = mp->ma_used; |
| 1161 | v = PyList_New(n); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1162 | if (v == NULL) |
| 1163 | return NULL; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1164 | if (n != mp->ma_used) { |
| 1165 | /* Durnit. The allocations caused the dict to resize. |
| 1166 | * Just start over, this shouldn't normally happen. |
| 1167 | */ |
| 1168 | Py_DECREF(v); |
| 1169 | goto again; |
| 1170 | } |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 1171 | ep = mp->ma_table; |
| 1172 | mask = mp->ma_mask; |
| 1173 | for (i = 0, j = 0; i <= mask; i++) { |
| 1174 | if (ep[i].me_value != NULL) { |
| 1175 | PyObject *value = ep[i].me_value; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1176 | Py_INCREF(value); |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1177 | PyList_SET_ITEM(v, j, value); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1178 | j++; |
| 1179 | } |
| 1180 | } |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 1181 | assert(j == n); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1182 | return v; |
| 1183 | } |
| 1184 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1185 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1186 | dict_items(register PyDictObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1187 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1188 | register PyObject *v; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 1189 | register Py_ssize_t i, j, n; |
| 1190 | Py_ssize_t mask; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1191 | PyObject *item, *key, *value; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1192 | PyDictEntry *ep; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1193 | |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1194 | /* Preallocate the list of tuples, to avoid allocations during |
| 1195 | * the loop over the items, which could trigger GC, which |
| 1196 | * could resize the dict. :-( |
| 1197 | */ |
| 1198 | again: |
| 1199 | n = mp->ma_used; |
| 1200 | v = PyList_New(n); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1201 | if (v == NULL) |
| 1202 | return NULL; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1203 | for (i = 0; i < n; i++) { |
| 1204 | item = PyTuple_New(2); |
| 1205 | if (item == NULL) { |
| 1206 | Py_DECREF(v); |
| 1207 | return NULL; |
| 1208 | } |
| 1209 | PyList_SET_ITEM(v, i, item); |
| 1210 | } |
| 1211 | if (n != mp->ma_used) { |
| 1212 | /* Durnit. The allocations caused the dict to resize. |
| 1213 | * Just start over, this shouldn't normally happen. |
| 1214 | */ |
| 1215 | Py_DECREF(v); |
| 1216 | goto again; |
| 1217 | } |
| 1218 | /* Nothing we do below makes any function calls. */ |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 1219 | ep = mp->ma_table; |
| 1220 | mask = mp->ma_mask; |
| 1221 | for (i = 0, j = 0; i <= mask; i++) { |
Raymond Hettinger | 0690512 | 2004-03-19 10:30:00 +0000 | [diff] [blame] | 1222 | if ((value=ep[i].me_value) != NULL) { |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 1223 | key = ep[i].me_key; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1224 | item = PyList_GET_ITEM(v, j); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1225 | Py_INCREF(key); |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1226 | PyTuple_SET_ITEM(item, 0, key); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1227 | Py_INCREF(value); |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1228 | PyTuple_SET_ITEM(item, 1, value); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1229 | j++; |
| 1230 | } |
| 1231 | } |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1232 | assert(j == n); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1233 | return v; |
| 1234 | } |
| 1235 | |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1236 | static PyObject * |
Tim Peters | bca1cbc | 2002-12-09 22:56:13 +0000 | [diff] [blame] | 1237 | dict_fromkeys(PyObject *cls, PyObject *args) |
Raymond Hettinger | e33d3df | 2002-11-27 07:29:33 +0000 | [diff] [blame] | 1238 | { |
| 1239 | PyObject *seq; |
| 1240 | PyObject *value = Py_None; |
| 1241 | PyObject *it; /* iter(seq) */ |
| 1242 | PyObject *key; |
| 1243 | PyObject *d; |
Raymond Hettinger | e33d3df | 2002-11-27 07:29:33 +0000 | [diff] [blame] | 1244 | int status; |
| 1245 | |
Raymond Hettinger | ea3fdf4 | 2002-12-29 16:33:45 +0000 | [diff] [blame] | 1246 | if (!PyArg_UnpackTuple(args, "fromkeys", 1, 2, &seq, &value)) |
Raymond Hettinger | e33d3df | 2002-11-27 07:29:33 +0000 | [diff] [blame] | 1247 | return NULL; |
| 1248 | |
| 1249 | d = PyObject_CallObject(cls, NULL); |
| 1250 | if (d == NULL) |
| 1251 | return NULL; |
Raymond Hettinger | e33d3df | 2002-11-27 07:29:33 +0000 | [diff] [blame] | 1252 | |
Raymond Hettinger | cdcf887 | 2007-11-07 02:26:17 +0000 | [diff] [blame] | 1253 | if (PyDict_CheckExact(d) && PyDict_CheckExact(seq)) { |
| 1254 | PyDictObject *mp = (PyDictObject *)d; |
| 1255 | PyObject *oldvalue; |
| 1256 | Py_ssize_t pos = 0; |
| 1257 | PyObject *key; |
| 1258 | long hash; |
| 1259 | |
Raymond Hettinger | a27474c | 2008-06-28 22:16:53 +0000 | [diff] [blame] | 1260 | if (dictresize(mp, Py_SIZE(seq))) |
Raymond Hettinger | cdcf887 | 2007-11-07 02:26:17 +0000 | [diff] [blame] | 1261 | return NULL; |
| 1262 | |
| 1263 | while (_PyDict_Next(seq, &pos, &key, &oldvalue, &hash)) { |
| 1264 | Py_INCREF(key); |
| 1265 | Py_INCREF(value); |
| 1266 | if (insertdict(mp, key, hash, value)) |
| 1267 | return NULL; |
| 1268 | } |
| 1269 | return d; |
| 1270 | } |
| 1271 | |
Raymond Hettinger | 0bbbfc4 | 2007-03-20 21:27:24 +0000 | [diff] [blame] | 1272 | if (PyDict_CheckExact(d) && PyAnySet_CheckExact(seq)) { |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1273 | PyDictObject *mp = (PyDictObject *)d; |
Raymond Hettinger | 0bbbfc4 | 2007-03-20 21:27:24 +0000 | [diff] [blame] | 1274 | Py_ssize_t pos = 0; |
| 1275 | PyObject *key; |
| 1276 | long hash; |
| 1277 | |
| 1278 | if (dictresize(mp, PySet_GET_SIZE(seq))) |
| 1279 | return NULL; |
| 1280 | |
| 1281 | while (_PySet_NextEntry(seq, &pos, &key, &hash)) { |
| 1282 | Py_INCREF(key); |
Raymond Hettinger | e3146f5 | 2007-03-21 20:33:57 +0000 | [diff] [blame] | 1283 | Py_INCREF(value); |
| 1284 | if (insertdict(mp, key, hash, value)) |
Raymond Hettinger | 0bbbfc4 | 2007-03-20 21:27:24 +0000 | [diff] [blame] | 1285 | return NULL; |
| 1286 | } |
| 1287 | return d; |
| 1288 | } |
| 1289 | |
Raymond Hettinger | e33d3df | 2002-11-27 07:29:33 +0000 | [diff] [blame] | 1290 | it = PyObject_GetIter(seq); |
| 1291 | if (it == NULL){ |
| 1292 | Py_DECREF(d); |
| 1293 | return NULL; |
| 1294 | } |
| 1295 | |
Raymond Hettinger | 3444879 | 2007-11-09 23:14:44 +0000 | [diff] [blame] | 1296 | if (PyDict_CheckExact(d)) { |
| 1297 | while ((key = PyIter_Next(it)) != NULL) { |
| 1298 | status = PyDict_SetItem(d, key, value); |
| 1299 | Py_DECREF(key); |
| 1300 | if (status < 0) |
Raymond Hettinger | e33d3df | 2002-11-27 07:29:33 +0000 | [diff] [blame] | 1301 | goto Fail; |
Raymond Hettinger | e33d3df | 2002-11-27 07:29:33 +0000 | [diff] [blame] | 1302 | } |
Raymond Hettinger | 3444879 | 2007-11-09 23:14:44 +0000 | [diff] [blame] | 1303 | } else { |
| 1304 | while ((key = PyIter_Next(it)) != NULL) { |
| 1305 | status = PyObject_SetItem(d, key, value); |
| 1306 | Py_DECREF(key); |
| 1307 | if (status < 0) |
| 1308 | goto Fail; |
| 1309 | } |
Raymond Hettinger | e33d3df | 2002-11-27 07:29:33 +0000 | [diff] [blame] | 1310 | } |
| 1311 | |
Raymond Hettinger | 3444879 | 2007-11-09 23:14:44 +0000 | [diff] [blame] | 1312 | if (PyErr_Occurred()) |
| 1313 | goto Fail; |
Raymond Hettinger | e33d3df | 2002-11-27 07:29:33 +0000 | [diff] [blame] | 1314 | Py_DECREF(it); |
| 1315 | return d; |
| 1316 | |
| 1317 | Fail: |
| 1318 | Py_DECREF(it); |
| 1319 | Py_DECREF(d); |
| 1320 | return NULL; |
| 1321 | } |
| 1322 | |
Raymond Hettinger | 31017ae | 2004-03-04 08:25:44 +0000 | [diff] [blame] | 1323 | static int |
| 1324 | dict_update_common(PyObject *self, PyObject *args, PyObject *kwds, char *methname) |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1325 | { |
Raymond Hettinger | 31017ae | 2004-03-04 08:25:44 +0000 | [diff] [blame] | 1326 | PyObject *arg = NULL; |
| 1327 | int result = 0; |
| 1328 | |
| 1329 | if (!PyArg_UnpackTuple(args, methname, 0, 1, &arg)) |
| 1330 | result = -1; |
| 1331 | |
| 1332 | else if (arg != NULL) { |
| 1333 | if (PyObject_HasAttrString(arg, "keys")) |
| 1334 | result = PyDict_Merge(self, arg, 1); |
| 1335 | else |
| 1336 | result = PyDict_MergeFromSeq2(self, arg, 1); |
| 1337 | } |
| 1338 | if (result == 0 && kwds != NULL) |
| 1339 | result = PyDict_Merge(self, kwds, 1); |
| 1340 | return result; |
| 1341 | } |
| 1342 | |
| 1343 | static PyObject * |
| 1344 | dict_update(PyObject *self, PyObject *args, PyObject *kwds) |
| 1345 | { |
Raymond Hettinger | 7892b1c | 2004-04-12 18:10:01 +0000 | [diff] [blame] | 1346 | if (dict_update_common(self, args, kwds, "update") != -1) |
| 1347 | Py_RETURN_NONE; |
| 1348 | return NULL; |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1349 | } |
| 1350 | |
Guido van Rossum | 05ac6de | 2001-08-10 20:28:28 +0000 | [diff] [blame] | 1351 | /* Update unconditionally replaces existing items. |
| 1352 | Merge has a 3rd argument 'override'; if set, it acts like Update, |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 1353 | otherwise it leaves existing items unchanged. |
| 1354 | |
| 1355 | PyDict_{Update,Merge} update/merge from a mapping object. |
| 1356 | |
Tim Peters | f582b82 | 2001-12-11 18:51:08 +0000 | [diff] [blame] | 1357 | PyDict_MergeFromSeq2 updates/merges from any iterable object |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 1358 | producing iterable objects of length 2. |
| 1359 | */ |
| 1360 | |
Tim Peters | f582b82 | 2001-12-11 18:51:08 +0000 | [diff] [blame] | 1361 | int |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 1362 | PyDict_MergeFromSeq2(PyObject *d, PyObject *seq2, int override) |
| 1363 | { |
| 1364 | PyObject *it; /* iter(seq2) */ |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 1365 | Py_ssize_t i; /* index into seq2 of current element */ |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 1366 | PyObject *item; /* seq2[i] */ |
| 1367 | PyObject *fast; /* item as a 2-tuple or 2-list */ |
| 1368 | |
| 1369 | assert(d != NULL); |
| 1370 | assert(PyDict_Check(d)); |
| 1371 | assert(seq2 != NULL); |
| 1372 | |
| 1373 | it = PyObject_GetIter(seq2); |
| 1374 | if (it == NULL) |
| 1375 | return -1; |
| 1376 | |
| 1377 | for (i = 0; ; ++i) { |
| 1378 | PyObject *key, *value; |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 1379 | Py_ssize_t n; |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 1380 | |
| 1381 | fast = NULL; |
| 1382 | item = PyIter_Next(it); |
| 1383 | if (item == NULL) { |
| 1384 | if (PyErr_Occurred()) |
| 1385 | goto Fail; |
| 1386 | break; |
| 1387 | } |
| 1388 | |
| 1389 | /* Convert item to sequence, and verify length 2. */ |
| 1390 | fast = PySequence_Fast(item, ""); |
| 1391 | if (fast == NULL) { |
| 1392 | if (PyErr_ExceptionMatches(PyExc_TypeError)) |
| 1393 | PyErr_Format(PyExc_TypeError, |
| 1394 | "cannot convert dictionary update " |
Neal Norwitz | d3881b0 | 2006-05-30 04:25:05 +0000 | [diff] [blame] | 1395 | "sequence element #%zd to a sequence", |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 1396 | i); |
| 1397 | goto Fail; |
| 1398 | } |
| 1399 | n = PySequence_Fast_GET_SIZE(fast); |
| 1400 | if (n != 2) { |
| 1401 | PyErr_Format(PyExc_ValueError, |
Neal Norwitz | d3881b0 | 2006-05-30 04:25:05 +0000 | [diff] [blame] | 1402 | "dictionary update sequence element #%zd " |
Martin v. Löwis | 2c95cc6 | 2006-02-16 06:54:25 +0000 | [diff] [blame] | 1403 | "has length %zd; 2 is required", |
Martin v. Löwis | e0e89f7 | 2006-02-16 06:59:22 +0000 | [diff] [blame] | 1404 | i, n); |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 1405 | goto Fail; |
| 1406 | } |
| 1407 | |
| 1408 | /* Update/merge with this (key, value) pair. */ |
| 1409 | key = PySequence_Fast_GET_ITEM(fast, 0); |
| 1410 | value = PySequence_Fast_GET_ITEM(fast, 1); |
| 1411 | if (override || PyDict_GetItem(d, key) == NULL) { |
| 1412 | int status = PyDict_SetItem(d, key, value); |
| 1413 | if (status < 0) |
| 1414 | goto Fail; |
| 1415 | } |
| 1416 | Py_DECREF(fast); |
| 1417 | Py_DECREF(item); |
| 1418 | } |
| 1419 | |
| 1420 | i = 0; |
| 1421 | goto Return; |
| 1422 | Fail: |
| 1423 | Py_XDECREF(item); |
| 1424 | Py_XDECREF(fast); |
| 1425 | i = -1; |
| 1426 | Return: |
| 1427 | Py_DECREF(it); |
Neal Norwitz | d3881b0 | 2006-05-30 04:25:05 +0000 | [diff] [blame] | 1428 | return Py_SAFE_DOWNCAST(i, Py_ssize_t, int); |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 1429 | } |
| 1430 | |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1431 | int |
| 1432 | PyDict_Update(PyObject *a, PyObject *b) |
| 1433 | { |
Guido van Rossum | 05ac6de | 2001-08-10 20:28:28 +0000 | [diff] [blame] | 1434 | return PyDict_Merge(a, b, 1); |
| 1435 | } |
| 1436 | |
| 1437 | int |
| 1438 | PyDict_Merge(PyObject *a, PyObject *b, int override) |
| 1439 | { |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1440 | register PyDictObject *mp, *other; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 1441 | register Py_ssize_t i; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1442 | PyDictEntry *entry; |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1443 | |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1444 | /* We accept for the argument either a concrete dictionary object, |
| 1445 | * or an abstract "mapping" object. For the former, we can do |
| 1446 | * things quite efficiently. For the latter, we only require that |
| 1447 | * PyMapping_Keys() and PyObject_GetItem() be supported. |
| 1448 | */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1449 | if (a == NULL || !PyDict_Check(a) || b == NULL) { |
| 1450 | PyErr_BadInternalCall(); |
| 1451 | return -1; |
| 1452 | } |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1453 | mp = (PyDictObject*)a; |
Raymond Hettinger | 3dbd4c5 | 2008-01-25 19:24:46 +0000 | [diff] [blame] | 1454 | if (PyDict_Check(b)) { |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1455 | other = (PyDictObject*)b; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1456 | if (other == mp || other->ma_used == 0) |
| 1457 | /* a.update(a) or a.update({}); nothing to do */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1458 | return 0; |
Raymond Hettinger | 186e739 | 2005-05-14 18:08:25 +0000 | [diff] [blame] | 1459 | if (mp->ma_used == 0) |
| 1460 | /* Since the target dict is empty, PyDict_GetItem() |
| 1461 | * always returns NULL. Setting override to 1 |
| 1462 | * skips the unnecessary test. |
| 1463 | */ |
| 1464 | override = 1; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1465 | /* Do one big resize at the start, rather than |
| 1466 | * incrementally resizing as we insert new items. Expect |
| 1467 | * that there will be no (or few) overlapping keys. |
| 1468 | */ |
| 1469 | if ((mp->ma_fill + other->ma_used)*3 >= (mp->ma_mask+1)*2) { |
Raymond Hettinger | c8d2290 | 2003-05-07 00:49:40 +0000 | [diff] [blame] | 1470 | if (dictresize(mp, (mp->ma_used + other->ma_used)*2) != 0) |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1471 | return -1; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1472 | } |
| 1473 | for (i = 0; i <= other->ma_mask; i++) { |
| 1474 | entry = &other->ma_table[i]; |
Guido van Rossum | 05ac6de | 2001-08-10 20:28:28 +0000 | [diff] [blame] | 1475 | if (entry->me_value != NULL && |
| 1476 | (override || |
| 1477 | PyDict_GetItem(a, entry->me_key) == NULL)) { |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1478 | Py_INCREF(entry->me_key); |
| 1479 | Py_INCREF(entry->me_value); |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 1480 | if (insertdict(mp, entry->me_key, |
| 1481 | (long)entry->me_hash, |
| 1482 | entry->me_value) != 0) |
| 1483 | return -1; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1484 | } |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1485 | } |
| 1486 | } |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1487 | else { |
| 1488 | /* Do it the generic, slower way */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1489 | PyObject *keys = PyMapping_Keys(b); |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1490 | PyObject *iter; |
| 1491 | PyObject *key, *value; |
| 1492 | int status; |
| 1493 | |
| 1494 | if (keys == NULL) |
| 1495 | /* Docstring says this is equivalent to E.keys() so |
| 1496 | * if E doesn't have a .keys() method we want |
| 1497 | * AttributeError to percolate up. Might as well |
| 1498 | * do the same for any other error. |
| 1499 | */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1500 | return -1; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1501 | |
| 1502 | iter = PyObject_GetIter(keys); |
| 1503 | Py_DECREF(keys); |
| 1504 | if (iter == NULL) |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1505 | return -1; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1506 | |
| 1507 | for (key = PyIter_Next(iter); key; key = PyIter_Next(iter)) { |
Guido van Rossum | 05ac6de | 2001-08-10 20:28:28 +0000 | [diff] [blame] | 1508 | if (!override && PyDict_GetItem(a, key) != NULL) { |
| 1509 | Py_DECREF(key); |
| 1510 | continue; |
| 1511 | } |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1512 | value = PyObject_GetItem(b, key); |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1513 | if (value == NULL) { |
| 1514 | Py_DECREF(iter); |
| 1515 | Py_DECREF(key); |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1516 | return -1; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1517 | } |
Guido van Rossum | 05ac6de | 2001-08-10 20:28:28 +0000 | [diff] [blame] | 1518 | status = PyDict_SetItem(a, key, value); |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1519 | Py_DECREF(key); |
| 1520 | Py_DECREF(value); |
| 1521 | if (status < 0) { |
| 1522 | Py_DECREF(iter); |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1523 | return -1; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1524 | } |
| 1525 | } |
| 1526 | Py_DECREF(iter); |
| 1527 | if (PyErr_Occurred()) |
| 1528 | /* Iterator completed, via error */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1529 | return -1; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1530 | } |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 1531 | return 0; |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1532 | } |
| 1533 | |
| 1534 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1535 | dict_copy(register PyDictObject *mp) |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1536 | { |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 1537 | return PyDict_Copy((PyObject*)mp); |
| 1538 | } |
| 1539 | |
| 1540 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1541 | PyDict_Copy(PyObject *o) |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 1542 | { |
Raymond Hettinger | ebedb2f | 2004-03-08 04:19:01 +0000 | [diff] [blame] | 1543 | PyObject *copy; |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 1544 | |
| 1545 | if (o == NULL || !PyDict_Check(o)) { |
| 1546 | PyErr_BadInternalCall(); |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1547 | return NULL; |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 1548 | } |
Raymond Hettinger | ebedb2f | 2004-03-08 04:19:01 +0000 | [diff] [blame] | 1549 | copy = PyDict_New(); |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1550 | if (copy == NULL) |
| 1551 | return NULL; |
Raymond Hettinger | ebedb2f | 2004-03-08 04:19:01 +0000 | [diff] [blame] | 1552 | if (PyDict_Merge(copy, o, 1) == 0) |
| 1553 | return copy; |
| 1554 | Py_DECREF(copy); |
Raymond Hettinger | 1356f78 | 2005-04-15 15:58:42 +0000 | [diff] [blame] | 1555 | return NULL; |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1556 | } |
| 1557 | |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 1558 | Py_ssize_t |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1559 | PyDict_Size(PyObject *mp) |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 1560 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1561 | if (mp == NULL || !PyDict_Check(mp)) { |
| 1562 | PyErr_BadInternalCall(); |
Jeremy Hylton | 7083bb7 | 2004-02-17 20:10:11 +0000 | [diff] [blame] | 1563 | return -1; |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 1564 | } |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1565 | return ((PyDictObject *)mp)->ma_used; |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 1566 | } |
| 1567 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1568 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1569 | PyDict_Keys(PyObject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1570 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1571 | if (mp == NULL || !PyDict_Check(mp)) { |
| 1572 | PyErr_BadInternalCall(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1573 | return NULL; |
| 1574 | } |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1575 | return dict_keys((PyDictObject *)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1576 | } |
| 1577 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1578 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1579 | PyDict_Values(PyObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1580 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1581 | if (mp == NULL || !PyDict_Check(mp)) { |
| 1582 | PyErr_BadInternalCall(); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1583 | return NULL; |
| 1584 | } |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1585 | return dict_values((PyDictObject *)mp); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1586 | } |
| 1587 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1588 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1589 | PyDict_Items(PyObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1590 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1591 | if (mp == NULL || !PyDict_Check(mp)) { |
| 1592 | PyErr_BadInternalCall(); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1593 | return NULL; |
| 1594 | } |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1595 | return dict_items((PyDictObject *)mp); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1596 | } |
| 1597 | |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1598 | /* Subroutine which returns the smallest key in a for which b's value |
| 1599 | is different or absent. The value is returned too, through the |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1600 | pval argument. Both are NULL if no key in a is found for which b's status |
| 1601 | differs. The refcounts on (and only on) non-NULL *pval and function return |
| 1602 | values must be decremented by the caller (characterize() increments them |
| 1603 | to ensure that mutating comparison and PyDict_GetItem calls can't delete |
| 1604 | them before the caller is done looking at them). */ |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1605 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1606 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1607 | characterize(PyDictObject *a, PyDictObject *b, PyObject **pval) |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1608 | { |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1609 | PyObject *akey = NULL; /* smallest key in a s.t. a[akey] != b[akey] */ |
| 1610 | PyObject *aval = NULL; /* a[akey] */ |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 1611 | Py_ssize_t i; |
| 1612 | int cmp; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1613 | |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 1614 | for (i = 0; i <= a->ma_mask; i++) { |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1615 | PyObject *thiskey, *thisaval, *thisbval; |
| 1616 | if (a->ma_table[i].me_value == NULL) |
| 1617 | continue; |
| 1618 | thiskey = a->ma_table[i].me_key; |
| 1619 | Py_INCREF(thiskey); /* keep alive across compares */ |
| 1620 | if (akey != NULL) { |
| 1621 | cmp = PyObject_RichCompareBool(akey, thiskey, Py_LT); |
| 1622 | if (cmp < 0) { |
| 1623 | Py_DECREF(thiskey); |
| 1624 | goto Fail; |
| 1625 | } |
| 1626 | if (cmp > 0 || |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 1627 | i > a->ma_mask || |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1628 | a->ma_table[i].me_value == NULL) |
| 1629 | { |
| 1630 | /* Not the *smallest* a key; or maybe it is |
| 1631 | * but the compare shrunk the dict so we can't |
| 1632 | * find its associated value anymore; or |
| 1633 | * maybe it is but the compare deleted the |
| 1634 | * a[thiskey] entry. |
Neal Norwitz | d3881b0 | 2006-05-30 04:25:05 +0000 | [diff] [blame] | 1635 | */ |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1636 | Py_DECREF(thiskey); |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1637 | continue; |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 1638 | } |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1639 | } |
| 1640 | |
| 1641 | /* Compare a[thiskey] to b[thiskey]; cmp <- true iff equal. */ |
| 1642 | thisaval = a->ma_table[i].me_value; |
| 1643 | assert(thisaval); |
| 1644 | Py_INCREF(thisaval); /* keep alive */ |
| 1645 | thisbval = PyDict_GetItem((PyObject *)b, thiskey); |
| 1646 | if (thisbval == NULL) |
| 1647 | cmp = 0; |
| 1648 | else { |
| 1649 | /* both dicts have thiskey: same values? */ |
| 1650 | cmp = PyObject_RichCompareBool( |
| 1651 | thisaval, thisbval, Py_EQ); |
| 1652 | if (cmp < 0) { |
| 1653 | Py_DECREF(thiskey); |
| 1654 | Py_DECREF(thisaval); |
| 1655 | goto Fail; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1656 | } |
| 1657 | } |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1658 | if (cmp == 0) { |
| 1659 | /* New winner. */ |
| 1660 | Py_XDECREF(akey); |
| 1661 | Py_XDECREF(aval); |
| 1662 | akey = thiskey; |
| 1663 | aval = thisaval; |
| 1664 | } |
| 1665 | else { |
| 1666 | Py_DECREF(thiskey); |
| 1667 | Py_DECREF(thisaval); |
| 1668 | } |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1669 | } |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1670 | *pval = aval; |
| 1671 | return akey; |
| 1672 | |
| 1673 | Fail: |
| 1674 | Py_XDECREF(akey); |
| 1675 | Py_XDECREF(aval); |
| 1676 | *pval = NULL; |
| 1677 | return NULL; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1678 | } |
| 1679 | |
| 1680 | static int |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1681 | dict_compare(PyDictObject *a, PyDictObject *b) |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1682 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1683 | PyObject *adiff, *bdiff, *aval, *bval; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1684 | int res; |
| 1685 | |
| 1686 | /* Compare lengths first */ |
| 1687 | if (a->ma_used < b->ma_used) |
| 1688 | return -1; /* a is shorter */ |
| 1689 | else if (a->ma_used > b->ma_used) |
| 1690 | return 1; /* b is shorter */ |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1691 | |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1692 | /* Same length -- check all keys */ |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1693 | bdiff = bval = NULL; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1694 | adiff = characterize(a, b, &aval); |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1695 | if (adiff == NULL) { |
| 1696 | assert(!aval); |
Tim Peters | 3918fb2 | 2001-05-10 18:58:31 +0000 | [diff] [blame] | 1697 | /* Either an error, or a is a subset with the same length so |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1698 | * must be equal. |
| 1699 | */ |
| 1700 | res = PyErr_Occurred() ? -1 : 0; |
| 1701 | goto Finished; |
| 1702 | } |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1703 | bdiff = characterize(b, a, &bval); |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1704 | if (bdiff == NULL && PyErr_Occurred()) { |
| 1705 | assert(!bval); |
| 1706 | res = -1; |
| 1707 | goto Finished; |
| 1708 | } |
| 1709 | res = 0; |
| 1710 | if (bdiff) { |
| 1711 | /* bdiff == NULL "should be" impossible now, but perhaps |
| 1712 | * the last comparison done by the characterize() on a had |
| 1713 | * the side effect of making the dicts equal! |
| 1714 | */ |
| 1715 | res = PyObject_Compare(adiff, bdiff); |
| 1716 | } |
| 1717 | if (res == 0 && bval != NULL) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1718 | res = PyObject_Compare(aval, bval); |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1719 | |
| 1720 | Finished: |
| 1721 | Py_XDECREF(adiff); |
| 1722 | Py_XDECREF(bdiff); |
| 1723 | Py_XDECREF(aval); |
| 1724 | Py_XDECREF(bval); |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1725 | return res; |
| 1726 | } |
| 1727 | |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1728 | /* Return 1 if dicts equal, 0 if not, -1 if error. |
| 1729 | * Gets out as soon as any difference is detected. |
| 1730 | * Uses only Py_EQ comparison. |
| 1731 | */ |
| 1732 | static int |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1733 | dict_equal(PyDictObject *a, PyDictObject *b) |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1734 | { |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 1735 | Py_ssize_t i; |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1736 | |
| 1737 | if (a->ma_used != b->ma_used) |
| 1738 | /* can't be equal if # of entries differ */ |
| 1739 | return 0; |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 1740 | |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1741 | /* Same # of entries -- check all of 'em. Exit early on any diff. */ |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 1742 | for (i = 0; i <= a->ma_mask; i++) { |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1743 | PyObject *aval = a->ma_table[i].me_value; |
| 1744 | if (aval != NULL) { |
| 1745 | int cmp; |
| 1746 | PyObject *bval; |
| 1747 | PyObject *key = a->ma_table[i].me_key; |
| 1748 | /* temporarily bump aval's refcount to ensure it stays |
| 1749 | alive until we're done with it */ |
| 1750 | Py_INCREF(aval); |
Neal Norwitz | a22975f | 2006-09-05 02:24:03 +0000 | [diff] [blame] | 1751 | /* ditto for key */ |
| 1752 | Py_INCREF(key); |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1753 | bval = PyDict_GetItem((PyObject *)b, key); |
Neal Norwitz | a22975f | 2006-09-05 02:24:03 +0000 | [diff] [blame] | 1754 | Py_DECREF(key); |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1755 | if (bval == NULL) { |
| 1756 | Py_DECREF(aval); |
| 1757 | return 0; |
| 1758 | } |
| 1759 | cmp = PyObject_RichCompareBool(aval, bval, Py_EQ); |
| 1760 | Py_DECREF(aval); |
| 1761 | if (cmp <= 0) /* error or not equal */ |
| 1762 | return cmp; |
| 1763 | } |
| 1764 | } |
| 1765 | return 1; |
| 1766 | } |
| 1767 | |
| 1768 | static PyObject * |
| 1769 | dict_richcompare(PyObject *v, PyObject *w, int op) |
| 1770 | { |
| 1771 | int cmp; |
| 1772 | PyObject *res; |
| 1773 | |
| 1774 | if (!PyDict_Check(v) || !PyDict_Check(w)) { |
| 1775 | res = Py_NotImplemented; |
| 1776 | } |
| 1777 | else if (op == Py_EQ || op == Py_NE) { |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1778 | cmp = dict_equal((PyDictObject *)v, (PyDictObject *)w); |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1779 | if (cmp < 0) |
| 1780 | return NULL; |
| 1781 | res = (cmp == (op == Py_EQ)) ? Py_True : Py_False; |
| 1782 | } |
Steven Bethard | ae42f33 | 2008-03-18 17:26:10 +0000 | [diff] [blame] | 1783 | else { |
| 1784 | /* Py3K warning if comparison isn't == or != */ |
Benjamin Peterson | 9f4f481 | 2008-04-27 03:01:45 +0000 | [diff] [blame] | 1785 | if (PyErr_WarnPy3k("dict inequality comparisons not supported " |
Benjamin Peterson | f19a7b9 | 2008-04-27 18:40:21 +0000 | [diff] [blame] | 1786 | "in 3.x", 1) < 0) { |
Steven Bethard | ae42f33 | 2008-03-18 17:26:10 +0000 | [diff] [blame] | 1787 | return NULL; |
| 1788 | } |
Tim Peters | 4fa58bf | 2001-05-10 21:45:19 +0000 | [diff] [blame] | 1789 | res = Py_NotImplemented; |
Steven Bethard | ae42f33 | 2008-03-18 17:26:10 +0000 | [diff] [blame] | 1790 | } |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1791 | Py_INCREF(res); |
| 1792 | return res; |
| 1793 | } |
| 1794 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1795 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1796 | dict_contains(register PyDictObject *mp, PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1797 | { |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1798 | long hash; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1799 | PyDictEntry *ep; |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 1800 | |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1801 | if (!PyString_CheckExact(key) || |
| 1802 | (hash = ((PyStringObject *) key)->ob_shash) == -1) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1803 | hash = PyObject_Hash(key); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1804 | if (hash == -1) |
| 1805 | return NULL; |
| 1806 | } |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 1807 | ep = (mp->ma_lookup)(mp, key, hash); |
| 1808 | if (ep == NULL) |
| 1809 | return NULL; |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 1810 | return PyBool_FromLong(ep->me_value != NULL); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1811 | } |
| 1812 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1813 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1814 | dict_has_key(register PyDictObject *mp, PyObject *key) |
Neal Norwitz | 8b2bfbc | 2007-05-23 06:35:32 +0000 | [diff] [blame] | 1815 | { |
Benjamin Peterson | 9f4f481 | 2008-04-27 03:01:45 +0000 | [diff] [blame] | 1816 | if (PyErr_WarnPy3k("dict.has_key() not supported in 3.x; " |
Benjamin Peterson | f19a7b9 | 2008-04-27 18:40:21 +0000 | [diff] [blame] | 1817 | "use the in operator", 1) < 0) |
Neal Norwitz | 8b2bfbc | 2007-05-23 06:35:32 +0000 | [diff] [blame] | 1818 | return NULL; |
| 1819 | return dict_contains(mp, key); |
| 1820 | } |
| 1821 | |
| 1822 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1823 | dict_get(register PyDictObject *mp, PyObject *args) |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1824 | { |
| 1825 | PyObject *key; |
Barry Warsaw | 320ac33 | 1997-10-20 17:26:25 +0000 | [diff] [blame] | 1826 | PyObject *failobj = Py_None; |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1827 | PyObject *val = NULL; |
| 1828 | long hash; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1829 | PyDictEntry *ep; |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1830 | |
Raymond Hettinger | ea3fdf4 | 2002-12-29 16:33:45 +0000 | [diff] [blame] | 1831 | if (!PyArg_UnpackTuple(args, "get", 1, 2, &key, &failobj)) |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1832 | return NULL; |
| 1833 | |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1834 | if (!PyString_CheckExact(key) || |
| 1835 | (hash = ((PyStringObject *) key)->ob_shash) == -1) { |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1836 | hash = PyObject_Hash(key); |
| 1837 | if (hash == -1) |
| 1838 | return NULL; |
| 1839 | } |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 1840 | ep = (mp->ma_lookup)(mp, key, hash); |
| 1841 | if (ep == NULL) |
| 1842 | return NULL; |
| 1843 | val = ep->me_value; |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1844 | if (val == NULL) |
| 1845 | val = failobj; |
| 1846 | Py_INCREF(val); |
| 1847 | return val; |
| 1848 | } |
| 1849 | |
| 1850 | |
| 1851 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1852 | dict_setdefault(register PyDictObject *mp, PyObject *args) |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1853 | { |
| 1854 | PyObject *key; |
| 1855 | PyObject *failobj = Py_None; |
| 1856 | PyObject *val = NULL; |
| 1857 | long hash; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1858 | PyDictEntry *ep; |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1859 | |
Raymond Hettinger | ea3fdf4 | 2002-12-29 16:33:45 +0000 | [diff] [blame] | 1860 | if (!PyArg_UnpackTuple(args, "setdefault", 1, 2, &key, &failobj)) |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1861 | return NULL; |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1862 | |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1863 | if (!PyString_CheckExact(key) || |
| 1864 | (hash = ((PyStringObject *) key)->ob_shash) == -1) { |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1865 | hash = PyObject_Hash(key); |
| 1866 | if (hash == -1) |
| 1867 | return NULL; |
| 1868 | } |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 1869 | ep = (mp->ma_lookup)(mp, key, hash); |
| 1870 | if (ep == NULL) |
| 1871 | return NULL; |
| 1872 | val = ep->me_value; |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1873 | if (val == NULL) { |
| 1874 | val = failobj; |
| 1875 | if (PyDict_SetItem((PyObject*)mp, key, failobj)) |
| 1876 | val = NULL; |
| 1877 | } |
| 1878 | Py_XINCREF(val); |
| 1879 | return val; |
| 1880 | } |
| 1881 | |
| 1882 | |
| 1883 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1884 | dict_clear(register PyDictObject *mp) |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 1885 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1886 | PyDict_Clear((PyObject *)mp); |
Raymond Hettinger | 7892b1c | 2004-04-12 18:10:01 +0000 | [diff] [blame] | 1887 | Py_RETURN_NONE; |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 1888 | } |
| 1889 | |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1890 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1891 | dict_pop(PyDictObject *mp, PyObject *args) |
Guido van Rossum | e027d98 | 2002-04-12 15:11:59 +0000 | [diff] [blame] | 1892 | { |
| 1893 | long hash; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1894 | PyDictEntry *ep; |
Guido van Rossum | e027d98 | 2002-04-12 15:11:59 +0000 | [diff] [blame] | 1895 | PyObject *old_value, *old_key; |
Raymond Hettinger | a3e1e4c | 2003-03-06 23:54:28 +0000 | [diff] [blame] | 1896 | PyObject *key, *deflt = NULL; |
Guido van Rossum | e027d98 | 2002-04-12 15:11:59 +0000 | [diff] [blame] | 1897 | |
Raymond Hettinger | a3e1e4c | 2003-03-06 23:54:28 +0000 | [diff] [blame] | 1898 | if(!PyArg_UnpackTuple(args, "pop", 1, 2, &key, &deflt)) |
| 1899 | return NULL; |
Guido van Rossum | e027d98 | 2002-04-12 15:11:59 +0000 | [diff] [blame] | 1900 | if (mp->ma_used == 0) { |
Raymond Hettinger | a3e1e4c | 2003-03-06 23:54:28 +0000 | [diff] [blame] | 1901 | if (deflt) { |
| 1902 | Py_INCREF(deflt); |
| 1903 | return deflt; |
| 1904 | } |
Guido van Rossum | e027d98 | 2002-04-12 15:11:59 +0000 | [diff] [blame] | 1905 | PyErr_SetString(PyExc_KeyError, |
| 1906 | "pop(): dictionary is empty"); |
| 1907 | return NULL; |
| 1908 | } |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 1909 | if (!PyString_CheckExact(key) || |
| 1910 | (hash = ((PyStringObject *) key)->ob_shash) == -1) { |
Guido van Rossum | e027d98 | 2002-04-12 15:11:59 +0000 | [diff] [blame] | 1911 | hash = PyObject_Hash(key); |
| 1912 | if (hash == -1) |
| 1913 | return NULL; |
| 1914 | } |
| 1915 | ep = (mp->ma_lookup)(mp, key, hash); |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 1916 | if (ep == NULL) |
| 1917 | return NULL; |
Guido van Rossum | e027d98 | 2002-04-12 15:11:59 +0000 | [diff] [blame] | 1918 | if (ep->me_value == NULL) { |
Raymond Hettinger | a3e1e4c | 2003-03-06 23:54:28 +0000 | [diff] [blame] | 1919 | if (deflt) { |
| 1920 | Py_INCREF(deflt); |
| 1921 | return deflt; |
| 1922 | } |
Georg Brandl | b9f4ad3 | 2006-10-29 18:31:42 +0000 | [diff] [blame] | 1923 | set_key_error(key); |
Guido van Rossum | e027d98 | 2002-04-12 15:11:59 +0000 | [diff] [blame] | 1924 | return NULL; |
| 1925 | } |
| 1926 | old_key = ep->me_key; |
| 1927 | Py_INCREF(dummy); |
| 1928 | ep->me_key = dummy; |
| 1929 | old_value = ep->me_value; |
| 1930 | ep->me_value = NULL; |
| 1931 | mp->ma_used--; |
| 1932 | Py_DECREF(old_key); |
| 1933 | return old_value; |
| 1934 | } |
| 1935 | |
| 1936 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1937 | dict_popitem(PyDictObject *mp) |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1938 | { |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 1939 | Py_ssize_t i = 0; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 1940 | PyDictEntry *ep; |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1941 | PyObject *res; |
| 1942 | |
Tim Peters | f4b33f6 | 2001-06-02 05:42:29 +0000 | [diff] [blame] | 1943 | /* Allocate the result tuple before checking the size. Believe it |
| 1944 | * or not, this allocation could trigger a garbage collection which |
| 1945 | * could empty the dict, so if we checked the size first and that |
| 1946 | * happened, the result would be an infinite loop (searching for an |
| 1947 | * entry that no longer exists). Note that the usual popitem() |
| 1948 | * idiom is "while d: k, v = d.popitem()". so needing to throw the |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 1949 | * tuple away if the dict *is* empty isn't a significant |
Tim Peters | f4b33f6 | 2001-06-02 05:42:29 +0000 | [diff] [blame] | 1950 | * inefficiency -- possible, but unlikely in practice. |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1951 | */ |
| 1952 | res = PyTuple_New(2); |
| 1953 | if (res == NULL) |
| 1954 | return NULL; |
Guido van Rossum | e04eaec | 2001-04-16 00:02:32 +0000 | [diff] [blame] | 1955 | if (mp->ma_used == 0) { |
| 1956 | Py_DECREF(res); |
| 1957 | PyErr_SetString(PyExc_KeyError, |
| 1958 | "popitem(): dictionary is empty"); |
| 1959 | return NULL; |
| 1960 | } |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1961 | /* Set ep to "the first" dict entry with a value. We abuse the hash |
| 1962 | * field of slot 0 to hold a search finger: |
| 1963 | * If slot 0 has a value, use slot 0. |
| 1964 | * Else slot 0 is being used to hold a search finger, |
Neal Norwitz | d3881b0 | 2006-05-30 04:25:05 +0000 | [diff] [blame] | 1965 | * and we use its hash value as the first index to look. |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1966 | */ |
| 1967 | ep = &mp->ma_table[0]; |
| 1968 | if (ep->me_value == NULL) { |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 1969 | i = ep->me_hash; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 1970 | /* The hash field may be a real hash value, or it may be a |
| 1971 | * legit search finger, or it may be a once-legit search |
| 1972 | * finger that's out of bounds now because it wrapped around |
| 1973 | * or the table shrunk -- simply make sure it's in bounds now. |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1974 | */ |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 1975 | if (i > mp->ma_mask || i < 1) |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1976 | i = 1; /* skip slot 0 */ |
| 1977 | while ((ep = &mp->ma_table[i])->me_value == NULL) { |
| 1978 | i++; |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 1979 | if (i > mp->ma_mask) |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1980 | i = 1; |
| 1981 | } |
| 1982 | } |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1983 | PyTuple_SET_ITEM(res, 0, ep->me_key); |
| 1984 | PyTuple_SET_ITEM(res, 1, ep->me_value); |
| 1985 | Py_INCREF(dummy); |
| 1986 | ep->me_key = dummy; |
| 1987 | ep->me_value = NULL; |
| 1988 | mp->ma_used--; |
| 1989 | assert(mp->ma_table[0].me_value == NULL); |
| 1990 | mp->ma_table[0].me_hash = i + 1; /* next place to start */ |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1991 | return res; |
| 1992 | } |
| 1993 | |
Jeremy Hylton | 8caad49 | 2000-06-23 14:18:11 +0000 | [diff] [blame] | 1994 | static int |
| 1995 | dict_traverse(PyObject *op, visitproc visit, void *arg) |
| 1996 | { |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 1997 | Py_ssize_t i = 0; |
Jeremy Hylton | 8caad49 | 2000-06-23 14:18:11 +0000 | [diff] [blame] | 1998 | PyObject *pk; |
| 1999 | PyObject *pv; |
| 2000 | |
| 2001 | while (PyDict_Next(op, &i, &pk, &pv)) { |
Thomas Wouters | c6e5506 | 2006-04-15 21:47:09 +0000 | [diff] [blame] | 2002 | Py_VISIT(pk); |
| 2003 | Py_VISIT(pv); |
Jeremy Hylton | 8caad49 | 2000-06-23 14:18:11 +0000 | [diff] [blame] | 2004 | } |
| 2005 | return 0; |
| 2006 | } |
| 2007 | |
| 2008 | static int |
| 2009 | dict_tp_clear(PyObject *op) |
| 2010 | { |
| 2011 | PyDict_Clear(op); |
| 2012 | return 0; |
| 2013 | } |
| 2014 | |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2015 | |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2016 | extern PyTypeObject PyDictIterKey_Type; /* Forward */ |
| 2017 | extern PyTypeObject PyDictIterValue_Type; /* Forward */ |
| 2018 | extern PyTypeObject PyDictIterItem_Type; /* Forward */ |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 2019 | static PyObject *dictiter_new(PyDictObject *, PyTypeObject *); |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2020 | |
| 2021 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 2022 | dict_iterkeys(PyDictObject *dict) |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2023 | { |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2024 | return dictiter_new(dict, &PyDictIterKey_Type); |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2025 | } |
| 2026 | |
| 2027 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 2028 | dict_itervalues(PyDictObject *dict) |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2029 | { |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2030 | return dictiter_new(dict, &PyDictIterValue_Type); |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2031 | } |
| 2032 | |
| 2033 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 2034 | dict_iteritems(PyDictObject *dict) |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2035 | { |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2036 | return dictiter_new(dict, &PyDictIterItem_Type); |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2037 | } |
| 2038 | |
Robert Schuppenies | 51df064 | 2008-06-01 16:16:17 +0000 | [diff] [blame] | 2039 | static PyObject * |
| 2040 | dict_sizeof(PyDictObject *mp) |
| 2041 | { |
| 2042 | Py_ssize_t res; |
| 2043 | |
Robert Schuppenies | 161b921 | 2008-06-26 15:20:35 +0000 | [diff] [blame] | 2044 | res = sizeof(PyDictObject); |
Robert Schuppenies | 51df064 | 2008-06-01 16:16:17 +0000 | [diff] [blame] | 2045 | if (mp->ma_table != mp->ma_smalltable) |
| 2046 | res = res + (mp->ma_mask + 1) * sizeof(PyDictEntry); |
| 2047 | return PyInt_FromSsize_t(res); |
| 2048 | } |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2049 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2050 | PyDoc_STRVAR(has_key__doc__, |
Raymond Hettinger | 574aa32 | 2003-09-01 22:12:08 +0000 | [diff] [blame] | 2051 | "D.has_key(k) -> True if D has a key k, else False"); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2052 | |
Raymond Hettinger | 8f5cdaa | 2003-12-13 11:26:12 +0000 | [diff] [blame] | 2053 | PyDoc_STRVAR(contains__doc__, |
| 2054 | "D.__contains__(k) -> True if D has a key k, else False"); |
| 2055 | |
| 2056 | PyDoc_STRVAR(getitem__doc__, "x.__getitem__(y) <==> x[y]"); |
| 2057 | |
Robert Schuppenies | 51df064 | 2008-06-01 16:16:17 +0000 | [diff] [blame] | 2058 | PyDoc_STRVAR(sizeof__doc__, |
Georg Brandl | 7a6de8b | 2008-06-01 16:42:16 +0000 | [diff] [blame] | 2059 | "D.__sizeof__() -> size of D in memory, in bytes"); |
Robert Schuppenies | 51df064 | 2008-06-01 16:16:17 +0000 | [diff] [blame] | 2060 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2061 | PyDoc_STRVAR(get__doc__, |
Guido van Rossum | efae886 | 2002-09-04 11:29:45 +0000 | [diff] [blame] | 2062 | "D.get(k[,d]) -> D[k] if k in D, else d. d defaults to None."); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2063 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2064 | PyDoc_STRVAR(setdefault_doc__, |
Guido van Rossum | efae886 | 2002-09-04 11:29:45 +0000 | [diff] [blame] | 2065 | "D.setdefault(k[,d]) -> D.get(k,d), also set D[k]=d if k not in D"); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2066 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2067 | PyDoc_STRVAR(pop__doc__, |
Georg Brandl | 4aef703 | 2008-11-07 08:56:27 +0000 | [diff] [blame^] | 2068 | "D.pop(k[,d]) -> v, remove specified key and return the corresponding value.\n\ |
Raymond Hettinger | a3e1e4c | 2003-03-06 23:54:28 +0000 | [diff] [blame] | 2069 | If key is not found, d is returned if given, otherwise KeyError is raised"); |
Guido van Rossum | e027d98 | 2002-04-12 15:11:59 +0000 | [diff] [blame] | 2070 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2071 | PyDoc_STRVAR(popitem__doc__, |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2072 | "D.popitem() -> (k, v), remove and return some (key, value) pair as a\n\ |
Georg Brandl | 4aef703 | 2008-11-07 08:56:27 +0000 | [diff] [blame^] | 2073 | 2-tuple; but raise KeyError if D is empty."); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2074 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2075 | PyDoc_STRVAR(keys__doc__, |
| 2076 | "D.keys() -> list of D's keys"); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2077 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2078 | PyDoc_STRVAR(items__doc__, |
| 2079 | "D.items() -> list of D's (key, value) pairs, as 2-tuples"); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2080 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2081 | PyDoc_STRVAR(values__doc__, |
| 2082 | "D.values() -> list of D's values"); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2083 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2084 | PyDoc_STRVAR(update__doc__, |
Georg Brandl | 4aef703 | 2008-11-07 08:56:27 +0000 | [diff] [blame^] | 2085 | "D.update(E, **F) -> None. Update D from dict/iterable E and F.\n" |
| 2086 | "If E has a .keys() method, does: for k in E: D[k] = E[k]\n\ |
| 2087 | If E lacks .keys() method, does: for (k, v) in E: D[k] = v\n\ |
| 2088 | In either case, this is followed by: for k in F: D[k] = F[k]"); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2089 | |
Raymond Hettinger | e33d3df | 2002-11-27 07:29:33 +0000 | [diff] [blame] | 2090 | PyDoc_STRVAR(fromkeys__doc__, |
| 2091 | "dict.fromkeys(S[,v]) -> New dict with keys from S and values equal to v.\n\ |
| 2092 | v defaults to None."); |
| 2093 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2094 | PyDoc_STRVAR(clear__doc__, |
| 2095 | "D.clear() -> None. Remove all items from D."); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2096 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2097 | PyDoc_STRVAR(copy__doc__, |
| 2098 | "D.copy() -> a shallow copy of D"); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2099 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2100 | PyDoc_STRVAR(iterkeys__doc__, |
| 2101 | "D.iterkeys() -> an iterator over the keys of D"); |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2102 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2103 | PyDoc_STRVAR(itervalues__doc__, |
| 2104 | "D.itervalues() -> an iterator over the values of D"); |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2105 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2106 | PyDoc_STRVAR(iteritems__doc__, |
| 2107 | "D.iteritems() -> an iterator over the (key, value) items of D"); |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2108 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 2109 | static PyMethodDef mapp_methods[] = { |
Neal Norwitz | c792629 | 2007-05-23 06:57:35 +0000 | [diff] [blame] | 2110 | {"__contains__",(PyCFunction)dict_contains, METH_O | METH_COEXIST, |
Raymond Hettinger | 8f5cdaa | 2003-12-13 11:26:12 +0000 | [diff] [blame] | 2111 | contains__doc__}, |
Raymond Hettinger | 0c66967 | 2003-12-13 13:31:55 +0000 | [diff] [blame] | 2112 | {"__getitem__", (PyCFunction)dict_subscript, METH_O | METH_COEXIST, |
Raymond Hettinger | 8f5cdaa | 2003-12-13 11:26:12 +0000 | [diff] [blame] | 2113 | getitem__doc__}, |
Robert Schuppenies | 51df064 | 2008-06-01 16:16:17 +0000 | [diff] [blame] | 2114 | {"__sizeof__", (PyCFunction)dict_sizeof, METH_NOARGS, |
| 2115 | sizeof__doc__}, |
Martin v. Löwis | e3eb1f2 | 2001-08-16 13:15:00 +0000 | [diff] [blame] | 2116 | {"has_key", (PyCFunction)dict_has_key, METH_O, |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2117 | has_key__doc__}, |
| 2118 | {"get", (PyCFunction)dict_get, METH_VARARGS, |
| 2119 | get__doc__}, |
| 2120 | {"setdefault", (PyCFunction)dict_setdefault, METH_VARARGS, |
| 2121 | setdefault_doc__}, |
Raymond Hettinger | a3e1e4c | 2003-03-06 23:54:28 +0000 | [diff] [blame] | 2122 | {"pop", (PyCFunction)dict_pop, METH_VARARGS, |
Just van Rossum | a797d81 | 2002-11-23 09:45:04 +0000 | [diff] [blame] | 2123 | pop__doc__}, |
Martin v. Löwis | e3eb1f2 | 2001-08-16 13:15:00 +0000 | [diff] [blame] | 2124 | {"popitem", (PyCFunction)dict_popitem, METH_NOARGS, |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2125 | popitem__doc__}, |
Martin v. Löwis | e3eb1f2 | 2001-08-16 13:15:00 +0000 | [diff] [blame] | 2126 | {"keys", (PyCFunction)dict_keys, METH_NOARGS, |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2127 | keys__doc__}, |
Martin v. Löwis | e3eb1f2 | 2001-08-16 13:15:00 +0000 | [diff] [blame] | 2128 | {"items", (PyCFunction)dict_items, METH_NOARGS, |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2129 | items__doc__}, |
Martin v. Löwis | e3eb1f2 | 2001-08-16 13:15:00 +0000 | [diff] [blame] | 2130 | {"values", (PyCFunction)dict_values, METH_NOARGS, |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2131 | values__doc__}, |
Raymond Hettinger | 31017ae | 2004-03-04 08:25:44 +0000 | [diff] [blame] | 2132 | {"update", (PyCFunction)dict_update, METH_VARARGS | METH_KEYWORDS, |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2133 | update__doc__}, |
Raymond Hettinger | e33d3df | 2002-11-27 07:29:33 +0000 | [diff] [blame] | 2134 | {"fromkeys", (PyCFunction)dict_fromkeys, METH_VARARGS | METH_CLASS, |
| 2135 | fromkeys__doc__}, |
Martin v. Löwis | e3eb1f2 | 2001-08-16 13:15:00 +0000 | [diff] [blame] | 2136 | {"clear", (PyCFunction)dict_clear, METH_NOARGS, |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2137 | clear__doc__}, |
Martin v. Löwis | e3eb1f2 | 2001-08-16 13:15:00 +0000 | [diff] [blame] | 2138 | {"copy", (PyCFunction)dict_copy, METH_NOARGS, |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2139 | copy__doc__}, |
Martin v. Löwis | e3eb1f2 | 2001-08-16 13:15:00 +0000 | [diff] [blame] | 2140 | {"iterkeys", (PyCFunction)dict_iterkeys, METH_NOARGS, |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2141 | iterkeys__doc__}, |
Martin v. Löwis | e3eb1f2 | 2001-08-16 13:15:00 +0000 | [diff] [blame] | 2142 | {"itervalues", (PyCFunction)dict_itervalues, METH_NOARGS, |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2143 | itervalues__doc__}, |
Martin v. Löwis | e3eb1f2 | 2001-08-16 13:15:00 +0000 | [diff] [blame] | 2144 | {"iteritems", (PyCFunction)dict_iteritems, METH_NOARGS, |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2145 | iteritems__doc__}, |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2146 | {NULL, NULL} /* sentinel */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2147 | }; |
| 2148 | |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 2149 | /* Return 1 if `key` is in dict `op`, 0 if not, and -1 on error. */ |
Raymond Hettinger | bc0f2ab | 2003-11-25 21:12:14 +0000 | [diff] [blame] | 2150 | int |
| 2151 | PyDict_Contains(PyObject *op, PyObject *key) |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 2152 | { |
| 2153 | long hash; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 2154 | PyDictObject *mp = (PyDictObject *)op; |
| 2155 | PyDictEntry *ep; |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 2156 | |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 2157 | if (!PyString_CheckExact(key) || |
| 2158 | (hash = ((PyStringObject *) key)->ob_shash) == -1) { |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 2159 | hash = PyObject_Hash(key); |
| 2160 | if (hash == -1) |
| 2161 | return -1; |
| 2162 | } |
Armin Rigo | 35f6d36 | 2006-06-01 13:19:12 +0000 | [diff] [blame] | 2163 | ep = (mp->ma_lookup)(mp, key, hash); |
Tim Peters | d770ebd | 2006-06-01 15:50:44 +0000 | [diff] [blame] | 2164 | return ep == NULL ? -1 : (ep->me_value != NULL); |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 2165 | } |
| 2166 | |
Raymond Hettinger | d6fc72a | 2007-02-19 02:03:19 +0000 | [diff] [blame] | 2167 | /* Internal version of PyDict_Contains used when the hash value is already known */ |
| 2168 | int |
| 2169 | _PyDict_Contains(PyObject *op, PyObject *key, long hash) |
| 2170 | { |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 2171 | PyDictObject *mp = (PyDictObject *)op; |
| 2172 | PyDictEntry *ep; |
Raymond Hettinger | d6fc72a | 2007-02-19 02:03:19 +0000 | [diff] [blame] | 2173 | |
| 2174 | ep = (mp->ma_lookup)(mp, key, hash); |
| 2175 | return ep == NULL ? -1 : (ep->me_value != NULL); |
| 2176 | } |
| 2177 | |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 2178 | /* Hack to implement "key in dict" */ |
| 2179 | static PySequenceMethods dict_as_sequence = { |
Georg Brandl | 347b300 | 2006-03-30 11:57:00 +0000 | [diff] [blame] | 2180 | 0, /* sq_length */ |
| 2181 | 0, /* sq_concat */ |
| 2182 | 0, /* sq_repeat */ |
| 2183 | 0, /* sq_item */ |
| 2184 | 0, /* sq_slice */ |
| 2185 | 0, /* sq_ass_item */ |
| 2186 | 0, /* sq_ass_slice */ |
| 2187 | PyDict_Contains, /* sq_contains */ |
| 2188 | 0, /* sq_inplace_concat */ |
| 2189 | 0, /* sq_inplace_repeat */ |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 2190 | }; |
| 2191 | |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2192 | static PyObject * |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 2193 | dict_new(PyTypeObject *type, PyObject *args, PyObject *kwds) |
| 2194 | { |
| 2195 | PyObject *self; |
| 2196 | |
| 2197 | assert(type != NULL && type->tp_alloc != NULL); |
| 2198 | self = type->tp_alloc(type, 0); |
| 2199 | if (self != NULL) { |
| 2200 | PyDictObject *d = (PyDictObject *)self; |
| 2201 | /* It's guaranteed that tp->alloc zeroed out the struct. */ |
| 2202 | assert(d->ma_table == NULL && d->ma_fill == 0 && d->ma_used == 0); |
| 2203 | INIT_NONZERO_DICT_SLOTS(d); |
| 2204 | d->ma_lookup = lookdict_string; |
| 2205 | #ifdef SHOW_CONVERSION_COUNTS |
| 2206 | ++created; |
| 2207 | #endif |
| 2208 | } |
| 2209 | return self; |
| 2210 | } |
| 2211 | |
Tim Peters | 25786c0 | 2001-09-02 08:22:48 +0000 | [diff] [blame] | 2212 | static int |
| 2213 | dict_init(PyObject *self, PyObject *args, PyObject *kwds) |
| 2214 | { |
Raymond Hettinger | 31017ae | 2004-03-04 08:25:44 +0000 | [diff] [blame] | 2215 | return dict_update_common(self, args, kwds, "dict"); |
Tim Peters | 25786c0 | 2001-09-02 08:22:48 +0000 | [diff] [blame] | 2216 | } |
| 2217 | |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 2218 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 2219 | dict_iter(PyDictObject *dict) |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2220 | { |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2221 | return dictiter_new(dict, &PyDictIterKey_Type); |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2222 | } |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2223 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2224 | PyDoc_STRVAR(dictionary_doc, |
Tim Peters | a427a2b | 2001-10-29 22:25:45 +0000 | [diff] [blame] | 2225 | "dict() -> new empty dictionary.\n" |
| 2226 | "dict(mapping) -> new dictionary initialized from a mapping object's\n" |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2227 | " (key, value) pairs.\n" |
Tim Peters | a427a2b | 2001-10-29 22:25:45 +0000 | [diff] [blame] | 2228 | "dict(seq) -> new dictionary initialized as if via:\n" |
Tim Peters | 4d85953 | 2001-10-27 18:27:48 +0000 | [diff] [blame] | 2229 | " d = {}\n" |
| 2230 | " for k, v in seq:\n" |
Just van Rossum | a797d81 | 2002-11-23 09:45:04 +0000 | [diff] [blame] | 2231 | " d[k] = v\n" |
| 2232 | "dict(**kwargs) -> new dictionary initialized with the name=value pairs\n" |
| 2233 | " in the keyword argument list. For example: dict(one=1, two=2)"); |
Tim Peters | 25786c0 | 2001-09-02 08:22:48 +0000 | [diff] [blame] | 2234 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 2235 | PyTypeObject PyDict_Type = { |
Martin v. Löwis | 6819210 | 2007-07-21 06:55:02 +0000 | [diff] [blame] | 2236 | PyVarObject_HEAD_INIT(&PyType_Type, 0) |
Tim Peters | a427a2b | 2001-10-29 22:25:45 +0000 | [diff] [blame] | 2237 | "dict", |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 2238 | sizeof(PyDictObject), |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2239 | 0, |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 2240 | (destructor)dict_dealloc, /* tp_dealloc */ |
| 2241 | (printfunc)dict_print, /* tp_print */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 2242 | 0, /* tp_getattr */ |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 2243 | 0, /* tp_setattr */ |
Tim Peters | 4fa58bf | 2001-05-10 21:45:19 +0000 | [diff] [blame] | 2244 | (cmpfunc)dict_compare, /* tp_compare */ |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 2245 | (reprfunc)dict_repr, /* tp_repr */ |
| 2246 | 0, /* tp_as_number */ |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 2247 | &dict_as_sequence, /* tp_as_sequence */ |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 2248 | &dict_as_mapping, /* tp_as_mapping */ |
Nick Coghlan | 53663a6 | 2008-07-15 14:27:37 +0000 | [diff] [blame] | 2249 | (hashfunc)PyObject_HashNotImplemented, /* tp_hash */ |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 2250 | 0, /* tp_call */ |
| 2251 | 0, /* tp_str */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 2252 | PyObject_GenericGetAttr, /* tp_getattro */ |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 2253 | 0, /* tp_setattro */ |
| 2254 | 0, /* tp_as_buffer */ |
Neil Schemenauer | e83c00e | 2001-08-29 23:54:21 +0000 | [diff] [blame] | 2255 | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | |
Neal Norwitz | ee3a1b5 | 2007-02-25 19:44:48 +0000 | [diff] [blame] | 2256 | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_DICT_SUBCLASS, /* tp_flags */ |
Tim Peters | 25786c0 | 2001-09-02 08:22:48 +0000 | [diff] [blame] | 2257 | dictionary_doc, /* tp_doc */ |
Georg Brandl | 347b300 | 2006-03-30 11:57:00 +0000 | [diff] [blame] | 2258 | dict_traverse, /* tp_traverse */ |
| 2259 | dict_tp_clear, /* tp_clear */ |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 2260 | dict_richcompare, /* tp_richcompare */ |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2261 | 0, /* tp_weaklistoffset */ |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2262 | (getiterfunc)dict_iter, /* tp_iter */ |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 2263 | 0, /* tp_iternext */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 2264 | mapp_methods, /* tp_methods */ |
| 2265 | 0, /* tp_members */ |
| 2266 | 0, /* tp_getset */ |
| 2267 | 0, /* tp_base */ |
| 2268 | 0, /* tp_dict */ |
| 2269 | 0, /* tp_descr_get */ |
| 2270 | 0, /* tp_descr_set */ |
| 2271 | 0, /* tp_dictoffset */ |
Georg Brandl | 347b300 | 2006-03-30 11:57:00 +0000 | [diff] [blame] | 2272 | dict_init, /* tp_init */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 2273 | PyType_GenericAlloc, /* tp_alloc */ |
| 2274 | dict_new, /* tp_new */ |
Neil Schemenauer | 6189b89 | 2002-04-12 02:43:00 +0000 | [diff] [blame] | 2275 | PyObject_GC_Del, /* tp_free */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2276 | }; |
| 2277 | |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 2278 | /* For backward compatibility with old dictionary interface */ |
| 2279 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 2280 | PyObject * |
Martin v. Löwis | 32b4a1b | 2002-12-11 13:21:12 +0000 | [diff] [blame] | 2281 | PyDict_GetItemString(PyObject *v, const char *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2282 | { |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 2283 | PyObject *kv, *rv; |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 2284 | kv = PyString_FromString(key); |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 2285 | if (kv == NULL) |
| 2286 | return NULL; |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 2287 | rv = PyDict_GetItem(v, kv); |
| 2288 | Py_DECREF(kv); |
| 2289 | return rv; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2290 | } |
| 2291 | |
| 2292 | int |
Martin v. Löwis | 32b4a1b | 2002-12-11 13:21:12 +0000 | [diff] [blame] | 2293 | PyDict_SetItemString(PyObject *v, const char *key, PyObject *item) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2294 | { |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 2295 | PyObject *kv; |
| 2296 | int err; |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 2297 | kv = PyString_FromString(key); |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 2298 | if (kv == NULL) |
Guido van Rossum | 037b220 | 1997-05-20 18:35:19 +0000 | [diff] [blame] | 2299 | return -1; |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 2300 | PyString_InternInPlace(&kv); /* XXX Should we really? */ |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 2301 | err = PyDict_SetItem(v, kv, item); |
| 2302 | Py_DECREF(kv); |
| 2303 | return err; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2304 | } |
| 2305 | |
| 2306 | int |
Martin v. Löwis | 32b4a1b | 2002-12-11 13:21:12 +0000 | [diff] [blame] | 2307 | PyDict_DelItemString(PyObject *v, const char *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2308 | { |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 2309 | PyObject *kv; |
| 2310 | int err; |
Gregory P. Smith | dd96db6 | 2008-06-09 04:58:54 +0000 | [diff] [blame] | 2311 | kv = PyString_FromString(key); |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 2312 | if (kv == NULL) |
Guido van Rossum | 037b220 | 1997-05-20 18:35:19 +0000 | [diff] [blame] | 2313 | return -1; |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 2314 | err = PyDict_DelItem(v, kv); |
| 2315 | Py_DECREF(kv); |
| 2316 | return err; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2317 | } |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2318 | |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2319 | /* Dictionary iterator types */ |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2320 | |
| 2321 | typedef struct { |
| 2322 | PyObject_HEAD |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 2323 | PyDictObject *di_dict; /* Set to NULL when iterator is exhausted */ |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 2324 | Py_ssize_t di_used; |
| 2325 | Py_ssize_t di_pos; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2326 | PyObject* di_result; /* reusable result tuple for iteritems */ |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 2327 | Py_ssize_t len; |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2328 | } dictiterobject; |
| 2329 | |
| 2330 | static PyObject * |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 2331 | dictiter_new(PyDictObject *dict, PyTypeObject *itertype) |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2332 | { |
| 2333 | dictiterobject *di; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2334 | di = PyObject_New(dictiterobject, itertype); |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2335 | if (di == NULL) |
| 2336 | return NULL; |
| 2337 | Py_INCREF(dict); |
| 2338 | di->di_dict = dict; |
Guido van Rossum | b1f35bf | 2001-05-02 15:13:44 +0000 | [diff] [blame] | 2339 | di->di_used = dict->ma_used; |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2340 | di->di_pos = 0; |
Raymond Hettinger | 0ce6dc8 | 2004-03-18 08:38:00 +0000 | [diff] [blame] | 2341 | di->len = dict->ma_used; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2342 | if (itertype == &PyDictIterItem_Type) { |
| 2343 | di->di_result = PyTuple_Pack(2, Py_None, Py_None); |
| 2344 | if (di->di_result == NULL) { |
| 2345 | Py_DECREF(di); |
| 2346 | return NULL; |
| 2347 | } |
| 2348 | } |
| 2349 | else |
| 2350 | di->di_result = NULL; |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2351 | return (PyObject *)di; |
| 2352 | } |
| 2353 | |
| 2354 | static void |
| 2355 | dictiter_dealloc(dictiterobject *di) |
| 2356 | { |
Guido van Rossum | 2147df7 | 2002-07-16 20:30:22 +0000 | [diff] [blame] | 2357 | Py_XDECREF(di->di_dict); |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2358 | Py_XDECREF(di->di_result); |
Neil Schemenauer | 6189b89 | 2002-04-12 02:43:00 +0000 | [diff] [blame] | 2359 | PyObject_Del(di); |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2360 | } |
| 2361 | |
Raymond Hettinger | 6b27cda | 2005-09-24 21:23:05 +0000 | [diff] [blame] | 2362 | static PyObject * |
Raymond Hettinger | 0ce6dc8 | 2004-03-18 08:38:00 +0000 | [diff] [blame] | 2363 | dictiter_len(dictiterobject *di) |
| 2364 | { |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 2365 | Py_ssize_t len = 0; |
Raymond Hettinger | 7892b1c | 2004-04-12 18:10:01 +0000 | [diff] [blame] | 2366 | if (di->di_dict != NULL && di->di_used == di->di_dict->ma_used) |
Raymond Hettinger | 6b27cda | 2005-09-24 21:23:05 +0000 | [diff] [blame] | 2367 | len = di->len; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 2368 | return PyInt_FromSize_t(len); |
Raymond Hettinger | 0ce6dc8 | 2004-03-18 08:38:00 +0000 | [diff] [blame] | 2369 | } |
| 2370 | |
Armin Rigo | f5b3e36 | 2006-02-11 21:32:43 +0000 | [diff] [blame] | 2371 | PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it))."); |
Raymond Hettinger | 6b27cda | 2005-09-24 21:23:05 +0000 | [diff] [blame] | 2372 | |
| 2373 | static PyMethodDef dictiter_methods[] = { |
Armin Rigo | f5b3e36 | 2006-02-11 21:32:43 +0000 | [diff] [blame] | 2374 | {"__length_hint__", (PyCFunction)dictiter_len, METH_NOARGS, length_hint_doc}, |
Raymond Hettinger | 6b27cda | 2005-09-24 21:23:05 +0000 | [diff] [blame] | 2375 | {NULL, NULL} /* sentinel */ |
Raymond Hettinger | 0ce6dc8 | 2004-03-18 08:38:00 +0000 | [diff] [blame] | 2376 | }; |
| 2377 | |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2378 | static PyObject *dictiter_iternextkey(dictiterobject *di) |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 2379 | { |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2380 | PyObject *key; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 2381 | register Py_ssize_t i, mask; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 2382 | register PyDictEntry *ep; |
| 2383 | PyDictObject *d = di->di_dict; |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 2384 | |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2385 | if (d == NULL) |
Guido van Rossum | 2147df7 | 2002-07-16 20:30:22 +0000 | [diff] [blame] | 2386 | return NULL; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2387 | assert (PyDict_Check(d)); |
Guido van Rossum | 2147df7 | 2002-07-16 20:30:22 +0000 | [diff] [blame] | 2388 | |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2389 | if (di->di_used != d->ma_used) { |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 2390 | PyErr_SetString(PyExc_RuntimeError, |
| 2391 | "dictionary changed size during iteration"); |
Guido van Rossum | 2147df7 | 2002-07-16 20:30:22 +0000 | [diff] [blame] | 2392 | di->di_used = -1; /* Make this state sticky */ |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 2393 | return NULL; |
| 2394 | } |
Guido van Rossum | 2147df7 | 2002-07-16 20:30:22 +0000 | [diff] [blame] | 2395 | |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2396 | i = di->di_pos; |
| 2397 | if (i < 0) |
| 2398 | goto fail; |
| 2399 | ep = d->ma_table; |
| 2400 | mask = d->ma_mask; |
| 2401 | while (i <= mask && ep[i].me_value == NULL) |
| 2402 | i++; |
| 2403 | di->di_pos = i+1; |
| 2404 | if (i > mask) |
| 2405 | goto fail; |
Raymond Hettinger | 0ce6dc8 | 2004-03-18 08:38:00 +0000 | [diff] [blame] | 2406 | di->len--; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2407 | key = ep[i].me_key; |
| 2408 | Py_INCREF(key); |
| 2409 | return key; |
| 2410 | |
| 2411 | fail: |
| 2412 | Py_DECREF(d); |
Guido van Rossum | 2147df7 | 2002-07-16 20:30:22 +0000 | [diff] [blame] | 2413 | di->di_dict = NULL; |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 2414 | return NULL; |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2415 | } |
| 2416 | |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2417 | PyTypeObject PyDictIterKey_Type = { |
Martin v. Löwis | 6819210 | 2007-07-21 06:55:02 +0000 | [diff] [blame] | 2418 | PyVarObject_HEAD_INIT(&PyType_Type, 0) |
Raymond Hettinger | 0ce6dc8 | 2004-03-18 08:38:00 +0000 | [diff] [blame] | 2419 | "dictionary-keyiterator", /* tp_name */ |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2420 | sizeof(dictiterobject), /* tp_basicsize */ |
| 2421 | 0, /* tp_itemsize */ |
| 2422 | /* methods */ |
| 2423 | (destructor)dictiter_dealloc, /* tp_dealloc */ |
| 2424 | 0, /* tp_print */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 2425 | 0, /* tp_getattr */ |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2426 | 0, /* tp_setattr */ |
| 2427 | 0, /* tp_compare */ |
| 2428 | 0, /* tp_repr */ |
| 2429 | 0, /* tp_as_number */ |
Raymond Hettinger | 6b27cda | 2005-09-24 21:23:05 +0000 | [diff] [blame] | 2430 | 0, /* tp_as_sequence */ |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2431 | 0, /* tp_as_mapping */ |
| 2432 | 0, /* tp_hash */ |
| 2433 | 0, /* tp_call */ |
| 2434 | 0, /* tp_str */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 2435 | PyObject_GenericGetAttr, /* tp_getattro */ |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2436 | 0, /* tp_setattro */ |
| 2437 | 0, /* tp_as_buffer */ |
| 2438 | Py_TPFLAGS_DEFAULT, /* tp_flags */ |
| 2439 | 0, /* tp_doc */ |
| 2440 | 0, /* tp_traverse */ |
| 2441 | 0, /* tp_clear */ |
| 2442 | 0, /* tp_richcompare */ |
| 2443 | 0, /* tp_weaklistoffset */ |
Raymond Hettinger | 1da1dbf | 2003-03-17 19:46:11 +0000 | [diff] [blame] | 2444 | PyObject_SelfIter, /* tp_iter */ |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2445 | (iternextfunc)dictiter_iternextkey, /* tp_iternext */ |
Raymond Hettinger | 6b27cda | 2005-09-24 21:23:05 +0000 | [diff] [blame] | 2446 | dictiter_methods, /* tp_methods */ |
| 2447 | 0, |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2448 | }; |
| 2449 | |
| 2450 | static PyObject *dictiter_iternextvalue(dictiterobject *di) |
| 2451 | { |
| 2452 | PyObject *value; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 2453 | register Py_ssize_t i, mask; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 2454 | register PyDictEntry *ep; |
| 2455 | PyDictObject *d = di->di_dict; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2456 | |
| 2457 | if (d == NULL) |
| 2458 | return NULL; |
| 2459 | assert (PyDict_Check(d)); |
| 2460 | |
| 2461 | if (di->di_used != d->ma_used) { |
| 2462 | PyErr_SetString(PyExc_RuntimeError, |
| 2463 | "dictionary changed size during iteration"); |
| 2464 | di->di_used = -1; /* Make this state sticky */ |
| 2465 | return NULL; |
| 2466 | } |
| 2467 | |
| 2468 | i = di->di_pos; |
Guido van Rossum | 09240f6 | 2004-03-20 19:11:58 +0000 | [diff] [blame] | 2469 | mask = d->ma_mask; |
| 2470 | if (i < 0 || i > mask) |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2471 | goto fail; |
| 2472 | ep = d->ma_table; |
Guido van Rossum | 09240f6 | 2004-03-20 19:11:58 +0000 | [diff] [blame] | 2473 | while ((value=ep[i].me_value) == NULL) { |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2474 | i++; |
Guido van Rossum | 09240f6 | 2004-03-20 19:11:58 +0000 | [diff] [blame] | 2475 | if (i > mask) |
| 2476 | goto fail; |
| 2477 | } |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2478 | di->di_pos = i+1; |
Raymond Hettinger | 0ce6dc8 | 2004-03-18 08:38:00 +0000 | [diff] [blame] | 2479 | di->len--; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2480 | Py_INCREF(value); |
| 2481 | return value; |
| 2482 | |
| 2483 | fail: |
| 2484 | Py_DECREF(d); |
| 2485 | di->di_dict = NULL; |
| 2486 | return NULL; |
| 2487 | } |
| 2488 | |
| 2489 | PyTypeObject PyDictIterValue_Type = { |
Martin v. Löwis | 6819210 | 2007-07-21 06:55:02 +0000 | [diff] [blame] | 2490 | PyVarObject_HEAD_INIT(&PyType_Type, 0) |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2491 | "dictionary-valueiterator", /* tp_name */ |
| 2492 | sizeof(dictiterobject), /* tp_basicsize */ |
| 2493 | 0, /* tp_itemsize */ |
| 2494 | /* methods */ |
| 2495 | (destructor)dictiter_dealloc, /* tp_dealloc */ |
| 2496 | 0, /* tp_print */ |
| 2497 | 0, /* tp_getattr */ |
| 2498 | 0, /* tp_setattr */ |
| 2499 | 0, /* tp_compare */ |
| 2500 | 0, /* tp_repr */ |
| 2501 | 0, /* tp_as_number */ |
Raymond Hettinger | 6b27cda | 2005-09-24 21:23:05 +0000 | [diff] [blame] | 2502 | 0, /* tp_as_sequence */ |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2503 | 0, /* tp_as_mapping */ |
| 2504 | 0, /* tp_hash */ |
| 2505 | 0, /* tp_call */ |
| 2506 | 0, /* tp_str */ |
| 2507 | PyObject_GenericGetAttr, /* tp_getattro */ |
| 2508 | 0, /* tp_setattro */ |
| 2509 | 0, /* tp_as_buffer */ |
| 2510 | Py_TPFLAGS_DEFAULT, /* tp_flags */ |
| 2511 | 0, /* tp_doc */ |
| 2512 | 0, /* tp_traverse */ |
| 2513 | 0, /* tp_clear */ |
| 2514 | 0, /* tp_richcompare */ |
| 2515 | 0, /* tp_weaklistoffset */ |
| 2516 | PyObject_SelfIter, /* tp_iter */ |
| 2517 | (iternextfunc)dictiter_iternextvalue, /* tp_iternext */ |
Raymond Hettinger | 6b27cda | 2005-09-24 21:23:05 +0000 | [diff] [blame] | 2518 | dictiter_methods, /* tp_methods */ |
| 2519 | 0, |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2520 | }; |
| 2521 | |
| 2522 | static PyObject *dictiter_iternextitem(dictiterobject *di) |
| 2523 | { |
| 2524 | PyObject *key, *value, *result = di->di_result; |
Tim Peters | 9b10f7e | 2006-05-30 04:16:25 +0000 | [diff] [blame] | 2525 | register Py_ssize_t i, mask; |
Brett Cannon | 77ae87c | 2007-10-10 00:07:50 +0000 | [diff] [blame] | 2526 | register PyDictEntry *ep; |
| 2527 | PyDictObject *d = di->di_dict; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2528 | |
| 2529 | if (d == NULL) |
| 2530 | return NULL; |
| 2531 | assert (PyDict_Check(d)); |
| 2532 | |
| 2533 | if (di->di_used != d->ma_used) { |
| 2534 | PyErr_SetString(PyExc_RuntimeError, |
| 2535 | "dictionary changed size during iteration"); |
| 2536 | di->di_used = -1; /* Make this state sticky */ |
| 2537 | return NULL; |
| 2538 | } |
| 2539 | |
| 2540 | i = di->di_pos; |
| 2541 | if (i < 0) |
| 2542 | goto fail; |
| 2543 | ep = d->ma_table; |
| 2544 | mask = d->ma_mask; |
| 2545 | while (i <= mask && ep[i].me_value == NULL) |
| 2546 | i++; |
| 2547 | di->di_pos = i+1; |
| 2548 | if (i > mask) |
| 2549 | goto fail; |
| 2550 | |
| 2551 | if (result->ob_refcnt == 1) { |
| 2552 | Py_INCREF(result); |
| 2553 | Py_DECREF(PyTuple_GET_ITEM(result, 0)); |
| 2554 | Py_DECREF(PyTuple_GET_ITEM(result, 1)); |
| 2555 | } else { |
| 2556 | result = PyTuple_New(2); |
Tim Peters | 60b2996 | 2006-01-01 01:19:23 +0000 | [diff] [blame] | 2557 | if (result == NULL) |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2558 | return NULL; |
| 2559 | } |
Raymond Hettinger | 0ce6dc8 | 2004-03-18 08:38:00 +0000 | [diff] [blame] | 2560 | di->len--; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2561 | key = ep[i].me_key; |
| 2562 | value = ep[i].me_value; |
| 2563 | Py_INCREF(key); |
| 2564 | Py_INCREF(value); |
| 2565 | PyTuple_SET_ITEM(result, 0, key); |
| 2566 | PyTuple_SET_ITEM(result, 1, value); |
| 2567 | return result; |
| 2568 | |
| 2569 | fail: |
| 2570 | Py_DECREF(d); |
| 2571 | di->di_dict = NULL; |
| 2572 | return NULL; |
| 2573 | } |
| 2574 | |
| 2575 | PyTypeObject PyDictIterItem_Type = { |
Martin v. Löwis | 6819210 | 2007-07-21 06:55:02 +0000 | [diff] [blame] | 2576 | PyVarObject_HEAD_INIT(&PyType_Type, 0) |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2577 | "dictionary-itemiterator", /* tp_name */ |
| 2578 | sizeof(dictiterobject), /* tp_basicsize */ |
| 2579 | 0, /* tp_itemsize */ |
| 2580 | /* methods */ |
| 2581 | (destructor)dictiter_dealloc, /* tp_dealloc */ |
| 2582 | 0, /* tp_print */ |
| 2583 | 0, /* tp_getattr */ |
| 2584 | 0, /* tp_setattr */ |
| 2585 | 0, /* tp_compare */ |
| 2586 | 0, /* tp_repr */ |
| 2587 | 0, /* tp_as_number */ |
Raymond Hettinger | 6b27cda | 2005-09-24 21:23:05 +0000 | [diff] [blame] | 2588 | 0, /* tp_as_sequence */ |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 2589 | 0, /* tp_as_mapping */ |
| 2590 | 0, /* tp_hash */ |
| 2591 | 0, /* tp_call */ |
| 2592 | 0, /* tp_str */ |
| 2593 | PyObject_GenericGetAttr, /* tp_getattro */ |
| 2594 | 0, /* tp_setattro */ |
| 2595 | 0, /* tp_as_buffer */ |
| 2596 | Py_TPFLAGS_DEFAULT, /* tp_flags */ |
| 2597 | 0, /* tp_doc */ |
| 2598 | 0, /* tp_traverse */ |
| 2599 | 0, /* tp_clear */ |
| 2600 | 0, /* tp_richcompare */ |
| 2601 | 0, /* tp_weaklistoffset */ |
| 2602 | PyObject_SelfIter, /* tp_iter */ |
| 2603 | (iternextfunc)dictiter_iternextitem, /* tp_iternext */ |
Raymond Hettinger | 6b27cda | 2005-09-24 21:23:05 +0000 | [diff] [blame] | 2604 | dictiter_methods, /* tp_methods */ |
| 2605 | 0, |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 2606 | }; |