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