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