Guido van Rossum | 2bc1379 | 1999-03-24 19:06:42 +0000 | [diff] [blame] | 1 | /* Dictionary object implementation using a hash table */ |
Guido van Rossum | 9bfef44 | 1993-03-29 10:43:31 +0000 | [diff] [blame] | 2 | |
Raymond Hettinger | 930427b | 2003-05-03 06:51:59 +0000 | [diff] [blame] | 3 | /* The distribution includes a separate file, Objects/dictnotes.txt, |
Tim Peters | 60b2996 | 2006-01-01 01:19:23 +0000 | [diff] [blame] | 4 | describing explorations into dictionary design and optimization. |
Raymond Hettinger | 930427b | 2003-05-03 06:51:59 +0000 | [diff] [blame] | 5 | It covers typical dictionary use patterns, the parameters for |
| 6 | tuning dictionaries, and several ideas for possible optimizations. |
| 7 | */ |
| 8 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 9 | /* PyDictKeysObject |
| 10 | |
| 11 | This implements the dictionary's hashtable. |
| 12 | |
Raymond Hettinger | b12785d | 2016-10-22 09:58:14 -0700 | [diff] [blame] | 13 | As of Python 3.6, this is compact and ordered. Basic idea is described here: |
| 14 | * https://mail.python.org/pipermail/python-dev/2012-December/123028.html |
| 15 | * https://morepypy.blogspot.com/2015/01/faster-more-memory-efficient-and-more.html |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 16 | |
| 17 | layout: |
| 18 | |
| 19 | +---------------+ |
| 20 | | dk_refcnt | |
| 21 | | dk_size | |
| 22 | | dk_lookup | |
| 23 | | dk_usable | |
| 24 | | dk_nentries | |
| 25 | +---------------+ |
| 26 | | dk_indices | |
| 27 | | | |
| 28 | +---------------+ |
| 29 | | dk_entries | |
| 30 | | | |
| 31 | +---------------+ |
| 32 | |
| 33 | dk_indices is actual hashtable. It holds index in entries, or DKIX_EMPTY(-1) |
| 34 | or DKIX_DUMMY(-2). |
| 35 | Size of indices is dk_size. Type of each index in indices is vary on dk_size: |
| 36 | |
| 37 | * int8 for dk_size <= 128 |
| 38 | * int16 for 256 <= dk_size <= 2**15 |
| 39 | * int32 for 2**16 <= dk_size <= 2**31 |
| 40 | * int64 for 2**32 <= dk_size |
| 41 | |
| 42 | dk_entries is array of PyDictKeyEntry. It's size is USABLE_FRACTION(dk_size). |
| 43 | DK_ENTRIES(dk) can be used to get pointer to entries. |
| 44 | |
| 45 | NOTE: Since negative value is used for DKIX_EMPTY and DKIX_DUMMY, type of |
| 46 | dk_indices entry is signed integer and int16 is used for table which |
| 47 | dk_size == 256. |
| 48 | */ |
| 49 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 50 | |
| 51 | /* |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 52 | The DictObject can be in one of two forms. |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 53 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 54 | Either: |
| 55 | A combined table: |
| 56 | ma_values == NULL, dk_refcnt == 1. |
| 57 | Values are stored in the me_value field of the PyDictKeysObject. |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 58 | Or: |
| 59 | A split table: |
| 60 | ma_values != NULL, dk_refcnt >= 1 |
| 61 | Values are stored in the ma_values array. |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 62 | Only string (unicode) keys are allowed. |
| 63 | All dicts sharing same key must have same insertion order. |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 64 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 65 | There are four kinds of slots in the table (slot is index, and |
| 66 | DK_ENTRIES(keys)[index] if index >= 0): |
| 67 | |
| 68 | 1. Unused. index == DKIX_EMPTY |
| 69 | Does not hold an active (key, value) pair now and never did. Unused can |
| 70 | transition to Active upon key insertion. This is each slot's initial state. |
| 71 | |
| 72 | 2. Active. index >= 0, me_key != NULL and me_value != NULL |
| 73 | Holds an active (key, value) pair. Active can transition to Dummy or |
| 74 | Pending upon key deletion (for combined and split tables respectively). |
| 75 | This is the only case in which me_value != NULL. |
| 76 | |
| 77 | 3. Dummy. index == DKIX_DUMMY (combined only) |
| 78 | Previously held an active (key, value) pair, but that was deleted and an |
| 79 | active pair has not yet overwritten the slot. Dummy can transition to |
| 80 | Active upon key insertion. Dummy slots cannot be made Unused again |
| 81 | else the probe sequence in case of collision would have no way to know |
| 82 | they were once active. |
| 83 | |
| 84 | 4. Pending. index >= 0, key != NULL, and value == NULL (split only) |
| 85 | Not yet inserted in split-table. |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 86 | */ |
| 87 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 88 | /* |
| 89 | Preserving insertion order |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 90 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 91 | It's simple for combined table. Since dk_entries is mostly append only, we can |
| 92 | get insertion order by just iterating dk_entries. |
| 93 | |
| 94 | One exception is .popitem(). It removes last item in dk_entries and decrement |
| 95 | dk_nentries to achieve amortized O(1). Since there are DKIX_DUMMY remains in |
| 96 | dk_indices, we can't increment dk_usable even though dk_nentries is |
| 97 | decremented. |
| 98 | |
| 99 | In split table, inserting into pending entry is allowed only for dk_entries[ix] |
| 100 | where ix == mp->ma_used. Inserting into other index and deleting item cause |
| 101 | converting the dict to the combined table. |
| 102 | */ |
| 103 | |
| 104 | /* PyDict_MINSIZE is the starting size for any new dict. |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 105 | * 8 allows dicts with no more than 5 active entries; experiments suggested |
| 106 | * this suffices for the majority of dicts (consisting mostly of usually-small |
| 107 | * dicts created to pass keyword arguments). |
| 108 | * Making this 8, rather than 4 reduces the number of resizes for most |
| 109 | * dictionaries, without any significant extra memory use. |
| 110 | */ |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 111 | #define PyDict_MINSIZE 8 |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 112 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 113 | #include "Python.h" |
Eric Snow | 2ebc5ce | 2017-09-07 23:51:28 -0600 | [diff] [blame] | 114 | #include "internal/pystate.h" |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 115 | #include "dict-common.h" |
Victor Stinner | 990397e | 2016-09-09 20:22:59 -0700 | [diff] [blame] | 116 | #include "stringlib/eq.h" /* to get unicode_eq() */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 117 | |
Larry Hastings | 61272b7 | 2014-01-07 12:41:53 -0800 | [diff] [blame] | 118 | /*[clinic input] |
Larry Hastings | c204726 | 2014-01-25 20:43:29 -0800 | [diff] [blame] | 119 | class dict "PyDictObject *" "&PyDict_Type" |
Larry Hastings | 61272b7 | 2014-01-07 12:41:53 -0800 | [diff] [blame] | 120 | [clinic start generated code]*/ |
Larry Hastings | 581ee36 | 2014-01-28 05:00:08 -0800 | [diff] [blame] | 121 | /*[clinic end generated code: output=da39a3ee5e6b4b0d input=f157a5a0ce9589d6]*/ |
Larry Hastings | 44e2eaa | 2013-11-23 15:37:55 -0800 | [diff] [blame] | 122 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 123 | |
| 124 | /* |
| 125 | To ensure the lookup algorithm terminates, there must be at least one Unused |
| 126 | slot (NULL key) in the table. |
| 127 | To avoid slowing down lookups on a near-full table, we resize the table when |
| 128 | it's USABLE_FRACTION (currently two-thirds) full. |
| 129 | */ |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 130 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 131 | #define PERTURB_SHIFT 5 |
| 132 | |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 133 | /* |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 134 | Major subtleties ahead: Most hash schemes depend on having a "good" hash |
| 135 | function, in the sense of simulating randomness. Python doesn't: its most |
R David Murray | 537ad7a | 2016-07-10 12:33:18 -0400 | [diff] [blame] | 136 | important hash functions (for ints) are very regular in common |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 137 | cases: |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 138 | |
R David Murray | 537ad7a | 2016-07-10 12:33:18 -0400 | [diff] [blame] | 139 | >>>[hash(i) for i in range(4)] |
Guido van Rossum | dc5f6b2 | 2006-08-24 21:29:26 +0000 | [diff] [blame] | 140 | [0, 1, 2, 3] |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 141 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 142 | This isn't necessarily bad! To the contrary, in a table of size 2**i, taking |
| 143 | the low-order i bits as the initial table index is extremely fast, and there |
R David Murray | 537ad7a | 2016-07-10 12:33:18 -0400 | [diff] [blame] | 144 | are no collisions at all for dicts indexed by a contiguous range of ints. So |
| 145 | this gives better-than-random behavior in common cases, and that's very |
| 146 | desirable. |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 147 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 148 | OTOH, when collisions occur, the tendency to fill contiguous slices of the |
| 149 | hash table makes a good collision resolution strategy crucial. Taking only |
| 150 | the last i bits of the hash code is also vulnerable: for example, consider |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 151 | the list [i << 16 for i in range(20000)] as a set of keys. Since ints are |
Guido van Rossum | dc5f6b2 | 2006-08-24 21:29:26 +0000 | [diff] [blame] | 152 | their own hash codes, and this fits in a dict of size 2**15, the last 15 bits |
| 153 | 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] | 154 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 155 | But catering to unusual cases should not slow the usual ones, so we just take |
| 156 | the last i bits anyway. It's up to collision resolution to do the rest. If |
| 157 | we *usually* find the key we're looking for on the first try (and, it turns |
| 158 | out, we usually do -- the table load factor is kept under 2/3, so the odds |
| 159 | are solidly in our favor), then it makes best sense to keep the initial index |
| 160 | computation dirt cheap. |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 161 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 162 | The first half of collision resolution is to visit table indices via this |
| 163 | recurrence: |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 164 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 165 | j = ((5*j) + 1) mod 2**i |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 166 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 167 | For any initial j in range(2**i), repeating that 2**i times generates each |
| 168 | int in range(2**i) exactly once (see any text on random-number generation for |
| 169 | proof). By itself, this doesn't help much: like linear probing (setting |
| 170 | j += 1, or j -= 1, on each loop trip), it scans the table entries in a fixed |
| 171 | order. This would be bad, except that's not the only thing we do, and it's |
| 172 | actually *good* in the common cases where hash keys are consecutive. In an |
| 173 | example that's really too small to make this entirely clear, for a table of |
| 174 | size 2**3 the order of indices is: |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 175 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 176 | 0 -> 1 -> 6 -> 7 -> 4 -> 5 -> 2 -> 3 -> 0 [and here it's repeating] |
| 177 | |
| 178 | If two things come in at index 5, the first place we look after is index 2, |
| 179 | not 6, so if another comes in at index 6 the collision at 5 didn't hurt it. |
| 180 | Linear probing is deadly in this case because there the fixed probe order |
| 181 | is the *same* as the order consecutive keys are likely to arrive. But it's |
| 182 | extremely unlikely hash codes will follow a 5*j+1 recurrence by accident, |
| 183 | and certain that consecutive hash codes do not. |
| 184 | |
| 185 | The other half of the strategy is to get the other bits of the hash code |
| 186 | into play. This is done by initializing a (unsigned) vrbl "perturb" to the |
| 187 | full hash code, and changing the recurrence to: |
| 188 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 189 | perturb >>= PERTURB_SHIFT; |
INADA Naoki | 267941c | 2016-10-06 15:19:07 +0900 | [diff] [blame] | 190 | j = (5*j) + 1 + perturb; |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 191 | use j % 2**i as the next table index; |
| 192 | |
| 193 | Now the probe sequence depends (eventually) on every bit in the hash code, |
| 194 | and the pseudo-scrambling property of recurring on 5*j+1 is more valuable, |
| 195 | because it quickly magnifies small differences in the bits that didn't affect |
| 196 | the initial index. Note that because perturb is unsigned, if the recurrence |
| 197 | is executed often enough perturb eventually becomes and remains 0. At that |
| 198 | point (very rarely reached) the recurrence is on (just) 5*j+1 again, and |
| 199 | that's certain to find an empty slot eventually (since it generates every int |
| 200 | in range(2**i), and we make sure there's always at least one empty slot). |
| 201 | |
| 202 | Selecting a good value for PERTURB_SHIFT is a balancing act. You want it |
| 203 | small so that the high bits of the hash code continue to affect the probe |
| 204 | sequence across iterations; but you want it large so that in really bad cases |
| 205 | the high-order hash bits have an effect on early iterations. 5 was "the |
| 206 | best" in minimizing total collisions across experiments Tim Peters ran (on |
| 207 | both normal and pathological cases), but 4 and 6 weren't significantly worse. |
| 208 | |
Guido van Rossum | dc5f6b2 | 2006-08-24 21:29:26 +0000 | [diff] [blame] | 209 | Historical: Reimer Behrends contributed the idea of using a polynomial-based |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 210 | approach, using repeated multiplication by x in GF(2**n) where an irreducible |
| 211 | polynomial for each table size was chosen such that x was a primitive root. |
| 212 | Christian Tismer later extended that to use division by x instead, as an |
| 213 | efficient way to get the high bits of the hash code into play. This scheme |
Guido van Rossum | 8ce8a78 | 2007-11-01 19:42:39 +0000 | [diff] [blame] | 214 | also gave excellent collision statistics, but was more expensive: two |
| 215 | if-tests were required inside the loop; computing "the next" index took about |
| 216 | the same number of operations but without as much potential parallelism |
| 217 | (e.g., computing 5*j can go on at the same time as computing 1+perturb in the |
| 218 | above, and then shifting perturb can be done while the table index is being |
| 219 | masked); and the PyDictObject struct required a member to hold the table's |
| 220 | polynomial. In Tim's experiments the current scheme ran faster, produced |
| 221 | equally good collision statistics, needed less code & used less memory. |
Thomas Wouters | 4d70c3d | 2006-06-08 14:42:34 +0000 | [diff] [blame] | 222 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 223 | */ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 224 | |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 225 | /* forward declarations */ |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 226 | static Py_ssize_t lookdict(PyDictObject *mp, PyObject *key, |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 227 | Py_hash_t hash, PyObject **value_addr); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 228 | static Py_ssize_t lookdict_unicode(PyDictObject *mp, PyObject *key, |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 229 | Py_hash_t hash, PyObject **value_addr); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 230 | static Py_ssize_t |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 231 | lookdict_unicode_nodummy(PyDictObject *mp, PyObject *key, |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 232 | Py_hash_t hash, PyObject **value_addr); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 233 | static Py_ssize_t lookdict_split(PyDictObject *mp, PyObject *key, |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 234 | Py_hash_t hash, PyObject **value_addr); |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 235 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 236 | static int dictresize(PyDictObject *mp, Py_ssize_t minused); |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 237 | |
Benjamin Peterson | 3c56929 | 2016-09-08 13:16:41 -0700 | [diff] [blame] | 238 | /*Global counter used to set ma_version_tag field of dictionary. |
Victor Stinner | 3b6a6b4 | 2016-09-08 12:51:24 -0700 | [diff] [blame] | 239 | * It is incremented each time that a dictionary is created and each |
| 240 | * time that a dictionary is modified. */ |
| 241 | static uint64_t pydict_global_version = 0; |
| 242 | |
| 243 | #define DICT_NEXT_VERSION() (++pydict_global_version) |
| 244 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 245 | /* Dictionary reuse scheme to save calls to malloc and free */ |
Christian Heimes | 2202f87 | 2008-02-06 14:31:34 +0000 | [diff] [blame] | 246 | #ifndef PyDict_MAXFREELIST |
| 247 | #define PyDict_MAXFREELIST 80 |
| 248 | #endif |
| 249 | static PyDictObject *free_list[PyDict_MAXFREELIST]; |
| 250 | static int numfree = 0; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 251 | static PyDictKeysObject *keys_free_list[PyDict_MAXFREELIST]; |
| 252 | static int numfreekeys = 0; |
Raymond Hettinger | 4344278 | 2004-03-17 21:55:03 +0000 | [diff] [blame] | 253 | |
Serhiy Storchaka | 1009bf1 | 2015-04-03 23:53:51 +0300 | [diff] [blame] | 254 | #include "clinic/dictobject.c.h" |
| 255 | |
Antoine Pitrou | 9a812cb | 2011-11-15 00:00:12 +0100 | [diff] [blame] | 256 | int |
| 257 | PyDict_ClearFreeList(void) |
Christian Heimes | 77c02eb | 2008-02-09 02:18:51 +0000 | [diff] [blame] | 258 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 259 | PyDictObject *op; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 260 | int ret = numfree + numfreekeys; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 261 | while (numfree) { |
| 262 | op = free_list[--numfree]; |
| 263 | assert(PyDict_CheckExact(op)); |
| 264 | PyObject_GC_Del(op); |
| 265 | } |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 266 | while (numfreekeys) { |
| 267 | PyObject_FREE(keys_free_list[--numfreekeys]); |
| 268 | } |
Antoine Pitrou | 9a812cb | 2011-11-15 00:00:12 +0100 | [diff] [blame] | 269 | return ret; |
| 270 | } |
| 271 | |
David Malcolm | 49526f4 | 2012-06-22 14:55:41 -0400 | [diff] [blame] | 272 | /* Print summary info about the state of the optimized allocator */ |
| 273 | void |
| 274 | _PyDict_DebugMallocStats(FILE *out) |
| 275 | { |
| 276 | _PyDebugAllocatorStats(out, |
| 277 | "free PyDictObject", numfree, sizeof(PyDictObject)); |
| 278 | } |
| 279 | |
| 280 | |
Antoine Pitrou | 9a812cb | 2011-11-15 00:00:12 +0100 | [diff] [blame] | 281 | void |
| 282 | PyDict_Fini(void) |
| 283 | { |
| 284 | PyDict_ClearFreeList(); |
Christian Heimes | 77c02eb | 2008-02-09 02:18:51 +0000 | [diff] [blame] | 285 | } |
| 286 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 287 | #define DK_SIZE(dk) ((dk)->dk_size) |
| 288 | #if SIZEOF_VOID_P > 4 |
Victor Stinner | 58f7c5a | 2016-09-08 11:37:36 -0700 | [diff] [blame] | 289 | #define DK_IXSIZE(dk) \ |
| 290 | (DK_SIZE(dk) <= 0xff ? \ |
| 291 | 1 : DK_SIZE(dk) <= 0xffff ? \ |
| 292 | 2 : DK_SIZE(dk) <= 0xffffffff ? \ |
Benjamin Peterson | 3c56929 | 2016-09-08 13:16:41 -0700 | [diff] [blame] | 293 | 4 : sizeof(int64_t)) |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 294 | #else |
Victor Stinner | 58f7c5a | 2016-09-08 11:37:36 -0700 | [diff] [blame] | 295 | #define DK_IXSIZE(dk) \ |
| 296 | (DK_SIZE(dk) <= 0xff ? \ |
| 297 | 1 : DK_SIZE(dk) <= 0xffff ? \ |
Benjamin Peterson | 3c56929 | 2016-09-08 13:16:41 -0700 | [diff] [blame] | 298 | 2 : sizeof(int32_t)) |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 299 | #endif |
Victor Stinner | 58f7c5a | 2016-09-08 11:37:36 -0700 | [diff] [blame] | 300 | #define DK_ENTRIES(dk) \ |
Benjamin Peterson | 186122e | 2016-09-08 12:20:12 -0700 | [diff] [blame] | 301 | ((PyDictKeyEntry*)(&(dk)->dk_indices.as_1[DK_SIZE(dk) * DK_IXSIZE(dk)])) |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 302 | |
Antoine Pitrou | 2d169b2 | 2012-05-12 23:43:44 +0200 | [diff] [blame] | 303 | #define DK_DEBUG_INCREF _Py_INC_REFTOTAL _Py_REF_DEBUG_COMMA |
| 304 | #define DK_DEBUG_DECREF _Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA |
| 305 | |
| 306 | #define DK_INCREF(dk) (DK_DEBUG_INCREF ++(dk)->dk_refcnt) |
| 307 | #define DK_DECREF(dk) if (DK_DEBUG_DECREF (--(dk)->dk_refcnt) == 0) free_keys_object(dk) |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 308 | #define DK_MASK(dk) (((dk)->dk_size)-1) |
| 309 | #define IS_POWER_OF_2(x) (((x) & (x-1)) == 0) |
| 310 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 311 | /* lookup indices. returns DKIX_EMPTY, DKIX_DUMMY, or ix >=0 */ |
Benjamin Peterson | 7322225 | 2016-09-08 09:58:47 -0700 | [diff] [blame] | 312 | static inline Py_ssize_t |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 313 | dk_get_index(PyDictKeysObject *keys, Py_ssize_t i) |
| 314 | { |
| 315 | Py_ssize_t s = DK_SIZE(keys); |
Victor Stinner | 71211e3 | 2016-09-08 10:52:46 -0700 | [diff] [blame] | 316 | Py_ssize_t ix; |
| 317 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 318 | if (s <= 0xff) { |
Benjamin Peterson | 186122e | 2016-09-08 12:20:12 -0700 | [diff] [blame] | 319 | int8_t *indices = keys->dk_indices.as_1; |
Victor Stinner | 208857e | 2016-09-08 11:35:46 -0700 | [diff] [blame] | 320 | ix = indices[i]; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 321 | } |
| 322 | else if (s <= 0xffff) { |
Benjamin Peterson | 186122e | 2016-09-08 12:20:12 -0700 | [diff] [blame] | 323 | int16_t *indices = keys->dk_indices.as_2; |
Victor Stinner | 208857e | 2016-09-08 11:35:46 -0700 | [diff] [blame] | 324 | ix = indices[i]; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 325 | } |
Benjamin Peterson | 3c56929 | 2016-09-08 13:16:41 -0700 | [diff] [blame] | 326 | #if SIZEOF_VOID_P > 4 |
Serhiy Storchaka | 473e0e4 | 2016-09-10 21:34:43 +0300 | [diff] [blame] | 327 | else if (s > 0xffffffff) { |
Benjamin Peterson | 186122e | 2016-09-08 12:20:12 -0700 | [diff] [blame] | 328 | int64_t *indices = keys->dk_indices.as_8; |
Victor Stinner | 208857e | 2016-09-08 11:35:46 -0700 | [diff] [blame] | 329 | ix = indices[i]; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 330 | } |
Benjamin Peterson | 3c56929 | 2016-09-08 13:16:41 -0700 | [diff] [blame] | 331 | #endif |
Serhiy Storchaka | 473e0e4 | 2016-09-10 21:34:43 +0300 | [diff] [blame] | 332 | else { |
| 333 | int32_t *indices = keys->dk_indices.as_4; |
| 334 | ix = indices[i]; |
| 335 | } |
Victor Stinner | 71211e3 | 2016-09-08 10:52:46 -0700 | [diff] [blame] | 336 | assert(ix >= DKIX_DUMMY); |
| 337 | return ix; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 338 | } |
| 339 | |
| 340 | /* write to indices. */ |
Benjamin Peterson | 7322225 | 2016-09-08 09:58:47 -0700 | [diff] [blame] | 341 | static inline void |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 342 | dk_set_index(PyDictKeysObject *keys, Py_ssize_t i, Py_ssize_t ix) |
| 343 | { |
| 344 | Py_ssize_t s = DK_SIZE(keys); |
Victor Stinner | 71211e3 | 2016-09-08 10:52:46 -0700 | [diff] [blame] | 345 | |
| 346 | assert(ix >= DKIX_DUMMY); |
| 347 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 348 | if (s <= 0xff) { |
Benjamin Peterson | 186122e | 2016-09-08 12:20:12 -0700 | [diff] [blame] | 349 | int8_t *indices = keys->dk_indices.as_1; |
Victor Stinner | 71211e3 | 2016-09-08 10:52:46 -0700 | [diff] [blame] | 350 | assert(ix <= 0x7f); |
Victor Stinner | 208857e | 2016-09-08 11:35:46 -0700 | [diff] [blame] | 351 | indices[i] = (char)ix; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 352 | } |
| 353 | else if (s <= 0xffff) { |
Benjamin Peterson | 186122e | 2016-09-08 12:20:12 -0700 | [diff] [blame] | 354 | int16_t *indices = keys->dk_indices.as_2; |
Victor Stinner | 71211e3 | 2016-09-08 10:52:46 -0700 | [diff] [blame] | 355 | assert(ix <= 0x7fff); |
Victor Stinner | 208857e | 2016-09-08 11:35:46 -0700 | [diff] [blame] | 356 | indices[i] = (int16_t)ix; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 357 | } |
Benjamin Peterson | 3c56929 | 2016-09-08 13:16:41 -0700 | [diff] [blame] | 358 | #if SIZEOF_VOID_P > 4 |
Serhiy Storchaka | 473e0e4 | 2016-09-10 21:34:43 +0300 | [diff] [blame] | 359 | else if (s > 0xffffffff) { |
Benjamin Peterson | 186122e | 2016-09-08 12:20:12 -0700 | [diff] [blame] | 360 | int64_t *indices = keys->dk_indices.as_8; |
Victor Stinner | 208857e | 2016-09-08 11:35:46 -0700 | [diff] [blame] | 361 | indices[i] = ix; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 362 | } |
Benjamin Peterson | 3c56929 | 2016-09-08 13:16:41 -0700 | [diff] [blame] | 363 | #endif |
Serhiy Storchaka | 473e0e4 | 2016-09-10 21:34:43 +0300 | [diff] [blame] | 364 | else { |
| 365 | int32_t *indices = keys->dk_indices.as_4; |
| 366 | assert(ix <= 0x7fffffff); |
| 367 | indices[i] = (int32_t)ix; |
| 368 | } |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 369 | } |
| 370 | |
| 371 | |
Antoine Pitrou | a504a7a | 2012-06-24 21:03:45 +0200 | [diff] [blame] | 372 | /* USABLE_FRACTION is the maximum dictionary load. |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 373 | * Increasing this ratio makes dictionaries more dense resulting in more |
| 374 | * collisions. Decreasing it improves sparseness at the expense of spreading |
| 375 | * indices over more cache lines and at the cost of total memory consumed. |
Antoine Pitrou | a504a7a | 2012-06-24 21:03:45 +0200 | [diff] [blame] | 376 | * |
| 377 | * USABLE_FRACTION must obey the following: |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 378 | * (0 < USABLE_FRACTION(n) < n) for all n >= 2 |
| 379 | * |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 380 | * USABLE_FRACTION should be quick to calculate. |
| 381 | * Fractions around 1/2 to 2/3 seem to work well in practice. |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 382 | */ |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 383 | #define USABLE_FRACTION(n) (((n) << 1)/3) |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 384 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 385 | /* ESTIMATE_SIZE is reverse function of USABLE_FRACTION. |
| 386 | * This can be used to reserve enough size to insert n entries without |
| 387 | * resizing. |
| 388 | */ |
INADA Naoki | 92c50ee | 2016-11-22 00:57:02 +0900 | [diff] [blame] | 389 | #define ESTIMATE_SIZE(n) (((n)*3+1) >> 1) |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 390 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 391 | /* Alternative fraction that is otherwise close enough to 2n/3 to make |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 392 | * little difference. 8 * 2/3 == 8 * 5/8 == 5. 16 * 2/3 == 16 * 5/8 == 10. |
| 393 | * 32 * 2/3 = 21, 32 * 5/8 = 20. |
| 394 | * Its advantage is that it is faster to compute on machines with slow division. |
| 395 | * #define USABLE_FRACTION(n) (((n) >> 1) + ((n) >> 2) - ((n) >> 3)) |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 396 | */ |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 397 | |
Victor Stinner | a9f61a5 | 2013-07-16 22:17:26 +0200 | [diff] [blame] | 398 | /* GROWTH_RATE. Growth rate upon hitting maximum load. |
| 399 | * Currently set to used*2 + capacity/2. |
| 400 | * This means that dicts double in size when growing without deletions, |
Raymond Hettinger | 36f74aa | 2013-05-17 03:01:13 -0700 | [diff] [blame] | 401 | * but have more head room when the number of deletions is on a par with the |
| 402 | * number of insertions. |
| 403 | * Raising this to used*4 doubles memory consumption depending on the size of |
Antoine Pitrou | a504a7a | 2012-06-24 21:03:45 +0200 | [diff] [blame] | 404 | * the dictionary, but results in half the number of resizes, less effort to |
Raymond Hettinger | 36f74aa | 2013-05-17 03:01:13 -0700 | [diff] [blame] | 405 | * resize. |
| 406 | * GROWTH_RATE was set to used*4 up to version 3.2. |
| 407 | * GROWTH_RATE was set to used*2 in version 3.3.0 |
Antoine Pitrou | a504a7a | 2012-06-24 21:03:45 +0200 | [diff] [blame] | 408 | */ |
Raymond Hettinger | 36f74aa | 2013-05-17 03:01:13 -0700 | [diff] [blame] | 409 | #define GROWTH_RATE(d) (((d)->ma_used*2)+((d)->ma_keys->dk_size>>1)) |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 410 | |
| 411 | #define ENSURE_ALLOWS_DELETIONS(d) \ |
| 412 | if ((d)->ma_keys->dk_lookup == lookdict_unicode_nodummy) { \ |
| 413 | (d)->ma_keys->dk_lookup = lookdict_unicode; \ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 414 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 415 | |
| 416 | /* This immutable, empty PyDictKeysObject is used for PyDict_Clear() |
| 417 | * (which cannot fail and thus can do no allocation). |
| 418 | */ |
| 419 | static PyDictKeysObject empty_keys_struct = { |
Serhiy Storchaka | 97932e4 | 2016-09-26 23:01:23 +0300 | [diff] [blame] | 420 | 1, /* dk_refcnt */ |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 421 | 1, /* dk_size */ |
| 422 | lookdict_split, /* dk_lookup */ |
| 423 | 0, /* dk_usable (immutable) */ |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 424 | 0, /* dk_nentries */ |
Benjamin Peterson | 186122e | 2016-09-08 12:20:12 -0700 | [diff] [blame] | 425 | .dk_indices = { .as_1 = {DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY, |
| 426 | DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY}}, |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 427 | }; |
| 428 | |
| 429 | static PyObject *empty_values[1] = { NULL }; |
| 430 | |
| 431 | #define Py_EMPTY_KEYS &empty_keys_struct |
| 432 | |
Victor Stinner | 611b0fa | 2016-09-14 15:02:01 +0200 | [diff] [blame] | 433 | /* Uncomment to check the dict content in _PyDict_CheckConsistency() */ |
| 434 | /* #define DEBUG_PYDICT */ |
| 435 | |
| 436 | |
T. Wouters | a00c3fd | 2017-03-31 09:14:41 -0700 | [diff] [blame] | 437 | #ifndef NDEBUG |
Victor Stinner | 611b0fa | 2016-09-14 15:02:01 +0200 | [diff] [blame] | 438 | static int |
| 439 | _PyDict_CheckConsistency(PyDictObject *mp) |
| 440 | { |
| 441 | PyDictKeysObject *keys = mp->ma_keys; |
| 442 | int splitted = _PyDict_HasSplitTable(mp); |
| 443 | Py_ssize_t usable = USABLE_FRACTION(keys->dk_size); |
| 444 | #ifdef DEBUG_PYDICT |
| 445 | PyDictKeyEntry *entries = DK_ENTRIES(keys); |
| 446 | Py_ssize_t i; |
| 447 | #endif |
| 448 | |
| 449 | assert(0 <= mp->ma_used && mp->ma_used <= usable); |
| 450 | assert(IS_POWER_OF_2(keys->dk_size)); |
| 451 | assert(0 <= keys->dk_usable |
| 452 | && keys->dk_usable <= usable); |
| 453 | assert(0 <= keys->dk_nentries |
| 454 | && keys->dk_nentries <= usable); |
| 455 | assert(keys->dk_usable + keys->dk_nentries <= usable); |
| 456 | |
| 457 | if (!splitted) { |
| 458 | /* combined table */ |
| 459 | assert(keys->dk_refcnt == 1); |
| 460 | } |
| 461 | |
| 462 | #ifdef DEBUG_PYDICT |
| 463 | for (i=0; i < keys->dk_size; i++) { |
| 464 | Py_ssize_t ix = dk_get_index(keys, i); |
| 465 | assert(DKIX_DUMMY <= ix && ix <= usable); |
| 466 | } |
| 467 | |
| 468 | for (i=0; i < usable; i++) { |
| 469 | PyDictKeyEntry *entry = &entries[i]; |
| 470 | PyObject *key = entry->me_key; |
| 471 | |
| 472 | if (key != NULL) { |
| 473 | if (PyUnicode_CheckExact(key)) { |
| 474 | Py_hash_t hash = ((PyASCIIObject *)key)->hash; |
| 475 | assert(hash != -1); |
| 476 | assert(entry->me_hash == hash); |
| 477 | } |
| 478 | else { |
| 479 | /* test_dict fails if PyObject_Hash() is called again */ |
| 480 | assert(entry->me_hash != -1); |
| 481 | } |
| 482 | if (!splitted) { |
| 483 | assert(entry->me_value != NULL); |
| 484 | } |
| 485 | } |
| 486 | |
| 487 | if (splitted) { |
| 488 | assert(entry->me_value == NULL); |
| 489 | } |
| 490 | } |
| 491 | |
| 492 | if (splitted) { |
| 493 | /* splitted table */ |
| 494 | for (i=0; i < mp->ma_used; i++) { |
| 495 | assert(mp->ma_values[i] != NULL); |
| 496 | } |
| 497 | } |
| 498 | #endif |
| 499 | |
| 500 | return 1; |
| 501 | } |
| 502 | #endif |
| 503 | |
| 504 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 505 | static PyDictKeysObject *new_keys_object(Py_ssize_t size) |
| 506 | { |
| 507 | PyDictKeysObject *dk; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 508 | Py_ssize_t es, usable; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 509 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 510 | assert(size >= PyDict_MINSIZE); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 511 | assert(IS_POWER_OF_2(size)); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 512 | |
| 513 | usable = USABLE_FRACTION(size); |
| 514 | if (size <= 0xff) { |
| 515 | es = 1; |
| 516 | } |
| 517 | else if (size <= 0xffff) { |
| 518 | es = 2; |
| 519 | } |
| 520 | #if SIZEOF_VOID_P > 4 |
| 521 | else if (size <= 0xffffffff) { |
| 522 | es = 4; |
| 523 | } |
| 524 | #endif |
| 525 | else { |
| 526 | es = sizeof(Py_ssize_t); |
| 527 | } |
| 528 | |
| 529 | if (size == PyDict_MINSIZE && numfreekeys > 0) { |
| 530 | dk = keys_free_list[--numfreekeys]; |
| 531 | } |
| 532 | else { |
Victor Stinner | 98ee9d5 | 2016-09-08 09:33:56 -0700 | [diff] [blame] | 533 | dk = PyObject_MALLOC(sizeof(PyDictKeysObject) |
| 534 | - Py_MEMBER_SIZE(PyDictKeysObject, dk_indices) |
| 535 | + es * size |
| 536 | + sizeof(PyDictKeyEntry) * usable); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 537 | if (dk == NULL) { |
| 538 | PyErr_NoMemory(); |
| 539 | return NULL; |
| 540 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 541 | } |
Antoine Pitrou | 2d169b2 | 2012-05-12 23:43:44 +0200 | [diff] [blame] | 542 | DK_DEBUG_INCREF dk->dk_refcnt = 1; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 543 | dk->dk_size = size; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 544 | dk->dk_usable = usable; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 545 | dk->dk_lookup = lookdict_unicode_nodummy; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 546 | dk->dk_nentries = 0; |
Benjamin Peterson | 186122e | 2016-09-08 12:20:12 -0700 | [diff] [blame] | 547 | memset(&dk->dk_indices.as_1[0], 0xff, es * size); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 548 | memset(DK_ENTRIES(dk), 0, sizeof(PyDictKeyEntry) * usable); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 549 | return dk; |
| 550 | } |
| 551 | |
| 552 | static void |
| 553 | free_keys_object(PyDictKeysObject *keys) |
| 554 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 555 | PyDictKeyEntry *entries = DK_ENTRIES(keys); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 556 | Py_ssize_t i, n; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 557 | for (i = 0, n = keys->dk_nentries; i < n; i++) { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 558 | Py_XDECREF(entries[i].me_key); |
| 559 | Py_XDECREF(entries[i].me_value); |
| 560 | } |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 561 | if (keys->dk_size == PyDict_MINSIZE && numfreekeys < PyDict_MAXFREELIST) { |
| 562 | keys_free_list[numfreekeys++] = keys; |
| 563 | return; |
| 564 | } |
Raymond Hettinger | ce5179f | 2016-01-31 08:56:21 -0800 | [diff] [blame] | 565 | PyObject_FREE(keys); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 566 | } |
| 567 | |
| 568 | #define new_values(size) PyMem_NEW(PyObject *, size) |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 569 | #define free_values(values) PyMem_FREE(values) |
| 570 | |
| 571 | /* Consumes a reference to the keys object */ |
| 572 | static PyObject * |
| 573 | new_dict(PyDictKeysObject *keys, PyObject **values) |
| 574 | { |
| 575 | PyDictObject *mp; |
Victor Stinner | c9b7f51 | 2013-07-08 22:19:20 +0200 | [diff] [blame] | 576 | assert(keys != NULL); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 577 | if (numfree) { |
| 578 | mp = free_list[--numfree]; |
| 579 | assert (mp != NULL); |
| 580 | assert (Py_TYPE(mp) == &PyDict_Type); |
| 581 | _Py_NewReference((PyObject *)mp); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 582 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 583 | else { |
| 584 | mp = PyObject_GC_New(PyDictObject, &PyDict_Type); |
| 585 | if (mp == NULL) { |
| 586 | DK_DECREF(keys); |
| 587 | free_values(values); |
| 588 | return NULL; |
| 589 | } |
| 590 | } |
| 591 | mp->ma_keys = keys; |
| 592 | mp->ma_values = values; |
| 593 | mp->ma_used = 0; |
Victor Stinner | 3b6a6b4 | 2016-09-08 12:51:24 -0700 | [diff] [blame] | 594 | mp->ma_version_tag = DICT_NEXT_VERSION(); |
Victor Stinner | 611b0fa | 2016-09-14 15:02:01 +0200 | [diff] [blame] | 595 | assert(_PyDict_CheckConsistency(mp)); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 596 | return (PyObject *)mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 597 | } |
| 598 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 599 | /* Consumes a reference to the keys object */ |
| 600 | static PyObject * |
| 601 | new_dict_with_shared_keys(PyDictKeysObject *keys) |
| 602 | { |
| 603 | PyObject **values; |
| 604 | Py_ssize_t i, size; |
| 605 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 606 | size = USABLE_FRACTION(DK_SIZE(keys)); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 607 | values = new_values(size); |
| 608 | if (values == NULL) { |
| 609 | DK_DECREF(keys); |
| 610 | return PyErr_NoMemory(); |
| 611 | } |
| 612 | for (i = 0; i < size; i++) { |
| 613 | values[i] = NULL; |
| 614 | } |
| 615 | return new_dict(keys, values); |
| 616 | } |
| 617 | |
| 618 | PyObject * |
| 619 | PyDict_New(void) |
| 620 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 621 | PyDictKeysObject *keys = new_keys_object(PyDict_MINSIZE); |
Victor Stinner | c9b7f51 | 2013-07-08 22:19:20 +0200 | [diff] [blame] | 622 | if (keys == NULL) |
| 623 | return NULL; |
| 624 | return new_dict(keys, NULL); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 625 | } |
| 626 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 627 | /* Search index of hash table from offset of entry table */ |
| 628 | static Py_ssize_t |
| 629 | lookdict_index(PyDictKeysObject *k, Py_hash_t hash, Py_ssize_t index) |
| 630 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 631 | size_t mask = DK_MASK(k); |
INADA Naoki | 073ae48 | 2017-06-23 15:22:50 +0900 | [diff] [blame] | 632 | size_t perturb = (size_t)hash; |
| 633 | size_t i = (size_t)hash & mask; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 634 | |
INADA Naoki | 073ae48 | 2017-06-23 15:22:50 +0900 | [diff] [blame] | 635 | for (;;) { |
| 636 | Py_ssize_t ix = dk_get_index(k, i); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 637 | if (ix == index) { |
| 638 | return i; |
| 639 | } |
| 640 | if (ix == DKIX_EMPTY) { |
| 641 | return DKIX_EMPTY; |
| 642 | } |
INADA Naoki | 073ae48 | 2017-06-23 15:22:50 +0900 | [diff] [blame] | 643 | perturb >>= PERTURB_SHIFT; |
| 644 | i = mask & (i*5 + perturb + 1); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 645 | } |
Barry Warsaw | b2e5794 | 2017-09-14 18:13:16 -0700 | [diff] [blame] | 646 | Py_UNREACHABLE(); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 647 | } |
| 648 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 649 | /* |
| 650 | The basic lookup function used by all operations. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 651 | 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] | 652 | Open addressing is preferred over chaining since the link overhead for |
| 653 | chaining would be substantial (100% with typical malloc overhead). |
| 654 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 655 | The initial probe index is computed as hash mod the table size. Subsequent |
| 656 | probe indices are computed as explained earlier. |
Guido van Rossum | 2bc1379 | 1999-03-24 19:06:42 +0000 | [diff] [blame] | 657 | |
| 658 | All arithmetic on hash should ignore overflow. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 659 | |
Guido van Rossum | dc5f6b2 | 2006-08-24 21:29:26 +0000 | [diff] [blame] | 660 | 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] | 661 | contributions by Reimer Behrends, Jyrki Alakuijala, Vladimir Marangozov and |
Guido van Rossum | dc5f6b2 | 2006-08-24 21:29:26 +0000 | [diff] [blame] | 662 | Christian Tismer. |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 663 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 664 | lookdict() is general-purpose, and may return DKIX_ERROR if (and only if) a |
Victor Stinner | a4348cc | 2016-09-08 12:01:25 -0700 | [diff] [blame] | 665 | comparison raises an exception. |
Guido van Rossum | 89d8c60 | 2007-09-18 17:26:56 +0000 | [diff] [blame] | 666 | lookdict_unicode() below is specialized to string keys, comparison of which can |
INADA Naoki | 1b8df10 | 2017-02-20 22:48:10 +0900 | [diff] [blame] | 667 | never raise an exception; that function can never return DKIX_ERROR when key |
| 668 | is string. Otherwise, it falls back to lookdict(). |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 669 | lookdict_unicode_nodummy is further specialized for string keys that cannot be |
| 670 | the <dummy> value. |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 671 | For both, when the key isn't found a DKIX_EMPTY is returned. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 672 | */ |
Victor Stinner | c7a8f67 | 2016-11-15 15:13:40 +0100 | [diff] [blame] | 673 | static Py_ssize_t _Py_HOT_FUNCTION |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 674 | lookdict(PyDictObject *mp, PyObject *key, |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 675 | Py_hash_t hash, PyObject **value_addr) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 676 | { |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 677 | size_t i, mask, perturb; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 678 | PyDictKeysObject *dk; |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 679 | PyDictKeyEntry *ep0; |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 680 | |
Antoine Pitrou | 9a23490 | 2012-05-13 20:48:01 +0200 | [diff] [blame] | 681 | top: |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 682 | dk = mp->ma_keys; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 683 | ep0 = DK_ENTRIES(dk); |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 684 | mask = DK_MASK(dk); |
| 685 | perturb = hash; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 686 | i = (size_t)hash & mask; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 687 | |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 688 | for (;;) { |
| 689 | Py_ssize_t ix = dk_get_index(dk, i); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 690 | if (ix == DKIX_EMPTY) { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 691 | *value_addr = NULL; |
| 692 | return ix; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 693 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 694 | if (ix >= 0) { |
| 695 | PyDictKeyEntry *ep = &ep0[ix]; |
| 696 | assert(ep->me_key != NULL); |
| 697 | if (ep->me_key == key) { |
| 698 | *value_addr = ep->me_value; |
| 699 | return ix; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 700 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 701 | if (ep->me_hash == hash) { |
| 702 | PyObject *startkey = ep->me_key; |
| 703 | Py_INCREF(startkey); |
| 704 | int cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); |
| 705 | Py_DECREF(startkey); |
| 706 | if (cmp < 0) { |
| 707 | *value_addr = NULL; |
| 708 | return DKIX_ERROR; |
| 709 | } |
| 710 | if (dk == mp->ma_keys && ep->me_key == startkey) { |
| 711 | if (cmp > 0) { |
| 712 | *value_addr = ep->me_value; |
| 713 | return ix; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 714 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 715 | } |
| 716 | else { |
| 717 | /* The dict was mutated, restart */ |
| 718 | goto top; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 719 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 720 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 721 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 722 | perturb >>= PERTURB_SHIFT; |
| 723 | i = (i*5 + perturb + 1) & mask; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 724 | } |
Barry Warsaw | b2e5794 | 2017-09-14 18:13:16 -0700 | [diff] [blame] | 725 | Py_UNREACHABLE(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 726 | } |
| 727 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 728 | /* Specialized version for string-only keys */ |
Victor Stinner | c7a8f67 | 2016-11-15 15:13:40 +0100 | [diff] [blame] | 729 | static Py_ssize_t _Py_HOT_FUNCTION |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 730 | lookdict_unicode(PyDictObject *mp, PyObject *key, |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 731 | Py_hash_t hash, PyObject **value_addr) |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 732 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 733 | assert(mp->ma_values == NULL); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 734 | /* Make sure this function doesn't have to handle non-unicode keys, |
| 735 | including subclasses of str; e.g., one reason to subclass |
| 736 | unicodes is to override __eq__, and for speed we don't cater to |
| 737 | that here. */ |
| 738 | if (!PyUnicode_CheckExact(key)) { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 739 | mp->ma_keys->dk_lookup = lookdict; |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 740 | return lookdict(mp, key, hash, value_addr); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 741 | } |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 742 | |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 743 | PyDictKeyEntry *ep0 = DK_ENTRIES(mp->ma_keys); |
| 744 | size_t mask = DK_MASK(mp->ma_keys); |
| 745 | size_t perturb = (size_t)hash; |
| 746 | size_t i = (size_t)hash & mask; |
| 747 | |
| 748 | for (;;) { |
| 749 | Py_ssize_t ix = dk_get_index(mp->ma_keys, i); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 750 | if (ix == DKIX_EMPTY) { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 751 | *value_addr = NULL; |
| 752 | return DKIX_EMPTY; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 753 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 754 | if (ix >= 0) { |
| 755 | PyDictKeyEntry *ep = &ep0[ix]; |
| 756 | assert(ep->me_key != NULL); |
| 757 | assert(PyUnicode_CheckExact(ep->me_key)); |
| 758 | if (ep->me_key == key || |
| 759 | (ep->me_hash == hash && unicode_eq(ep->me_key, key))) { |
| 760 | *value_addr = ep->me_value; |
| 761 | return ix; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 762 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 763 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 764 | perturb >>= PERTURB_SHIFT; |
| 765 | i = mask & (i*5 + perturb + 1); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 766 | } |
Barry Warsaw | b2e5794 | 2017-09-14 18:13:16 -0700 | [diff] [blame] | 767 | Py_UNREACHABLE(); |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 768 | } |
| 769 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 770 | /* Faster version of lookdict_unicode when it is known that no <dummy> keys |
| 771 | * will be present. */ |
Victor Stinner | c7a8f67 | 2016-11-15 15:13:40 +0100 | [diff] [blame] | 772 | static Py_ssize_t _Py_HOT_FUNCTION |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 773 | lookdict_unicode_nodummy(PyDictObject *mp, PyObject *key, |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 774 | Py_hash_t hash, PyObject **value_addr) |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 775 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 776 | assert(mp->ma_values == NULL); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 777 | /* Make sure this function doesn't have to handle non-unicode keys, |
| 778 | including subclasses of str; e.g., one reason to subclass |
| 779 | unicodes is to override __eq__, and for speed we don't cater to |
| 780 | that here. */ |
| 781 | if (!PyUnicode_CheckExact(key)) { |
| 782 | mp->ma_keys->dk_lookup = lookdict; |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 783 | return lookdict(mp, key, hash, value_addr); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 784 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 785 | |
| 786 | PyDictKeyEntry *ep0 = DK_ENTRIES(mp->ma_keys); |
| 787 | size_t mask = DK_MASK(mp->ma_keys); |
| 788 | size_t perturb = (size_t)hash; |
| 789 | size_t i = (size_t)hash & mask; |
| 790 | |
| 791 | for (;;) { |
| 792 | Py_ssize_t ix = dk_get_index(mp->ma_keys, i); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 793 | assert (ix != DKIX_DUMMY); |
| 794 | if (ix == DKIX_EMPTY) { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 795 | *value_addr = NULL; |
| 796 | return DKIX_EMPTY; |
| 797 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 798 | PyDictKeyEntry *ep = &ep0[ix]; |
| 799 | assert(ep->me_key != NULL); |
| 800 | assert(PyUnicode_CheckExact(ep->me_key)); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 801 | if (ep->me_key == key || |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 802 | (ep->me_hash == hash && unicode_eq(ep->me_key, key))) { |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 803 | *value_addr = ep->me_value; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 804 | return ix; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 805 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 806 | perturb >>= PERTURB_SHIFT; |
| 807 | i = mask & (i*5 + perturb + 1); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 808 | } |
Barry Warsaw | b2e5794 | 2017-09-14 18:13:16 -0700 | [diff] [blame] | 809 | Py_UNREACHABLE(); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 810 | } |
| 811 | |
| 812 | /* Version of lookdict for split tables. |
| 813 | * All split tables and only split tables use this lookup function. |
| 814 | * Split tables only contain unicode keys and no dummy keys, |
| 815 | * so algorithm is the same as lookdict_unicode_nodummy. |
| 816 | */ |
Victor Stinner | c7a8f67 | 2016-11-15 15:13:40 +0100 | [diff] [blame] | 817 | static Py_ssize_t _Py_HOT_FUNCTION |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 818 | lookdict_split(PyDictObject *mp, PyObject *key, |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 819 | Py_hash_t hash, PyObject **value_addr) |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 820 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 821 | /* mp must split table */ |
| 822 | assert(mp->ma_values != NULL); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 823 | if (!PyUnicode_CheckExact(key)) { |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 824 | Py_ssize_t ix = lookdict(mp, key, hash, value_addr); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 825 | if (ix >= 0) { |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 826 | *value_addr = mp->ma_values[ix]; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 827 | } |
| 828 | return ix; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 829 | } |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 830 | |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 831 | PyDictKeyEntry *ep0 = DK_ENTRIES(mp->ma_keys); |
| 832 | size_t mask = DK_MASK(mp->ma_keys); |
| 833 | size_t perturb = (size_t)hash; |
| 834 | size_t i = (size_t)hash & mask; |
| 835 | |
| 836 | for (;;) { |
| 837 | Py_ssize_t ix = dk_get_index(mp->ma_keys, i); |
| 838 | assert (ix != DKIX_DUMMY); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 839 | if (ix == DKIX_EMPTY) { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 840 | *value_addr = NULL; |
| 841 | return DKIX_EMPTY; |
| 842 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 843 | PyDictKeyEntry *ep = &ep0[ix]; |
| 844 | assert(ep->me_key != NULL); |
| 845 | assert(PyUnicode_CheckExact(ep->me_key)); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 846 | if (ep->me_key == key || |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 847 | (ep->me_hash == hash && unicode_eq(ep->me_key, key))) { |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 848 | *value_addr = mp->ma_values[ix]; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 849 | return ix; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 850 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 851 | perturb >>= PERTURB_SHIFT; |
| 852 | i = mask & (i*5 + perturb + 1); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 853 | } |
Barry Warsaw | b2e5794 | 2017-09-14 18:13:16 -0700 | [diff] [blame] | 854 | Py_UNREACHABLE(); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 855 | } |
| 856 | |
Benjamin Peterson | fb88636 | 2010-04-24 18:21:17 +0000 | [diff] [blame] | 857 | int |
| 858 | _PyDict_HasOnlyStringKeys(PyObject *dict) |
| 859 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 860 | Py_ssize_t pos = 0; |
| 861 | PyObject *key, *value; |
Benjamin Peterson | f609654 | 2010-11-17 22:33:12 +0000 | [diff] [blame] | 862 | assert(PyDict_Check(dict)); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 863 | /* Shortcut */ |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 864 | if (((PyDictObject *)dict)->ma_keys->dk_lookup != lookdict) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 865 | return 1; |
| 866 | while (PyDict_Next(dict, &pos, &key, &value)) |
| 867 | if (!PyUnicode_Check(key)) |
| 868 | return 0; |
| 869 | return 1; |
Benjamin Peterson | fb88636 | 2010-04-24 18:21:17 +0000 | [diff] [blame] | 870 | } |
| 871 | |
Antoine Pitrou | 3a652b1 | 2009-03-23 18:52:06 +0000 | [diff] [blame] | 872 | #define MAINTAIN_TRACKING(mp, key, value) \ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 873 | do { \ |
| 874 | if (!_PyObject_GC_IS_TRACKED(mp)) { \ |
| 875 | if (_PyObject_GC_MAY_BE_TRACKED(key) || \ |
| 876 | _PyObject_GC_MAY_BE_TRACKED(value)) { \ |
| 877 | _PyObject_GC_TRACK(mp); \ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 878 | } \ |
| 879 | } \ |
| 880 | } while(0) |
Antoine Pitrou | 3a652b1 | 2009-03-23 18:52:06 +0000 | [diff] [blame] | 881 | |
| 882 | void |
| 883 | _PyDict_MaybeUntrack(PyObject *op) |
| 884 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 885 | PyDictObject *mp; |
| 886 | PyObject *value; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 887 | Py_ssize_t i, numentries; |
| 888 | PyDictKeyEntry *ep0; |
Antoine Pitrou | 3a652b1 | 2009-03-23 18:52:06 +0000 | [diff] [blame] | 889 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 890 | if (!PyDict_CheckExact(op) || !_PyObject_GC_IS_TRACKED(op)) |
| 891 | return; |
| 892 | |
| 893 | mp = (PyDictObject *) op; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 894 | ep0 = DK_ENTRIES(mp->ma_keys); |
| 895 | numentries = mp->ma_keys->dk_nentries; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 896 | if (_PyDict_HasSplitTable(mp)) { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 897 | for (i = 0; i < numentries; i++) { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 898 | if ((value = mp->ma_values[i]) == NULL) |
| 899 | continue; |
| 900 | if (_PyObject_GC_MAY_BE_TRACKED(value)) { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 901 | assert(!_PyObject_GC_MAY_BE_TRACKED(ep0[i].me_key)); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 902 | return; |
| 903 | } |
| 904 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 905 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 906 | else { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 907 | for (i = 0; i < numentries; i++) { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 908 | if ((value = ep0[i].me_value) == NULL) |
| 909 | continue; |
| 910 | if (_PyObject_GC_MAY_BE_TRACKED(value) || |
| 911 | _PyObject_GC_MAY_BE_TRACKED(ep0[i].me_key)) |
| 912 | return; |
| 913 | } |
| 914 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 915 | _PyObject_GC_UNTRACK(op); |
Antoine Pitrou | 3a652b1 | 2009-03-23 18:52:06 +0000 | [diff] [blame] | 916 | } |
| 917 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 918 | /* Internal function to find slot for an item from its hash |
Victor Stinner | 3c336c5 | 2016-09-12 14:17:40 +0200 | [diff] [blame] | 919 | when it is known that the key is not present in the dict. |
| 920 | |
| 921 | The dict must be combined. */ |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 922 | static Py_ssize_t |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 923 | find_empty_slot(PyDictKeysObject *keys, Py_hash_t hash) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 924 | { |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 925 | assert(keys != NULL); |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 926 | |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 927 | const size_t mask = DK_MASK(keys); |
| 928 | size_t i = hash & mask; |
| 929 | Py_ssize_t ix = dk_get_index(keys, i); |
| 930 | for (size_t perturb = hash; ix >= 0;) { |
INADA Naoki | 267941c | 2016-10-06 15:19:07 +0900 | [diff] [blame] | 931 | perturb >>= PERTURB_SHIFT; |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 932 | i = (i*5 + perturb + 1) & mask; |
| 933 | ix = dk_get_index(keys, i); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 934 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 935 | return i; |
Thomas Wouters | 4d70c3d | 2006-06-08 14:42:34 +0000 | [diff] [blame] | 936 | } |
| 937 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 938 | static int |
| 939 | insertion_resize(PyDictObject *mp) |
| 940 | { |
Raymond Hettinger | 36f74aa | 2013-05-17 03:01:13 -0700 | [diff] [blame] | 941 | return dictresize(mp, GROWTH_RATE(mp)); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 942 | } |
Antoine Pitrou | e965d97 | 2012-02-27 00:45:12 +0100 | [diff] [blame] | 943 | |
| 944 | /* |
| 945 | Internal routine to insert a new item into the table. |
| 946 | Used both by the internal resize routine and by the public insert routine. |
Antoine Pitrou | e965d97 | 2012-02-27 00:45:12 +0100 | [diff] [blame] | 947 | Returns -1 if an error occurred, or 0 on success. |
| 948 | */ |
| 949 | static int |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 950 | insertdict(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject *value) |
Antoine Pitrou | e965d97 | 2012-02-27 00:45:12 +0100 | [diff] [blame] | 951 | { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 952 | PyObject *old_value; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 953 | PyDictKeyEntry *ep; |
Antoine Pitrou | e965d97 | 2012-02-27 00:45:12 +0100 | [diff] [blame] | 954 | |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 955 | Py_INCREF(key); |
| 956 | Py_INCREF(value); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 957 | if (mp->ma_values != NULL && !PyUnicode_CheckExact(key)) { |
| 958 | if (insertion_resize(mp) < 0) |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 959 | goto Fail; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 960 | } |
| 961 | |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 962 | Py_ssize_t ix = mp->ma_keys->dk_lookup(mp, key, hash, &old_value); |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 963 | if (ix == DKIX_ERROR) |
| 964 | goto Fail; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 965 | |
Antoine Pitrou | d696732 | 2014-10-18 00:35:00 +0200 | [diff] [blame] | 966 | assert(PyUnicode_CheckExact(key) || mp->ma_keys->dk_lookup == lookdict); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 967 | MAINTAIN_TRACKING(mp, key, value); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 968 | |
| 969 | /* When insertion order is different from shared key, we can't share |
| 970 | * the key anymore. Convert this instance to combine table. |
| 971 | */ |
| 972 | if (_PyDict_HasSplitTable(mp) && |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 973 | ((ix >= 0 && old_value == NULL && mp->ma_used != ix) || |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 974 | (ix == DKIX_EMPTY && mp->ma_used != mp->ma_keys->dk_nentries))) { |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 975 | if (insertion_resize(mp) < 0) |
| 976 | goto Fail; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 977 | ix = DKIX_EMPTY; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 978 | } |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 979 | |
| 980 | if (ix == DKIX_EMPTY) { |
| 981 | /* Insert into new slot. */ |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 982 | assert(old_value == NULL); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 983 | if (mp->ma_keys->dk_usable <= 0) { |
| 984 | /* Need to resize. */ |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 985 | if (insertion_resize(mp) < 0) |
| 986 | goto Fail; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 987 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 988 | Py_ssize_t hashpos = find_empty_slot(mp->ma_keys, hash); |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 989 | ep = &DK_ENTRIES(mp->ma_keys)[mp->ma_keys->dk_nentries]; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 990 | dk_set_index(mp->ma_keys, hashpos, mp->ma_keys->dk_nentries); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 991 | ep->me_key = key; |
| 992 | ep->me_hash = hash; |
| 993 | if (mp->ma_values) { |
| 994 | assert (mp->ma_values[mp->ma_keys->dk_nentries] == NULL); |
| 995 | mp->ma_values[mp->ma_keys->dk_nentries] = value; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 996 | } |
| 997 | else { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 998 | ep->me_value = value; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 999 | } |
| 1000 | mp->ma_used++; |
Victor Stinner | 3b6a6b4 | 2016-09-08 12:51:24 -0700 | [diff] [blame] | 1001 | mp->ma_version_tag = DICT_NEXT_VERSION(); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1002 | mp->ma_keys->dk_usable--; |
| 1003 | mp->ma_keys->dk_nentries++; |
| 1004 | assert(mp->ma_keys->dk_usable >= 0); |
Victor Stinner | 611b0fa | 2016-09-14 15:02:01 +0200 | [diff] [blame] | 1005 | assert(_PyDict_CheckConsistency(mp)); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1006 | return 0; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1007 | } |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1008 | |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1009 | if (_PyDict_HasSplitTable(mp)) { |
| 1010 | mp->ma_values[ix] = value; |
| 1011 | if (old_value == NULL) { |
| 1012 | /* pending state */ |
| 1013 | assert(ix == mp->ma_used); |
| 1014 | mp->ma_used++; |
| 1015 | } |
| 1016 | } |
| 1017 | else { |
| 1018 | assert(old_value != NULL); |
| 1019 | DK_ENTRIES(mp->ma_keys)[ix].me_value = value; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1020 | } |
| 1021 | |
Victor Stinner | 3b6a6b4 | 2016-09-08 12:51:24 -0700 | [diff] [blame] | 1022 | mp->ma_version_tag = DICT_NEXT_VERSION(); |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1023 | Py_XDECREF(old_value); /* which **CAN** re-enter (see issue #22653) */ |
Victor Stinner | 611b0fa | 2016-09-14 15:02:01 +0200 | [diff] [blame] | 1024 | assert(_PyDict_CheckConsistency(mp)); |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 1025 | Py_DECREF(key); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1026 | return 0; |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 1027 | |
| 1028 | Fail: |
| 1029 | Py_DECREF(value); |
| 1030 | Py_DECREF(key); |
| 1031 | return -1; |
Antoine Pitrou | e965d97 | 2012-02-27 00:45:12 +0100 | [diff] [blame] | 1032 | } |
| 1033 | |
Thomas Wouters | 4d70c3d | 2006-06-08 14:42:34 +0000 | [diff] [blame] | 1034 | /* |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1035 | Internal routine used by dictresize() to buid a hashtable of entries. |
Thomas Wouters | 4d70c3d | 2006-06-08 14:42:34 +0000 | [diff] [blame] | 1036 | */ |
| 1037 | static void |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1038 | build_indices(PyDictKeysObject *keys, PyDictKeyEntry *ep, Py_ssize_t n) |
Thomas Wouters | 4d70c3d | 2006-06-08 14:42:34 +0000 | [diff] [blame] | 1039 | { |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1040 | size_t mask = (size_t)DK_SIZE(keys) - 1; |
| 1041 | for (Py_ssize_t ix = 0; ix != n; ix++, ep++) { |
| 1042 | Py_hash_t hash = ep->me_hash; |
| 1043 | size_t i = hash & mask; |
| 1044 | for (size_t perturb = hash; dk_get_index(keys, i) != DKIX_EMPTY;) { |
| 1045 | perturb >>= PERTURB_SHIFT; |
INADA Naoki | 870c286 | 2017-06-24 09:03:19 +0900 | [diff] [blame] | 1046 | i = mask & (i*5 + perturb + 1); |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1047 | } |
| 1048 | dk_set_index(keys, i, ix); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1049 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1050 | } |
| 1051 | |
| 1052 | /* |
| 1053 | Restructure the table by allocating a new table and reinserting all |
| 1054 | items again. When entries have been deleted, the new table may |
| 1055 | actually be smaller than the old one. |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1056 | If a table is split (its keys and hashes are shared, its values are not), |
| 1057 | then the values are temporarily copied into the table, it is resized as |
| 1058 | a combined table, then the me_value slots in the old table are NULLed out. |
| 1059 | After resizing a table is always combined, |
| 1060 | but can be resplit by make_keys_shared(). |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1061 | */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1062 | static int |
Victor Stinner | 3d3f264 | 2016-12-15 17:21:23 +0100 | [diff] [blame] | 1063 | dictresize(PyDictObject *mp, Py_ssize_t minsize) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1064 | { |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1065 | Py_ssize_t newsize, numentries; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1066 | PyDictKeysObject *oldkeys; |
| 1067 | PyObject **oldvalues; |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1068 | PyDictKeyEntry *oldentries, *newentries; |
Tim Peters | 91a364d | 2001-05-19 07:04:38 +0000 | [diff] [blame] | 1069 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1070 | /* Find the smallest table size > minused. */ |
| 1071 | for (newsize = PyDict_MINSIZE; |
Victor Stinner | 3d3f264 | 2016-12-15 17:21:23 +0100 | [diff] [blame] | 1072 | newsize < minsize && newsize > 0; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1073 | newsize <<= 1) |
| 1074 | ; |
| 1075 | if (newsize <= 0) { |
| 1076 | PyErr_NoMemory(); |
| 1077 | return -1; |
| 1078 | } |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1079 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1080 | oldkeys = mp->ma_keys; |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1081 | |
| 1082 | /* NOTE: Current odict checks mp->ma_keys to detect resize happen. |
| 1083 | * So we can't reuse oldkeys even if oldkeys->dk_size == newsize. |
| 1084 | * TODO: Try reusing oldkeys when reimplement odict. |
| 1085 | */ |
| 1086 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1087 | /* Allocate a new table. */ |
| 1088 | mp->ma_keys = new_keys_object(newsize); |
| 1089 | if (mp->ma_keys == NULL) { |
| 1090 | mp->ma_keys = oldkeys; |
| 1091 | return -1; |
| 1092 | } |
Victor Stinner | 3d3f264 | 2016-12-15 17:21:23 +0100 | [diff] [blame] | 1093 | // New table must be large enough. |
| 1094 | assert(mp->ma_keys->dk_usable >= mp->ma_used); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1095 | if (oldkeys->dk_lookup == lookdict) |
| 1096 | mp->ma_keys->dk_lookup = lookdict; |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1097 | |
| 1098 | numentries = mp->ma_used; |
| 1099 | oldentries = DK_ENTRIES(oldkeys); |
| 1100 | newentries = DK_ENTRIES(mp->ma_keys); |
| 1101 | oldvalues = mp->ma_values; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1102 | if (oldvalues != NULL) { |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1103 | /* Convert split table into new combined table. |
| 1104 | * We must incref keys; we can transfer values. |
| 1105 | * Note that values of split table is always dense. |
| 1106 | */ |
| 1107 | for (Py_ssize_t i = 0; i < numentries; i++) { |
| 1108 | assert(oldvalues[i] != NULL); |
| 1109 | PyDictKeyEntry *ep = &oldentries[i]; |
| 1110 | PyObject *key = ep->me_key; |
| 1111 | Py_INCREF(key); |
| 1112 | newentries[i].me_key = key; |
| 1113 | newentries[i].me_hash = ep->me_hash; |
| 1114 | newentries[i].me_value = oldvalues[i]; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1115 | } |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1116 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1117 | DK_DECREF(oldkeys); |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1118 | mp->ma_values = NULL; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1119 | if (oldvalues != empty_values) { |
| 1120 | free_values(oldvalues); |
| 1121 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1122 | } |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1123 | else { // combined table. |
| 1124 | if (oldkeys->dk_nentries == numentries) { |
| 1125 | memcpy(newentries, oldentries, numentries * sizeof(PyDictKeyEntry)); |
| 1126 | } |
| 1127 | else { |
| 1128 | PyDictKeyEntry *ep = oldentries; |
| 1129 | for (Py_ssize_t i = 0; i < numentries; i++) { |
| 1130 | while (ep->me_value == NULL) |
| 1131 | ep++; |
| 1132 | newentries[i] = *ep++; |
| 1133 | } |
| 1134 | } |
| 1135 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1136 | assert(oldkeys->dk_lookup != lookdict_split); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1137 | assert(oldkeys->dk_refcnt == 1); |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1138 | if (oldkeys->dk_size == PyDict_MINSIZE && |
| 1139 | numfreekeys < PyDict_MAXFREELIST) { |
| 1140 | DK_DEBUG_DECREF keys_free_list[numfreekeys++] = oldkeys; |
| 1141 | } |
| 1142 | else { |
| 1143 | DK_DEBUG_DECREF PyObject_FREE(oldkeys); |
| 1144 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1145 | } |
Serhiy Storchaka | e26e20d | 2016-10-29 10:50:00 +0300 | [diff] [blame] | 1146 | |
| 1147 | build_indices(mp->ma_keys, newentries, numentries); |
| 1148 | mp->ma_keys->dk_usable -= numentries; |
| 1149 | mp->ma_keys->dk_nentries = numentries; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1150 | return 0; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1151 | } |
| 1152 | |
Benjamin Peterson | 15ee821 | 2012-04-24 14:44:18 -0400 | [diff] [blame] | 1153 | /* Returns NULL if unable to split table. |
| 1154 | * A NULL return does not necessarily indicate an error */ |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1155 | static PyDictKeysObject * |
| 1156 | make_keys_shared(PyObject *op) |
| 1157 | { |
| 1158 | Py_ssize_t i; |
| 1159 | Py_ssize_t size; |
| 1160 | PyDictObject *mp = (PyDictObject *)op; |
| 1161 | |
Benjamin Peterson | 15ee821 | 2012-04-24 14:44:18 -0400 | [diff] [blame] | 1162 | if (!PyDict_CheckExact(op)) |
| 1163 | return NULL; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1164 | if (!_PyDict_HasSplitTable(mp)) { |
| 1165 | PyDictKeyEntry *ep0; |
| 1166 | PyObject **values; |
| 1167 | assert(mp->ma_keys->dk_refcnt == 1); |
| 1168 | if (mp->ma_keys->dk_lookup == lookdict) { |
| 1169 | return NULL; |
| 1170 | } |
| 1171 | else if (mp->ma_keys->dk_lookup == lookdict_unicode) { |
| 1172 | /* Remove dummy keys */ |
| 1173 | if (dictresize(mp, DK_SIZE(mp->ma_keys))) |
| 1174 | return NULL; |
| 1175 | } |
| 1176 | assert(mp->ma_keys->dk_lookup == lookdict_unicode_nodummy); |
| 1177 | /* Copy values into a new array */ |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1178 | ep0 = DK_ENTRIES(mp->ma_keys); |
| 1179 | size = USABLE_FRACTION(DK_SIZE(mp->ma_keys)); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1180 | values = new_values(size); |
| 1181 | if (values == NULL) { |
| 1182 | PyErr_SetString(PyExc_MemoryError, |
| 1183 | "Not enough memory to allocate new values array"); |
| 1184 | return NULL; |
| 1185 | } |
| 1186 | for (i = 0; i < size; i++) { |
| 1187 | values[i] = ep0[i].me_value; |
| 1188 | ep0[i].me_value = NULL; |
| 1189 | } |
| 1190 | mp->ma_keys->dk_lookup = lookdict_split; |
| 1191 | mp->ma_values = values; |
| 1192 | } |
| 1193 | DK_INCREF(mp->ma_keys); |
| 1194 | return mp->ma_keys; |
| 1195 | } |
Christian Heimes | 99170a5 | 2007-12-19 02:07:34 +0000 | [diff] [blame] | 1196 | |
| 1197 | PyObject * |
| 1198 | _PyDict_NewPresized(Py_ssize_t minused) |
| 1199 | { |
INADA Naoki | 92c50ee | 2016-11-22 00:57:02 +0900 | [diff] [blame] | 1200 | const Py_ssize_t max_presize = 128 * 1024; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1201 | Py_ssize_t newsize; |
| 1202 | PyDictKeysObject *new_keys; |
INADA Naoki | 92c50ee | 2016-11-22 00:57:02 +0900 | [diff] [blame] | 1203 | |
| 1204 | /* There are no strict guarantee that returned dict can contain minused |
| 1205 | * items without resize. So we create medium size dict instead of very |
| 1206 | * large dict or MemoryError. |
| 1207 | */ |
| 1208 | if (minused > USABLE_FRACTION(max_presize)) { |
| 1209 | newsize = max_presize; |
| 1210 | } |
| 1211 | else { |
| 1212 | Py_ssize_t minsize = ESTIMATE_SIZE(minused); |
| 1213 | newsize = PyDict_MINSIZE; |
| 1214 | while (newsize < minsize) { |
| 1215 | newsize <<= 1; |
| 1216 | } |
| 1217 | } |
| 1218 | assert(IS_POWER_OF_2(newsize)); |
| 1219 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1220 | new_keys = new_keys_object(newsize); |
| 1221 | if (new_keys == NULL) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1222 | return NULL; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1223 | return new_dict(new_keys, NULL); |
Christian Heimes | 99170a5 | 2007-12-19 02:07:34 +0000 | [diff] [blame] | 1224 | } |
| 1225 | |
Thomas Wouters | 4d70c3d | 2006-06-08 14:42:34 +0000 | [diff] [blame] | 1226 | /* Note that, for historical reasons, PyDict_GetItem() suppresses all errors |
| 1227 | * that may occur (originally dicts supported only string keys, and exceptions |
| 1228 | * 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] | 1229 | * 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] | 1230 | * (suppressed) occurred while computing the key's hash, or that some error |
| 1231 | * (suppressed) occurred when comparing keys in the dict's internal probe |
| 1232 | * sequence. A nasty example of the latter is when a Python-coded comparison |
| 1233 | * function hits a stack-depth error, which can cause this to return NULL |
| 1234 | * even if the key is present. |
| 1235 | */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1236 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1237 | PyDict_GetItem(PyObject *op, PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1238 | { |
Benjamin Peterson | 8f67d08 | 2010-10-17 20:54:53 +0000 | [diff] [blame] | 1239 | Py_hash_t hash; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1240 | Py_ssize_t ix; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1241 | PyDictObject *mp = (PyDictObject *)op; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1242 | PyThreadState *tstate; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1243 | PyObject *value; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1244 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1245 | if (!PyDict_Check(op)) |
| 1246 | return NULL; |
| 1247 | if (!PyUnicode_CheckExact(key) || |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 1248 | (hash = ((PyASCIIObject *) key)->hash) == -1) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1249 | { |
| 1250 | hash = PyObject_Hash(key); |
| 1251 | if (hash == -1) { |
| 1252 | PyErr_Clear(); |
| 1253 | return NULL; |
| 1254 | } |
| 1255 | } |
Thomas Wouters | 4d70c3d | 2006-06-08 14:42:34 +0000 | [diff] [blame] | 1256 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1257 | /* We can arrive here with a NULL tstate during initialization: try |
| 1258 | running "python -Wi" for an example related to string interning. |
| 1259 | Let's just hope that no exception occurs then... This must be |
| 1260 | _PyThreadState_Current and not PyThreadState_GET() because in debug |
| 1261 | mode, the latter complains if tstate is NULL. */ |
Victor Stinner | 0cae609 | 2016-11-11 01:43:56 +0100 | [diff] [blame] | 1262 | tstate = PyThreadState_GET(); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1263 | if (tstate != NULL && tstate->curexc_type != NULL) { |
| 1264 | /* preserve the existing exception */ |
| 1265 | PyObject *err_type, *err_value, *err_tb; |
| 1266 | PyErr_Fetch(&err_type, &err_value, &err_tb); |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1267 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1268 | /* ignore errors */ |
| 1269 | PyErr_Restore(err_type, err_value, err_tb); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1270 | if (ix < 0) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1271 | return NULL; |
| 1272 | } |
| 1273 | else { |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1274 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1275 | if (ix < 0) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1276 | PyErr_Clear(); |
| 1277 | return NULL; |
| 1278 | } |
| 1279 | } |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1280 | return value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1281 | } |
| 1282 | |
Serhiy Storchaka | f0b311b | 2016-11-06 13:18:24 +0200 | [diff] [blame] | 1283 | /* Same as PyDict_GetItemWithError() but with hash supplied by caller. |
| 1284 | This returns NULL *with* an exception set if an exception occurred. |
| 1285 | It returns NULL *without* an exception set if the key wasn't present. |
| 1286 | */ |
Raymond Hettinger | 4b74fba | 2014-05-03 16:32:11 -0700 | [diff] [blame] | 1287 | PyObject * |
| 1288 | _PyDict_GetItem_KnownHash(PyObject *op, PyObject *key, Py_hash_t hash) |
| 1289 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1290 | Py_ssize_t ix; |
Raymond Hettinger | 4b74fba | 2014-05-03 16:32:11 -0700 | [diff] [blame] | 1291 | PyDictObject *mp = (PyDictObject *)op; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1292 | PyObject *value; |
Raymond Hettinger | 4b74fba | 2014-05-03 16:32:11 -0700 | [diff] [blame] | 1293 | |
Serhiy Storchaka | f0b311b | 2016-11-06 13:18:24 +0200 | [diff] [blame] | 1294 | if (!PyDict_Check(op)) { |
| 1295 | PyErr_BadInternalCall(); |
Raymond Hettinger | 4b74fba | 2014-05-03 16:32:11 -0700 | [diff] [blame] | 1296 | return NULL; |
Raymond Hettinger | 4b74fba | 2014-05-03 16:32:11 -0700 | [diff] [blame] | 1297 | } |
Serhiy Storchaka | f0b311b | 2016-11-06 13:18:24 +0200 | [diff] [blame] | 1298 | |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1299 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value); |
Serhiy Storchaka | f0b311b | 2016-11-06 13:18:24 +0200 | [diff] [blame] | 1300 | if (ix < 0) { |
| 1301 | return NULL; |
Raymond Hettinger | 4b74fba | 2014-05-03 16:32:11 -0700 | [diff] [blame] | 1302 | } |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1303 | return value; |
Raymond Hettinger | 4b74fba | 2014-05-03 16:32:11 -0700 | [diff] [blame] | 1304 | } |
| 1305 | |
Guido van Rossum | 47b9ff6 | 2006-08-24 00:41:19 +0000 | [diff] [blame] | 1306 | /* Variant of PyDict_GetItem() that doesn't suppress exceptions. |
| 1307 | This returns NULL *with* an exception set if an exception occurred. |
| 1308 | It returns NULL *without* an exception set if the key wasn't present. |
| 1309 | */ |
| 1310 | PyObject * |
| 1311 | PyDict_GetItemWithError(PyObject *op, PyObject *key) |
| 1312 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1313 | Py_ssize_t ix; |
Benjamin Peterson | 8f67d08 | 2010-10-17 20:54:53 +0000 | [diff] [blame] | 1314 | Py_hash_t hash; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1315 | PyDictObject*mp = (PyDictObject *)op; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1316 | PyObject *value; |
Guido van Rossum | 47b9ff6 | 2006-08-24 00:41:19 +0000 | [diff] [blame] | 1317 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1318 | if (!PyDict_Check(op)) { |
| 1319 | PyErr_BadInternalCall(); |
| 1320 | return NULL; |
| 1321 | } |
| 1322 | if (!PyUnicode_CheckExact(key) || |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 1323 | (hash = ((PyASCIIObject *) key)->hash) == -1) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1324 | { |
| 1325 | hash = PyObject_Hash(key); |
| 1326 | if (hash == -1) { |
| 1327 | return NULL; |
| 1328 | } |
| 1329 | } |
Guido van Rossum | 47b9ff6 | 2006-08-24 00:41:19 +0000 | [diff] [blame] | 1330 | |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1331 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1332 | if (ix < 0) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1333 | return NULL; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1334 | return value; |
Guido van Rossum | 47b9ff6 | 2006-08-24 00:41:19 +0000 | [diff] [blame] | 1335 | } |
| 1336 | |
Brett Cannon | fd07415 | 2012-04-14 14:10:13 -0400 | [diff] [blame] | 1337 | PyObject * |
| 1338 | _PyDict_GetItemIdWithError(PyObject *dp, struct _Py_Identifier *key) |
| 1339 | { |
| 1340 | PyObject *kv; |
| 1341 | kv = _PyUnicode_FromId(key); /* borrowed */ |
| 1342 | if (kv == NULL) |
| 1343 | return NULL; |
| 1344 | return PyDict_GetItemWithError(dp, kv); |
| 1345 | } |
| 1346 | |
Victor Stinner | b4efc96 | 2015-11-20 09:24:02 +0100 | [diff] [blame] | 1347 | /* Fast version of global value lookup (LOAD_GLOBAL). |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1348 | * Lookup in globals, then builtins. |
Victor Stinner | b4efc96 | 2015-11-20 09:24:02 +0100 | [diff] [blame] | 1349 | * |
| 1350 | * Raise an exception and return NULL if an error occurred (ex: computing the |
| 1351 | * key hash failed, key comparison failed, ...). Return NULL if the key doesn't |
| 1352 | * exist. Return the value if the key exists. |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1353 | */ |
| 1354 | PyObject * |
| 1355 | _PyDict_LoadGlobal(PyDictObject *globals, PyDictObject *builtins, PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1356 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1357 | Py_ssize_t ix; |
Victor Stinner | b4efc96 | 2015-11-20 09:24:02 +0100 | [diff] [blame] | 1358 | Py_hash_t hash; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1359 | PyObject *value; |
Victor Stinner | b4efc96 | 2015-11-20 09:24:02 +0100 | [diff] [blame] | 1360 | |
| 1361 | if (!PyUnicode_CheckExact(key) || |
| 1362 | (hash = ((PyASCIIObject *) key)->hash) == -1) |
| 1363 | { |
| 1364 | hash = PyObject_Hash(key); |
| 1365 | if (hash == -1) |
| 1366 | return NULL; |
Antoine Pitrou | e965d97 | 2012-02-27 00:45:12 +0100 | [diff] [blame] | 1367 | } |
Victor Stinner | b4efc96 | 2015-11-20 09:24:02 +0100 | [diff] [blame] | 1368 | |
| 1369 | /* namespace 1: globals */ |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1370 | ix = globals->ma_keys->dk_lookup(globals, key, hash, &value); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1371 | if (ix == DKIX_ERROR) |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1372 | return NULL; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1373 | if (ix != DKIX_EMPTY && value != NULL) |
| 1374 | return value; |
Victor Stinner | b4efc96 | 2015-11-20 09:24:02 +0100 | [diff] [blame] | 1375 | |
| 1376 | /* namespace 2: builtins */ |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1377 | ix = builtins->ma_keys->dk_lookup(builtins, key, hash, &value); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1378 | if (ix < 0) |
Victor Stinner | b4efc96 | 2015-11-20 09:24:02 +0100 | [diff] [blame] | 1379 | return NULL; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1380 | return value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1381 | } |
| 1382 | |
Antoine Pitrou | e965d97 | 2012-02-27 00:45:12 +0100 | [diff] [blame] | 1383 | /* CAUTION: PyDict_SetItem() must guarantee that it won't resize the |
| 1384 | * dictionary if it's merely replacing the value for an existing key. |
| 1385 | * This means that it's safe to loop over a dictionary with PyDict_Next() |
| 1386 | * and occasionally replace a value -- but you can't insert new keys or |
| 1387 | * remove them. |
| 1388 | */ |
| 1389 | int |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1390 | PyDict_SetItem(PyObject *op, PyObject *key, PyObject *value) |
Antoine Pitrou | e965d97 | 2012-02-27 00:45:12 +0100 | [diff] [blame] | 1391 | { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1392 | PyDictObject *mp; |
| 1393 | Py_hash_t hash; |
Antoine Pitrou | e965d97 | 2012-02-27 00:45:12 +0100 | [diff] [blame] | 1394 | if (!PyDict_Check(op)) { |
| 1395 | PyErr_BadInternalCall(); |
| 1396 | return -1; |
| 1397 | } |
| 1398 | assert(key); |
| 1399 | assert(value); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1400 | mp = (PyDictObject *)op; |
| 1401 | if (!PyUnicode_CheckExact(key) || |
| 1402 | (hash = ((PyASCIIObject *) key)->hash) == -1) |
| 1403 | { |
Antoine Pitrou | e965d97 | 2012-02-27 00:45:12 +0100 | [diff] [blame] | 1404 | hash = PyObject_Hash(key); |
| 1405 | if (hash == -1) |
| 1406 | return -1; |
| 1407 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1408 | |
| 1409 | /* insertdict() handles any resizing that might be necessary */ |
| 1410 | return insertdict(mp, key, hash, value); |
Antoine Pitrou | e965d97 | 2012-02-27 00:45:12 +0100 | [diff] [blame] | 1411 | } |
| 1412 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1413 | int |
Raymond Hettinger | 4b74fba | 2014-05-03 16:32:11 -0700 | [diff] [blame] | 1414 | _PyDict_SetItem_KnownHash(PyObject *op, PyObject *key, PyObject *value, |
| 1415 | Py_hash_t hash) |
| 1416 | { |
| 1417 | PyDictObject *mp; |
| 1418 | |
| 1419 | if (!PyDict_Check(op)) { |
| 1420 | PyErr_BadInternalCall(); |
| 1421 | return -1; |
| 1422 | } |
| 1423 | assert(key); |
| 1424 | assert(value); |
Serhiy Storchaka | b9d98d5 | 2015-10-02 12:47:11 +0300 | [diff] [blame] | 1425 | assert(hash != -1); |
Raymond Hettinger | 4b74fba | 2014-05-03 16:32:11 -0700 | [diff] [blame] | 1426 | mp = (PyDictObject *)op; |
| 1427 | |
| 1428 | /* insertdict() handles any resizing that might be necessary */ |
| 1429 | return insertdict(mp, key, hash, value); |
| 1430 | } |
| 1431 | |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1432 | static int |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1433 | delitem_common(PyDictObject *mp, Py_hash_t hash, Py_ssize_t ix, |
Antoine Pitrou | c06ae20 | 2016-12-27 14:34:54 +0100 | [diff] [blame] | 1434 | PyObject *old_value) |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1435 | { |
Antoine Pitrou | c06ae20 | 2016-12-27 14:34:54 +0100 | [diff] [blame] | 1436 | PyObject *old_key; |
Antoine Pitrou | d741ed4 | 2016-12-27 14:23:43 +0100 | [diff] [blame] | 1437 | PyDictKeyEntry *ep; |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1438 | |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1439 | Py_ssize_t hashpos = lookdict_index(mp->ma_keys, hash, ix); |
| 1440 | assert(hashpos >= 0); |
| 1441 | |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1442 | mp->ma_used--; |
Antoine Pitrou | d741ed4 | 2016-12-27 14:23:43 +0100 | [diff] [blame] | 1443 | mp->ma_version_tag = DICT_NEXT_VERSION(); |
| 1444 | ep = &DK_ENTRIES(mp->ma_keys)[ix]; |
| 1445 | dk_set_index(mp->ma_keys, hashpos, DKIX_DUMMY); |
| 1446 | ENSURE_ALLOWS_DELETIONS(mp); |
| 1447 | old_key = ep->me_key; |
| 1448 | ep->me_key = NULL; |
Antoine Pitrou | c06ae20 | 2016-12-27 14:34:54 +0100 | [diff] [blame] | 1449 | ep->me_value = NULL; |
Antoine Pitrou | d741ed4 | 2016-12-27 14:23:43 +0100 | [diff] [blame] | 1450 | Py_DECREF(old_key); |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1451 | Py_DECREF(old_value); |
Antoine Pitrou | d741ed4 | 2016-12-27 14:23:43 +0100 | [diff] [blame] | 1452 | |
| 1453 | assert(_PyDict_CheckConsistency(mp)); |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1454 | return 0; |
| 1455 | } |
| 1456 | |
Raymond Hettinger | 4b74fba | 2014-05-03 16:32:11 -0700 | [diff] [blame] | 1457 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1458 | PyDict_DelItem(PyObject *op, PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1459 | { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1460 | Py_hash_t hash; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1461 | assert(key); |
| 1462 | if (!PyUnicode_CheckExact(key) || |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 1463 | (hash = ((PyASCIIObject *) key)->hash) == -1) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1464 | hash = PyObject_Hash(key); |
| 1465 | if (hash == -1) |
| 1466 | return -1; |
| 1467 | } |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1468 | |
| 1469 | return _PyDict_DelItem_KnownHash(op, key, hash); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1470 | } |
| 1471 | |
Serhiy Storchaka | b9d98d5 | 2015-10-02 12:47:11 +0300 | [diff] [blame] | 1472 | int |
| 1473 | _PyDict_DelItem_KnownHash(PyObject *op, PyObject *key, Py_hash_t hash) |
| 1474 | { |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1475 | Py_ssize_t ix; |
Serhiy Storchaka | b9d98d5 | 2015-10-02 12:47:11 +0300 | [diff] [blame] | 1476 | PyDictObject *mp; |
Antoine Pitrou | c06ae20 | 2016-12-27 14:34:54 +0100 | [diff] [blame] | 1477 | PyObject *old_value; |
Serhiy Storchaka | b9d98d5 | 2015-10-02 12:47:11 +0300 | [diff] [blame] | 1478 | |
| 1479 | if (!PyDict_Check(op)) { |
| 1480 | PyErr_BadInternalCall(); |
| 1481 | return -1; |
| 1482 | } |
| 1483 | assert(key); |
| 1484 | assert(hash != -1); |
| 1485 | mp = (PyDictObject *)op; |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1486 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1487 | if (ix == DKIX_ERROR) |
Serhiy Storchaka | b9d98d5 | 2015-10-02 12:47:11 +0300 | [diff] [blame] | 1488 | return -1; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1489 | if (ix == DKIX_EMPTY || old_value == NULL) { |
Serhiy Storchaka | b9d98d5 | 2015-10-02 12:47:11 +0300 | [diff] [blame] | 1490 | _PyErr_SetKeyError(key); |
| 1491 | return -1; |
| 1492 | } |
Victor Stinner | 78601a3 | 2016-09-09 19:28:36 -0700 | [diff] [blame] | 1493 | |
| 1494 | // Split table doesn't allow deletion. Combine it. |
| 1495 | if (_PyDict_HasSplitTable(mp)) { |
| 1496 | if (dictresize(mp, DK_SIZE(mp->ma_keys))) { |
| 1497 | return -1; |
| 1498 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1499 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value); |
Victor Stinner | 78601a3 | 2016-09-09 19:28:36 -0700 | [diff] [blame] | 1500 | assert(ix >= 0); |
| 1501 | } |
| 1502 | |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1503 | return delitem_common(mp, hash, ix, old_value); |
Serhiy Storchaka | b9d98d5 | 2015-10-02 12:47:11 +0300 | [diff] [blame] | 1504 | } |
| 1505 | |
Antoine Pitrou | d741ed4 | 2016-12-27 14:23:43 +0100 | [diff] [blame] | 1506 | /* This function promises that the predicate -> deletion sequence is atomic |
| 1507 | * (i.e. protected by the GIL), assuming the predicate itself doesn't |
| 1508 | * release the GIL. |
| 1509 | */ |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1510 | int |
| 1511 | _PyDict_DelItemIf(PyObject *op, PyObject *key, |
| 1512 | int (*predicate)(PyObject *value)) |
| 1513 | { |
Antoine Pitrou | d741ed4 | 2016-12-27 14:23:43 +0100 | [diff] [blame] | 1514 | Py_ssize_t hashpos, ix; |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1515 | PyDictObject *mp; |
| 1516 | Py_hash_t hash; |
Antoine Pitrou | c06ae20 | 2016-12-27 14:34:54 +0100 | [diff] [blame] | 1517 | PyObject *old_value; |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1518 | int res; |
| 1519 | |
| 1520 | if (!PyDict_Check(op)) { |
| 1521 | PyErr_BadInternalCall(); |
| 1522 | return -1; |
| 1523 | } |
| 1524 | assert(key); |
| 1525 | hash = PyObject_Hash(key); |
| 1526 | if (hash == -1) |
| 1527 | return -1; |
| 1528 | mp = (PyDictObject *)op; |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1529 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value); |
Antoine Pitrou | d741ed4 | 2016-12-27 14:23:43 +0100 | [diff] [blame] | 1530 | if (ix == DKIX_ERROR) |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1531 | return -1; |
Antoine Pitrou | c06ae20 | 2016-12-27 14:34:54 +0100 | [diff] [blame] | 1532 | if (ix == DKIX_EMPTY || old_value == NULL) { |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1533 | _PyErr_SetKeyError(key); |
| 1534 | return -1; |
| 1535 | } |
Antoine Pitrou | d741ed4 | 2016-12-27 14:23:43 +0100 | [diff] [blame] | 1536 | |
| 1537 | // Split table doesn't allow deletion. Combine it. |
| 1538 | if (_PyDict_HasSplitTable(mp)) { |
| 1539 | if (dictresize(mp, DK_SIZE(mp->ma_keys))) { |
| 1540 | return -1; |
| 1541 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1542 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value); |
Antoine Pitrou | d741ed4 | 2016-12-27 14:23:43 +0100 | [diff] [blame] | 1543 | assert(ix >= 0); |
| 1544 | } |
| 1545 | |
Antoine Pitrou | c06ae20 | 2016-12-27 14:34:54 +0100 | [diff] [blame] | 1546 | res = predicate(old_value); |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1547 | if (res == -1) |
| 1548 | return -1; |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1549 | |
| 1550 | hashpos = lookdict_index(mp->ma_keys, hash, ix); |
| 1551 | assert(hashpos >= 0); |
| 1552 | |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1553 | if (res > 0) |
Antoine Pitrou | c06ae20 | 2016-12-27 14:34:54 +0100 | [diff] [blame] | 1554 | return delitem_common(mp, hashpos, ix, old_value); |
Antoine Pitrou | e10ca3a | 2016-12-27 14:19:20 +0100 | [diff] [blame] | 1555 | else |
| 1556 | return 0; |
| 1557 | } |
| 1558 | |
| 1559 | |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1560 | void |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1561 | PyDict_Clear(PyObject *op) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1562 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1563 | PyDictObject *mp; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1564 | PyDictKeysObject *oldkeys; |
| 1565 | PyObject **oldvalues; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1566 | Py_ssize_t i, n; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 1567 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1568 | if (!PyDict_Check(op)) |
| 1569 | return; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1570 | mp = ((PyDictObject *)op); |
| 1571 | oldkeys = mp->ma_keys; |
| 1572 | oldvalues = mp->ma_values; |
| 1573 | if (oldvalues == empty_values) |
| 1574 | return; |
| 1575 | /* Empty the dict... */ |
| 1576 | DK_INCREF(Py_EMPTY_KEYS); |
| 1577 | mp->ma_keys = Py_EMPTY_KEYS; |
| 1578 | mp->ma_values = empty_values; |
| 1579 | mp->ma_used = 0; |
Victor Stinner | 3b6a6b4 | 2016-09-08 12:51:24 -0700 | [diff] [blame] | 1580 | mp->ma_version_tag = DICT_NEXT_VERSION(); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1581 | /* ...then clear the keys and values */ |
| 1582 | if (oldvalues != NULL) { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1583 | n = oldkeys->dk_nentries; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1584 | for (i = 0; i < n; i++) |
| 1585 | Py_CLEAR(oldvalues[i]); |
| 1586 | free_values(oldvalues); |
| 1587 | DK_DECREF(oldkeys); |
| 1588 | } |
| 1589 | else { |
| 1590 | assert(oldkeys->dk_refcnt == 1); |
Antoine Pitrou | 2d169b2 | 2012-05-12 23:43:44 +0200 | [diff] [blame] | 1591 | DK_DECREF(oldkeys); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1592 | } |
Victor Stinner | 611b0fa | 2016-09-14 15:02:01 +0200 | [diff] [blame] | 1593 | assert(_PyDict_CheckConsistency(mp)); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1594 | } |
| 1595 | |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1596 | /* Internal version of PyDict_Next that returns a hash value in addition |
| 1597 | * to the key and value. |
| 1598 | * Return 1 on success, return 0 when the reached the end of the dictionary |
| 1599 | * (or if op is not a dictionary) |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1600 | */ |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1601 | int |
| 1602 | _PyDict_Next(PyObject *op, Py_ssize_t *ppos, PyObject **pkey, |
| 1603 | PyObject **pvalue, Py_hash_t *phash) |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1604 | { |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 1605 | Py_ssize_t i; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1606 | PyDictObject *mp; |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1607 | PyDictKeyEntry *entry_ptr; |
| 1608 | PyObject *value; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1609 | |
| 1610 | if (!PyDict_Check(op)) |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1611 | return 0; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1612 | mp = (PyDictObject *)op; |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1613 | i = *ppos; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1614 | if (mp->ma_values) { |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 1615 | if (i < 0 || i >= mp->ma_used) |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1616 | return 0; |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 1617 | /* values of split table is always dense */ |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1618 | entry_ptr = &DK_ENTRIES(mp->ma_keys)[i]; |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 1619 | value = mp->ma_values[i]; |
| 1620 | assert(value != NULL); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1621 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1622 | else { |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 1623 | Py_ssize_t n = mp->ma_keys->dk_nentries; |
| 1624 | if (i < 0 || i >= n) |
| 1625 | return 0; |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1626 | entry_ptr = &DK_ENTRIES(mp->ma_keys)[i]; |
| 1627 | while (i < n && entry_ptr->me_value == NULL) { |
| 1628 | entry_ptr++; |
| 1629 | i++; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1630 | } |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1631 | if (i >= n) |
| 1632 | return 0; |
| 1633 | value = entry_ptr->me_value; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1634 | } |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1635 | *ppos = i+1; |
| 1636 | if (pkey) |
| 1637 | *pkey = entry_ptr->me_key; |
| 1638 | if (phash) |
| 1639 | *phash = entry_ptr->me_hash; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1640 | if (pvalue) |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1641 | *pvalue = value; |
| 1642 | return 1; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1643 | } |
| 1644 | |
Tim Peters | 080c88b | 2003-02-15 03:01:11 +0000 | [diff] [blame] | 1645 | /* |
| 1646 | * Iterate over a dict. Use like so: |
| 1647 | * |
Thomas Wouters | 4d70c3d | 2006-06-08 14:42:34 +0000 | [diff] [blame] | 1648 | * Py_ssize_t i; |
Tim Peters | 080c88b | 2003-02-15 03:01:11 +0000 | [diff] [blame] | 1649 | * PyObject *key, *value; |
| 1650 | * i = 0; # important! i should not otherwise be changed by you |
Neal Norwitz | 0732301 | 2003-02-15 14:45:12 +0000 | [diff] [blame] | 1651 | * while (PyDict_Next(yourdict, &i, &key, &value)) { |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1652 | * Refer to borrowed references in key and value. |
Tim Peters | 080c88b | 2003-02-15 03:01:11 +0000 | [diff] [blame] | 1653 | * } |
| 1654 | * |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1655 | * Return 1 on success, return 0 when the reached the end of the dictionary |
| 1656 | * (or if op is not a dictionary) |
| 1657 | * |
Tim Peters | 080c88b | 2003-02-15 03:01:11 +0000 | [diff] [blame] | 1658 | * 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] | 1659 | * mutates the dict. One exception: it is safe if the loop merely changes |
| 1660 | * the values associated with the keys (but doesn't insert new keys or |
| 1661 | * delete keys), via PyDict_SetItem(). |
| 1662 | */ |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1663 | int |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 1664 | 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] | 1665 | { |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 1666 | return _PyDict_Next(op, ppos, pkey, pvalue, NULL); |
Thomas Wouters | cf297e4 | 2007-02-23 15:07:44 +0000 | [diff] [blame] | 1667 | } |
| 1668 | |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 1669 | /* Internal version of dict.pop(). */ |
| 1670 | PyObject * |
Serhiy Storchaka | 42e1ea9 | 2017-01-12 19:12:21 +0200 | [diff] [blame] | 1671 | _PyDict_Pop_KnownHash(PyObject *dict, PyObject *key, Py_hash_t hash, PyObject *deflt) |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 1672 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1673 | Py_ssize_t ix, hashpos; |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 1674 | PyObject *old_value, *old_key; |
| 1675 | PyDictKeyEntry *ep; |
Yury Selivanov | 684ef2c | 2016-10-28 19:01:21 -0400 | [diff] [blame] | 1676 | PyDictObject *mp; |
| 1677 | |
| 1678 | assert(PyDict_Check(dict)); |
| 1679 | mp = (PyDictObject *)dict; |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 1680 | |
| 1681 | if (mp->ma_used == 0) { |
| 1682 | if (deflt) { |
| 1683 | Py_INCREF(deflt); |
| 1684 | return deflt; |
| 1685 | } |
| 1686 | _PyErr_SetKeyError(key); |
| 1687 | return NULL; |
| 1688 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1689 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1690 | if (ix == DKIX_ERROR) |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 1691 | return NULL; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1692 | if (ix == DKIX_EMPTY || old_value == NULL) { |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 1693 | if (deflt) { |
| 1694 | Py_INCREF(deflt); |
| 1695 | return deflt; |
| 1696 | } |
| 1697 | _PyErr_SetKeyError(key); |
| 1698 | return NULL; |
| 1699 | } |
Victor Stinner | 3b6a6b4 | 2016-09-08 12:51:24 -0700 | [diff] [blame] | 1700 | |
Victor Stinner | 78601a3 | 2016-09-09 19:28:36 -0700 | [diff] [blame] | 1701 | // Split table doesn't allow deletion. Combine it. |
| 1702 | if (_PyDict_HasSplitTable(mp)) { |
| 1703 | if (dictresize(mp, DK_SIZE(mp->ma_keys))) { |
| 1704 | return NULL; |
| 1705 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1706 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &old_value); |
Victor Stinner | 78601a3 | 2016-09-09 19:28:36 -0700 | [diff] [blame] | 1707 | assert(ix >= 0); |
| 1708 | } |
| 1709 | |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1710 | hashpos = lookdict_index(mp->ma_keys, hash, ix); |
| 1711 | assert(hashpos >= 0); |
Victor Stinner | 78601a3 | 2016-09-09 19:28:36 -0700 | [diff] [blame] | 1712 | assert(old_value != NULL); |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 1713 | mp->ma_used--; |
Victor Stinner | 3b6a6b4 | 2016-09-08 12:51:24 -0700 | [diff] [blame] | 1714 | mp->ma_version_tag = DICT_NEXT_VERSION(); |
Victor Stinner | 78601a3 | 2016-09-09 19:28:36 -0700 | [diff] [blame] | 1715 | dk_set_index(mp->ma_keys, hashpos, DKIX_DUMMY); |
| 1716 | ep = &DK_ENTRIES(mp->ma_keys)[ix]; |
| 1717 | ENSURE_ALLOWS_DELETIONS(mp); |
| 1718 | old_key = ep->me_key; |
| 1719 | ep->me_key = NULL; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1720 | ep->me_value = NULL; |
Victor Stinner | 78601a3 | 2016-09-09 19:28:36 -0700 | [diff] [blame] | 1721 | Py_DECREF(old_key); |
Victor Stinner | 611b0fa | 2016-09-14 15:02:01 +0200 | [diff] [blame] | 1722 | |
| 1723 | assert(_PyDict_CheckConsistency(mp)); |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 1724 | return old_value; |
| 1725 | } |
| 1726 | |
Serhiy Storchaka | 6779652 | 2017-01-12 18:34:33 +0200 | [diff] [blame] | 1727 | PyObject * |
Serhiy Storchaka | 42e1ea9 | 2017-01-12 19:12:21 +0200 | [diff] [blame] | 1728 | _PyDict_Pop(PyObject *dict, PyObject *key, PyObject *deflt) |
Serhiy Storchaka | 6779652 | 2017-01-12 18:34:33 +0200 | [diff] [blame] | 1729 | { |
| 1730 | Py_hash_t hash; |
| 1731 | |
Serhiy Storchaka | 42e1ea9 | 2017-01-12 19:12:21 +0200 | [diff] [blame] | 1732 | if (((PyDictObject *)dict)->ma_used == 0) { |
Serhiy Storchaka | 6779652 | 2017-01-12 18:34:33 +0200 | [diff] [blame] | 1733 | if (deflt) { |
| 1734 | Py_INCREF(deflt); |
| 1735 | return deflt; |
| 1736 | } |
| 1737 | _PyErr_SetKeyError(key); |
| 1738 | return NULL; |
| 1739 | } |
| 1740 | if (!PyUnicode_CheckExact(key) || |
| 1741 | (hash = ((PyASCIIObject *) key)->hash) == -1) { |
| 1742 | hash = PyObject_Hash(key); |
| 1743 | if (hash == -1) |
| 1744 | return NULL; |
| 1745 | } |
Serhiy Storchaka | 42e1ea9 | 2017-01-12 19:12:21 +0200 | [diff] [blame] | 1746 | return _PyDict_Pop_KnownHash(dict, key, hash, deflt); |
Serhiy Storchaka | 6779652 | 2017-01-12 18:34:33 +0200 | [diff] [blame] | 1747 | } |
| 1748 | |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 1749 | /* Internal version of dict.from_keys(). It is subclass-friendly. */ |
| 1750 | PyObject * |
| 1751 | _PyDict_FromKeys(PyObject *cls, PyObject *iterable, PyObject *value) |
| 1752 | { |
| 1753 | PyObject *it; /* iter(iterable) */ |
| 1754 | PyObject *key; |
| 1755 | PyObject *d; |
| 1756 | int status; |
| 1757 | |
Victor Stinner | a5ed5f0 | 2016-12-06 18:45:50 +0100 | [diff] [blame] | 1758 | d = _PyObject_CallNoArg(cls); |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 1759 | if (d == NULL) |
| 1760 | return NULL; |
| 1761 | |
| 1762 | if (PyDict_CheckExact(d) && ((PyDictObject *)d)->ma_used == 0) { |
| 1763 | if (PyDict_CheckExact(iterable)) { |
| 1764 | PyDictObject *mp = (PyDictObject *)d; |
| 1765 | PyObject *oldvalue; |
| 1766 | Py_ssize_t pos = 0; |
| 1767 | PyObject *key; |
| 1768 | Py_hash_t hash; |
| 1769 | |
Serhiy Storchaka | c61ac16 | 2017-03-21 08:52:38 +0200 | [diff] [blame] | 1770 | if (dictresize(mp, ESTIMATE_SIZE(PyDict_GET_SIZE(iterable)))) { |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 1771 | Py_DECREF(d); |
| 1772 | return NULL; |
| 1773 | } |
| 1774 | |
| 1775 | while (_PyDict_Next(iterable, &pos, &key, &oldvalue, &hash)) { |
| 1776 | if (insertdict(mp, key, hash, value)) { |
| 1777 | Py_DECREF(d); |
| 1778 | return NULL; |
| 1779 | } |
| 1780 | } |
| 1781 | return d; |
| 1782 | } |
| 1783 | if (PyAnySet_CheckExact(iterable)) { |
| 1784 | PyDictObject *mp = (PyDictObject *)d; |
| 1785 | Py_ssize_t pos = 0; |
| 1786 | PyObject *key; |
| 1787 | Py_hash_t hash; |
| 1788 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1789 | if (dictresize(mp, ESTIMATE_SIZE(PySet_GET_SIZE(iterable)))) { |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 1790 | Py_DECREF(d); |
| 1791 | return NULL; |
| 1792 | } |
| 1793 | |
| 1794 | while (_PySet_NextEntry(iterable, &pos, &key, &hash)) { |
| 1795 | if (insertdict(mp, key, hash, value)) { |
| 1796 | Py_DECREF(d); |
| 1797 | return NULL; |
| 1798 | } |
| 1799 | } |
| 1800 | return d; |
| 1801 | } |
| 1802 | } |
| 1803 | |
| 1804 | it = PyObject_GetIter(iterable); |
| 1805 | if (it == NULL){ |
| 1806 | Py_DECREF(d); |
| 1807 | return NULL; |
| 1808 | } |
| 1809 | |
| 1810 | if (PyDict_CheckExact(d)) { |
| 1811 | while ((key = PyIter_Next(it)) != NULL) { |
| 1812 | status = PyDict_SetItem(d, key, value); |
| 1813 | Py_DECREF(key); |
| 1814 | if (status < 0) |
| 1815 | goto Fail; |
| 1816 | } |
| 1817 | } else { |
| 1818 | while ((key = PyIter_Next(it)) != NULL) { |
| 1819 | status = PyObject_SetItem(d, key, value); |
| 1820 | Py_DECREF(key); |
| 1821 | if (status < 0) |
| 1822 | goto Fail; |
| 1823 | } |
| 1824 | } |
| 1825 | |
| 1826 | if (PyErr_Occurred()) |
| 1827 | goto Fail; |
| 1828 | Py_DECREF(it); |
| 1829 | return d; |
| 1830 | |
| 1831 | Fail: |
| 1832 | Py_DECREF(it); |
| 1833 | Py_DECREF(d); |
| 1834 | return NULL; |
| 1835 | } |
| 1836 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1837 | /* Methods */ |
| 1838 | |
| 1839 | static void |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1840 | dict_dealloc(PyDictObject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1841 | { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1842 | PyObject **values = mp->ma_values; |
| 1843 | PyDictKeysObject *keys = mp->ma_keys; |
| 1844 | Py_ssize_t i, n; |
INADA Naoki | a6296d3 | 2017-08-24 14:55:17 +0900 | [diff] [blame] | 1845 | |
| 1846 | /* bpo-31095: UnTrack is needed before calling any callbacks */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1847 | PyObject_GC_UnTrack(mp); |
| 1848 | Py_TRASHCAN_SAFE_BEGIN(mp) |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1849 | if (values != NULL) { |
| 1850 | if (values != empty_values) { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1851 | for (i = 0, n = mp->ma_keys->dk_nentries; i < n; i++) { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1852 | Py_XDECREF(values[i]); |
| 1853 | } |
| 1854 | free_values(values); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1855 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1856 | DK_DECREF(keys); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1857 | } |
Victor Stinner | ac2a4fe | 2013-07-16 22:19:00 +0200 | [diff] [blame] | 1858 | else if (keys != NULL) { |
Antoine Pitrou | 2d169b2 | 2012-05-12 23:43:44 +0200 | [diff] [blame] | 1859 | assert(keys->dk_refcnt == 1); |
| 1860 | DK_DECREF(keys); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1861 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1862 | if (numfree < PyDict_MAXFREELIST && Py_TYPE(mp) == &PyDict_Type) |
| 1863 | free_list[numfree++] = mp; |
| 1864 | else |
| 1865 | Py_TYPE(mp)->tp_free((PyObject *)mp); |
| 1866 | Py_TRASHCAN_SAFE_END(mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1867 | } |
| 1868 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1869 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1870 | static PyObject * |
Guido van Rossum | 8ce8a78 | 2007-11-01 19:42:39 +0000 | [diff] [blame] | 1871 | dict_repr(PyDictObject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1872 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1873 | Py_ssize_t i; |
Victor Stinner | f91929b | 2013-11-19 13:07:38 +0100 | [diff] [blame] | 1874 | PyObject *key = NULL, *value = NULL; |
| 1875 | _PyUnicodeWriter writer; |
| 1876 | int first; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 1877 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1878 | i = Py_ReprEnter((PyObject *)mp); |
| 1879 | if (i != 0) { |
| 1880 | return i > 0 ? PyUnicode_FromString("{...}") : NULL; |
| 1881 | } |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 1882 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1883 | if (mp->ma_used == 0) { |
Victor Stinner | f91929b | 2013-11-19 13:07:38 +0100 | [diff] [blame] | 1884 | Py_ReprLeave((PyObject *)mp); |
| 1885 | return PyUnicode_FromString("{}"); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1886 | } |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1887 | |
Victor Stinner | f91929b | 2013-11-19 13:07:38 +0100 | [diff] [blame] | 1888 | _PyUnicodeWriter_Init(&writer); |
| 1889 | writer.overallocate = 1; |
| 1890 | /* "{" + "1: 2" + ", 3: 4" * (len - 1) + "}" */ |
| 1891 | writer.min_length = 1 + 4 + (2 + 4) * (mp->ma_used - 1) + 1; |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1892 | |
Victor Stinner | f91929b | 2013-11-19 13:07:38 +0100 | [diff] [blame] | 1893 | if (_PyUnicodeWriter_WriteChar(&writer, '{') < 0) |
| 1894 | goto error; |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1895 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1896 | /* Do repr() on each key+value pair, and insert ": " between them. |
| 1897 | Note that repr may mutate the dict. */ |
| 1898 | i = 0; |
Victor Stinner | f91929b | 2013-11-19 13:07:38 +0100 | [diff] [blame] | 1899 | first = 1; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1900 | while (PyDict_Next((PyObject *)mp, &i, &key, &value)) { |
Victor Stinner | f91929b | 2013-11-19 13:07:38 +0100 | [diff] [blame] | 1901 | PyObject *s; |
| 1902 | int res; |
| 1903 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1904 | /* Prevent repr from deleting key or value during key format. */ |
| 1905 | Py_INCREF(key); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1906 | Py_INCREF(value); |
Victor Stinner | f97dfd7 | 2013-07-18 01:00:45 +0200 | [diff] [blame] | 1907 | |
Victor Stinner | f91929b | 2013-11-19 13:07:38 +0100 | [diff] [blame] | 1908 | if (!first) { |
| 1909 | if (_PyUnicodeWriter_WriteASCIIString(&writer, ", ", 2) < 0) |
| 1910 | goto error; |
| 1911 | } |
| 1912 | first = 0; |
| 1913 | |
| 1914 | s = PyObject_Repr(key); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1915 | if (s == NULL) |
Victor Stinner | f91929b | 2013-11-19 13:07:38 +0100 | [diff] [blame] | 1916 | goto error; |
| 1917 | res = _PyUnicodeWriter_WriteStr(&writer, s); |
| 1918 | Py_DECREF(s); |
| 1919 | if (res < 0) |
| 1920 | goto error; |
| 1921 | |
| 1922 | if (_PyUnicodeWriter_WriteASCIIString(&writer, ": ", 2) < 0) |
| 1923 | goto error; |
| 1924 | |
| 1925 | s = PyObject_Repr(value); |
| 1926 | if (s == NULL) |
| 1927 | goto error; |
| 1928 | res = _PyUnicodeWriter_WriteStr(&writer, s); |
| 1929 | Py_DECREF(s); |
| 1930 | if (res < 0) |
| 1931 | goto error; |
| 1932 | |
| 1933 | Py_CLEAR(key); |
| 1934 | Py_CLEAR(value); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1935 | } |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1936 | |
Victor Stinner | f91929b | 2013-11-19 13:07:38 +0100 | [diff] [blame] | 1937 | writer.overallocate = 0; |
| 1938 | if (_PyUnicodeWriter_WriteChar(&writer, '}') < 0) |
| 1939 | goto error; |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 1940 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1941 | Py_ReprLeave((PyObject *)mp); |
Victor Stinner | f91929b | 2013-11-19 13:07:38 +0100 | [diff] [blame] | 1942 | |
| 1943 | return _PyUnicodeWriter_Finish(&writer); |
| 1944 | |
| 1945 | error: |
| 1946 | Py_ReprLeave((PyObject *)mp); |
| 1947 | _PyUnicodeWriter_Dealloc(&writer); |
| 1948 | Py_XDECREF(key); |
| 1949 | Py_XDECREF(value); |
| 1950 | return NULL; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1951 | } |
| 1952 | |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 1953 | static Py_ssize_t |
Guido van Rossum | 8ce8a78 | 2007-11-01 19:42:39 +0000 | [diff] [blame] | 1954 | dict_length(PyDictObject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1955 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1956 | return mp->ma_used; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1957 | } |
| 1958 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1959 | static PyObject * |
Antoine Pitrou | 9ed5f27 | 2013-08-13 20:18:52 +0200 | [diff] [blame] | 1960 | dict_subscript(PyDictObject *mp, PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1961 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1962 | Py_ssize_t ix; |
Benjamin Peterson | 8f67d08 | 2010-10-17 20:54:53 +0000 | [diff] [blame] | 1963 | Py_hash_t hash; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1964 | PyObject *value; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 1965 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1966 | if (!PyUnicode_CheckExact(key) || |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 1967 | (hash = ((PyASCIIObject *) key)->hash) == -1) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1968 | hash = PyObject_Hash(key); |
| 1969 | if (hash == -1) |
| 1970 | return NULL; |
| 1971 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 1972 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 1973 | if (ix == DKIX_ERROR) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1974 | return NULL; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1975 | if (ix == DKIX_EMPTY || value == NULL) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1976 | if (!PyDict_CheckExact(mp)) { |
| 1977 | /* Look up __missing__ method if we're a subclass. */ |
| 1978 | PyObject *missing, *res; |
Benjamin Peterson | ce79852 | 2012-01-22 11:24:29 -0500 | [diff] [blame] | 1979 | _Py_IDENTIFIER(__missing__); |
| 1980 | missing = _PyObject_LookupSpecial((PyObject *)mp, &PyId___missing__); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1981 | if (missing != NULL) { |
Victor Stinner | de4ae3d | 2016-12-04 22:59:09 +0100 | [diff] [blame] | 1982 | res = PyObject_CallFunctionObjArgs(missing, |
| 1983 | key, NULL); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1984 | Py_DECREF(missing); |
| 1985 | return res; |
| 1986 | } |
| 1987 | else if (PyErr_Occurred()) |
| 1988 | return NULL; |
| 1989 | } |
Raymond Hettinger | 69492da | 2013-09-02 15:59:26 -0700 | [diff] [blame] | 1990 | _PyErr_SetKeyError(key); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1991 | return NULL; |
| 1992 | } |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 1993 | Py_INCREF(value); |
| 1994 | return value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1995 | } |
| 1996 | |
| 1997 | static int |
Guido van Rossum | 8ce8a78 | 2007-11-01 19:42:39 +0000 | [diff] [blame] | 1998 | dict_ass_sub(PyDictObject *mp, PyObject *v, PyObject *w) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1999 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2000 | if (w == NULL) |
| 2001 | return PyDict_DelItem((PyObject *)mp, v); |
| 2002 | else |
| 2003 | return PyDict_SetItem((PyObject *)mp, v, w); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2004 | } |
| 2005 | |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 2006 | static PyMappingMethods dict_as_mapping = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2007 | (lenfunc)dict_length, /*mp_length*/ |
| 2008 | (binaryfunc)dict_subscript, /*mp_subscript*/ |
| 2009 | (objobjargproc)dict_ass_sub, /*mp_ass_subscript*/ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2010 | }; |
| 2011 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 2012 | static PyObject * |
Antoine Pitrou | 9ed5f27 | 2013-08-13 20:18:52 +0200 | [diff] [blame] | 2013 | dict_keys(PyDictObject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2014 | { |
Antoine Pitrou | 9ed5f27 | 2013-08-13 20:18:52 +0200 | [diff] [blame] | 2015 | PyObject *v; |
| 2016 | Py_ssize_t i, j; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2017 | PyDictKeyEntry *ep; |
| 2018 | Py_ssize_t size, n, offset; |
| 2019 | PyObject **value_ptr; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 2020 | |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 2021 | again: |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2022 | n = mp->ma_used; |
| 2023 | v = PyList_New(n); |
| 2024 | if (v == NULL) |
| 2025 | return NULL; |
| 2026 | if (n != mp->ma_used) { |
| 2027 | /* Durnit. The allocations caused the dict to resize. |
| 2028 | * Just start over, this shouldn't normally happen. |
| 2029 | */ |
| 2030 | Py_DECREF(v); |
| 2031 | goto again; |
| 2032 | } |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2033 | ep = DK_ENTRIES(mp->ma_keys); |
| 2034 | size = mp->ma_keys->dk_nentries; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2035 | if (mp->ma_values) { |
| 2036 | value_ptr = mp->ma_values; |
| 2037 | offset = sizeof(PyObject *); |
| 2038 | } |
| 2039 | else { |
| 2040 | value_ptr = &ep[0].me_value; |
| 2041 | offset = sizeof(PyDictKeyEntry); |
| 2042 | } |
| 2043 | for (i = 0, j = 0; i < size; i++) { |
| 2044 | if (*value_ptr != NULL) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2045 | PyObject *key = ep[i].me_key; |
| 2046 | Py_INCREF(key); |
| 2047 | PyList_SET_ITEM(v, j, key); |
| 2048 | j++; |
| 2049 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2050 | value_ptr = (PyObject **)(((char *)value_ptr) + offset); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2051 | } |
| 2052 | assert(j == n); |
| 2053 | return v; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2054 | } |
| 2055 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 2056 | static PyObject * |
Antoine Pitrou | 9ed5f27 | 2013-08-13 20:18:52 +0200 | [diff] [blame] | 2057 | dict_values(PyDictObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 2058 | { |
Antoine Pitrou | 9ed5f27 | 2013-08-13 20:18:52 +0200 | [diff] [blame] | 2059 | PyObject *v; |
| 2060 | Py_ssize_t i, j; |
Benjamin Peterson | f0acae2 | 2016-09-08 09:50:08 -0700 | [diff] [blame] | 2061 | PyDictKeyEntry *ep; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2062 | Py_ssize_t size, n, offset; |
| 2063 | PyObject **value_ptr; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 2064 | |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 2065 | again: |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2066 | n = mp->ma_used; |
| 2067 | v = PyList_New(n); |
| 2068 | if (v == NULL) |
| 2069 | return NULL; |
| 2070 | if (n != mp->ma_used) { |
| 2071 | /* Durnit. The allocations caused the dict to resize. |
| 2072 | * Just start over, this shouldn't normally happen. |
| 2073 | */ |
| 2074 | Py_DECREF(v); |
| 2075 | goto again; |
| 2076 | } |
Benjamin Peterson | f0acae2 | 2016-09-08 09:50:08 -0700 | [diff] [blame] | 2077 | ep = DK_ENTRIES(mp->ma_keys); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2078 | size = mp->ma_keys->dk_nentries; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2079 | if (mp->ma_values) { |
| 2080 | value_ptr = mp->ma_values; |
| 2081 | offset = sizeof(PyObject *); |
| 2082 | } |
| 2083 | else { |
Benjamin Peterson | f0acae2 | 2016-09-08 09:50:08 -0700 | [diff] [blame] | 2084 | value_ptr = &ep[0].me_value; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2085 | offset = sizeof(PyDictKeyEntry); |
| 2086 | } |
| 2087 | for (i = 0, j = 0; i < size; i++) { |
| 2088 | PyObject *value = *value_ptr; |
| 2089 | value_ptr = (PyObject **)(((char *)value_ptr) + offset); |
| 2090 | if (value != NULL) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2091 | Py_INCREF(value); |
| 2092 | PyList_SET_ITEM(v, j, value); |
| 2093 | j++; |
| 2094 | } |
| 2095 | } |
| 2096 | assert(j == n); |
| 2097 | return v; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 2098 | } |
| 2099 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 2100 | static PyObject * |
Antoine Pitrou | 9ed5f27 | 2013-08-13 20:18:52 +0200 | [diff] [blame] | 2101 | dict_items(PyDictObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 2102 | { |
Antoine Pitrou | 9ed5f27 | 2013-08-13 20:18:52 +0200 | [diff] [blame] | 2103 | PyObject *v; |
| 2104 | Py_ssize_t i, j, n; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2105 | Py_ssize_t size, offset; |
| 2106 | PyObject *item, *key; |
| 2107 | PyDictKeyEntry *ep; |
| 2108 | PyObject **value_ptr; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 2109 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2110 | /* Preallocate the list of tuples, to avoid allocations during |
| 2111 | * the loop over the items, which could trigger GC, which |
| 2112 | * could resize the dict. :-( |
| 2113 | */ |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 2114 | again: |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2115 | n = mp->ma_used; |
| 2116 | v = PyList_New(n); |
| 2117 | if (v == NULL) |
| 2118 | return NULL; |
| 2119 | for (i = 0; i < n; i++) { |
| 2120 | item = PyTuple_New(2); |
| 2121 | if (item == NULL) { |
| 2122 | Py_DECREF(v); |
| 2123 | return NULL; |
| 2124 | } |
| 2125 | PyList_SET_ITEM(v, i, item); |
| 2126 | } |
| 2127 | if (n != mp->ma_used) { |
| 2128 | /* Durnit. The allocations caused the dict to resize. |
| 2129 | * Just start over, this shouldn't normally happen. |
| 2130 | */ |
| 2131 | Py_DECREF(v); |
| 2132 | goto again; |
| 2133 | } |
| 2134 | /* Nothing we do below makes any function calls. */ |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2135 | ep = DK_ENTRIES(mp->ma_keys); |
| 2136 | size = mp->ma_keys->dk_nentries; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2137 | if (mp->ma_values) { |
| 2138 | value_ptr = mp->ma_values; |
| 2139 | offset = sizeof(PyObject *); |
| 2140 | } |
| 2141 | else { |
| 2142 | value_ptr = &ep[0].me_value; |
| 2143 | offset = sizeof(PyDictKeyEntry); |
| 2144 | } |
| 2145 | for (i = 0, j = 0; i < size; i++) { |
| 2146 | PyObject *value = *value_ptr; |
| 2147 | value_ptr = (PyObject **)(((char *)value_ptr) + offset); |
| 2148 | if (value != NULL) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2149 | key = ep[i].me_key; |
| 2150 | item = PyList_GET_ITEM(v, j); |
| 2151 | Py_INCREF(key); |
| 2152 | PyTuple_SET_ITEM(item, 0, key); |
| 2153 | Py_INCREF(value); |
| 2154 | PyTuple_SET_ITEM(item, 1, value); |
| 2155 | j++; |
| 2156 | } |
| 2157 | } |
| 2158 | assert(j == n); |
| 2159 | return v; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 2160 | } |
| 2161 | |
Larry Hastings | 5c66189 | 2014-01-24 06:17:25 -0800 | [diff] [blame] | 2162 | /*[clinic input] |
| 2163 | @classmethod |
| 2164 | dict.fromkeys |
Larry Hastings | 5c66189 | 2014-01-24 06:17:25 -0800 | [diff] [blame] | 2165 | iterable: object |
| 2166 | value: object=None |
| 2167 | / |
| 2168 | |
Serhiy Storchaka | 78d9e58 | 2017-01-25 00:30:04 +0200 | [diff] [blame] | 2169 | Create a new dictionary with keys from iterable and values set to value. |
Larry Hastings | 5c66189 | 2014-01-24 06:17:25 -0800 | [diff] [blame] | 2170 | [clinic start generated code]*/ |
| 2171 | |
Larry Hastings | 5c66189 | 2014-01-24 06:17:25 -0800 | [diff] [blame] | 2172 | static PyObject * |
| 2173 | dict_fromkeys_impl(PyTypeObject *type, PyObject *iterable, PyObject *value) |
Serhiy Storchaka | 78d9e58 | 2017-01-25 00:30:04 +0200 | [diff] [blame] | 2174 | /*[clinic end generated code: output=8fb98e4b10384999 input=382ba4855d0f74c3]*/ |
Larry Hastings | 5c66189 | 2014-01-24 06:17:25 -0800 | [diff] [blame] | 2175 | { |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 2176 | return _PyDict_FromKeys((PyObject *)type, iterable, value); |
Raymond Hettinger | e33d3df | 2002-11-27 07:29:33 +0000 | [diff] [blame] | 2177 | } |
| 2178 | |
Raymond Hettinger | 31017ae | 2004-03-04 08:25:44 +0000 | [diff] [blame] | 2179 | static int |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2180 | dict_update_common(PyObject *self, PyObject *args, PyObject *kwds, |
| 2181 | const char *methname) |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 2182 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2183 | PyObject *arg = NULL; |
| 2184 | int result = 0; |
Raymond Hettinger | 31017ae | 2004-03-04 08:25:44 +0000 | [diff] [blame] | 2185 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2186 | if (!PyArg_UnpackTuple(args, methname, 0, 1, &arg)) |
| 2187 | result = -1; |
Raymond Hettinger | 31017ae | 2004-03-04 08:25:44 +0000 | [diff] [blame] | 2188 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2189 | else if (arg != NULL) { |
Martin v. Löwis | 1c67dd9 | 2011-10-14 15:16:45 +0200 | [diff] [blame] | 2190 | _Py_IDENTIFIER(keys); |
| 2191 | if (_PyObject_HasAttrId(arg, &PyId_keys)) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2192 | result = PyDict_Merge(self, arg, 1); |
| 2193 | else |
| 2194 | result = PyDict_MergeFromSeq2(self, arg, 1); |
| 2195 | } |
| 2196 | if (result == 0 && kwds != NULL) { |
| 2197 | if (PyArg_ValidateKeywordArguments(kwds)) |
| 2198 | result = PyDict_Merge(self, kwds, 1); |
| 2199 | else |
| 2200 | result = -1; |
| 2201 | } |
| 2202 | return result; |
Raymond Hettinger | 31017ae | 2004-03-04 08:25:44 +0000 | [diff] [blame] | 2203 | } |
| 2204 | |
Victor Stinner | 91f0d4a | 2017-01-19 12:45:06 +0100 | [diff] [blame] | 2205 | /* Note: dict.update() uses the METH_VARARGS|METH_KEYWORDS calling convention. |
Serhiy Storchaka | 6969eaf | 2017-07-03 21:20:15 +0300 | [diff] [blame] | 2206 | Using METH_FASTCALL|METH_KEYWORDS would make dict.update(**dict2) calls |
| 2207 | slower, see the issue #29312. */ |
Raymond Hettinger | 31017ae | 2004-03-04 08:25:44 +0000 | [diff] [blame] | 2208 | static PyObject * |
| 2209 | dict_update(PyObject *self, PyObject *args, PyObject *kwds) |
| 2210 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2211 | if (dict_update_common(self, args, kwds, "update") != -1) |
| 2212 | Py_RETURN_NONE; |
| 2213 | return NULL; |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 2214 | } |
| 2215 | |
Guido van Rossum | 05ac6de | 2001-08-10 20:28:28 +0000 | [diff] [blame] | 2216 | /* Update unconditionally replaces existing items. |
| 2217 | Merge has a 3rd argument 'override'; if set, it acts like Update, |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2218 | otherwise it leaves existing items unchanged. |
| 2219 | |
| 2220 | PyDict_{Update,Merge} update/merge from a mapping object. |
| 2221 | |
Tim Peters | f582b82 | 2001-12-11 18:51:08 +0000 | [diff] [blame] | 2222 | PyDict_MergeFromSeq2 updates/merges from any iterable object |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2223 | producing iterable objects of length 2. |
| 2224 | */ |
| 2225 | |
Tim Peters | f582b82 | 2001-12-11 18:51:08 +0000 | [diff] [blame] | 2226 | int |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2227 | PyDict_MergeFromSeq2(PyObject *d, PyObject *seq2, int override) |
| 2228 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2229 | PyObject *it; /* iter(seq2) */ |
| 2230 | Py_ssize_t i; /* index into seq2 of current element */ |
| 2231 | PyObject *item; /* seq2[i] */ |
| 2232 | PyObject *fast; /* item as a 2-tuple or 2-list */ |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2233 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2234 | assert(d != NULL); |
| 2235 | assert(PyDict_Check(d)); |
| 2236 | assert(seq2 != NULL); |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2237 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2238 | it = PyObject_GetIter(seq2); |
| 2239 | if (it == NULL) |
| 2240 | return -1; |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2241 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2242 | for (i = 0; ; ++i) { |
| 2243 | PyObject *key, *value; |
| 2244 | Py_ssize_t n; |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2245 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2246 | fast = NULL; |
| 2247 | item = PyIter_Next(it); |
| 2248 | if (item == NULL) { |
| 2249 | if (PyErr_Occurred()) |
| 2250 | goto Fail; |
| 2251 | break; |
| 2252 | } |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2253 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2254 | /* Convert item to sequence, and verify length 2. */ |
| 2255 | fast = PySequence_Fast(item, ""); |
| 2256 | if (fast == NULL) { |
| 2257 | if (PyErr_ExceptionMatches(PyExc_TypeError)) |
| 2258 | PyErr_Format(PyExc_TypeError, |
| 2259 | "cannot convert dictionary update " |
| 2260 | "sequence element #%zd to a sequence", |
| 2261 | i); |
| 2262 | goto Fail; |
| 2263 | } |
| 2264 | n = PySequence_Fast_GET_SIZE(fast); |
| 2265 | if (n != 2) { |
| 2266 | PyErr_Format(PyExc_ValueError, |
| 2267 | "dictionary update sequence element #%zd " |
| 2268 | "has length %zd; 2 is required", |
| 2269 | i, n); |
| 2270 | goto Fail; |
| 2271 | } |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2272 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2273 | /* Update/merge with this (key, value) pair. */ |
| 2274 | key = PySequence_Fast_GET_ITEM(fast, 0); |
| 2275 | value = PySequence_Fast_GET_ITEM(fast, 1); |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 2276 | Py_INCREF(key); |
| 2277 | Py_INCREF(value); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2278 | if (override || PyDict_GetItem(d, key) == NULL) { |
| 2279 | int status = PyDict_SetItem(d, key, value); |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 2280 | if (status < 0) { |
| 2281 | Py_DECREF(key); |
| 2282 | Py_DECREF(value); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2283 | goto Fail; |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 2284 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2285 | } |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 2286 | Py_DECREF(key); |
| 2287 | Py_DECREF(value); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2288 | Py_DECREF(fast); |
| 2289 | Py_DECREF(item); |
| 2290 | } |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2291 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2292 | i = 0; |
Victor Stinner | 611b0fa | 2016-09-14 15:02:01 +0200 | [diff] [blame] | 2293 | assert(_PyDict_CheckConsistency((PyDictObject *)d)); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2294 | goto Return; |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2295 | Fail: |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2296 | Py_XDECREF(item); |
| 2297 | Py_XDECREF(fast); |
| 2298 | i = -1; |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2299 | Return: |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2300 | Py_DECREF(it); |
| 2301 | return Py_SAFE_DOWNCAST(i, Py_ssize_t, int); |
Tim Peters | 1fc240e | 2001-10-26 05:06:50 +0000 | [diff] [blame] | 2302 | } |
| 2303 | |
doko@ubuntu.com | c96df68 | 2016-10-11 08:04:02 +0200 | [diff] [blame] | 2304 | static int |
Serhiy Storchaka | e036ef8 | 2016-10-02 11:06:43 +0300 | [diff] [blame] | 2305 | dict_merge(PyObject *a, PyObject *b, int override) |
Guido van Rossum | 05ac6de | 2001-08-10 20:28:28 +0000 | [diff] [blame] | 2306 | { |
Antoine Pitrou | 9ed5f27 | 2013-08-13 20:18:52 +0200 | [diff] [blame] | 2307 | PyDictObject *mp, *other; |
| 2308 | Py_ssize_t i, n; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2309 | PyDictKeyEntry *entry, *ep0; |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 2310 | |
Serhiy Storchaka | e036ef8 | 2016-10-02 11:06:43 +0300 | [diff] [blame] | 2311 | assert(0 <= override && override <= 2); |
| 2312 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2313 | /* We accept for the argument either a concrete dictionary object, |
| 2314 | * or an abstract "mapping" object. For the former, we can do |
| 2315 | * things quite efficiently. For the latter, we only require that |
| 2316 | * PyMapping_Keys() and PyObject_GetItem() be supported. |
| 2317 | */ |
| 2318 | if (a == NULL || !PyDict_Check(a) || b == NULL) { |
| 2319 | PyErr_BadInternalCall(); |
| 2320 | return -1; |
| 2321 | } |
| 2322 | mp = (PyDictObject*)a; |
| 2323 | if (PyDict_Check(b)) { |
| 2324 | other = (PyDictObject*)b; |
| 2325 | if (other == mp || other->ma_used == 0) |
| 2326 | /* a.update(a) or a.update({}); nothing to do */ |
| 2327 | return 0; |
| 2328 | if (mp->ma_used == 0) |
| 2329 | /* Since the target dict is empty, PyDict_GetItem() |
| 2330 | * always returns NULL. Setting override to 1 |
| 2331 | * skips the unnecessary test. |
| 2332 | */ |
| 2333 | override = 1; |
| 2334 | /* Do one big resize at the start, rather than |
| 2335 | * incrementally resizing as we insert new items. Expect |
| 2336 | * that there will be no (or few) overlapping keys. |
| 2337 | */ |
INADA Naoki | b1152be | 2016-10-27 19:26:50 +0900 | [diff] [blame] | 2338 | if (USABLE_FRACTION(mp->ma_keys->dk_size) < other->ma_used) { |
| 2339 | if (dictresize(mp, ESTIMATE_SIZE(mp->ma_used + other->ma_used))) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2340 | return -1; |
INADA Naoki | b1152be | 2016-10-27 19:26:50 +0900 | [diff] [blame] | 2341 | } |
| 2342 | } |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2343 | ep0 = DK_ENTRIES(other->ma_keys); |
| 2344 | for (i = 0, n = other->ma_keys->dk_nentries; i < n; i++) { |
Benjamin Peterson | a82f77f | 2015-07-04 19:55:16 -0500 | [diff] [blame] | 2345 | PyObject *key, *value; |
| 2346 | Py_hash_t hash; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2347 | entry = &ep0[i]; |
Benjamin Peterson | a82f77f | 2015-07-04 19:55:16 -0500 | [diff] [blame] | 2348 | key = entry->me_key; |
| 2349 | hash = entry->me_hash; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2350 | if (other->ma_values) |
| 2351 | value = other->ma_values[i]; |
| 2352 | else |
| 2353 | value = entry->me_value; |
| 2354 | |
Benjamin Peterson | a82f77f | 2015-07-04 19:55:16 -0500 | [diff] [blame] | 2355 | if (value != NULL) { |
| 2356 | int err = 0; |
| 2357 | Py_INCREF(key); |
| 2358 | Py_INCREF(value); |
Serhiy Storchaka | f0b311b | 2016-11-06 13:18:24 +0200 | [diff] [blame] | 2359 | if (override == 1) |
Benjamin Peterson | a82f77f | 2015-07-04 19:55:16 -0500 | [diff] [blame] | 2360 | err = insertdict(mp, key, hash, value); |
Serhiy Storchaka | f0b311b | 2016-11-06 13:18:24 +0200 | [diff] [blame] | 2361 | else if (_PyDict_GetItem_KnownHash(a, key, hash) == NULL) { |
| 2362 | if (PyErr_Occurred()) { |
| 2363 | Py_DECREF(value); |
| 2364 | Py_DECREF(key); |
| 2365 | return -1; |
| 2366 | } |
| 2367 | err = insertdict(mp, key, hash, value); |
| 2368 | } |
Serhiy Storchaka | e036ef8 | 2016-10-02 11:06:43 +0300 | [diff] [blame] | 2369 | else if (override != 0) { |
| 2370 | _PyErr_SetKeyError(key); |
| 2371 | Py_DECREF(value); |
| 2372 | Py_DECREF(key); |
| 2373 | return -1; |
| 2374 | } |
Benjamin Peterson | a82f77f | 2015-07-04 19:55:16 -0500 | [diff] [blame] | 2375 | Py_DECREF(value); |
| 2376 | Py_DECREF(key); |
| 2377 | if (err != 0) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2378 | return -1; |
Benjamin Peterson | a82f77f | 2015-07-04 19:55:16 -0500 | [diff] [blame] | 2379 | |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2380 | if (n != other->ma_keys->dk_nentries) { |
Benjamin Peterson | a82f77f | 2015-07-04 19:55:16 -0500 | [diff] [blame] | 2381 | PyErr_SetString(PyExc_RuntimeError, |
| 2382 | "dict mutated during update"); |
| 2383 | return -1; |
| 2384 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2385 | } |
| 2386 | } |
| 2387 | } |
| 2388 | else { |
| 2389 | /* Do it the generic, slower way */ |
| 2390 | PyObject *keys = PyMapping_Keys(b); |
| 2391 | PyObject *iter; |
| 2392 | PyObject *key, *value; |
| 2393 | int status; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 2394 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2395 | if (keys == NULL) |
| 2396 | /* Docstring says this is equivalent to E.keys() so |
| 2397 | * if E doesn't have a .keys() method we want |
| 2398 | * AttributeError to percolate up. Might as well |
| 2399 | * do the same for any other error. |
| 2400 | */ |
| 2401 | return -1; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 2402 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2403 | iter = PyObject_GetIter(keys); |
| 2404 | Py_DECREF(keys); |
| 2405 | if (iter == NULL) |
| 2406 | return -1; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 2407 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2408 | for (key = PyIter_Next(iter); key; key = PyIter_Next(iter)) { |
Serhiy Storchaka | e036ef8 | 2016-10-02 11:06:43 +0300 | [diff] [blame] | 2409 | if (override != 1 && PyDict_GetItem(a, key) != NULL) { |
| 2410 | if (override != 0) { |
| 2411 | _PyErr_SetKeyError(key); |
| 2412 | Py_DECREF(key); |
| 2413 | Py_DECREF(iter); |
| 2414 | return -1; |
| 2415 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2416 | Py_DECREF(key); |
| 2417 | continue; |
| 2418 | } |
| 2419 | value = PyObject_GetItem(b, key); |
| 2420 | if (value == NULL) { |
| 2421 | Py_DECREF(iter); |
| 2422 | Py_DECREF(key); |
| 2423 | return -1; |
| 2424 | } |
| 2425 | status = PyDict_SetItem(a, key, value); |
| 2426 | Py_DECREF(key); |
| 2427 | Py_DECREF(value); |
| 2428 | if (status < 0) { |
| 2429 | Py_DECREF(iter); |
| 2430 | return -1; |
| 2431 | } |
| 2432 | } |
| 2433 | Py_DECREF(iter); |
| 2434 | if (PyErr_Occurred()) |
| 2435 | /* Iterator completed, via error */ |
| 2436 | return -1; |
| 2437 | } |
Victor Stinner | 611b0fa | 2016-09-14 15:02:01 +0200 | [diff] [blame] | 2438 | assert(_PyDict_CheckConsistency((PyDictObject *)a)); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2439 | return 0; |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 2440 | } |
| 2441 | |
Serhiy Storchaka | e036ef8 | 2016-10-02 11:06:43 +0300 | [diff] [blame] | 2442 | int |
| 2443 | PyDict_Update(PyObject *a, PyObject *b) |
| 2444 | { |
| 2445 | return dict_merge(a, b, 1); |
| 2446 | } |
| 2447 | |
| 2448 | int |
| 2449 | PyDict_Merge(PyObject *a, PyObject *b, int override) |
| 2450 | { |
| 2451 | /* XXX Deprecate override not in (0, 1). */ |
| 2452 | return dict_merge(a, b, override != 0); |
| 2453 | } |
| 2454 | |
| 2455 | int |
| 2456 | _PyDict_MergeEx(PyObject *a, PyObject *b, int override) |
| 2457 | { |
| 2458 | return dict_merge(a, b, override); |
| 2459 | } |
| 2460 | |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 2461 | static PyObject * |
Antoine Pitrou | 9ed5f27 | 2013-08-13 20:18:52 +0200 | [diff] [blame] | 2462 | dict_copy(PyDictObject *mp) |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 2463 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2464 | return PyDict_Copy((PyObject*)mp); |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 2465 | } |
| 2466 | |
| 2467 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 2468 | PyDict_Copy(PyObject *o) |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 2469 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2470 | PyObject *copy; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2471 | PyDictObject *mp; |
| 2472 | Py_ssize_t i, n; |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 2473 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2474 | if (o == NULL || !PyDict_Check(o)) { |
| 2475 | PyErr_BadInternalCall(); |
| 2476 | return NULL; |
| 2477 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2478 | mp = (PyDictObject *)o; |
| 2479 | if (_PyDict_HasSplitTable(mp)) { |
| 2480 | PyDictObject *split_copy; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2481 | Py_ssize_t size = USABLE_FRACTION(DK_SIZE(mp->ma_keys)); |
| 2482 | PyObject **newvalues; |
| 2483 | newvalues = new_values(size); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2484 | if (newvalues == NULL) |
| 2485 | return PyErr_NoMemory(); |
| 2486 | split_copy = PyObject_GC_New(PyDictObject, &PyDict_Type); |
| 2487 | if (split_copy == NULL) { |
| 2488 | free_values(newvalues); |
| 2489 | return NULL; |
| 2490 | } |
| 2491 | split_copy->ma_values = newvalues; |
| 2492 | split_copy->ma_keys = mp->ma_keys; |
| 2493 | split_copy->ma_used = mp->ma_used; |
| 2494 | DK_INCREF(mp->ma_keys); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2495 | for (i = 0, n = size; i < n; i++) { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2496 | PyObject *value = mp->ma_values[i]; |
| 2497 | Py_XINCREF(value); |
| 2498 | split_copy->ma_values[i] = value; |
| 2499 | } |
Benjamin Peterson | 7ce67e4 | 2012-04-24 10:32:57 -0400 | [diff] [blame] | 2500 | if (_PyObject_GC_IS_TRACKED(mp)) |
| 2501 | _PyObject_GC_TRACK(split_copy); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2502 | return (PyObject *)split_copy; |
| 2503 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2504 | copy = PyDict_New(); |
| 2505 | if (copy == NULL) |
| 2506 | return NULL; |
| 2507 | if (PyDict_Merge(copy, o, 1) == 0) |
| 2508 | return copy; |
| 2509 | Py_DECREF(copy); |
| 2510 | return NULL; |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 2511 | } |
| 2512 | |
Martin v. Löwis | 18e1655 | 2006-02-15 17:27:45 +0000 | [diff] [blame] | 2513 | Py_ssize_t |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 2514 | PyDict_Size(PyObject *mp) |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 2515 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2516 | if (mp == NULL || !PyDict_Check(mp)) { |
| 2517 | PyErr_BadInternalCall(); |
| 2518 | return -1; |
| 2519 | } |
| 2520 | return ((PyDictObject *)mp)->ma_used; |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 2521 | } |
| 2522 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 2523 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 2524 | PyDict_Keys(PyObject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2525 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2526 | if (mp == NULL || !PyDict_Check(mp)) { |
| 2527 | PyErr_BadInternalCall(); |
| 2528 | return NULL; |
| 2529 | } |
| 2530 | return dict_keys((PyDictObject *)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2531 | } |
| 2532 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 2533 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 2534 | PyDict_Values(PyObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 2535 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2536 | if (mp == NULL || !PyDict_Check(mp)) { |
| 2537 | PyErr_BadInternalCall(); |
| 2538 | return NULL; |
| 2539 | } |
| 2540 | return dict_values((PyDictObject *)mp); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 2541 | } |
| 2542 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 2543 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 2544 | PyDict_Items(PyObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 2545 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2546 | if (mp == NULL || !PyDict_Check(mp)) { |
| 2547 | PyErr_BadInternalCall(); |
| 2548 | return NULL; |
| 2549 | } |
| 2550 | return dict_items((PyDictObject *)mp); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 2551 | } |
| 2552 | |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 2553 | /* Return 1 if dicts equal, 0 if not, -1 if error. |
| 2554 | * Gets out as soon as any difference is detected. |
| 2555 | * Uses only Py_EQ comparison. |
| 2556 | */ |
| 2557 | static int |
Guido van Rossum | 8ce8a78 | 2007-11-01 19:42:39 +0000 | [diff] [blame] | 2558 | dict_equal(PyDictObject *a, PyDictObject *b) |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 2559 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2560 | Py_ssize_t i; |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 2561 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2562 | if (a->ma_used != b->ma_used) |
| 2563 | /* can't be equal if # of entries differ */ |
| 2564 | return 0; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2565 | /* Same # of entries -- check all of 'em. Exit early on any diff. */ |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2566 | for (i = 0; i < a->ma_keys->dk_nentries; i++) { |
| 2567 | PyDictKeyEntry *ep = &DK_ENTRIES(a->ma_keys)[i]; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2568 | PyObject *aval; |
| 2569 | if (a->ma_values) |
| 2570 | aval = a->ma_values[i]; |
| 2571 | else |
| 2572 | aval = ep->me_value; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2573 | if (aval != NULL) { |
| 2574 | int cmp; |
| 2575 | PyObject *bval; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2576 | PyObject *key = ep->me_key; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2577 | /* temporarily bump aval's refcount to ensure it stays |
| 2578 | alive until we're done with it */ |
| 2579 | Py_INCREF(aval); |
| 2580 | /* ditto for key */ |
| 2581 | Py_INCREF(key); |
Antoine Pitrou | 0e9958b | 2012-12-02 19:10:07 +0100 | [diff] [blame] | 2582 | /* reuse the known hash value */ |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 2583 | b->ma_keys->dk_lookup(b, key, ep->me_hash, &bval); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2584 | if (bval == NULL) { |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 2585 | Py_DECREF(key); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2586 | Py_DECREF(aval); |
| 2587 | if (PyErr_Occurred()) |
| 2588 | return -1; |
| 2589 | return 0; |
| 2590 | } |
| 2591 | cmp = PyObject_RichCompareBool(aval, bval, Py_EQ); |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 2592 | Py_DECREF(key); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2593 | Py_DECREF(aval); |
| 2594 | if (cmp <= 0) /* error or not equal */ |
| 2595 | return cmp; |
| 2596 | } |
| 2597 | } |
| 2598 | return 1; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2599 | } |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 2600 | |
| 2601 | static PyObject * |
| 2602 | dict_richcompare(PyObject *v, PyObject *w, int op) |
| 2603 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2604 | int cmp; |
| 2605 | PyObject *res; |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 2606 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2607 | if (!PyDict_Check(v) || !PyDict_Check(w)) { |
| 2608 | res = Py_NotImplemented; |
| 2609 | } |
| 2610 | else if (op == Py_EQ || op == Py_NE) { |
| 2611 | cmp = dict_equal((PyDictObject *)v, (PyDictObject *)w); |
| 2612 | if (cmp < 0) |
| 2613 | return NULL; |
| 2614 | res = (cmp == (op == Py_EQ)) ? Py_True : Py_False; |
| 2615 | } |
| 2616 | else |
| 2617 | res = Py_NotImplemented; |
| 2618 | Py_INCREF(res); |
| 2619 | return res; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2620 | } |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 2621 | |
Larry Hastings | 61272b7 | 2014-01-07 12:41:53 -0800 | [diff] [blame] | 2622 | /*[clinic input] |
Larry Hastings | 3182680 | 2013-10-19 00:09:25 -0700 | [diff] [blame] | 2623 | |
| 2624 | @coexist |
| 2625 | dict.__contains__ |
| 2626 | |
| 2627 | key: object |
| 2628 | / |
| 2629 | |
Serhiy Storchaka | 78d9e58 | 2017-01-25 00:30:04 +0200 | [diff] [blame] | 2630 | True if the dictionary has the specified key, else False. |
Larry Hastings | 61272b7 | 2014-01-07 12:41:53 -0800 | [diff] [blame] | 2631 | [clinic start generated code]*/ |
Larry Hastings | 3182680 | 2013-10-19 00:09:25 -0700 | [diff] [blame] | 2632 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 2633 | static PyObject * |
Larry Hastings | c204726 | 2014-01-25 20:43:29 -0800 | [diff] [blame] | 2634 | dict___contains__(PyDictObject *self, PyObject *key) |
Serhiy Storchaka | 19d2597 | 2017-02-04 08:05:07 +0200 | [diff] [blame] | 2635 | /*[clinic end generated code: output=a3d03db709ed6e6b input=fe1cb42ad831e820]*/ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2636 | { |
Larry Hastings | c204726 | 2014-01-25 20:43:29 -0800 | [diff] [blame] | 2637 | register PyDictObject *mp = self; |
Benjamin Peterson | 8f67d08 | 2010-10-17 20:54:53 +0000 | [diff] [blame] | 2638 | Py_hash_t hash; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2639 | Py_ssize_t ix; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 2640 | PyObject *value; |
Thomas Wouters | 4d70c3d | 2006-06-08 14:42:34 +0000 | [diff] [blame] | 2641 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2642 | if (!PyUnicode_CheckExact(key) || |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 2643 | (hash = ((PyASCIIObject *) key)->hash) == -1) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2644 | hash = PyObject_Hash(key); |
| 2645 | if (hash == -1) |
| 2646 | return NULL; |
| 2647 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 2648 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2649 | if (ix == DKIX_ERROR) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2650 | return NULL; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 2651 | if (ix == DKIX_EMPTY || value == NULL) |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2652 | Py_RETURN_FALSE; |
| 2653 | Py_RETURN_TRUE; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 2654 | } |
| 2655 | |
Victor Stinner | 7dc6a5f | 2017-01-19 12:37:13 +0100 | [diff] [blame] | 2656 | /*[clinic input] |
| 2657 | dict.get |
| 2658 | |
| 2659 | key: object |
Serhiy Storchaka | 48088ee | 2017-01-19 19:00:30 +0200 | [diff] [blame] | 2660 | default: object = None |
Victor Stinner | 7dc6a5f | 2017-01-19 12:37:13 +0100 | [diff] [blame] | 2661 | / |
| 2662 | |
Serhiy Storchaka | 78d9e58 | 2017-01-25 00:30:04 +0200 | [diff] [blame] | 2663 | Return the value for key if key is in the dictionary, else default. |
Victor Stinner | 7dc6a5f | 2017-01-19 12:37:13 +0100 | [diff] [blame] | 2664 | [clinic start generated code]*/ |
| 2665 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 2666 | static PyObject * |
Serhiy Storchaka | 48088ee | 2017-01-19 19:00:30 +0200 | [diff] [blame] | 2667 | dict_get_impl(PyDictObject *self, PyObject *key, PyObject *default_value) |
Serhiy Storchaka | 78d9e58 | 2017-01-25 00:30:04 +0200 | [diff] [blame] | 2668 | /*[clinic end generated code: output=bba707729dee05bf input=279ddb5790b6b107]*/ |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 2669 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2670 | PyObject *val = NULL; |
Benjamin Peterson | 8f67d08 | 2010-10-17 20:54:53 +0000 | [diff] [blame] | 2671 | Py_hash_t hash; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2672 | Py_ssize_t ix; |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 2673 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2674 | if (!PyUnicode_CheckExact(key) || |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 2675 | (hash = ((PyASCIIObject *) key)->hash) == -1) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2676 | hash = PyObject_Hash(key); |
| 2677 | if (hash == -1) |
| 2678 | return NULL; |
| 2679 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 2680 | ix = (self->ma_keys->dk_lookup) (self, key, hash, &val); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2681 | if (ix == DKIX_ERROR) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2682 | return NULL; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 2683 | if (ix == DKIX_EMPTY || val == NULL) { |
Serhiy Storchaka | 48088ee | 2017-01-19 19:00:30 +0200 | [diff] [blame] | 2684 | val = default_value; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 2685 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2686 | Py_INCREF(val); |
| 2687 | return val; |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 2688 | } |
| 2689 | |
Benjamin Peterson | 00e9886 | 2013-03-07 22:16:29 -0500 | [diff] [blame] | 2690 | PyObject * |
| 2691 | PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj) |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 2692 | { |
Benjamin Peterson | 00e9886 | 2013-03-07 22:16:29 -0500 | [diff] [blame] | 2693 | PyDictObject *mp = (PyDictObject *)d; |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2694 | PyObject *value; |
Benjamin Peterson | 8f67d08 | 2010-10-17 20:54:53 +0000 | [diff] [blame] | 2695 | Py_hash_t hash; |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 2696 | |
Benjamin Peterson | 00e9886 | 2013-03-07 22:16:29 -0500 | [diff] [blame] | 2697 | if (!PyDict_Check(d)) { |
| 2698 | PyErr_BadInternalCall(); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2699 | return NULL; |
Benjamin Peterson | 00e9886 | 2013-03-07 22:16:29 -0500 | [diff] [blame] | 2700 | } |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2701 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2702 | if (!PyUnicode_CheckExact(key) || |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 2703 | (hash = ((PyASCIIObject *) key)->hash) == -1) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2704 | hash = PyObject_Hash(key); |
| 2705 | if (hash == -1) |
| 2706 | return NULL; |
| 2707 | } |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2708 | |
| 2709 | if (mp->ma_values != NULL && !PyUnicode_CheckExact(key)) { |
| 2710 | if (insertion_resize(mp) < 0) |
| 2711 | return NULL; |
| 2712 | } |
| 2713 | |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 2714 | Py_ssize_t ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2715 | if (ix == DKIX_ERROR) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2716 | return NULL; |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2717 | |
| 2718 | if (_PyDict_HasSplitTable(mp) && |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 2719 | ((ix >= 0 && value == NULL && mp->ma_used != ix) || |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2720 | (ix == DKIX_EMPTY && mp->ma_used != mp->ma_keys->dk_nentries))) { |
| 2721 | if (insertion_resize(mp) < 0) { |
| 2722 | return NULL; |
| 2723 | } |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2724 | ix = DKIX_EMPTY; |
| 2725 | } |
| 2726 | |
| 2727 | if (ix == DKIX_EMPTY) { |
| 2728 | PyDictKeyEntry *ep, *ep0; |
| 2729 | value = defaultobj; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2730 | if (mp->ma_keys->dk_usable <= 0) { |
Victor Stinner | 3c336c5 | 2016-09-12 14:17:40 +0200 | [diff] [blame] | 2731 | if (insertion_resize(mp) < 0) { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2732 | return NULL; |
Victor Stinner | 3c336c5 | 2016-09-12 14:17:40 +0200 | [diff] [blame] | 2733 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2734 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 2735 | Py_ssize_t hashpos = find_empty_slot(mp->ma_keys, hash); |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2736 | ep0 = DK_ENTRIES(mp->ma_keys); |
| 2737 | ep = &ep0[mp->ma_keys->dk_nentries]; |
| 2738 | dk_set_index(mp->ma_keys, hashpos, mp->ma_keys->dk_nentries); |
Benjamin Peterson | b1efa53 | 2013-03-04 09:47:50 -0500 | [diff] [blame] | 2739 | Py_INCREF(key); |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2740 | Py_INCREF(value); |
| 2741 | MAINTAIN_TRACKING(mp, key, value); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2742 | ep->me_key = key; |
| 2743 | ep->me_hash = hash; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 2744 | if (_PyDict_HasSplitTable(mp)) { |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2745 | assert(mp->ma_values[mp->ma_keys->dk_nentries] == NULL); |
| 2746 | mp->ma_values[mp->ma_keys->dk_nentries] = value; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2747 | } |
| 2748 | else { |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2749 | ep->me_value = value; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2750 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2751 | mp->ma_used++; |
Victor Stinner | 3b6a6b4 | 2016-09-08 12:51:24 -0700 | [diff] [blame] | 2752 | mp->ma_version_tag = DICT_NEXT_VERSION(); |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2753 | mp->ma_keys->dk_usable--; |
| 2754 | mp->ma_keys->dk_nentries++; |
| 2755 | assert(mp->ma_keys->dk_usable >= 0); |
| 2756 | } |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 2757 | else if (value == NULL) { |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2758 | value = defaultobj; |
| 2759 | assert(_PyDict_HasSplitTable(mp)); |
| 2760 | assert(ix == mp->ma_used); |
| 2761 | Py_INCREF(value); |
| 2762 | MAINTAIN_TRACKING(mp, key, value); |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 2763 | mp->ma_values[ix] = value; |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2764 | mp->ma_used++; |
| 2765 | mp->ma_version_tag = DICT_NEXT_VERSION(); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2766 | } |
INADA Naoki | 93f26f7 | 2016-11-02 18:45:16 +0900 | [diff] [blame] | 2767 | |
| 2768 | assert(_PyDict_CheckConsistency(mp)); |
| 2769 | return value; |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 2770 | } |
| 2771 | |
Victor Stinner | 7dc6a5f | 2017-01-19 12:37:13 +0100 | [diff] [blame] | 2772 | /*[clinic input] |
| 2773 | dict.setdefault |
| 2774 | |
| 2775 | key: object |
Serhiy Storchaka | 48088ee | 2017-01-19 19:00:30 +0200 | [diff] [blame] | 2776 | default: object = None |
Victor Stinner | 7dc6a5f | 2017-01-19 12:37:13 +0100 | [diff] [blame] | 2777 | / |
| 2778 | |
Serhiy Storchaka | 78d9e58 | 2017-01-25 00:30:04 +0200 | [diff] [blame] | 2779 | Insert key with a value of default if key is not in the dictionary. |
| 2780 | |
| 2781 | Return the value for key if key is in the dictionary, else default. |
Victor Stinner | 7dc6a5f | 2017-01-19 12:37:13 +0100 | [diff] [blame] | 2782 | [clinic start generated code]*/ |
| 2783 | |
Benjamin Peterson | 00e9886 | 2013-03-07 22:16:29 -0500 | [diff] [blame] | 2784 | static PyObject * |
Serhiy Storchaka | 48088ee | 2017-01-19 19:00:30 +0200 | [diff] [blame] | 2785 | dict_setdefault_impl(PyDictObject *self, PyObject *key, |
| 2786 | PyObject *default_value) |
Serhiy Storchaka | 78d9e58 | 2017-01-25 00:30:04 +0200 | [diff] [blame] | 2787 | /*[clinic end generated code: output=f8c1101ebf69e220 input=0f063756e815fd9d]*/ |
Benjamin Peterson | 00e9886 | 2013-03-07 22:16:29 -0500 | [diff] [blame] | 2788 | { |
Victor Stinner | 7dc6a5f | 2017-01-19 12:37:13 +0100 | [diff] [blame] | 2789 | PyObject *val; |
Benjamin Peterson | 00e9886 | 2013-03-07 22:16:29 -0500 | [diff] [blame] | 2790 | |
Serhiy Storchaka | 48088ee | 2017-01-19 19:00:30 +0200 | [diff] [blame] | 2791 | val = PyDict_SetDefault((PyObject *)self, key, default_value); |
Benjamin Peterson | 00e9886 | 2013-03-07 22:16:29 -0500 | [diff] [blame] | 2792 | Py_XINCREF(val); |
| 2793 | return val; |
| 2794 | } |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 2795 | |
| 2796 | static PyObject * |
Antoine Pitrou | 9ed5f27 | 2013-08-13 20:18:52 +0200 | [diff] [blame] | 2797 | dict_clear(PyDictObject *mp) |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 2798 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2799 | PyDict_Clear((PyObject *)mp); |
| 2800 | Py_RETURN_NONE; |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 2801 | } |
| 2802 | |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 2803 | static PyObject * |
Guido van Rossum | 8ce8a78 | 2007-11-01 19:42:39 +0000 | [diff] [blame] | 2804 | dict_pop(PyDictObject *mp, PyObject *args) |
Guido van Rossum | e027d98 | 2002-04-12 15:11:59 +0000 | [diff] [blame] | 2805 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2806 | PyObject *key, *deflt = NULL; |
Guido van Rossum | e027d98 | 2002-04-12 15:11:59 +0000 | [diff] [blame] | 2807 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2808 | if(!PyArg_UnpackTuple(args, "pop", 1, 2, &key, &deflt)) |
| 2809 | return NULL; |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 2810 | |
Yury Selivanov | 684ef2c | 2016-10-28 19:01:21 -0400 | [diff] [blame] | 2811 | return _PyDict_Pop((PyObject*)mp, key, deflt); |
Guido van Rossum | e027d98 | 2002-04-12 15:11:59 +0000 | [diff] [blame] | 2812 | } |
| 2813 | |
| 2814 | static PyObject * |
Guido van Rossum | 8ce8a78 | 2007-11-01 19:42:39 +0000 | [diff] [blame] | 2815 | dict_popitem(PyDictObject *mp) |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 2816 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2817 | Py_ssize_t i, j; |
| 2818 | PyDictKeyEntry *ep0, *ep; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2819 | PyObject *res; |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 2820 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2821 | /* Allocate the result tuple before checking the size. Believe it |
| 2822 | * or not, this allocation could trigger a garbage collection which |
| 2823 | * could empty the dict, so if we checked the size first and that |
| 2824 | * happened, the result would be an infinite loop (searching for an |
| 2825 | * entry that no longer exists). Note that the usual popitem() |
| 2826 | * idiom is "while d: k, v = d.popitem()". so needing to throw the |
| 2827 | * tuple away if the dict *is* empty isn't a significant |
| 2828 | * inefficiency -- possible, but unlikely in practice. |
| 2829 | */ |
| 2830 | res = PyTuple_New(2); |
| 2831 | if (res == NULL) |
| 2832 | return NULL; |
| 2833 | if (mp->ma_used == 0) { |
| 2834 | Py_DECREF(res); |
| 2835 | PyErr_SetString(PyExc_KeyError, |
| 2836 | "popitem(): dictionary is empty"); |
| 2837 | return NULL; |
| 2838 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2839 | /* Convert split table to combined table */ |
| 2840 | if (mp->ma_keys->dk_lookup == lookdict_split) { |
| 2841 | if (dictresize(mp, DK_SIZE(mp->ma_keys))) { |
| 2842 | Py_DECREF(res); |
| 2843 | return NULL; |
| 2844 | } |
| 2845 | } |
| 2846 | ENSURE_ALLOWS_DELETIONS(mp); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2847 | |
| 2848 | /* Pop last item */ |
| 2849 | ep0 = DK_ENTRIES(mp->ma_keys); |
| 2850 | i = mp->ma_keys->dk_nentries - 1; |
| 2851 | while (i >= 0 && ep0[i].me_value == NULL) { |
| 2852 | i--; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2853 | } |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2854 | assert(i >= 0); |
| 2855 | |
| 2856 | ep = &ep0[i]; |
| 2857 | j = lookdict_index(mp->ma_keys, ep->me_hash, i); |
| 2858 | assert(j >= 0); |
| 2859 | assert(dk_get_index(mp->ma_keys, j) == i); |
| 2860 | dk_set_index(mp->ma_keys, j, DKIX_DUMMY); |
| 2861 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2862 | PyTuple_SET_ITEM(res, 0, ep->me_key); |
| 2863 | PyTuple_SET_ITEM(res, 1, ep->me_value); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2864 | ep->me_key = NULL; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2865 | ep->me_value = NULL; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2866 | /* We can't dk_usable++ since there is DKIX_DUMMY in indices */ |
| 2867 | mp->ma_keys->dk_nentries = i; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2868 | mp->ma_used--; |
Victor Stinner | 3b6a6b4 | 2016-09-08 12:51:24 -0700 | [diff] [blame] | 2869 | mp->ma_version_tag = DICT_NEXT_VERSION(); |
Victor Stinner | 611b0fa | 2016-09-14 15:02:01 +0200 | [diff] [blame] | 2870 | assert(_PyDict_CheckConsistency(mp)); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2871 | return res; |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 2872 | } |
| 2873 | |
Jeremy Hylton | 8caad49 | 2000-06-23 14:18:11 +0000 | [diff] [blame] | 2874 | static int |
| 2875 | dict_traverse(PyObject *op, visitproc visit, void *arg) |
| 2876 | { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2877 | PyDictObject *mp = (PyDictObject *)op; |
Benjamin Peterson | 55f4452 | 2016-09-05 12:12:59 -0700 | [diff] [blame] | 2878 | PyDictKeysObject *keys = mp->ma_keys; |
Serhiy Storchaka | 46825d2 | 2016-09-26 21:29:34 +0300 | [diff] [blame] | 2879 | PyDictKeyEntry *entries = DK_ENTRIES(keys); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2880 | Py_ssize_t i, n = keys->dk_nentries; |
| 2881 | |
Benjamin Peterson | 55f4452 | 2016-09-05 12:12:59 -0700 | [diff] [blame] | 2882 | if (keys->dk_lookup == lookdict) { |
| 2883 | for (i = 0; i < n; i++) { |
| 2884 | if (entries[i].me_value != NULL) { |
| 2885 | Py_VISIT(entries[i].me_value); |
| 2886 | Py_VISIT(entries[i].me_key); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2887 | } |
| 2888 | } |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2889 | } |
| 2890 | else { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2891 | if (mp->ma_values != NULL) { |
Benjamin Peterson | 55f4452 | 2016-09-05 12:12:59 -0700 | [diff] [blame] | 2892 | for (i = 0; i < n; i++) { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2893 | Py_VISIT(mp->ma_values[i]); |
| 2894 | } |
| 2895 | } |
| 2896 | else { |
Benjamin Peterson | 55f4452 | 2016-09-05 12:12:59 -0700 | [diff] [blame] | 2897 | for (i = 0; i < n; i++) { |
| 2898 | Py_VISIT(entries[i].me_value); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2899 | } |
| 2900 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2901 | } |
| 2902 | return 0; |
Jeremy Hylton | 8caad49 | 2000-06-23 14:18:11 +0000 | [diff] [blame] | 2903 | } |
| 2904 | |
| 2905 | static int |
| 2906 | dict_tp_clear(PyObject *op) |
| 2907 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2908 | PyDict_Clear(op); |
| 2909 | return 0; |
Jeremy Hylton | 8caad49 | 2000-06-23 14:18:11 +0000 | [diff] [blame] | 2910 | } |
| 2911 | |
Guido van Rossum | 8ce8a78 | 2007-11-01 19:42:39 +0000 | [diff] [blame] | 2912 | static PyObject *dictiter_new(PyDictObject *, PyTypeObject *); |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 2913 | |
Serhiy Storchaka | 0ce7a3a | 2015-12-22 08:16:18 +0200 | [diff] [blame] | 2914 | Py_ssize_t |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 2915 | _PyDict_SizeOf(PyDictObject *mp) |
Martin v. Löwis | 00709aa | 2008-06-04 14:18:43 +0000 | [diff] [blame] | 2916 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2917 | Py_ssize_t size, usable, res; |
Martin v. Löwis | 00709aa | 2008-06-04 14:18:43 +0000 | [diff] [blame] | 2918 | |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2919 | size = DK_SIZE(mp->ma_keys); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2920 | usable = USABLE_FRACTION(size); |
| 2921 | |
Serhiy Storchaka | 5c4064e | 2015-12-19 20:05:25 +0200 | [diff] [blame] | 2922 | res = _PyObject_SIZE(Py_TYPE(mp)); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 2923 | if (mp->ma_values) |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 2924 | res += usable * sizeof(PyObject*); |
Martin v. Loewis | 4f2f3b6 | 2012-04-24 19:13:57 +0200 | [diff] [blame] | 2925 | /* If the dictionary is split, the keys portion is accounted-for |
| 2926 | in the type object. */ |
| 2927 | if (mp->ma_keys->dk_refcnt == 1) |
Victor Stinner | 98ee9d5 | 2016-09-08 09:33:56 -0700 | [diff] [blame] | 2928 | res += (sizeof(PyDictKeysObject) |
| 2929 | - Py_MEMBER_SIZE(PyDictKeysObject, dk_indices) |
| 2930 | + DK_IXSIZE(mp->ma_keys) * size |
| 2931 | + sizeof(PyDictKeyEntry) * usable); |
Serhiy Storchaka | 0ce7a3a | 2015-12-22 08:16:18 +0200 | [diff] [blame] | 2932 | return res; |
Martin v. Loewis | 4f2f3b6 | 2012-04-24 19:13:57 +0200 | [diff] [blame] | 2933 | } |
| 2934 | |
| 2935 | Py_ssize_t |
| 2936 | _PyDict_KeysSize(PyDictKeysObject *keys) |
| 2937 | { |
Victor Stinner | 98ee9d5 | 2016-09-08 09:33:56 -0700 | [diff] [blame] | 2938 | return (sizeof(PyDictKeysObject) |
| 2939 | - Py_MEMBER_SIZE(PyDictKeysObject, dk_indices) |
| 2940 | + DK_IXSIZE(keys) * DK_SIZE(keys) |
| 2941 | + USABLE_FRACTION(DK_SIZE(keys)) * sizeof(PyDictKeyEntry)); |
Martin v. Löwis | 00709aa | 2008-06-04 14:18:43 +0000 | [diff] [blame] | 2942 | } |
| 2943 | |
doko@ubuntu.com | 17210f5 | 2016-01-14 14:04:59 +0100 | [diff] [blame] | 2944 | static PyObject * |
Serhiy Storchaka | 0ce7a3a | 2015-12-22 08:16:18 +0200 | [diff] [blame] | 2945 | dict_sizeof(PyDictObject *mp) |
| 2946 | { |
| 2947 | return PyLong_FromSsize_t(_PyDict_SizeOf(mp)); |
| 2948 | } |
| 2949 | |
Raymond Hettinger | 8f5cdaa | 2003-12-13 11:26:12 +0000 | [diff] [blame] | 2950 | PyDoc_STRVAR(getitem__doc__, "x.__getitem__(y) <==> x[y]"); |
| 2951 | |
Martin v. Löwis | 00709aa | 2008-06-04 14:18:43 +0000 | [diff] [blame] | 2952 | PyDoc_STRVAR(sizeof__doc__, |
| 2953 | "D.__sizeof__() -> size of D in memory, in bytes"); |
| 2954 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2955 | PyDoc_STRVAR(pop__doc__, |
Benjamin Peterson | f10a79a | 2008-10-11 00:49:57 +0000 | [diff] [blame] | 2956 | "D.pop(k[,d]) -> v, remove specified key and return the corresponding value.\n\ |
Raymond Hettinger | a3e1e4c | 2003-03-06 23:54:28 +0000 | [diff] [blame] | 2957 | 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] | 2958 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2959 | PyDoc_STRVAR(popitem__doc__, |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2960 | "D.popitem() -> (k, v), remove and return some (key, value) pair as a\n\ |
Benjamin Peterson | f10a79a | 2008-10-11 00:49:57 +0000 | [diff] [blame] | 2961 | 2-tuple; but raise KeyError if D is empty."); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2962 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2963 | PyDoc_STRVAR(update__doc__, |
Brett Cannon | f275416 | 2013-05-11 14:46:48 -0400 | [diff] [blame] | 2964 | "D.update([E, ]**F) -> None. Update D from dict/iterable E and F.\n\ |
| 2965 | If E is present and has a .keys() method, then does: for k in E: D[k] = E[k]\n\ |
| 2966 | If E is present and lacks a .keys() method, then does: for k, v in E: D[k] = v\n\ |
| 2967 | In either case, this is followed by: for k in F: D[k] = F[k]"); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2968 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2969 | PyDoc_STRVAR(clear__doc__, |
| 2970 | "D.clear() -> None. Remove all items from D."); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2971 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 2972 | PyDoc_STRVAR(copy__doc__, |
| 2973 | "D.copy() -> a shallow copy of D"); |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 2974 | |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 2975 | /* Forward */ |
| 2976 | static PyObject *dictkeys_new(PyObject *); |
| 2977 | static PyObject *dictitems_new(PyObject *); |
| 2978 | static PyObject *dictvalues_new(PyObject *); |
| 2979 | |
Guido van Rossum | 45c85d1 | 2007-07-27 16:31:40 +0000 | [diff] [blame] | 2980 | PyDoc_STRVAR(keys__doc__, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2981 | "D.keys() -> a set-like object providing a view on D's keys"); |
Guido van Rossum | 45c85d1 | 2007-07-27 16:31:40 +0000 | [diff] [blame] | 2982 | PyDoc_STRVAR(items__doc__, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2983 | "D.items() -> a set-like object providing a view on D's items"); |
Guido van Rossum | 45c85d1 | 2007-07-27 16:31:40 +0000 | [diff] [blame] | 2984 | PyDoc_STRVAR(values__doc__, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2985 | "D.values() -> an object providing a view on D's values"); |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 2986 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 2987 | static PyMethodDef mapp_methods[] = { |
Larry Hastings | 3182680 | 2013-10-19 00:09:25 -0700 | [diff] [blame] | 2988 | DICT___CONTAINS___METHODDEF |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2989 | {"__getitem__", (PyCFunction)dict_subscript, METH_O | METH_COEXIST, |
| 2990 | getitem__doc__}, |
Serhiy Storchaka | 0ce7a3a | 2015-12-22 08:16:18 +0200 | [diff] [blame] | 2991 | {"__sizeof__", (PyCFunction)dict_sizeof, METH_NOARGS, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2992 | sizeof__doc__}, |
Victor Stinner | 7dc6a5f | 2017-01-19 12:37:13 +0100 | [diff] [blame] | 2993 | DICT_GET_METHODDEF |
| 2994 | DICT_SETDEFAULT_METHODDEF |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 2995 | {"pop", (PyCFunction)dict_pop, METH_VARARGS, |
| 2996 | pop__doc__}, |
| 2997 | {"popitem", (PyCFunction)dict_popitem, METH_NOARGS, |
| 2998 | popitem__doc__}, |
| 2999 | {"keys", (PyCFunction)dictkeys_new, METH_NOARGS, |
| 3000 | keys__doc__}, |
| 3001 | {"items", (PyCFunction)dictitems_new, METH_NOARGS, |
| 3002 | items__doc__}, |
| 3003 | {"values", (PyCFunction)dictvalues_new, METH_NOARGS, |
| 3004 | values__doc__}, |
| 3005 | {"update", (PyCFunction)dict_update, METH_VARARGS | METH_KEYWORDS, |
| 3006 | update__doc__}, |
Larry Hastings | 5c66189 | 2014-01-24 06:17:25 -0800 | [diff] [blame] | 3007 | DICT_FROMKEYS_METHODDEF |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3008 | {"clear", (PyCFunction)dict_clear, METH_NOARGS, |
| 3009 | clear__doc__}, |
| 3010 | {"copy", (PyCFunction)dict_copy, METH_NOARGS, |
| 3011 | copy__doc__}, |
| 3012 | {NULL, NULL} /* sentinel */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 3013 | }; |
| 3014 | |
Thomas Wouters | 4d70c3d | 2006-06-08 14:42:34 +0000 | [diff] [blame] | 3015 | /* 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] | 3016 | int |
| 3017 | PyDict_Contains(PyObject *op, PyObject *key) |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 3018 | { |
Benjamin Peterson | 8f67d08 | 2010-10-17 20:54:53 +0000 | [diff] [blame] | 3019 | Py_hash_t hash; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 3020 | Py_ssize_t ix; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3021 | PyDictObject *mp = (PyDictObject *)op; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 3022 | PyObject *value; |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 3023 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3024 | if (!PyUnicode_CheckExact(key) || |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 3025 | (hash = ((PyASCIIObject *) key)->hash) == -1) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3026 | hash = PyObject_Hash(key); |
| 3027 | if (hash == -1) |
| 3028 | return -1; |
| 3029 | } |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 3030 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 3031 | if (ix == DKIX_ERROR) |
| 3032 | return -1; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 3033 | return (ix != DKIX_EMPTY && value != NULL); |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 3034 | } |
| 3035 | |
Thomas Wouters | cf297e4 | 2007-02-23 15:07:44 +0000 | [diff] [blame] | 3036 | /* Internal version of PyDict_Contains used when the hash value is already known */ |
| 3037 | int |
Benjamin Peterson | 8f67d08 | 2010-10-17 20:54:53 +0000 | [diff] [blame] | 3038 | _PyDict_Contains(PyObject *op, PyObject *key, Py_hash_t hash) |
Thomas Wouters | cf297e4 | 2007-02-23 15:07:44 +0000 | [diff] [blame] | 3039 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3040 | PyDictObject *mp = (PyDictObject *)op; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 3041 | PyObject *value; |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 3042 | Py_ssize_t ix; |
Thomas Wouters | cf297e4 | 2007-02-23 15:07:44 +0000 | [diff] [blame] | 3043 | |
INADA Naoki | 778928b | 2017-08-03 23:45:15 +0900 | [diff] [blame] | 3044 | ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 3045 | if (ix == DKIX_ERROR) |
| 3046 | return -1; |
INADA Naoki | ba60977 | 2016-12-07 20:41:42 +0900 | [diff] [blame] | 3047 | return (ix != DKIX_EMPTY && value != NULL); |
Thomas Wouters | cf297e4 | 2007-02-23 15:07:44 +0000 | [diff] [blame] | 3048 | } |
| 3049 | |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 3050 | /* Hack to implement "key in dict" */ |
| 3051 | static PySequenceMethods dict_as_sequence = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3052 | 0, /* sq_length */ |
| 3053 | 0, /* sq_concat */ |
| 3054 | 0, /* sq_repeat */ |
| 3055 | 0, /* sq_item */ |
| 3056 | 0, /* sq_slice */ |
| 3057 | 0, /* sq_ass_item */ |
| 3058 | 0, /* sq_ass_slice */ |
| 3059 | PyDict_Contains, /* sq_contains */ |
| 3060 | 0, /* sq_inplace_concat */ |
| 3061 | 0, /* sq_inplace_repeat */ |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 3062 | }; |
| 3063 | |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 3064 | static PyObject * |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 3065 | dict_new(PyTypeObject *type, PyObject *args, PyObject *kwds) |
| 3066 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3067 | PyObject *self; |
Victor Stinner | a9f61a5 | 2013-07-16 22:17:26 +0200 | [diff] [blame] | 3068 | PyDictObject *d; |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 3069 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3070 | assert(type != NULL && type->tp_alloc != NULL); |
| 3071 | self = type->tp_alloc(type, 0); |
Victor Stinner | a9f61a5 | 2013-07-16 22:17:26 +0200 | [diff] [blame] | 3072 | if (self == NULL) |
| 3073 | return NULL; |
Victor Stinner | a9f61a5 | 2013-07-16 22:17:26 +0200 | [diff] [blame] | 3074 | d = (PyDictObject *)self; |
Victor Stinner | ac2a4fe | 2013-07-16 22:19:00 +0200 | [diff] [blame] | 3075 | |
Victor Stinner | a9f61a5 | 2013-07-16 22:17:26 +0200 | [diff] [blame] | 3076 | /* The object has been implicitly tracked by tp_alloc */ |
| 3077 | if (type == &PyDict_Type) |
| 3078 | _PyObject_GC_UNTRACK(d); |
Victor Stinner | ac2a4fe | 2013-07-16 22:19:00 +0200 | [diff] [blame] | 3079 | |
| 3080 | d->ma_used = 0; |
Victor Stinner | 3b6a6b4 | 2016-09-08 12:51:24 -0700 | [diff] [blame] | 3081 | d->ma_version_tag = DICT_NEXT_VERSION(); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 3082 | d->ma_keys = new_keys_object(PyDict_MINSIZE); |
Victor Stinner | ac2a4fe | 2013-07-16 22:19:00 +0200 | [diff] [blame] | 3083 | if (d->ma_keys == NULL) { |
| 3084 | Py_DECREF(self); |
| 3085 | return NULL; |
| 3086 | } |
Victor Stinner | 611b0fa | 2016-09-14 15:02:01 +0200 | [diff] [blame] | 3087 | assert(_PyDict_CheckConsistency(d)); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3088 | return self; |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 3089 | } |
| 3090 | |
Tim Peters | 25786c0 | 2001-09-02 08:22:48 +0000 | [diff] [blame] | 3091 | static int |
| 3092 | dict_init(PyObject *self, PyObject *args, PyObject *kwds) |
| 3093 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3094 | return dict_update_common(self, args, kwds, "dict"); |
Tim Peters | 25786c0 | 2001-09-02 08:22:48 +0000 | [diff] [blame] | 3095 | } |
| 3096 | |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 3097 | static PyObject * |
Guido van Rossum | 8ce8a78 | 2007-11-01 19:42:39 +0000 | [diff] [blame] | 3098 | dict_iter(PyDictObject *dict) |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 3099 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3100 | return dictiter_new(dict, &PyDictIterKey_Type); |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 3101 | } |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 3102 | |
Martin v. Löwis | 14f8b4c | 2002-06-13 20:33:02 +0000 | [diff] [blame] | 3103 | PyDoc_STRVAR(dictionary_doc, |
Ezio Melotti | 7f807b7 | 2010-03-01 04:08:34 +0000 | [diff] [blame] | 3104 | "dict() -> new empty dictionary\n" |
Tim Peters | a427a2b | 2001-10-29 22:25:45 +0000 | [diff] [blame] | 3105 | "dict(mapping) -> new dictionary initialized from a mapping object's\n" |
Ezio Melotti | 7f807b7 | 2010-03-01 04:08:34 +0000 | [diff] [blame] | 3106 | " (key, value) pairs\n" |
| 3107 | "dict(iterable) -> new dictionary initialized as if via:\n" |
Tim Peters | 4d85953 | 2001-10-27 18:27:48 +0000 | [diff] [blame] | 3108 | " d = {}\n" |
Ezio Melotti | 7f807b7 | 2010-03-01 04:08:34 +0000 | [diff] [blame] | 3109 | " for k, v in iterable:\n" |
Just van Rossum | a797d81 | 2002-11-23 09:45:04 +0000 | [diff] [blame] | 3110 | " d[k] = v\n" |
| 3111 | "dict(**kwargs) -> new dictionary initialized with the name=value pairs\n" |
| 3112 | " in the keyword argument list. For example: dict(one=1, two=2)"); |
Tim Peters | 25786c0 | 2001-09-02 08:22:48 +0000 | [diff] [blame] | 3113 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 3114 | PyTypeObject PyDict_Type = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3115 | PyVarObject_HEAD_INIT(&PyType_Type, 0) |
| 3116 | "dict", |
| 3117 | sizeof(PyDictObject), |
| 3118 | 0, |
| 3119 | (destructor)dict_dealloc, /* tp_dealloc */ |
| 3120 | 0, /* tp_print */ |
| 3121 | 0, /* tp_getattr */ |
| 3122 | 0, /* tp_setattr */ |
| 3123 | 0, /* tp_reserved */ |
| 3124 | (reprfunc)dict_repr, /* tp_repr */ |
| 3125 | 0, /* tp_as_number */ |
| 3126 | &dict_as_sequence, /* tp_as_sequence */ |
| 3127 | &dict_as_mapping, /* tp_as_mapping */ |
Georg Brandl | 00da4e0 | 2010-10-18 07:32:48 +0000 | [diff] [blame] | 3128 | PyObject_HashNotImplemented, /* tp_hash */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3129 | 0, /* tp_call */ |
| 3130 | 0, /* tp_str */ |
| 3131 | PyObject_GenericGetAttr, /* tp_getattro */ |
| 3132 | 0, /* tp_setattro */ |
| 3133 | 0, /* tp_as_buffer */ |
| 3134 | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | |
| 3135 | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_DICT_SUBCLASS, /* tp_flags */ |
| 3136 | dictionary_doc, /* tp_doc */ |
| 3137 | dict_traverse, /* tp_traverse */ |
| 3138 | dict_tp_clear, /* tp_clear */ |
| 3139 | dict_richcompare, /* tp_richcompare */ |
| 3140 | 0, /* tp_weaklistoffset */ |
| 3141 | (getiterfunc)dict_iter, /* tp_iter */ |
| 3142 | 0, /* tp_iternext */ |
| 3143 | mapp_methods, /* tp_methods */ |
| 3144 | 0, /* tp_members */ |
| 3145 | 0, /* tp_getset */ |
| 3146 | 0, /* tp_base */ |
| 3147 | 0, /* tp_dict */ |
| 3148 | 0, /* tp_descr_get */ |
| 3149 | 0, /* tp_descr_set */ |
| 3150 | 0, /* tp_dictoffset */ |
| 3151 | dict_init, /* tp_init */ |
| 3152 | PyType_GenericAlloc, /* tp_alloc */ |
| 3153 | dict_new, /* tp_new */ |
| 3154 | PyObject_GC_Del, /* tp_free */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 3155 | }; |
| 3156 | |
Victor Stinner | 3c1e481 | 2012-03-26 22:10:51 +0200 | [diff] [blame] | 3157 | PyObject * |
| 3158 | _PyDict_GetItemId(PyObject *dp, struct _Py_Identifier *key) |
| 3159 | { |
| 3160 | PyObject *kv; |
| 3161 | kv = _PyUnicode_FromId(key); /* borrowed */ |
Victor Stinner | 5b3b100 | 2013-07-22 23:50:57 +0200 | [diff] [blame] | 3162 | if (kv == NULL) { |
| 3163 | PyErr_Clear(); |
Victor Stinner | 3c1e481 | 2012-03-26 22:10:51 +0200 | [diff] [blame] | 3164 | return NULL; |
Victor Stinner | 5b3b100 | 2013-07-22 23:50:57 +0200 | [diff] [blame] | 3165 | } |
Victor Stinner | 3c1e481 | 2012-03-26 22:10:51 +0200 | [diff] [blame] | 3166 | return PyDict_GetItem(dp, kv); |
| 3167 | } |
| 3168 | |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 3169 | /* For backward compatibility with old dictionary interface */ |
| 3170 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 3171 | PyObject * |
Martin v. Löwis | 32b4a1b | 2002-12-11 13:21:12 +0000 | [diff] [blame] | 3172 | PyDict_GetItemString(PyObject *v, const char *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 3173 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3174 | PyObject *kv, *rv; |
| 3175 | kv = PyUnicode_FromString(key); |
Victor Stinner | fdcbab9 | 2013-07-16 22:16:05 +0200 | [diff] [blame] | 3176 | if (kv == NULL) { |
| 3177 | PyErr_Clear(); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3178 | return NULL; |
Victor Stinner | fdcbab9 | 2013-07-16 22:16:05 +0200 | [diff] [blame] | 3179 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3180 | rv = PyDict_GetItem(v, kv); |
| 3181 | Py_DECREF(kv); |
| 3182 | return rv; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 3183 | } |
| 3184 | |
| 3185 | int |
Victor Stinner | 3c1e481 | 2012-03-26 22:10:51 +0200 | [diff] [blame] | 3186 | _PyDict_SetItemId(PyObject *v, struct _Py_Identifier *key, PyObject *item) |
| 3187 | { |
| 3188 | PyObject *kv; |
| 3189 | kv = _PyUnicode_FromId(key); /* borrowed */ |
| 3190 | if (kv == NULL) |
| 3191 | return -1; |
| 3192 | return PyDict_SetItem(v, kv, item); |
| 3193 | } |
| 3194 | |
| 3195 | int |
Martin v. Löwis | 32b4a1b | 2002-12-11 13:21:12 +0000 | [diff] [blame] | 3196 | PyDict_SetItemString(PyObject *v, const char *key, PyObject *item) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 3197 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3198 | PyObject *kv; |
| 3199 | int err; |
| 3200 | kv = PyUnicode_FromString(key); |
| 3201 | if (kv == NULL) |
| 3202 | return -1; |
| 3203 | PyUnicode_InternInPlace(&kv); /* XXX Should we really? */ |
| 3204 | err = PyDict_SetItem(v, kv, item); |
| 3205 | Py_DECREF(kv); |
| 3206 | return err; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 3207 | } |
| 3208 | |
| 3209 | int |
Victor Stinner | 5fd2e5a | 2013-11-06 18:58:22 +0100 | [diff] [blame] | 3210 | _PyDict_DelItemId(PyObject *v, _Py_Identifier *key) |
| 3211 | { |
| 3212 | PyObject *kv = _PyUnicode_FromId(key); /* borrowed */ |
| 3213 | if (kv == NULL) |
| 3214 | return -1; |
| 3215 | return PyDict_DelItem(v, kv); |
| 3216 | } |
| 3217 | |
| 3218 | int |
Martin v. Löwis | 32b4a1b | 2002-12-11 13:21:12 +0000 | [diff] [blame] | 3219 | PyDict_DelItemString(PyObject *v, const char *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 3220 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3221 | PyObject *kv; |
| 3222 | int err; |
| 3223 | kv = PyUnicode_FromString(key); |
| 3224 | if (kv == NULL) |
| 3225 | return -1; |
| 3226 | err = PyDict_DelItem(v, kv); |
| 3227 | Py_DECREF(kv); |
| 3228 | return err; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 3229 | } |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 3230 | |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3231 | /* Dictionary iterator types */ |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 3232 | |
| 3233 | typedef struct { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3234 | PyObject_HEAD |
| 3235 | PyDictObject *di_dict; /* Set to NULL when iterator is exhausted */ |
| 3236 | Py_ssize_t di_used; |
| 3237 | Py_ssize_t di_pos; |
| 3238 | PyObject* di_result; /* reusable result tuple for iteritems */ |
| 3239 | Py_ssize_t len; |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 3240 | } dictiterobject; |
| 3241 | |
| 3242 | static PyObject * |
Guido van Rossum | 8ce8a78 | 2007-11-01 19:42:39 +0000 | [diff] [blame] | 3243 | dictiter_new(PyDictObject *dict, PyTypeObject *itertype) |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 3244 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3245 | dictiterobject *di; |
| 3246 | di = PyObject_GC_New(dictiterobject, itertype); |
| 3247 | if (di == NULL) |
| 3248 | return NULL; |
| 3249 | Py_INCREF(dict); |
| 3250 | di->di_dict = dict; |
| 3251 | di->di_used = dict->ma_used; |
| 3252 | di->di_pos = 0; |
| 3253 | di->len = dict->ma_used; |
| 3254 | if (itertype == &PyDictIterItem_Type) { |
| 3255 | di->di_result = PyTuple_Pack(2, Py_None, Py_None); |
| 3256 | if (di->di_result == NULL) { |
| 3257 | Py_DECREF(di); |
| 3258 | return NULL; |
| 3259 | } |
| 3260 | } |
| 3261 | else |
| 3262 | di->di_result = NULL; |
| 3263 | _PyObject_GC_TRACK(di); |
| 3264 | return (PyObject *)di; |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 3265 | } |
| 3266 | |
| 3267 | static void |
| 3268 | dictiter_dealloc(dictiterobject *di) |
| 3269 | { |
INADA Naoki | a6296d3 | 2017-08-24 14:55:17 +0900 | [diff] [blame] | 3270 | /* bpo-31095: UnTrack is needed before calling any callbacks */ |
| 3271 | _PyObject_GC_UNTRACK(di); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3272 | Py_XDECREF(di->di_dict); |
| 3273 | Py_XDECREF(di->di_result); |
| 3274 | PyObject_GC_Del(di); |
Antoine Pitrou | 7ddda78 | 2009-01-01 15:35:33 +0000 | [diff] [blame] | 3275 | } |
| 3276 | |
| 3277 | static int |
| 3278 | dictiter_traverse(dictiterobject *di, visitproc visit, void *arg) |
| 3279 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3280 | Py_VISIT(di->di_dict); |
| 3281 | Py_VISIT(di->di_result); |
| 3282 | return 0; |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 3283 | } |
| 3284 | |
Raymond Hettinger | 6b27cda | 2005-09-24 21:23:05 +0000 | [diff] [blame] | 3285 | static PyObject * |
Raymond Hettinger | 0ce6dc8 | 2004-03-18 08:38:00 +0000 | [diff] [blame] | 3286 | dictiter_len(dictiterobject *di) |
| 3287 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3288 | Py_ssize_t len = 0; |
| 3289 | if (di->di_dict != NULL && di->di_used == di->di_dict->ma_used) |
| 3290 | len = di->len; |
| 3291 | return PyLong_FromSize_t(len); |
Raymond Hettinger | 0ce6dc8 | 2004-03-18 08:38:00 +0000 | [diff] [blame] | 3292 | } |
| 3293 | |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3294 | PyDoc_STRVAR(length_hint_doc, |
| 3295 | "Private method returning an estimate of len(list(it))."); |
Raymond Hettinger | 6b27cda | 2005-09-24 21:23:05 +0000 | [diff] [blame] | 3296 | |
Kristján Valur Jónsson | 31668b8 | 2012-04-03 10:49:41 +0000 | [diff] [blame] | 3297 | static PyObject * |
| 3298 | dictiter_reduce(dictiterobject *di); |
| 3299 | |
| 3300 | PyDoc_STRVAR(reduce_doc, "Return state information for pickling."); |
| 3301 | |
Raymond Hettinger | 6b27cda | 2005-09-24 21:23:05 +0000 | [diff] [blame] | 3302 | static PyMethodDef dictiter_methods[] = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3303 | {"__length_hint__", (PyCFunction)dictiter_len, METH_NOARGS, |
| 3304 | length_hint_doc}, |
Kristján Valur Jónsson | 31668b8 | 2012-04-03 10:49:41 +0000 | [diff] [blame] | 3305 | {"__reduce__", (PyCFunction)dictiter_reduce, METH_NOARGS, |
| 3306 | reduce_doc}, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3307 | {NULL, NULL} /* sentinel */ |
Raymond Hettinger | 0ce6dc8 | 2004-03-18 08:38:00 +0000 | [diff] [blame] | 3308 | }; |
| 3309 | |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 3310 | static PyObject* |
| 3311 | dictiter_iternextkey(dictiterobject *di) |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 3312 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3313 | PyObject *key; |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3314 | Py_ssize_t i; |
Antoine Pitrou | 9ed5f27 | 2013-08-13 20:18:52 +0200 | [diff] [blame] | 3315 | PyDictKeysObject *k; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3316 | PyDictObject *d = di->di_dict; |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 3317 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3318 | if (d == NULL) |
| 3319 | return NULL; |
| 3320 | assert (PyDict_Check(d)); |
Guido van Rossum | 2147df7 | 2002-07-16 20:30:22 +0000 | [diff] [blame] | 3321 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3322 | if (di->di_used != d->ma_used) { |
| 3323 | PyErr_SetString(PyExc_RuntimeError, |
| 3324 | "dictionary changed size during iteration"); |
| 3325 | di->di_used = -1; /* Make this state sticky */ |
| 3326 | return NULL; |
| 3327 | } |
Guido van Rossum | 2147df7 | 2002-07-16 20:30:22 +0000 | [diff] [blame] | 3328 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3329 | i = di->di_pos; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 3330 | k = d->ma_keys; |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3331 | assert(i >= 0); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 3332 | if (d->ma_values) { |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3333 | if (i >= d->ma_used) |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 3334 | goto fail; |
| 3335 | key = DK_ENTRIES(k)[i].me_key; |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3336 | assert(d->ma_values[i] != NULL); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 3337 | } |
| 3338 | else { |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3339 | Py_ssize_t n = k->dk_nentries; |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 3340 | PyDictKeyEntry *entry_ptr = &DK_ENTRIES(k)[i]; |
| 3341 | while (i < n && entry_ptr->me_value == NULL) { |
| 3342 | entry_ptr++; |
| 3343 | i++; |
| 3344 | } |
| 3345 | if (i >= n) |
| 3346 | goto fail; |
| 3347 | key = entry_ptr->me_key; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 3348 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3349 | di->di_pos = i+1; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3350 | di->len--; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3351 | Py_INCREF(key); |
| 3352 | return key; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3353 | |
| 3354 | fail: |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3355 | di->di_dict = NULL; |
Serhiy Storchaka | fbb1c5e | 2016-03-30 20:40:02 +0300 | [diff] [blame] | 3356 | Py_DECREF(d); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3357 | return NULL; |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 3358 | } |
| 3359 | |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3360 | PyTypeObject PyDictIterKey_Type = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3361 | PyVarObject_HEAD_INIT(&PyType_Type, 0) |
| 3362 | "dict_keyiterator", /* tp_name */ |
| 3363 | sizeof(dictiterobject), /* tp_basicsize */ |
| 3364 | 0, /* tp_itemsize */ |
| 3365 | /* methods */ |
| 3366 | (destructor)dictiter_dealloc, /* tp_dealloc */ |
| 3367 | 0, /* tp_print */ |
| 3368 | 0, /* tp_getattr */ |
| 3369 | 0, /* tp_setattr */ |
| 3370 | 0, /* tp_reserved */ |
| 3371 | 0, /* tp_repr */ |
| 3372 | 0, /* tp_as_number */ |
| 3373 | 0, /* tp_as_sequence */ |
| 3374 | 0, /* tp_as_mapping */ |
| 3375 | 0, /* tp_hash */ |
| 3376 | 0, /* tp_call */ |
| 3377 | 0, /* tp_str */ |
| 3378 | PyObject_GenericGetAttr, /* tp_getattro */ |
| 3379 | 0, /* tp_setattro */ |
| 3380 | 0, /* tp_as_buffer */ |
| 3381 | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ |
| 3382 | 0, /* tp_doc */ |
| 3383 | (traverseproc)dictiter_traverse, /* tp_traverse */ |
| 3384 | 0, /* tp_clear */ |
| 3385 | 0, /* tp_richcompare */ |
| 3386 | 0, /* tp_weaklistoffset */ |
| 3387 | PyObject_SelfIter, /* tp_iter */ |
| 3388 | (iternextfunc)dictiter_iternextkey, /* tp_iternext */ |
| 3389 | dictiter_methods, /* tp_methods */ |
| 3390 | 0, |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3391 | }; |
| 3392 | |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 3393 | static PyObject * |
| 3394 | dictiter_iternextvalue(dictiterobject *di) |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3395 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3396 | PyObject *value; |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3397 | Py_ssize_t i; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3398 | PyDictObject *d = di->di_dict; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3399 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3400 | if (d == NULL) |
| 3401 | return NULL; |
| 3402 | assert (PyDict_Check(d)); |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3403 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3404 | if (di->di_used != d->ma_used) { |
| 3405 | PyErr_SetString(PyExc_RuntimeError, |
| 3406 | "dictionary changed size during iteration"); |
| 3407 | di->di_used = -1; /* Make this state sticky */ |
| 3408 | return NULL; |
| 3409 | } |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3410 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3411 | i = di->di_pos; |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3412 | assert(i >= 0); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 3413 | if (d->ma_values) { |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3414 | if (i >= d->ma_used) |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 3415 | goto fail; |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3416 | value = d->ma_values[i]; |
| 3417 | assert(value != NULL); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 3418 | } |
| 3419 | else { |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3420 | Py_ssize_t n = d->ma_keys->dk_nentries; |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 3421 | PyDictKeyEntry *entry_ptr = &DK_ENTRIES(d->ma_keys)[i]; |
| 3422 | while (i < n && entry_ptr->me_value == NULL) { |
| 3423 | entry_ptr++; |
| 3424 | i++; |
| 3425 | } |
| 3426 | if (i >= n) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3427 | goto fail; |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 3428 | value = entry_ptr->me_value; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3429 | } |
| 3430 | di->di_pos = i+1; |
| 3431 | di->len--; |
| 3432 | Py_INCREF(value); |
| 3433 | return value; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3434 | |
| 3435 | fail: |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3436 | di->di_dict = NULL; |
Serhiy Storchaka | fbb1c5e | 2016-03-30 20:40:02 +0300 | [diff] [blame] | 3437 | Py_DECREF(d); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3438 | return NULL; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3439 | } |
| 3440 | |
| 3441 | PyTypeObject PyDictIterValue_Type = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3442 | PyVarObject_HEAD_INIT(&PyType_Type, 0) |
| 3443 | "dict_valueiterator", /* tp_name */ |
| 3444 | sizeof(dictiterobject), /* tp_basicsize */ |
| 3445 | 0, /* tp_itemsize */ |
| 3446 | /* methods */ |
| 3447 | (destructor)dictiter_dealloc, /* tp_dealloc */ |
| 3448 | 0, /* tp_print */ |
| 3449 | 0, /* tp_getattr */ |
| 3450 | 0, /* tp_setattr */ |
| 3451 | 0, /* tp_reserved */ |
| 3452 | 0, /* tp_repr */ |
| 3453 | 0, /* tp_as_number */ |
| 3454 | 0, /* tp_as_sequence */ |
| 3455 | 0, /* tp_as_mapping */ |
| 3456 | 0, /* tp_hash */ |
| 3457 | 0, /* tp_call */ |
| 3458 | 0, /* tp_str */ |
| 3459 | PyObject_GenericGetAttr, /* tp_getattro */ |
| 3460 | 0, /* tp_setattro */ |
| 3461 | 0, /* tp_as_buffer */ |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 3462 | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3463 | 0, /* tp_doc */ |
| 3464 | (traverseproc)dictiter_traverse, /* tp_traverse */ |
| 3465 | 0, /* tp_clear */ |
| 3466 | 0, /* tp_richcompare */ |
| 3467 | 0, /* tp_weaklistoffset */ |
| 3468 | PyObject_SelfIter, /* tp_iter */ |
| 3469 | (iternextfunc)dictiter_iternextvalue, /* tp_iternext */ |
| 3470 | dictiter_methods, /* tp_methods */ |
| 3471 | 0, |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3472 | }; |
| 3473 | |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 3474 | static PyObject * |
| 3475 | dictiter_iternextitem(dictiterobject *di) |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3476 | { |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 3477 | PyObject *key, *value, *result; |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3478 | Py_ssize_t i; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3479 | PyDictObject *d = di->di_dict; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3480 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3481 | if (d == NULL) |
| 3482 | return NULL; |
| 3483 | assert (PyDict_Check(d)); |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3484 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3485 | if (di->di_used != d->ma_used) { |
| 3486 | PyErr_SetString(PyExc_RuntimeError, |
| 3487 | "dictionary changed size during iteration"); |
| 3488 | di->di_used = -1; /* Make this state sticky */ |
| 3489 | return NULL; |
| 3490 | } |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3491 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3492 | i = di->di_pos; |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3493 | assert(i >= 0); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 3494 | if (d->ma_values) { |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3495 | if (i >= d->ma_used) |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 3496 | goto fail; |
| 3497 | key = DK_ENTRIES(d->ma_keys)[i].me_key; |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3498 | value = d->ma_values[i]; |
| 3499 | assert(value != NULL); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 3500 | } |
| 3501 | else { |
INADA Naoki | ca2d8be | 2016-11-04 16:59:10 +0900 | [diff] [blame] | 3502 | Py_ssize_t n = d->ma_keys->dk_nentries; |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 3503 | PyDictKeyEntry *entry_ptr = &DK_ENTRIES(d->ma_keys)[i]; |
| 3504 | while (i < n && entry_ptr->me_value == NULL) { |
| 3505 | entry_ptr++; |
| 3506 | i++; |
| 3507 | } |
| 3508 | if (i >= n) |
| 3509 | goto fail; |
| 3510 | key = entry_ptr->me_key; |
| 3511 | value = entry_ptr->me_value; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 3512 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3513 | di->di_pos = i+1; |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 3514 | di->len--; |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 3515 | Py_INCREF(key); |
| 3516 | Py_INCREF(value); |
| 3517 | result = di->di_result; |
| 3518 | if (Py_REFCNT(result) == 1) { |
| 3519 | PyObject *oldkey = PyTuple_GET_ITEM(result, 0); |
| 3520 | PyObject *oldvalue = PyTuple_GET_ITEM(result, 1); |
| 3521 | PyTuple_SET_ITEM(result, 0, key); /* steals reference */ |
| 3522 | PyTuple_SET_ITEM(result, 1, value); /* steals reference */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3523 | Py_INCREF(result); |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 3524 | Py_DECREF(oldkey); |
| 3525 | Py_DECREF(oldvalue); |
Serhiy Storchaka | 49f5cdd | 2016-10-09 23:08:05 +0300 | [diff] [blame] | 3526 | } |
| 3527 | else { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3528 | result = PyTuple_New(2); |
| 3529 | if (result == NULL) |
| 3530 | return NULL; |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 3531 | PyTuple_SET_ITEM(result, 0, key); /* steals reference */ |
| 3532 | PyTuple_SET_ITEM(result, 1, value); /* steals reference */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3533 | } |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3534 | return result; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3535 | |
| 3536 | fail: |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3537 | di->di_dict = NULL; |
Serhiy Storchaka | fbb1c5e | 2016-03-30 20:40:02 +0300 | [diff] [blame] | 3538 | Py_DECREF(d); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3539 | return NULL; |
Raymond Hettinger | 019a148 | 2004-03-18 02:41:19 +0000 | [diff] [blame] | 3540 | } |
| 3541 | |
| 3542 | PyTypeObject PyDictIterItem_Type = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3543 | PyVarObject_HEAD_INIT(&PyType_Type, 0) |
| 3544 | "dict_itemiterator", /* tp_name */ |
| 3545 | sizeof(dictiterobject), /* tp_basicsize */ |
| 3546 | 0, /* tp_itemsize */ |
| 3547 | /* methods */ |
| 3548 | (destructor)dictiter_dealloc, /* tp_dealloc */ |
| 3549 | 0, /* tp_print */ |
| 3550 | 0, /* tp_getattr */ |
| 3551 | 0, /* tp_setattr */ |
| 3552 | 0, /* tp_reserved */ |
| 3553 | 0, /* tp_repr */ |
| 3554 | 0, /* tp_as_number */ |
| 3555 | 0, /* tp_as_sequence */ |
| 3556 | 0, /* tp_as_mapping */ |
| 3557 | 0, /* tp_hash */ |
| 3558 | 0, /* tp_call */ |
| 3559 | 0, /* tp_str */ |
| 3560 | PyObject_GenericGetAttr, /* tp_getattro */ |
| 3561 | 0, /* tp_setattro */ |
| 3562 | 0, /* tp_as_buffer */ |
| 3563 | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ |
| 3564 | 0, /* tp_doc */ |
| 3565 | (traverseproc)dictiter_traverse, /* tp_traverse */ |
| 3566 | 0, /* tp_clear */ |
| 3567 | 0, /* tp_richcompare */ |
| 3568 | 0, /* tp_weaklistoffset */ |
| 3569 | PyObject_SelfIter, /* tp_iter */ |
| 3570 | (iternextfunc)dictiter_iternextitem, /* tp_iternext */ |
| 3571 | dictiter_methods, /* tp_methods */ |
| 3572 | 0, |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 3573 | }; |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3574 | |
| 3575 | |
Kristján Valur Jónsson | 31668b8 | 2012-04-03 10:49:41 +0000 | [diff] [blame] | 3576 | static PyObject * |
| 3577 | dictiter_reduce(dictiterobject *di) |
| 3578 | { |
| 3579 | PyObject *list; |
| 3580 | dictiterobject tmp; |
| 3581 | |
| 3582 | list = PyList_New(0); |
| 3583 | if (!list) |
| 3584 | return NULL; |
| 3585 | |
| 3586 | /* copy the itertor state */ |
| 3587 | tmp = *di; |
| 3588 | Py_XINCREF(tmp.di_dict); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 3589 | |
Kristján Valur Jónsson | 31668b8 | 2012-04-03 10:49:41 +0000 | [diff] [blame] | 3590 | /* iterate the temporary into a list */ |
| 3591 | for(;;) { |
| 3592 | PyObject *element = 0; |
| 3593 | if (Py_TYPE(di) == &PyDictIterItem_Type) |
| 3594 | element = dictiter_iternextitem(&tmp); |
| 3595 | else if (Py_TYPE(di) == &PyDictIterKey_Type) |
| 3596 | element = dictiter_iternextkey(&tmp); |
| 3597 | else if (Py_TYPE(di) == &PyDictIterValue_Type) |
| 3598 | element = dictiter_iternextvalue(&tmp); |
| 3599 | else |
Barry Warsaw | b2e5794 | 2017-09-14 18:13:16 -0700 | [diff] [blame] | 3600 | Py_UNREACHABLE(); |
Kristján Valur Jónsson | 31668b8 | 2012-04-03 10:49:41 +0000 | [diff] [blame] | 3601 | if (element) { |
| 3602 | if (PyList_Append(list, element)) { |
| 3603 | Py_DECREF(element); |
| 3604 | Py_DECREF(list); |
| 3605 | Py_XDECREF(tmp.di_dict); |
| 3606 | return NULL; |
| 3607 | } |
| 3608 | Py_DECREF(element); |
| 3609 | } else |
| 3610 | break; |
| 3611 | } |
| 3612 | Py_XDECREF(tmp.di_dict); |
| 3613 | /* check for error */ |
| 3614 | if (tmp.di_dict != NULL) { |
| 3615 | /* we have an error */ |
| 3616 | Py_DECREF(list); |
| 3617 | return NULL; |
| 3618 | } |
Antoine Pitrou | a701388 | 2012-04-05 00:04:20 +0200 | [diff] [blame] | 3619 | return Py_BuildValue("N(N)", _PyObject_GetBuiltin("iter"), list); |
Kristján Valur Jónsson | 31668b8 | 2012-04-03 10:49:41 +0000 | [diff] [blame] | 3620 | } |
| 3621 | |
Guido van Rossum | 3ac6741 | 2007-02-10 18:55:06 +0000 | [diff] [blame] | 3622 | /***********************************************/ |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3623 | /* View objects for keys(), items(), values(). */ |
Guido van Rossum | 3ac6741 | 2007-02-10 18:55:06 +0000 | [diff] [blame] | 3624 | /***********************************************/ |
| 3625 | |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3626 | /* The instance lay-out is the same for all three; but the type differs. */ |
| 3627 | |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3628 | static void |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 3629 | dictview_dealloc(_PyDictViewObject *dv) |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3630 | { |
INADA Naoki | a6296d3 | 2017-08-24 14:55:17 +0900 | [diff] [blame] | 3631 | /* bpo-31095: UnTrack is needed before calling any callbacks */ |
| 3632 | _PyObject_GC_UNTRACK(dv); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3633 | Py_XDECREF(dv->dv_dict); |
| 3634 | PyObject_GC_Del(dv); |
Antoine Pitrou | 7ddda78 | 2009-01-01 15:35:33 +0000 | [diff] [blame] | 3635 | } |
| 3636 | |
| 3637 | static int |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 3638 | dictview_traverse(_PyDictViewObject *dv, visitproc visit, void *arg) |
Antoine Pitrou | 7ddda78 | 2009-01-01 15:35:33 +0000 | [diff] [blame] | 3639 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3640 | Py_VISIT(dv->dv_dict); |
| 3641 | return 0; |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3642 | } |
| 3643 | |
Guido van Rossum | 83825ac | 2007-02-10 04:54:19 +0000 | [diff] [blame] | 3644 | static Py_ssize_t |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 3645 | dictview_len(_PyDictViewObject *dv) |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3646 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3647 | Py_ssize_t len = 0; |
| 3648 | if (dv->dv_dict != NULL) |
| 3649 | len = dv->dv_dict->ma_used; |
| 3650 | return len; |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3651 | } |
| 3652 | |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 3653 | PyObject * |
| 3654 | _PyDictView_New(PyObject *dict, PyTypeObject *type) |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3655 | { |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 3656 | _PyDictViewObject *dv; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3657 | if (dict == NULL) { |
| 3658 | PyErr_BadInternalCall(); |
| 3659 | return NULL; |
| 3660 | } |
| 3661 | if (!PyDict_Check(dict)) { |
| 3662 | /* XXX Get rid of this restriction later */ |
| 3663 | PyErr_Format(PyExc_TypeError, |
| 3664 | "%s() requires a dict argument, not '%s'", |
| 3665 | type->tp_name, dict->ob_type->tp_name); |
| 3666 | return NULL; |
| 3667 | } |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 3668 | dv = PyObject_GC_New(_PyDictViewObject, type); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3669 | if (dv == NULL) |
| 3670 | return NULL; |
| 3671 | Py_INCREF(dict); |
| 3672 | dv->dv_dict = (PyDictObject *)dict; |
| 3673 | _PyObject_GC_TRACK(dv); |
| 3674 | return (PyObject *)dv; |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3675 | } |
| 3676 | |
Neal Norwitz | e36f2ba | 2007-02-26 23:12:28 +0000 | [diff] [blame] | 3677 | /* TODO(guido): The views objects are not complete: |
| 3678 | |
| 3679 | * support more set operations |
| 3680 | * support arbitrary mappings? |
| 3681 | - either these should be static or exported in dictobject.h |
| 3682 | - if public then they should probably be in builtins |
| 3683 | */ |
| 3684 | |
Guido van Rossum | aac530c | 2007-08-24 22:33:45 +0000 | [diff] [blame] | 3685 | /* Return 1 if self is a subset of other, iterating over self; |
| 3686 | 0 if not; -1 if an error occurred. */ |
Guido van Rossum | d9214d1 | 2007-02-12 02:23:40 +0000 | [diff] [blame] | 3687 | static int |
| 3688 | all_contained_in(PyObject *self, PyObject *other) |
| 3689 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3690 | PyObject *iter = PyObject_GetIter(self); |
| 3691 | int ok = 1; |
Guido van Rossum | d9214d1 | 2007-02-12 02:23:40 +0000 | [diff] [blame] | 3692 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3693 | if (iter == NULL) |
| 3694 | return -1; |
| 3695 | for (;;) { |
| 3696 | PyObject *next = PyIter_Next(iter); |
| 3697 | if (next == NULL) { |
| 3698 | if (PyErr_Occurred()) |
| 3699 | ok = -1; |
| 3700 | break; |
| 3701 | } |
| 3702 | ok = PySequence_Contains(other, next); |
| 3703 | Py_DECREF(next); |
| 3704 | if (ok <= 0) |
| 3705 | break; |
| 3706 | } |
| 3707 | Py_DECREF(iter); |
| 3708 | return ok; |
Guido van Rossum | d9214d1 | 2007-02-12 02:23:40 +0000 | [diff] [blame] | 3709 | } |
| 3710 | |
| 3711 | static PyObject * |
| 3712 | dictview_richcompare(PyObject *self, PyObject *other, int op) |
| 3713 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3714 | Py_ssize_t len_self, len_other; |
| 3715 | int ok; |
| 3716 | PyObject *result; |
Guido van Rossum | aac530c | 2007-08-24 22:33:45 +0000 | [diff] [blame] | 3717 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3718 | assert(self != NULL); |
| 3719 | assert(PyDictViewSet_Check(self)); |
| 3720 | assert(other != NULL); |
Guido van Rossum | d9214d1 | 2007-02-12 02:23:40 +0000 | [diff] [blame] | 3721 | |
Brian Curtin | dfc80e3 | 2011-08-10 20:28:54 -0500 | [diff] [blame] | 3722 | if (!PyAnySet_Check(other) && !PyDictViewSet_Check(other)) |
| 3723 | Py_RETURN_NOTIMPLEMENTED; |
Guido van Rossum | aac530c | 2007-08-24 22:33:45 +0000 | [diff] [blame] | 3724 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3725 | len_self = PyObject_Size(self); |
| 3726 | if (len_self < 0) |
| 3727 | return NULL; |
| 3728 | len_other = PyObject_Size(other); |
| 3729 | if (len_other < 0) |
| 3730 | return NULL; |
Guido van Rossum | aac530c | 2007-08-24 22:33:45 +0000 | [diff] [blame] | 3731 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3732 | ok = 0; |
| 3733 | switch(op) { |
Guido van Rossum | aac530c | 2007-08-24 22:33:45 +0000 | [diff] [blame] | 3734 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3735 | case Py_NE: |
| 3736 | case Py_EQ: |
| 3737 | if (len_self == len_other) |
| 3738 | ok = all_contained_in(self, other); |
| 3739 | if (op == Py_NE && ok >= 0) |
| 3740 | ok = !ok; |
| 3741 | break; |
Guido van Rossum | aac530c | 2007-08-24 22:33:45 +0000 | [diff] [blame] | 3742 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3743 | case Py_LT: |
| 3744 | if (len_self < len_other) |
| 3745 | ok = all_contained_in(self, other); |
| 3746 | break; |
Guido van Rossum | aac530c | 2007-08-24 22:33:45 +0000 | [diff] [blame] | 3747 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3748 | case Py_LE: |
| 3749 | if (len_self <= len_other) |
| 3750 | ok = all_contained_in(self, other); |
| 3751 | break; |
Guido van Rossum | aac530c | 2007-08-24 22:33:45 +0000 | [diff] [blame] | 3752 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3753 | case Py_GT: |
| 3754 | if (len_self > len_other) |
| 3755 | ok = all_contained_in(other, self); |
| 3756 | break; |
Guido van Rossum | aac530c | 2007-08-24 22:33:45 +0000 | [diff] [blame] | 3757 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3758 | case Py_GE: |
| 3759 | if (len_self >= len_other) |
| 3760 | ok = all_contained_in(other, self); |
| 3761 | break; |
Guido van Rossum | aac530c | 2007-08-24 22:33:45 +0000 | [diff] [blame] | 3762 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3763 | } |
| 3764 | if (ok < 0) |
| 3765 | return NULL; |
| 3766 | result = ok ? Py_True : Py_False; |
| 3767 | Py_INCREF(result); |
| 3768 | return result; |
Guido van Rossum | d9214d1 | 2007-02-12 02:23:40 +0000 | [diff] [blame] | 3769 | } |
| 3770 | |
Raymond Hettinger | b0d56af | 2009-03-03 10:52:49 +0000 | [diff] [blame] | 3771 | static PyObject * |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 3772 | dictview_repr(_PyDictViewObject *dv) |
Raymond Hettinger | b0d56af | 2009-03-03 10:52:49 +0000 | [diff] [blame] | 3773 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3774 | PyObject *seq; |
| 3775 | PyObject *result; |
Raymond Hettinger | b0d56af | 2009-03-03 10:52:49 +0000 | [diff] [blame] | 3776 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3777 | seq = PySequence_List((PyObject *)dv); |
| 3778 | if (seq == NULL) |
| 3779 | return NULL; |
| 3780 | |
| 3781 | result = PyUnicode_FromFormat("%s(%R)", Py_TYPE(dv)->tp_name, seq); |
| 3782 | Py_DECREF(seq); |
| 3783 | return result; |
Raymond Hettinger | b0d56af | 2009-03-03 10:52:49 +0000 | [diff] [blame] | 3784 | } |
| 3785 | |
Guido van Rossum | 3ac6741 | 2007-02-10 18:55:06 +0000 | [diff] [blame] | 3786 | /*** dict_keys ***/ |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3787 | |
| 3788 | static PyObject * |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 3789 | dictkeys_iter(_PyDictViewObject *dv) |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3790 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3791 | if (dv->dv_dict == NULL) { |
| 3792 | Py_RETURN_NONE; |
| 3793 | } |
| 3794 | return dictiter_new(dv->dv_dict, &PyDictIterKey_Type); |
Guido van Rossum | 3ac6741 | 2007-02-10 18:55:06 +0000 | [diff] [blame] | 3795 | } |
| 3796 | |
| 3797 | static int |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 3798 | dictkeys_contains(_PyDictViewObject *dv, PyObject *obj) |
Guido van Rossum | 3ac6741 | 2007-02-10 18:55:06 +0000 | [diff] [blame] | 3799 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3800 | if (dv->dv_dict == NULL) |
| 3801 | return 0; |
| 3802 | return PyDict_Contains((PyObject *)dv->dv_dict, obj); |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3803 | } |
| 3804 | |
Guido van Rossum | 83825ac | 2007-02-10 04:54:19 +0000 | [diff] [blame] | 3805 | static PySequenceMethods dictkeys_as_sequence = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3806 | (lenfunc)dictview_len, /* sq_length */ |
| 3807 | 0, /* sq_concat */ |
| 3808 | 0, /* sq_repeat */ |
| 3809 | 0, /* sq_item */ |
| 3810 | 0, /* sq_slice */ |
| 3811 | 0, /* sq_ass_item */ |
| 3812 | 0, /* sq_ass_slice */ |
| 3813 | (objobjproc)dictkeys_contains, /* sq_contains */ |
Guido van Rossum | 83825ac | 2007-02-10 04:54:19 +0000 | [diff] [blame] | 3814 | }; |
| 3815 | |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3816 | static PyObject* |
| 3817 | dictviews_sub(PyObject* self, PyObject *other) |
| 3818 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3819 | PyObject *result = PySet_New(self); |
| 3820 | PyObject *tmp; |
Martin v. Löwis | bd928fe | 2011-10-14 10:20:37 +0200 | [diff] [blame] | 3821 | _Py_IDENTIFIER(difference_update); |
Martin v. Löwis | afe55bb | 2011-10-09 10:38:36 +0200 | [diff] [blame] | 3822 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3823 | if (result == NULL) |
| 3824 | return NULL; |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3825 | |
Benjamin Peterson | f11b25b | 2016-03-03 22:05:36 -0800 | [diff] [blame] | 3826 | tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_difference_update, other, NULL); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3827 | if (tmp == NULL) { |
| 3828 | Py_DECREF(result); |
| 3829 | return NULL; |
| 3830 | } |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3831 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3832 | Py_DECREF(tmp); |
| 3833 | return result; |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3834 | } |
| 3835 | |
Benjamin Peterson | 025e9eb | 2015-05-05 20:16:41 -0400 | [diff] [blame] | 3836 | PyObject* |
| 3837 | _PyDictView_Intersect(PyObject* self, PyObject *other) |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3838 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3839 | PyObject *result = PySet_New(self); |
| 3840 | PyObject *tmp; |
Martin v. Löwis | bd928fe | 2011-10-14 10:20:37 +0200 | [diff] [blame] | 3841 | _Py_IDENTIFIER(intersection_update); |
Martin v. Löwis | afe55bb | 2011-10-09 10:38:36 +0200 | [diff] [blame] | 3842 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3843 | if (result == NULL) |
| 3844 | return NULL; |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3845 | |
Benjamin Peterson | f11b25b | 2016-03-03 22:05:36 -0800 | [diff] [blame] | 3846 | tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_intersection_update, other, NULL); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3847 | if (tmp == NULL) { |
| 3848 | Py_DECREF(result); |
| 3849 | return NULL; |
| 3850 | } |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3851 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3852 | Py_DECREF(tmp); |
| 3853 | return result; |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3854 | } |
| 3855 | |
| 3856 | static PyObject* |
| 3857 | dictviews_or(PyObject* self, PyObject *other) |
| 3858 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3859 | PyObject *result = PySet_New(self); |
| 3860 | PyObject *tmp; |
Martin v. Löwis | 1c67dd9 | 2011-10-14 15:16:45 +0200 | [diff] [blame] | 3861 | _Py_IDENTIFIER(update); |
Victor Stinner | d1a9cc2 | 2011-10-13 22:51:17 +0200 | [diff] [blame] | 3862 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3863 | if (result == NULL) |
| 3864 | return NULL; |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3865 | |
Benjamin Peterson | f11b25b | 2016-03-03 22:05:36 -0800 | [diff] [blame] | 3866 | tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_update, other, NULL); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3867 | if (tmp == NULL) { |
| 3868 | Py_DECREF(result); |
| 3869 | return NULL; |
| 3870 | } |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3871 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3872 | Py_DECREF(tmp); |
| 3873 | return result; |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3874 | } |
| 3875 | |
| 3876 | static PyObject* |
| 3877 | dictviews_xor(PyObject* self, PyObject *other) |
| 3878 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3879 | PyObject *result = PySet_New(self); |
| 3880 | PyObject *tmp; |
Martin v. Löwis | bd928fe | 2011-10-14 10:20:37 +0200 | [diff] [blame] | 3881 | _Py_IDENTIFIER(symmetric_difference_update); |
Martin v. Löwis | afe55bb | 2011-10-09 10:38:36 +0200 | [diff] [blame] | 3882 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3883 | if (result == NULL) |
| 3884 | return NULL; |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3885 | |
Benjamin Peterson | f11b25b | 2016-03-03 22:05:36 -0800 | [diff] [blame] | 3886 | tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_symmetric_difference_update, other, NULL); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3887 | if (tmp == NULL) { |
| 3888 | Py_DECREF(result); |
| 3889 | return NULL; |
| 3890 | } |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3891 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3892 | Py_DECREF(tmp); |
| 3893 | return result; |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3894 | } |
| 3895 | |
| 3896 | static PyNumberMethods dictviews_as_number = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3897 | 0, /*nb_add*/ |
| 3898 | (binaryfunc)dictviews_sub, /*nb_subtract*/ |
| 3899 | 0, /*nb_multiply*/ |
| 3900 | 0, /*nb_remainder*/ |
| 3901 | 0, /*nb_divmod*/ |
| 3902 | 0, /*nb_power*/ |
| 3903 | 0, /*nb_negative*/ |
| 3904 | 0, /*nb_positive*/ |
| 3905 | 0, /*nb_absolute*/ |
| 3906 | 0, /*nb_bool*/ |
| 3907 | 0, /*nb_invert*/ |
| 3908 | 0, /*nb_lshift*/ |
| 3909 | 0, /*nb_rshift*/ |
Benjamin Peterson | 025e9eb | 2015-05-05 20:16:41 -0400 | [diff] [blame] | 3910 | (binaryfunc)_PyDictView_Intersect, /*nb_and*/ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3911 | (binaryfunc)dictviews_xor, /*nb_xor*/ |
| 3912 | (binaryfunc)dictviews_or, /*nb_or*/ |
Guido van Rossum | 523259b | 2007-08-24 23:41:22 +0000 | [diff] [blame] | 3913 | }; |
| 3914 | |
Daniel Stutzbach | 045b3ba | 2010-09-02 15:06:06 +0000 | [diff] [blame] | 3915 | static PyObject* |
| 3916 | dictviews_isdisjoint(PyObject *self, PyObject *other) |
| 3917 | { |
| 3918 | PyObject *it; |
| 3919 | PyObject *item = NULL; |
| 3920 | |
| 3921 | if (self == other) { |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 3922 | if (dictview_len((_PyDictViewObject *)self) == 0) |
Daniel Stutzbach | 045b3ba | 2010-09-02 15:06:06 +0000 | [diff] [blame] | 3923 | Py_RETURN_TRUE; |
| 3924 | else |
| 3925 | Py_RETURN_FALSE; |
| 3926 | } |
| 3927 | |
| 3928 | /* Iterate over the shorter object (only if other is a set, |
| 3929 | * because PySequence_Contains may be expensive otherwise): */ |
| 3930 | if (PyAnySet_Check(other) || PyDictViewSet_Check(other)) { |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 3931 | Py_ssize_t len_self = dictview_len((_PyDictViewObject *)self); |
Daniel Stutzbach | 045b3ba | 2010-09-02 15:06:06 +0000 | [diff] [blame] | 3932 | Py_ssize_t len_other = PyObject_Size(other); |
| 3933 | if (len_other == -1) |
| 3934 | return NULL; |
| 3935 | |
| 3936 | if ((len_other > len_self)) { |
| 3937 | PyObject *tmp = other; |
| 3938 | other = self; |
| 3939 | self = tmp; |
| 3940 | } |
| 3941 | } |
| 3942 | |
| 3943 | it = PyObject_GetIter(other); |
| 3944 | if (it == NULL) |
| 3945 | return NULL; |
| 3946 | |
| 3947 | while ((item = PyIter_Next(it)) != NULL) { |
| 3948 | int contains = PySequence_Contains(self, item); |
| 3949 | Py_DECREF(item); |
| 3950 | if (contains == -1) { |
| 3951 | Py_DECREF(it); |
| 3952 | return NULL; |
| 3953 | } |
| 3954 | |
| 3955 | if (contains) { |
| 3956 | Py_DECREF(it); |
| 3957 | Py_RETURN_FALSE; |
| 3958 | } |
| 3959 | } |
| 3960 | Py_DECREF(it); |
| 3961 | if (PyErr_Occurred()) |
| 3962 | return NULL; /* PyIter_Next raised an exception. */ |
| 3963 | Py_RETURN_TRUE; |
| 3964 | } |
| 3965 | |
| 3966 | PyDoc_STRVAR(isdisjoint_doc, |
| 3967 | "Return True if the view and the given iterable have a null intersection."); |
| 3968 | |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3969 | static PyMethodDef dictkeys_methods[] = { |
Daniel Stutzbach | 045b3ba | 2010-09-02 15:06:06 +0000 | [diff] [blame] | 3970 | {"isdisjoint", (PyCFunction)dictviews_isdisjoint, METH_O, |
| 3971 | isdisjoint_doc}, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3972 | {NULL, NULL} /* sentinel */ |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 3973 | }; |
| 3974 | |
| 3975 | PyTypeObject PyDictKeys_Type = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3976 | PyVarObject_HEAD_INIT(&PyType_Type, 0) |
| 3977 | "dict_keys", /* tp_name */ |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 3978 | sizeof(_PyDictViewObject), /* tp_basicsize */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 3979 | 0, /* tp_itemsize */ |
| 3980 | /* methods */ |
| 3981 | (destructor)dictview_dealloc, /* tp_dealloc */ |
| 3982 | 0, /* tp_print */ |
| 3983 | 0, /* tp_getattr */ |
| 3984 | 0, /* tp_setattr */ |
| 3985 | 0, /* tp_reserved */ |
| 3986 | (reprfunc)dictview_repr, /* tp_repr */ |
| 3987 | &dictviews_as_number, /* tp_as_number */ |
| 3988 | &dictkeys_as_sequence, /* tp_as_sequence */ |
| 3989 | 0, /* tp_as_mapping */ |
| 3990 | 0, /* tp_hash */ |
| 3991 | 0, /* tp_call */ |
| 3992 | 0, /* tp_str */ |
| 3993 | PyObject_GenericGetAttr, /* tp_getattro */ |
| 3994 | 0, /* tp_setattro */ |
| 3995 | 0, /* tp_as_buffer */ |
| 3996 | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ |
| 3997 | 0, /* tp_doc */ |
| 3998 | (traverseproc)dictview_traverse, /* tp_traverse */ |
| 3999 | 0, /* tp_clear */ |
| 4000 | dictview_richcompare, /* tp_richcompare */ |
| 4001 | 0, /* tp_weaklistoffset */ |
| 4002 | (getiterfunc)dictkeys_iter, /* tp_iter */ |
| 4003 | 0, /* tp_iternext */ |
| 4004 | dictkeys_methods, /* tp_methods */ |
| 4005 | 0, |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4006 | }; |
| 4007 | |
| 4008 | static PyObject * |
| 4009 | dictkeys_new(PyObject *dict) |
| 4010 | { |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 4011 | return _PyDictView_New(dict, &PyDictKeys_Type); |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4012 | } |
| 4013 | |
Guido van Rossum | 3ac6741 | 2007-02-10 18:55:06 +0000 | [diff] [blame] | 4014 | /*** dict_items ***/ |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4015 | |
| 4016 | static PyObject * |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 4017 | dictitems_iter(_PyDictViewObject *dv) |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4018 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 4019 | if (dv->dv_dict == NULL) { |
| 4020 | Py_RETURN_NONE; |
| 4021 | } |
| 4022 | return dictiter_new(dv->dv_dict, &PyDictIterItem_Type); |
Guido van Rossum | 3ac6741 | 2007-02-10 18:55:06 +0000 | [diff] [blame] | 4023 | } |
| 4024 | |
| 4025 | static int |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 4026 | dictitems_contains(_PyDictViewObject *dv, PyObject *obj) |
Guido van Rossum | 3ac6741 | 2007-02-10 18:55:06 +0000 | [diff] [blame] | 4027 | { |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 4028 | int result; |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 4029 | PyObject *key, *value, *found; |
| 4030 | if (dv->dv_dict == NULL) |
| 4031 | return 0; |
| 4032 | if (!PyTuple_Check(obj) || PyTuple_GET_SIZE(obj) != 2) |
| 4033 | return 0; |
| 4034 | key = PyTuple_GET_ITEM(obj, 0); |
| 4035 | value = PyTuple_GET_ITEM(obj, 1); |
Raymond Hettinger | 6692f01 | 2016-09-18 21:46:08 -0700 | [diff] [blame] | 4036 | found = PyDict_GetItemWithError((PyObject *)dv->dv_dict, key); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 4037 | if (found == NULL) { |
| 4038 | if (PyErr_Occurred()) |
| 4039 | return -1; |
| 4040 | return 0; |
| 4041 | } |
Serhiy Storchaka | 753bca3 | 2017-05-20 12:30:02 +0300 | [diff] [blame] | 4042 | Py_INCREF(found); |
| 4043 | result = PyObject_RichCompareBool(value, found, Py_EQ); |
| 4044 | Py_DECREF(found); |
| 4045 | return result; |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4046 | } |
| 4047 | |
Guido van Rossum | 83825ac | 2007-02-10 04:54:19 +0000 | [diff] [blame] | 4048 | static PySequenceMethods dictitems_as_sequence = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 4049 | (lenfunc)dictview_len, /* sq_length */ |
| 4050 | 0, /* sq_concat */ |
| 4051 | 0, /* sq_repeat */ |
| 4052 | 0, /* sq_item */ |
| 4053 | 0, /* sq_slice */ |
| 4054 | 0, /* sq_ass_item */ |
| 4055 | 0, /* sq_ass_slice */ |
| 4056 | (objobjproc)dictitems_contains, /* sq_contains */ |
Guido van Rossum | 83825ac | 2007-02-10 04:54:19 +0000 | [diff] [blame] | 4057 | }; |
| 4058 | |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4059 | static PyMethodDef dictitems_methods[] = { |
Daniel Stutzbach | 045b3ba | 2010-09-02 15:06:06 +0000 | [diff] [blame] | 4060 | {"isdisjoint", (PyCFunction)dictviews_isdisjoint, METH_O, |
| 4061 | isdisjoint_doc}, |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 4062 | {NULL, NULL} /* sentinel */ |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4063 | }; |
| 4064 | |
| 4065 | PyTypeObject PyDictItems_Type = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 4066 | PyVarObject_HEAD_INIT(&PyType_Type, 0) |
| 4067 | "dict_items", /* tp_name */ |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 4068 | sizeof(_PyDictViewObject), /* tp_basicsize */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 4069 | 0, /* tp_itemsize */ |
| 4070 | /* methods */ |
| 4071 | (destructor)dictview_dealloc, /* tp_dealloc */ |
| 4072 | 0, /* tp_print */ |
| 4073 | 0, /* tp_getattr */ |
| 4074 | 0, /* tp_setattr */ |
| 4075 | 0, /* tp_reserved */ |
| 4076 | (reprfunc)dictview_repr, /* tp_repr */ |
| 4077 | &dictviews_as_number, /* tp_as_number */ |
| 4078 | &dictitems_as_sequence, /* tp_as_sequence */ |
| 4079 | 0, /* tp_as_mapping */ |
| 4080 | 0, /* tp_hash */ |
| 4081 | 0, /* tp_call */ |
| 4082 | 0, /* tp_str */ |
| 4083 | PyObject_GenericGetAttr, /* tp_getattro */ |
| 4084 | 0, /* tp_setattro */ |
| 4085 | 0, /* tp_as_buffer */ |
| 4086 | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ |
| 4087 | 0, /* tp_doc */ |
| 4088 | (traverseproc)dictview_traverse, /* tp_traverse */ |
| 4089 | 0, /* tp_clear */ |
| 4090 | dictview_richcompare, /* tp_richcompare */ |
| 4091 | 0, /* tp_weaklistoffset */ |
| 4092 | (getiterfunc)dictitems_iter, /* tp_iter */ |
| 4093 | 0, /* tp_iternext */ |
| 4094 | dictitems_methods, /* tp_methods */ |
| 4095 | 0, |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4096 | }; |
| 4097 | |
| 4098 | static PyObject * |
| 4099 | dictitems_new(PyObject *dict) |
| 4100 | { |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 4101 | return _PyDictView_New(dict, &PyDictItems_Type); |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4102 | } |
| 4103 | |
Guido van Rossum | 3ac6741 | 2007-02-10 18:55:06 +0000 | [diff] [blame] | 4104 | /*** dict_values ***/ |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4105 | |
| 4106 | static PyObject * |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 4107 | dictvalues_iter(_PyDictViewObject *dv) |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4108 | { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 4109 | if (dv->dv_dict == NULL) { |
| 4110 | Py_RETURN_NONE; |
| 4111 | } |
| 4112 | return dictiter_new(dv->dv_dict, &PyDictIterValue_Type); |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4113 | } |
| 4114 | |
Guido van Rossum | 83825ac | 2007-02-10 04:54:19 +0000 | [diff] [blame] | 4115 | static PySequenceMethods dictvalues_as_sequence = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 4116 | (lenfunc)dictview_len, /* sq_length */ |
| 4117 | 0, /* sq_concat */ |
| 4118 | 0, /* sq_repeat */ |
| 4119 | 0, /* sq_item */ |
| 4120 | 0, /* sq_slice */ |
| 4121 | 0, /* sq_ass_item */ |
| 4122 | 0, /* sq_ass_slice */ |
| 4123 | (objobjproc)0, /* sq_contains */ |
Guido van Rossum | 83825ac | 2007-02-10 04:54:19 +0000 | [diff] [blame] | 4124 | }; |
| 4125 | |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4126 | static PyMethodDef dictvalues_methods[] = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 4127 | {NULL, NULL} /* sentinel */ |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4128 | }; |
| 4129 | |
| 4130 | PyTypeObject PyDictValues_Type = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 4131 | PyVarObject_HEAD_INIT(&PyType_Type, 0) |
| 4132 | "dict_values", /* tp_name */ |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 4133 | sizeof(_PyDictViewObject), /* tp_basicsize */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 4134 | 0, /* tp_itemsize */ |
| 4135 | /* methods */ |
| 4136 | (destructor)dictview_dealloc, /* tp_dealloc */ |
| 4137 | 0, /* tp_print */ |
| 4138 | 0, /* tp_getattr */ |
| 4139 | 0, /* tp_setattr */ |
| 4140 | 0, /* tp_reserved */ |
| 4141 | (reprfunc)dictview_repr, /* tp_repr */ |
| 4142 | 0, /* tp_as_number */ |
| 4143 | &dictvalues_as_sequence, /* tp_as_sequence */ |
| 4144 | 0, /* tp_as_mapping */ |
| 4145 | 0, /* tp_hash */ |
| 4146 | 0, /* tp_call */ |
| 4147 | 0, /* tp_str */ |
| 4148 | PyObject_GenericGetAttr, /* tp_getattro */ |
| 4149 | 0, /* tp_setattro */ |
| 4150 | 0, /* tp_as_buffer */ |
| 4151 | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ |
| 4152 | 0, /* tp_doc */ |
| 4153 | (traverseproc)dictview_traverse, /* tp_traverse */ |
| 4154 | 0, /* tp_clear */ |
| 4155 | 0, /* tp_richcompare */ |
| 4156 | 0, /* tp_weaklistoffset */ |
| 4157 | (getiterfunc)dictvalues_iter, /* tp_iter */ |
| 4158 | 0, /* tp_iternext */ |
| 4159 | dictvalues_methods, /* tp_methods */ |
| 4160 | 0, |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4161 | }; |
| 4162 | |
| 4163 | static PyObject * |
| 4164 | dictvalues_new(PyObject *dict) |
| 4165 | { |
Eric Snow | 96c6af9 | 2015-05-29 22:21:39 -0600 | [diff] [blame] | 4166 | return _PyDictView_New(dict, &PyDictValues_Type); |
Guido van Rossum | b90c848 | 2007-02-10 01:11:45 +0000 | [diff] [blame] | 4167 | } |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 4168 | |
| 4169 | /* Returns NULL if cannot allocate a new PyDictKeysObject, |
| 4170 | but does not set an error */ |
| 4171 | PyDictKeysObject * |
| 4172 | _PyDict_NewKeysForClass(void) |
| 4173 | { |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 4174 | PyDictKeysObject *keys = new_keys_object(PyDict_MINSIZE); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 4175 | if (keys == NULL) |
| 4176 | PyErr_Clear(); |
| 4177 | else |
| 4178 | keys->dk_lookup = lookdict_split; |
| 4179 | return keys; |
| 4180 | } |
| 4181 | |
| 4182 | #define CACHED_KEYS(tp) (((PyHeapTypeObject*)tp)->ht_cached_keys) |
| 4183 | |
| 4184 | PyObject * |
| 4185 | PyObject_GenericGetDict(PyObject *obj, void *context) |
| 4186 | { |
| 4187 | PyObject *dict, **dictptr = _PyObject_GetDictPtr(obj); |
| 4188 | if (dictptr == NULL) { |
| 4189 | PyErr_SetString(PyExc_AttributeError, |
| 4190 | "This object has no __dict__"); |
| 4191 | return NULL; |
| 4192 | } |
| 4193 | dict = *dictptr; |
| 4194 | if (dict == NULL) { |
| 4195 | PyTypeObject *tp = Py_TYPE(obj); |
| 4196 | if ((tp->tp_flags & Py_TPFLAGS_HEAPTYPE) && CACHED_KEYS(tp)) { |
| 4197 | DK_INCREF(CACHED_KEYS(tp)); |
| 4198 | *dictptr = dict = new_dict_with_shared_keys(CACHED_KEYS(tp)); |
| 4199 | } |
| 4200 | else { |
| 4201 | *dictptr = dict = PyDict_New(); |
| 4202 | } |
| 4203 | } |
| 4204 | Py_XINCREF(dict); |
| 4205 | return dict; |
| 4206 | } |
| 4207 | |
| 4208 | int |
| 4209 | _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr, |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 4210 | PyObject *key, PyObject *value) |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 4211 | { |
| 4212 | PyObject *dict; |
| 4213 | int res; |
| 4214 | PyDictKeysObject *cached; |
| 4215 | |
| 4216 | assert(dictptr != NULL); |
| 4217 | if ((tp->tp_flags & Py_TPFLAGS_HEAPTYPE) && (cached = CACHED_KEYS(tp))) { |
| 4218 | assert(dictptr != NULL); |
| 4219 | dict = *dictptr; |
| 4220 | if (dict == NULL) { |
| 4221 | DK_INCREF(cached); |
| 4222 | dict = new_dict_with_shared_keys(cached); |
| 4223 | if (dict == NULL) |
| 4224 | return -1; |
| 4225 | *dictptr = dict; |
| 4226 | } |
| 4227 | if (value == NULL) { |
| 4228 | res = PyDict_DelItem(dict, key); |
INADA Naoki | 2294f3a | 2017-02-12 13:51:30 +0900 | [diff] [blame] | 4229 | // Since key sharing dict doesn't allow deletion, PyDict_DelItem() |
| 4230 | // always converts dict to combined form. |
| 4231 | if ((cached = CACHED_KEYS(tp)) != NULL) { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 4232 | CACHED_KEYS(tp) = NULL; |
| 4233 | DK_DECREF(cached); |
| 4234 | } |
Victor Stinner | 3d3f264 | 2016-12-15 17:21:23 +0100 | [diff] [blame] | 4235 | } |
| 4236 | else { |
INADA Naoki | 2294f3a | 2017-02-12 13:51:30 +0900 | [diff] [blame] | 4237 | int was_shared = (cached == ((PyDictObject *)dict)->ma_keys); |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 4238 | res = PyDict_SetItem(dict, key, value); |
INADA Naoki | 2294f3a | 2017-02-12 13:51:30 +0900 | [diff] [blame] | 4239 | if (was_shared && |
| 4240 | (cached = CACHED_KEYS(tp)) != NULL && |
| 4241 | cached != ((PyDictObject *)dict)->ma_keys) { |
Victor Stinner | 3d3f264 | 2016-12-15 17:21:23 +0100 | [diff] [blame] | 4242 | /* PyDict_SetItem() may call dictresize and convert split table |
| 4243 | * into combined table. In such case, convert it to split |
| 4244 | * table again and update type's shared key only when this is |
| 4245 | * the only dict sharing key with the type. |
| 4246 | * |
| 4247 | * This is to allow using shared key in class like this: |
| 4248 | * |
| 4249 | * class C: |
| 4250 | * def __init__(self): |
| 4251 | * # one dict resize happens |
| 4252 | * self.a, self.b, self.c = 1, 2, 3 |
| 4253 | * self.d, self.e, self.f = 4, 5, 6 |
| 4254 | * a = C() |
| 4255 | */ |
Benjamin Peterson | 15ee821 | 2012-04-24 14:44:18 -0400 | [diff] [blame] | 4256 | if (cached->dk_refcnt == 1) { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 4257 | CACHED_KEYS(tp) = make_keys_shared(dict); |
Victor Stinner | 742da04 | 2016-09-07 17:40:12 -0700 | [diff] [blame] | 4258 | } |
| 4259 | else { |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 4260 | CACHED_KEYS(tp) = NULL; |
| 4261 | } |
| 4262 | DK_DECREF(cached); |
Benjamin Peterson | 15ee821 | 2012-04-24 14:44:18 -0400 | [diff] [blame] | 4263 | if (CACHED_KEYS(tp) == NULL && PyErr_Occurred()) |
| 4264 | return -1; |
Benjamin Peterson | 7d95e40 | 2012-04-23 11:24:50 -0400 | [diff] [blame] | 4265 | } |
| 4266 | } |
| 4267 | } else { |
| 4268 | dict = *dictptr; |
| 4269 | if (dict == NULL) { |
| 4270 | dict = PyDict_New(); |
| 4271 | if (dict == NULL) |
| 4272 | return -1; |
| 4273 | *dictptr = dict; |
| 4274 | } |
| 4275 | if (value == NULL) { |
| 4276 | res = PyDict_DelItem(dict, key); |
| 4277 | } else { |
| 4278 | res = PyDict_SetItem(dict, key, value); |
| 4279 | } |
| 4280 | } |
| 4281 | return res; |
| 4282 | } |
| 4283 | |
| 4284 | void |
| 4285 | _PyDictKeys_DecRef(PyDictKeysObject *keys) |
| 4286 | { |
| 4287 | DK_DECREF(keys); |
| 4288 | } |