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