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