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