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