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 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 4 | #include "Python.h" |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 5 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 6 | /* MINSIZE is the minimum size of a dictionary. This many slots are |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 7 | * allocated directly in the dict object (in the ma_smalltable member). |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 8 | * It must be a power of 2, and at least 4. 8 allows dicts with no more than |
| 9 | * 5 active entries to live in ma_smalltable (and so avoid an additional |
| 10 | * malloc); instrumentation suggested this suffices for the majority of |
| 11 | * dicts (consisting mostly of usually-small instance dicts and usually-small |
| 12 | * dicts created to pass keyword arguments). |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 13 | */ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 14 | #define MINSIZE 8 |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 15 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 16 | /* Define this out if you don't want conversion statistics on exit. */ |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 17 | #undef SHOW_CONVERSION_COUNTS |
| 18 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 19 | /* See large comment block below. This must be >= 1. */ |
| 20 | #define PERTURB_SHIFT 5 |
| 21 | |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 22 | /* |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 23 | Major subtleties ahead: Most hash schemes depend on having a "good" hash |
| 24 | function, in the sense of simulating randomness. Python doesn't: its most |
| 25 | important hash functions (for strings and ints) are very regular in common |
| 26 | cases: |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 27 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 28 | >>> map(hash, (0, 1, 2, 3)) |
| 29 | [0, 1, 2, 3] |
| 30 | >>> map(hash, ("namea", "nameb", "namec", "named")) |
| 31 | [-1658398457, -1658398460, -1658398459, -1658398462] |
| 32 | >>> |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 33 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 34 | This isn't necessarily bad! To the contrary, in a table of size 2**i, taking |
| 35 | the low-order i bits as the initial table index is extremely fast, and there |
| 36 | are no collisions at all for dicts indexed by a contiguous range of ints. |
| 37 | The same is approximately true when keys are "consecutive" strings. So this |
| 38 | 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] | 39 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 40 | OTOH, when collisions occur, the tendency to fill contiguous slices of the |
| 41 | hash table makes a good collision resolution strategy crucial. Taking only |
| 42 | the last i bits of the hash code is also vulnerable: for example, consider |
| 43 | [i << 16 for i in range(20000)] as a set of keys. Since ints are their own |
| 44 | hash codes, and this fits in a dict of size 2**15, the last 15 bits of every |
| 45 | 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] | 46 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 47 | But catering to unusual cases should not slow the usual ones, so we just take |
| 48 | the last i bits anyway. It's up to collision resolution to do the rest. If |
| 49 | we *usually* find the key we're looking for on the first try (and, it turns |
| 50 | out, we usually do -- the table load factor is kept under 2/3, so the odds |
| 51 | are solidly in our favor), then it makes best sense to keep the initial index |
| 52 | computation dirt cheap. |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 53 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 54 | The first half of collision resolution is to visit table indices via this |
| 55 | recurrence: |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 56 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 57 | j = ((5*j) + 1) mod 2**i |
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 | For any initial j in range(2**i), repeating that 2**i times generates each |
| 60 | int in range(2**i) exactly once (see any text on random-number generation for |
| 61 | proof). By itself, this doesn't help much: like linear probing (setting |
| 62 | j += 1, or j -= 1, on each loop trip), it scans the table entries in a fixed |
| 63 | order. This would be bad, except that's not the only thing we do, and it's |
| 64 | actually *good* in the common cases where hash keys are consecutive. In an |
| 65 | example that's really too small to make this entirely clear, for a table of |
| 66 | size 2**3 the order of indices is: |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 67 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 68 | 0 -> 1 -> 6 -> 7 -> 4 -> 5 -> 2 -> 3 -> 0 [and here it's repeating] |
| 69 | |
| 70 | If two things come in at index 5, the first place we look after is index 2, |
| 71 | not 6, so if another comes in at index 6 the collision at 5 didn't hurt it. |
| 72 | Linear probing is deadly in this case because there the fixed probe order |
| 73 | is the *same* as the order consecutive keys are likely to arrive. But it's |
| 74 | extremely unlikely hash codes will follow a 5*j+1 recurrence by accident, |
| 75 | and certain that consecutive hash codes do not. |
| 76 | |
| 77 | The other half of the strategy is to get the other bits of the hash code |
| 78 | into play. This is done by initializing a (unsigned) vrbl "perturb" to the |
| 79 | full hash code, and changing the recurrence to: |
| 80 | |
| 81 | j = (5*j) + 1 + perturb; |
| 82 | perturb >>= PERTURB_SHIFT; |
| 83 | use j % 2**i as the next table index; |
| 84 | |
| 85 | Now the probe sequence depends (eventually) on every bit in the hash code, |
| 86 | and the pseudo-scrambling property of recurring on 5*j+1 is more valuable, |
| 87 | because it quickly magnifies small differences in the bits that didn't affect |
| 88 | the initial index. Note that because perturb is unsigned, if the recurrence |
| 89 | is executed often enough perturb eventually becomes and remains 0. At that |
| 90 | point (very rarely reached) the recurrence is on (just) 5*j+1 again, and |
| 91 | that's certain to find an empty slot eventually (since it generates every int |
| 92 | in range(2**i), and we make sure there's always at least one empty slot). |
| 93 | |
| 94 | Selecting a good value for PERTURB_SHIFT is a balancing act. You want it |
| 95 | small so that the high bits of the hash code continue to affect the probe |
| 96 | sequence across iterations; but you want it large so that in really bad cases |
| 97 | the high-order hash bits have an effect on early iterations. 5 was "the |
| 98 | best" in minimizing total collisions across experiments Tim Peters ran (on |
| 99 | both normal and pathological cases), but 4 and 6 weren't significantly worse. |
| 100 | |
| 101 | Historical: Reimer Behrends contributed the idea of using a polynomial-based |
| 102 | approach, using repeated multiplication by x in GF(2**n) where an irreducible |
| 103 | polynomial for each table size was chosen such that x was a primitive root. |
| 104 | Christian Tismer later extended that to use division by x instead, as an |
| 105 | efficient way to get the high bits of the hash code into play. This scheme |
| 106 | also gave excellent collision statistics, but was more expensive: two |
| 107 | if-tests were required inside the loop; computing "the next" index took about |
| 108 | the same number of operations but without as much potential parallelism |
| 109 | (e.g., computing 5*j can go on at the same time as computing 1+perturb in the |
| 110 | above, and then shifting perturb can be done while the table index is being |
| 111 | masked); and the dictobject struct required a member to hold the table's |
| 112 | polynomial. In Tim's experiments the current scheme ran faster, produced |
| 113 | equally good collision statistics, needed less code & used less memory. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 114 | */ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 115 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 116 | /* Object used as dummy key to fill deleted entries */ |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 117 | static PyObject *dummy; /* Initialized by first call to newdictobject() */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 118 | |
| 119 | /* |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame] | 120 | There are three kinds of slots in the table: |
| 121 | |
| 122 | 1. Unused. me_key == me_value == NULL |
| 123 | Does not hold an active (key, value) pair now and never did. Unused can |
| 124 | transition to Active upon key insertion. This is the only case in which |
| 125 | me_key is NULL, and is each slot's initial state. |
| 126 | |
| 127 | 2. Active. me_key != NULL and me_key != dummy and me_value != NULL |
| 128 | Holds an active (key, value) pair. Active can transition to Dummy upon |
| 129 | key deletion. This is the only case in which me_value != NULL. |
| 130 | |
Tim Peters | f1c7c88 | 2000-12-13 19:58:25 +0000 | [diff] [blame] | 131 | 3. Dummy. me_key == dummy and me_value == NULL |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame] | 132 | Previously held an active (key, value) pair, but that was deleted and an |
| 133 | active pair has not yet overwritten the slot. Dummy can transition to |
| 134 | Active upon key insertion. Dummy slots cannot be made Unused again |
| 135 | (cannot have me_key set to NULL), else the probe sequence in case of |
| 136 | collision would have no way to know they were once active. |
Tim Peters | f1c7c88 | 2000-12-13 19:58:25 +0000 | [diff] [blame] | 137 | |
| 138 | Note: .popitem() abuses the me_hash field of an Unused or Dummy slot to |
| 139 | hold a search finger. The me_hash field of Unused or Dummy slots has no |
| 140 | meaning otherwise. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 141 | */ |
| 142 | typedef struct { |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame] | 143 | long me_hash; /* cached hash code of me_key */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 144 | PyObject *me_key; |
| 145 | PyObject *me_value; |
Guido van Rossum | 3648884 | 1997-04-11 19:14:07 +0000 | [diff] [blame] | 146 | #ifdef USE_CACHE_ALIGNED |
| 147 | long aligner; |
| 148 | #endif |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 149 | } dictentry; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 150 | |
| 151 | /* |
Tim Peters | f1c7c88 | 2000-12-13 19:58:25 +0000 | [diff] [blame] | 152 | To ensure the lookup algorithm terminates, there must be at least one Unused |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame] | 153 | slot (NULL key) in the table. |
| 154 | The value ma_fill is the number of non-NULL keys (sum of Active and Dummy); |
| 155 | ma_used is the number of non-NULL, non-dummy keys (== the number of non-NULL |
| 156 | values == the number of Active items). |
| 157 | To avoid slowing down lookups on a near-full table, we resize the table when |
Tim Peters | 6783070 | 2001-03-21 19:23:56 +0000 | [diff] [blame] | 158 | it's two-thirds full. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 159 | */ |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 160 | typedef struct dictobject dictobject; |
| 161 | struct dictobject { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 162 | PyObject_HEAD |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame] | 163 | int ma_fill; /* # Active + # Dummy */ |
| 164 | int ma_used; /* # Active */ |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 165 | |
| 166 | /* The table contains ma_mask + 1 slots, and that's a power of 2. |
| 167 | * We store the mask instead of the size because the mask is more |
| 168 | * frequently needed. |
| 169 | */ |
| 170 | int ma_mask; |
| 171 | |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 172 | /* ma_table points to ma_smalltable for small tables, else to |
| 173 | * additional malloc'ed memory. ma_table is never NULL! This rule |
| 174 | * saves repeated runtime null-tests in the workhorse getitem and |
| 175 | * setitem calls. |
| 176 | */ |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 177 | dictentry *ma_table; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 178 | dictentry *(*ma_lookup)(dictobject *mp, PyObject *key, long hash); |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 179 | dictentry ma_smalltable[MINSIZE]; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 180 | }; |
| 181 | |
| 182 | /* forward declarations */ |
| 183 | static dictentry * |
| 184 | lookdict_string(dictobject *mp, PyObject *key, long hash); |
| 185 | |
| 186 | #ifdef SHOW_CONVERSION_COUNTS |
| 187 | static long created = 0L; |
| 188 | static long converted = 0L; |
| 189 | |
| 190 | static void |
| 191 | show_counts(void) |
| 192 | { |
| 193 | fprintf(stderr, "created %ld string dicts\n", created); |
| 194 | fprintf(stderr, "converted %ld to normal dicts\n", converted); |
| 195 | fprintf(stderr, "%.2f%% conversion rate\n", (100.0*converted)/created); |
| 196 | } |
| 197 | #endif |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 198 | |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 199 | /* Set dictobject* mp to empty but w/ MINSIZE slots, using ma_smalltable. */ |
| 200 | #define empty_to_minsize(mp) do { \ |
| 201 | memset((mp)->ma_smalltable, 0, sizeof((mp)->ma_smalltable)); \ |
| 202 | (mp)->ma_table = (mp)->ma_smalltable; \ |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 203 | (mp)->ma_mask = MINSIZE - 1; \ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 204 | (mp)->ma_used = (mp)->ma_fill = 0; \ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 205 | } while(0) |
| 206 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 207 | PyObject * |
Thomas Wouters | 7889010 | 2000-07-22 19:25:51 +0000 | [diff] [blame] | 208 | PyDict_New(void) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 209 | { |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 210 | register dictobject *mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 211 | if (dummy == NULL) { /* Auto-initialize dummy */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 212 | dummy = PyString_FromString("<dummy key>"); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 213 | if (dummy == NULL) |
| 214 | return NULL; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 215 | #ifdef SHOW_CONVERSION_COUNTS |
| 216 | Py_AtExit(show_counts); |
| 217 | #endif |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 218 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 219 | mp = PyObject_NEW(dictobject, &PyDict_Type); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 220 | if (mp == NULL) |
| 221 | return NULL; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 222 | empty_to_minsize(mp); |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 223 | mp->ma_lookup = lookdict_string; |
| 224 | #ifdef SHOW_CONVERSION_COUNTS |
| 225 | ++created; |
| 226 | #endif |
Jeremy Hylton | c5007aa | 2000-06-30 05:02:53 +0000 | [diff] [blame] | 227 | PyObject_GC_Init(mp); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 228 | return (PyObject *)mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 229 | } |
| 230 | |
| 231 | /* |
| 232 | The basic lookup function used by all operations. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 233 | 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] | 234 | Open addressing is preferred over chaining since the link overhead for |
| 235 | chaining would be substantial (100% with typical malloc overhead). |
| 236 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 237 | The initial probe index is computed as hash mod the table size. Subsequent |
| 238 | probe indices are computed as explained earlier. |
Guido van Rossum | 2bc1379 | 1999-03-24 19:06:42 +0000 | [diff] [blame] | 239 | |
| 240 | All arithmetic on hash should ignore overflow. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 241 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 242 | (The details in this version are due to Tim Peters, building on many past |
| 243 | contributions by Reimer Behrends, Jyrki Alakuijala, Vladimir Marangozov and |
| 244 | Christian Tismer). |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 245 | |
| 246 | This function must never return NULL; failures are indicated by returning |
| 247 | a dictentry* for which the me_value field is NULL. Exceptions are never |
| 248 | reported by this function, and outstanding exceptions are maintained. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 249 | */ |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 250 | |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 251 | static dictentry * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 252 | lookdict(dictobject *mp, PyObject *key, register long hash) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 253 | { |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 254 | register int i; |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 255 | register unsigned int perturb; |
Guido van Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 256 | register dictentry *freeslot; |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 257 | register unsigned int mask = mp->ma_mask; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 258 | dictentry *ep0 = mp->ma_table; |
| 259 | register dictentry *ep; |
Tim Peters | 7b5d0af | 2001-06-03 04:14:43 +0000 | [diff] [blame] | 260 | register int restore_error; |
| 261 | register int checked_error; |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 262 | register int cmp; |
| 263 | PyObject *err_type, *err_value, *err_tb; |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 264 | PyObject *startkey; |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 265 | |
Tim Peters | 2f228e7 | 2001-05-13 00:19:31 +0000 | [diff] [blame] | 266 | i = hash & mask; |
Guido van Rossum | efb4609 | 1997-01-29 15:53:56 +0000 | [diff] [blame] | 267 | ep = &ep0[i]; |
Guido van Rossum | c1c7b1a | 1998-10-06 16:01:14 +0000 | [diff] [blame] | 268 | if (ep->me_key == NULL || ep->me_key == key) |
Guido van Rossum | 7d18159 | 1997-01-16 21:06:45 +0000 | [diff] [blame] | 269 | return ep; |
Tim Peters | 7b5d0af | 2001-06-03 04:14:43 +0000 | [diff] [blame] | 270 | |
| 271 | restore_error = checked_error = 0; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 272 | if (ep->me_key == dummy) |
Guido van Rossum | 7d18159 | 1997-01-16 21:06:45 +0000 | [diff] [blame] | 273 | freeslot = ep; |
Guido van Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 274 | else { |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 275 | if (ep->me_hash == hash) { |
| 276 | /* error can't have been checked yet */ |
| 277 | checked_error = 1; |
| 278 | if (PyErr_Occurred()) { |
| 279 | restore_error = 1; |
| 280 | PyErr_Fetch(&err_type, &err_value, &err_tb); |
| 281 | } |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 282 | startkey = ep->me_key; |
| 283 | cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); |
Tim Peters | 7b5d0af | 2001-06-03 04:14:43 +0000 | [diff] [blame] | 284 | if (cmp < 0) |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 285 | PyErr_Clear(); |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 286 | if (ep0 == mp->ma_table && ep->me_key == startkey) { |
| 287 | if (cmp > 0) |
| 288 | goto Done; |
| 289 | } |
| 290 | else { |
| 291 | /* The compare did major nasty stuff to the |
| 292 | * dict: start over. |
| 293 | * XXX A clever adversary could prevent this |
| 294 | * XXX from terminating. |
| 295 | */ |
| 296 | ep = lookdict(mp, key, hash); |
| 297 | goto Done; |
| 298 | } |
Guido van Rossum | fd7a0b8 | 1997-08-18 21:52:47 +0000 | [diff] [blame] | 299 | } |
| 300 | freeslot = NULL; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 301 | } |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 302 | |
Tim Peters | 342c65e | 2001-05-13 06:43:53 +0000 | [diff] [blame] | 303 | /* In the loop, me_key == dummy is by far (factor of 100s) the |
| 304 | least likely outcome, so test for that last. */ |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 305 | for (perturb = hash; ; perturb >>= PERTURB_SHIFT) { |
| 306 | i = (i << 2) + i + perturb + 1; |
| 307 | ep = &ep0[i & mask]; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 308 | if (ep->me_key == NULL) { |
Tim Peters | 7b5d0af | 2001-06-03 04:14:43 +0000 | [diff] [blame] | 309 | if (freeslot != NULL) |
| 310 | ep = freeslot; |
| 311 | break; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 312 | } |
Tim Peters | 7b5d0af | 2001-06-03 04:14:43 +0000 | [diff] [blame] | 313 | if (ep->me_key == key) |
| 314 | break; |
| 315 | if (ep->me_hash == hash && ep->me_key != dummy) { |
Fred Drake | c88b99c | 2000-08-31 19:04:07 +0000 | [diff] [blame] | 316 | if (!checked_error) { |
| 317 | checked_error = 1; |
| 318 | if (PyErr_Occurred()) { |
| 319 | restore_error = 1; |
| 320 | PyErr_Fetch(&err_type, &err_value, |
| 321 | &err_tb); |
| 322 | } |
| 323 | } |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 324 | startkey = ep->me_key; |
| 325 | cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); |
Tim Peters | 7b5d0af | 2001-06-03 04:14:43 +0000 | [diff] [blame] | 326 | if (cmp < 0) |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 327 | PyErr_Clear(); |
Tim Peters | 453163d | 2001-06-03 04:54:32 +0000 | [diff] [blame] | 328 | if (ep0 == mp->ma_table && ep->me_key == startkey) { |
| 329 | if (cmp > 0) |
| 330 | break; |
| 331 | } |
| 332 | else { |
| 333 | /* The compare did major nasty stuff to the |
| 334 | * dict: start over. |
| 335 | * XXX A clever adversary could prevent this |
| 336 | * XXX from terminating. |
| 337 | */ |
| 338 | ep = lookdict(mp, key, hash); |
| 339 | break; |
| 340 | } |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 341 | } |
Tim Peters | 342c65e | 2001-05-13 06:43:53 +0000 | [diff] [blame] | 342 | else if (ep->me_key == dummy && freeslot == NULL) |
| 343 | freeslot = ep; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 344 | } |
Tim Peters | 7b5d0af | 2001-06-03 04:14:43 +0000 | [diff] [blame] | 345 | |
| 346 | Done: |
| 347 | if (restore_error) |
| 348 | PyErr_Restore(err_type, err_value, err_tb); |
| 349 | return ep; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 350 | } |
| 351 | |
| 352 | /* |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 353 | * Hacked up version of lookdict which can assume keys are always strings; |
| 354 | * this assumption allows testing for errors during PyObject_Compare() to |
| 355 | * be dropped; string-string comparisons never raise exceptions. This also |
| 356 | * means we don't need to go through PyObject_Compare(); we can always use |
Martin v. Löwis | cd35306 | 2001-05-24 16:56:35 +0000 | [diff] [blame] | 357 | * _PyString_Eq directly. |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 358 | * |
| 359 | * This really only becomes meaningful if proper error handling in lookdict() |
| 360 | * is too expensive. |
| 361 | */ |
| 362 | static dictentry * |
| 363 | lookdict_string(dictobject *mp, PyObject *key, register long hash) |
| 364 | { |
| 365 | register int i; |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 366 | register unsigned int perturb; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 367 | register dictentry *freeslot; |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 368 | register unsigned int mask = mp->ma_mask; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 369 | dictentry *ep0 = mp->ma_table; |
| 370 | register dictentry *ep; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 371 | |
| 372 | /* make sure this function doesn't have to handle non-string keys */ |
| 373 | if (!PyString_Check(key)) { |
| 374 | #ifdef SHOW_CONVERSION_COUNTS |
| 375 | ++converted; |
| 376 | #endif |
| 377 | mp->ma_lookup = lookdict; |
| 378 | return lookdict(mp, key, hash); |
| 379 | } |
Tim Peters | 2f228e7 | 2001-05-13 00:19:31 +0000 | [diff] [blame] | 380 | i = hash & mask; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 381 | ep = &ep0[i]; |
| 382 | if (ep->me_key == NULL || ep->me_key == key) |
| 383 | return ep; |
| 384 | if (ep->me_key == dummy) |
| 385 | freeslot = ep; |
| 386 | else { |
| 387 | if (ep->me_hash == hash |
Martin v. Löwis | cd35306 | 2001-05-24 16:56:35 +0000 | [diff] [blame] | 388 | && _PyString_Eq(ep->me_key, key)) { |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 389 | return ep; |
| 390 | } |
| 391 | freeslot = NULL; |
| 392 | } |
Tim Peters | 15d4929 | 2001-05-27 07:39:22 +0000 | [diff] [blame] | 393 | |
Tim Peters | 342c65e | 2001-05-13 06:43:53 +0000 | [diff] [blame] | 394 | /* In the loop, me_key == dummy is by far (factor of 100s) the |
| 395 | least likely outcome, so test for that last. */ |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 396 | for (perturb = hash; ; perturb >>= PERTURB_SHIFT) { |
| 397 | i = (i << 2) + i + perturb + 1; |
| 398 | ep = &ep0[i & mask]; |
Tim Peters | 342c65e | 2001-05-13 06:43:53 +0000 | [diff] [blame] | 399 | if (ep->me_key == NULL) |
| 400 | return freeslot == NULL ? ep : freeslot; |
| 401 | if (ep->me_key == key |
| 402 | || (ep->me_hash == hash |
| 403 | && ep->me_key != dummy |
Martin v. Löwis | cd35306 | 2001-05-24 16:56:35 +0000 | [diff] [blame] | 404 | && _PyString_Eq(ep->me_key, key))) |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 405 | return ep; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 406 | if (ep->me_key == dummy && freeslot == NULL) |
Tim Peters | 342c65e | 2001-05-13 06:43:53 +0000 | [diff] [blame] | 407 | freeslot = ep; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 408 | } |
| 409 | } |
| 410 | |
| 411 | /* |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 412 | Internal routine to insert a new item into the table. |
| 413 | Used both by the internal resize routine and by the public insert routine. |
| 414 | Eats a reference to key and one to value. |
| 415 | */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 416 | static void |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 417 | insertdict(register dictobject *mp, PyObject *key, long hash, PyObject *value) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 418 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 419 | PyObject *old_value; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 420 | register dictentry *ep; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 421 | ep = (mp->ma_lookup)(mp, key, hash); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 422 | if (ep->me_value != NULL) { |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 423 | old_value = ep->me_value; |
| 424 | ep->me_value = value; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 425 | Py_DECREF(old_value); /* which **CAN** re-enter */ |
| 426 | Py_DECREF(key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 427 | } |
| 428 | else { |
| 429 | if (ep->me_key == NULL) |
| 430 | mp->ma_fill++; |
| 431 | else |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 432 | Py_DECREF(ep->me_key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 433 | ep->me_key = key; |
| 434 | ep->me_hash = hash; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 435 | ep->me_value = value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 436 | mp->ma_used++; |
| 437 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 438 | } |
| 439 | |
| 440 | /* |
| 441 | Restructure the table by allocating a new table and reinserting all |
| 442 | items again. When entries have been deleted, the new table may |
| 443 | actually be smaller than the old one. |
| 444 | */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 445 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 446 | dictresize(dictobject *mp, int minused) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 447 | { |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 448 | int newsize; |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 449 | dictentry *oldtable, *newtable, *ep; |
| 450 | int i; |
| 451 | int is_oldtable_malloced; |
| 452 | dictentry small_copy[MINSIZE]; |
Tim Peters | 91a364d | 2001-05-19 07:04:38 +0000 | [diff] [blame] | 453 | |
| 454 | assert(minused >= 0); |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 455 | |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 456 | /* Find the smallest table size > minused. */ |
| 457 | for (newsize = MINSIZE; |
| 458 | newsize <= minused && newsize > 0; |
| 459 | newsize <<= 1) |
| 460 | ; |
| 461 | if (newsize <= 0) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 462 | PyErr_NoMemory(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 463 | return -1; |
| 464 | } |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 465 | |
| 466 | /* Get space for a new table. */ |
| 467 | oldtable = mp->ma_table; |
| 468 | assert(oldtable != NULL); |
| 469 | is_oldtable_malloced = oldtable != mp->ma_smalltable; |
| 470 | |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 471 | if (newsize == MINSIZE) { |
Tim Peters | f8a548c | 2001-05-24 16:26:40 +0000 | [diff] [blame] | 472 | /* A large table is shrinking, or we can't get any smaller. */ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 473 | newtable = mp->ma_smalltable; |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 474 | if (newtable == oldtable) { |
Tim Peters | f8a548c | 2001-05-24 16:26:40 +0000 | [diff] [blame] | 475 | if (mp->ma_fill == mp->ma_used) { |
| 476 | /* No dummies, so no point doing anything. */ |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 477 | return 0; |
Tim Peters | f8a548c | 2001-05-24 16:26:40 +0000 | [diff] [blame] | 478 | } |
| 479 | /* We're not going to resize it, but rebuild the |
| 480 | table anyway to purge old dummy entries. |
| 481 | Subtle: This is *necessary* if fill==size, |
| 482 | as lookdict needs at least one virgin slot to |
| 483 | terminate failing searches. If fill < size, it's |
| 484 | merely desirable, as dummies slow searches. */ |
| 485 | assert(mp->ma_fill > mp->ma_used); |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 486 | memcpy(small_copy, oldtable, sizeof(small_copy)); |
| 487 | oldtable = small_copy; |
| 488 | } |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 489 | } |
| 490 | else { |
| 491 | newtable = PyMem_NEW(dictentry, newsize); |
| 492 | if (newtable == NULL) { |
| 493 | PyErr_NoMemory(); |
| 494 | return -1; |
| 495 | } |
| 496 | } |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 497 | |
| 498 | /* Make the dict empty, using the new table. */ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 499 | assert(newtable != oldtable); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 500 | mp->ma_table = newtable; |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 501 | mp->ma_mask = newsize - 1; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 502 | memset(newtable, 0, sizeof(dictentry) * newsize); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 503 | mp->ma_used = 0; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 504 | i = mp->ma_fill; |
| 505 | mp->ma_fill = 0; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 506 | |
Tim Peters | 1928314 | 2001-05-17 22:25:34 +0000 | [diff] [blame] | 507 | /* Copy the data over; this is refcount-neutral for active entries; |
| 508 | dummy entries aren't copied over, of course */ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 509 | for (ep = oldtable; i > 0; ep++) { |
| 510 | if (ep->me_value != NULL) { /* active entry */ |
| 511 | --i; |
Tim Peters | 1928314 | 2001-05-17 22:25:34 +0000 | [diff] [blame] | 512 | insertdict(mp, ep->me_key, ep->me_hash, ep->me_value); |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 513 | } |
Tim Peters | 1928314 | 2001-05-17 22:25:34 +0000 | [diff] [blame] | 514 | else if (ep->me_key != NULL) { /* dummy entry */ |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 515 | --i; |
Tim Peters | 1928314 | 2001-05-17 22:25:34 +0000 | [diff] [blame] | 516 | assert(ep->me_key == dummy); |
| 517 | Py_DECREF(ep->me_key); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 518 | } |
Tim Peters | 1928314 | 2001-05-17 22:25:34 +0000 | [diff] [blame] | 519 | /* else key == value == NULL: nothing to do */ |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 520 | } |
| 521 | |
Tim Peters | 0c6010b | 2001-05-23 23:33:57 +0000 | [diff] [blame] | 522 | if (is_oldtable_malloced) |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 523 | PyMem_DEL(oldtable); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 524 | return 0; |
| 525 | } |
| 526 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 527 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 528 | PyDict_GetItem(PyObject *op, PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 529 | { |
| 530 | long hash; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 531 | dictobject *mp = (dictobject *)op; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 532 | if (!PyDict_Check(op)) { |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 533 | return NULL; |
| 534 | } |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 535 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 536 | if (!PyString_Check(key) || |
| 537 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 538 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 539 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 540 | hash = PyObject_Hash(key); |
Guido van Rossum | 474b19e | 1998-05-14 01:00:51 +0000 | [diff] [blame] | 541 | if (hash == -1) { |
| 542 | PyErr_Clear(); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 543 | return NULL; |
Guido van Rossum | 474b19e | 1998-05-14 01:00:51 +0000 | [diff] [blame] | 544 | } |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 545 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 546 | return (mp->ma_lookup)(mp, key, hash)->me_value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 547 | } |
| 548 | |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 549 | /* CAUTION: PyDict_SetItem() must guarantee that it won't resize the |
| 550 | * dictionary if it is merely replacing the value for an existing key. |
| 551 | * This is means that it's safe to loop over a dictionary with |
| 552 | * PyDict_Next() and occasionally replace a value -- but you can't |
| 553 | * insert new keys or remove them. |
| 554 | */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 555 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 556 | PyDict_SetItem(register PyObject *op, PyObject *key, PyObject *value) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 557 | { |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 558 | register dictobject *mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 559 | register long hash; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 560 | register int n_used; |
| 561 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 562 | if (!PyDict_Check(op)) { |
| 563 | PyErr_BadInternalCall(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 564 | return -1; |
| 565 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 566 | mp = (dictobject *)op; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 567 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 568 | if (PyString_Check(key)) { |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 569 | #ifdef INTERN_STRINGS |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 570 | if (((PyStringObject *)key)->ob_sinterned != NULL) { |
| 571 | key = ((PyStringObject *)key)->ob_sinterned; |
| 572 | hash = ((PyStringObject *)key)->ob_shash; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 573 | } |
| 574 | else |
| 575 | #endif |
| 576 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 577 | hash = ((PyStringObject *)key)->ob_shash; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 578 | if (hash == -1) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 579 | hash = PyObject_Hash(key); |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 580 | } |
| 581 | } |
| 582 | else |
| 583 | #endif |
| 584 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 585 | hash = PyObject_Hash(key); |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 586 | if (hash == -1) |
| 587 | return -1; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 588 | } |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 589 | assert(mp->ma_fill <= mp->ma_mask); /* at least one empty slot */ |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 590 | n_used = mp->ma_used; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 591 | Py_INCREF(value); |
| 592 | Py_INCREF(key); |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 593 | insertdict(mp, key, hash, value); |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 594 | /* If we added a key, we can safely resize. Otherwise skip this! |
| 595 | * If fill >= 2/3 size, adjust size. Normally, this doubles the |
| 596 | * size, but it's also possible for the dict to shrink (if ma_fill is |
| 597 | * much larger than ma_used, meaning a lot of dict keys have been |
| 598 | * deleted). |
| 599 | */ |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 600 | if (mp->ma_used > n_used && mp->ma_fill*3 >= (mp->ma_mask+1)*2) { |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 601 | if (dictresize(mp, mp->ma_used*2) != 0) |
| 602 | return -1; |
| 603 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 604 | return 0; |
| 605 | } |
| 606 | |
| 607 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 608 | PyDict_DelItem(PyObject *op, PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 609 | { |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 610 | register dictobject *mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 611 | register long hash; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 612 | register dictentry *ep; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 613 | PyObject *old_value, *old_key; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 614 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 615 | if (!PyDict_Check(op)) { |
| 616 | PyErr_BadInternalCall(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 617 | return -1; |
| 618 | } |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 619 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 620 | if (!PyString_Check(key) || |
| 621 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 622 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 623 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 624 | hash = PyObject_Hash(key); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 625 | if (hash == -1) |
| 626 | return -1; |
| 627 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 628 | mp = (dictobject *)op; |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 629 | ep = (mp->ma_lookup)(mp, key, hash); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 630 | if (ep->me_value == NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 631 | PyErr_SetObject(PyExc_KeyError, key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 632 | return -1; |
| 633 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 634 | old_key = ep->me_key; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 635 | Py_INCREF(dummy); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 636 | ep->me_key = dummy; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 637 | old_value = ep->me_value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 638 | ep->me_value = NULL; |
| 639 | mp->ma_used--; |
Tim Peters | ea8f2bf | 2000-12-13 01:02:46 +0000 | [diff] [blame] | 640 | Py_DECREF(old_value); |
| 641 | Py_DECREF(old_key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 642 | return 0; |
| 643 | } |
| 644 | |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 645 | void |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 646 | PyDict_Clear(PyObject *op) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 647 | { |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 648 | dictobject *mp; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 649 | dictentry *ep, *table; |
| 650 | int table_is_malloced; |
| 651 | int fill; |
| 652 | dictentry small_copy[MINSIZE]; |
| 653 | #ifdef Py_DEBUG |
| 654 | int i, n; |
| 655 | #endif |
| 656 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 657 | if (!PyDict_Check(op)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 658 | return; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 659 | mp = (dictobject *)op; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 660 | #ifdef Py_DEBUG |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 661 | n = mp->ma_mask + 1; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 662 | i = 0; |
| 663 | #endif |
| 664 | |
| 665 | table = mp->ma_table; |
| 666 | assert(table != NULL); |
| 667 | table_is_malloced = table != mp->ma_smalltable; |
| 668 | |
| 669 | /* This is delicate. During the process of clearing the dict, |
| 670 | * decrefs can cause the dict to mutate. To avoid fatal confusion |
| 671 | * (voice of experience), we have to make the dict empty before |
| 672 | * clearing the slots, and never refer to anything via mp->xxx while |
| 673 | * clearing. |
| 674 | */ |
| 675 | fill = mp->ma_fill; |
| 676 | if (table_is_malloced) |
| 677 | empty_to_minsize(mp); |
| 678 | |
| 679 | else if (fill > 0) { |
| 680 | /* It's a small table with something that needs to be cleared. |
| 681 | * Afraid the only safe way is to copy the dict entries into |
| 682 | * another small table first. |
| 683 | */ |
| 684 | memcpy(small_copy, table, sizeof(small_copy)); |
| 685 | table = small_copy; |
| 686 | empty_to_minsize(mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 687 | } |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 688 | /* else it's a small table that's already empty */ |
| 689 | |
| 690 | /* Now we can finally clear things. If C had refcounts, we could |
| 691 | * assert that the refcount on table is 1 now, i.e. that this function |
| 692 | * has unique access to it, so decref side-effects can't alter it. |
| 693 | */ |
| 694 | for (ep = table; fill > 0; ++ep) { |
| 695 | #ifdef Py_DEBUG |
| 696 | assert(i < n); |
| 697 | ++i; |
| 698 | #endif |
| 699 | if (ep->me_key) { |
| 700 | --fill; |
| 701 | Py_DECREF(ep->me_key); |
| 702 | Py_XDECREF(ep->me_value); |
| 703 | } |
| 704 | #ifdef Py_DEBUG |
| 705 | else |
| 706 | assert(ep->me_value == NULL); |
| 707 | #endif |
| 708 | } |
| 709 | |
| 710 | if (table_is_malloced) |
| 711 | PyMem_DEL(table); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 712 | } |
| 713 | |
Tim Peters | 6783070 | 2001-03-21 19:23:56 +0000 | [diff] [blame] | 714 | /* CAUTION: In general, it isn't safe to use PyDict_Next in a loop that |
| 715 | * mutates the dict. One exception: it is safe if the loop merely changes |
| 716 | * the values associated with the keys (but doesn't insert new keys or |
| 717 | * delete keys), via PyDict_SetItem(). |
| 718 | */ |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 719 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 720 | PyDict_Next(PyObject *op, int *ppos, PyObject **pkey, PyObject **pvalue) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 721 | { |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 722 | int i; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 723 | register dictobject *mp; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 724 | if (!PyDict_Check(op)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 725 | return 0; |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 726 | mp = (dictobject *)op; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 727 | i = *ppos; |
| 728 | if (i < 0) |
| 729 | return 0; |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 730 | while (i <= mp->ma_mask && mp->ma_table[i].me_value == NULL) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 731 | i++; |
| 732 | *ppos = i+1; |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 733 | if (i > mp->ma_mask) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 734 | return 0; |
| 735 | if (pkey) |
| 736 | *pkey = mp->ma_table[i].me_key; |
| 737 | if (pvalue) |
| 738 | *pvalue = mp->ma_table[i].me_value; |
| 739 | return 1; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 740 | } |
| 741 | |
| 742 | /* Methods */ |
| 743 | |
| 744 | static void |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 745 | dict_dealloc(register dictobject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 746 | { |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 747 | register dictentry *ep; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 748 | int fill = mp->ma_fill; |
Guido van Rossum | d724b23 | 2000-03-13 16:01:29 +0000 | [diff] [blame] | 749 | Py_TRASHCAN_SAFE_BEGIN(mp) |
Jeremy Hylton | c5007aa | 2000-06-30 05:02:53 +0000 | [diff] [blame] | 750 | PyObject_GC_Fini(mp); |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 751 | for (ep = mp->ma_table; fill > 0; ep++) { |
| 752 | if (ep->me_key) { |
| 753 | --fill; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 754 | Py_DECREF(ep->me_key); |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 755 | Py_XDECREF(ep->me_value); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 756 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 757 | } |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 758 | if (mp->ma_table != mp->ma_smalltable) |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 759 | PyMem_DEL(mp->ma_table); |
Guido van Rossum | 4cc6ac7 | 2000-07-01 01:00:38 +0000 | [diff] [blame] | 760 | mp = (dictobject *) PyObject_AS_GC(mp); |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 761 | PyObject_DEL(mp); |
Guido van Rossum | d724b23 | 2000-03-13 16:01:29 +0000 | [diff] [blame] | 762 | Py_TRASHCAN_SAFE_END(mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 763 | } |
| 764 | |
| 765 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 766 | dict_print(register dictobject *mp, register FILE *fp, register int flags) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 767 | { |
| 768 | register int i; |
| 769 | register int any; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 770 | |
| 771 | i = Py_ReprEnter((PyObject*)mp); |
| 772 | if (i != 0) { |
| 773 | if (i < 0) |
| 774 | return i; |
| 775 | fprintf(fp, "{...}"); |
| 776 | return 0; |
| 777 | } |
| 778 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 779 | fprintf(fp, "{"); |
| 780 | any = 0; |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 781 | for (i = 0; i <= mp->ma_mask; i++) { |
Tim Peters | 23cf6be | 2001-06-02 08:02:56 +0000 | [diff] [blame] | 782 | dictentry *ep = mp->ma_table + i; |
| 783 | PyObject *pvalue = ep->me_value; |
| 784 | if (pvalue != NULL) { |
| 785 | /* Prevent PyObject_Repr from deleting value during |
| 786 | key format */ |
| 787 | Py_INCREF(pvalue); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 788 | if (any++ > 0) |
| 789 | fprintf(fp, ", "); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 790 | if (PyObject_Print((PyObject *)ep->me_key, fp, 0)!=0) { |
Tim Peters | 23cf6be | 2001-06-02 08:02:56 +0000 | [diff] [blame] | 791 | Py_DECREF(pvalue); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 792 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 793 | return -1; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 794 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 795 | fprintf(fp, ": "); |
Tim Peters | 19b77cf | 2001-06-02 08:27:39 +0000 | [diff] [blame] | 796 | if (PyObject_Print(pvalue, fp, 0) != 0) { |
Tim Peters | 23cf6be | 2001-06-02 08:02:56 +0000 | [diff] [blame] | 797 | Py_DECREF(pvalue); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 798 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 799 | return -1; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 800 | } |
Tim Peters | 23cf6be | 2001-06-02 08:02:56 +0000 | [diff] [blame] | 801 | Py_DECREF(pvalue); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 802 | } |
| 803 | } |
| 804 | fprintf(fp, "}"); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 805 | Py_ReprLeave((PyObject*)mp); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 806 | return 0; |
| 807 | } |
| 808 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 809 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 810 | dict_repr(dictobject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 811 | { |
Tim Peters | c605784 | 2001-06-16 07:52:53 +0000 | [diff] [blame] | 812 | int i; |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 813 | PyObject *s, *temp, *colon = NULL; |
| 814 | PyObject *pieces = NULL, *result = NULL; |
| 815 | PyObject *key, *value; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 816 | |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 817 | i = Py_ReprEnter((PyObject *)mp); |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 818 | if (i != 0) { |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 819 | return i > 0 ? PyString_FromString("{...}") : NULL; |
Guido van Rossum | 255443b | 1998-04-10 22:47:14 +0000 | [diff] [blame] | 820 | } |
| 821 | |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 822 | if (mp->ma_used == 0) { |
| 823 | result = PyString_FromString("{}"); |
| 824 | goto Done; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 825 | } |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 826 | |
| 827 | pieces = PyList_New(0); |
| 828 | if (pieces == NULL) |
| 829 | goto Done; |
| 830 | |
| 831 | colon = PyString_FromString(": "); |
| 832 | if (colon == NULL) |
| 833 | goto Done; |
| 834 | |
| 835 | /* Do repr() on each key+value pair, and insert ": " between them. |
| 836 | Note that repr may mutate the dict. */ |
Tim Peters | c605784 | 2001-06-16 07:52:53 +0000 | [diff] [blame] | 837 | i = 0; |
| 838 | while (PyDict_Next((PyObject *)mp, &i, &key, &value)) { |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 839 | int status; |
| 840 | /* Prevent repr from deleting value during key format. */ |
| 841 | Py_INCREF(value); |
| 842 | s = PyObject_Repr(key); |
| 843 | PyString_Concat(&s, colon); |
| 844 | PyString_ConcatAndDel(&s, PyObject_Repr(value)); |
| 845 | Py_DECREF(value); |
| 846 | if (s == NULL) |
| 847 | goto Done; |
| 848 | status = PyList_Append(pieces, s); |
| 849 | Py_DECREF(s); /* append created a new ref */ |
| 850 | if (status < 0) |
| 851 | goto Done; |
| 852 | } |
| 853 | |
| 854 | /* Add "{}" decorations to the first and last items. */ |
| 855 | assert(PyList_GET_SIZE(pieces) > 0); |
| 856 | s = PyString_FromString("{"); |
| 857 | if (s == NULL) |
| 858 | goto Done; |
| 859 | temp = PyList_GET_ITEM(pieces, 0); |
| 860 | PyString_ConcatAndDel(&s, temp); |
| 861 | PyList_SET_ITEM(pieces, 0, s); |
| 862 | if (s == NULL) |
| 863 | goto Done; |
| 864 | |
| 865 | s = PyString_FromString("}"); |
| 866 | if (s == NULL) |
| 867 | goto Done; |
| 868 | temp = PyList_GET_ITEM(pieces, PyList_GET_SIZE(pieces) - 1); |
| 869 | PyString_ConcatAndDel(&temp, s); |
| 870 | PyList_SET_ITEM(pieces, PyList_GET_SIZE(pieces) - 1, temp); |
| 871 | if (temp == NULL) |
| 872 | goto Done; |
| 873 | |
| 874 | /* Paste them all together with ", " between. */ |
| 875 | s = PyString_FromString(", "); |
| 876 | if (s == NULL) |
| 877 | goto Done; |
| 878 | result = _PyString_Join(s, pieces); |
| 879 | Py_DECREF(s); |
| 880 | |
| 881 | Done: |
| 882 | Py_XDECREF(pieces); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 883 | Py_XDECREF(colon); |
Tim Peters | a725959 | 2001-06-16 05:11:17 +0000 | [diff] [blame] | 884 | Py_ReprLeave((PyObject *)mp); |
| 885 | return result; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 886 | } |
| 887 | |
| 888 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 889 | dict_length(dictobject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 890 | { |
| 891 | return mp->ma_used; |
| 892 | } |
| 893 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 894 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 895 | dict_subscript(dictobject *mp, register PyObject *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 896 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 897 | PyObject *v; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 898 | long hash; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 899 | assert(mp->ma_table != NULL); |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 900 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 901 | if (!PyString_Check(key) || |
| 902 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 903 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 904 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 905 | hash = PyObject_Hash(key); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 906 | if (hash == -1) |
| 907 | return NULL; |
| 908 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 909 | v = (mp->ma_lookup)(mp, key, hash) -> me_value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 910 | if (v == NULL) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 911 | PyErr_SetObject(PyExc_KeyError, key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 912 | else |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 913 | Py_INCREF(v); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 914 | return v; |
| 915 | } |
| 916 | |
| 917 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 918 | dict_ass_sub(dictobject *mp, PyObject *v, PyObject *w) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 919 | { |
| 920 | if (w == NULL) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 921 | return PyDict_DelItem((PyObject *)mp, v); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 922 | else |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 923 | return PyDict_SetItem((PyObject *)mp, v, w); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 924 | } |
| 925 | |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 926 | static PyMappingMethods dict_as_mapping = { |
| 927 | (inquiry)dict_length, /*mp_length*/ |
| 928 | (binaryfunc)dict_subscript, /*mp_subscript*/ |
| 929 | (objobjargproc)dict_ass_sub, /*mp_ass_subscript*/ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 930 | }; |
| 931 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 932 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 933 | dict_keys(register dictobject *mp, PyObject *args) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 934 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 935 | register PyObject *v; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 936 | register int i, j, n; |
| 937 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 938 | if (!PyArg_NoArgs(args)) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 939 | return NULL; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 940 | again: |
| 941 | n = mp->ma_used; |
| 942 | v = PyList_New(n); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 943 | if (v == NULL) |
| 944 | return NULL; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 945 | if (n != mp->ma_used) { |
| 946 | /* Durnit. The allocations caused the dict to resize. |
| 947 | * Just start over, this shouldn't normally happen. |
| 948 | */ |
| 949 | Py_DECREF(v); |
| 950 | goto again; |
| 951 | } |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 952 | for (i = 0, j = 0; i <= mp->ma_mask; i++) { |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 953 | if (mp->ma_table[i].me_value != NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 954 | PyObject *key = mp->ma_table[i].me_key; |
| 955 | Py_INCREF(key); |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 956 | PyList_SET_ITEM(v, j, key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 957 | j++; |
| 958 | } |
| 959 | } |
| 960 | return v; |
| 961 | } |
| 962 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 963 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 964 | dict_values(register dictobject *mp, PyObject *args) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 965 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 966 | register PyObject *v; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 967 | register int i, j, n; |
| 968 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 969 | if (!PyArg_NoArgs(args)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 970 | return NULL; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 971 | again: |
| 972 | n = mp->ma_used; |
| 973 | v = PyList_New(n); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 974 | if (v == NULL) |
| 975 | return NULL; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 976 | if (n != mp->ma_used) { |
| 977 | /* Durnit. The allocations caused the dict to resize. |
| 978 | * Just start over, this shouldn't normally happen. |
| 979 | */ |
| 980 | Py_DECREF(v); |
| 981 | goto again; |
| 982 | } |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 983 | for (i = 0, j = 0; i <= mp->ma_mask; i++) { |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 984 | if (mp->ma_table[i].me_value != NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 985 | PyObject *value = mp->ma_table[i].me_value; |
| 986 | Py_INCREF(value); |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 987 | PyList_SET_ITEM(v, j, value); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 988 | j++; |
| 989 | } |
| 990 | } |
| 991 | return v; |
| 992 | } |
| 993 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 994 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 995 | dict_items(register dictobject *mp, PyObject *args) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 996 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 997 | register PyObject *v; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 998 | register int i, j, n; |
| 999 | PyObject *item, *key, *value; |
| 1000 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1001 | if (!PyArg_NoArgs(args)) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1002 | return NULL; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1003 | /* Preallocate the list of tuples, to avoid allocations during |
| 1004 | * the loop over the items, which could trigger GC, which |
| 1005 | * could resize the dict. :-( |
| 1006 | */ |
| 1007 | again: |
| 1008 | n = mp->ma_used; |
| 1009 | v = PyList_New(n); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1010 | if (v == NULL) |
| 1011 | return NULL; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1012 | for (i = 0; i < n; i++) { |
| 1013 | item = PyTuple_New(2); |
| 1014 | if (item == NULL) { |
| 1015 | Py_DECREF(v); |
| 1016 | return NULL; |
| 1017 | } |
| 1018 | PyList_SET_ITEM(v, i, item); |
| 1019 | } |
| 1020 | if (n != mp->ma_used) { |
| 1021 | /* Durnit. The allocations caused the dict to resize. |
| 1022 | * Just start over, this shouldn't normally happen. |
| 1023 | */ |
| 1024 | Py_DECREF(v); |
| 1025 | goto again; |
| 1026 | } |
| 1027 | /* Nothing we do below makes any function calls. */ |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 1028 | for (i = 0, j = 0; i <= mp->ma_mask; i++) { |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1029 | if (mp->ma_table[i].me_value != NULL) { |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1030 | key = mp->ma_table[i].me_key; |
| 1031 | value = mp->ma_table[i].me_value; |
| 1032 | item = PyList_GET_ITEM(v, j); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1033 | Py_INCREF(key); |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1034 | PyTuple_SET_ITEM(item, 0, key); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1035 | Py_INCREF(value); |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1036 | PyTuple_SET_ITEM(item, 1, value); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1037 | j++; |
| 1038 | } |
| 1039 | } |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1040 | assert(j == n); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1041 | return v; |
| 1042 | } |
| 1043 | |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1044 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1045 | dict_update(register dictobject *mp, PyObject *args) |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1046 | { |
| 1047 | register int i; |
| 1048 | dictobject *other; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1049 | dictentry *entry; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1050 | PyObject *param; |
| 1051 | /* We accept for the argument either a concrete dictionary object, |
| 1052 | * or an abstract "mapping" object. For the former, we can do |
| 1053 | * things quite efficiently. For the latter, we only require that |
| 1054 | * PyMapping_Keys() and PyObject_GetItem() be supported. |
| 1055 | */ |
| 1056 | if (!PyArg_ParseTuple(args, "O:update", ¶m)) |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1057 | return NULL; |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1058 | |
| 1059 | if (PyDict_Check(param)) { |
| 1060 | other = (dictobject*)param; |
| 1061 | if (other == mp || other->ma_used == 0) |
| 1062 | /* a.update(a) or a.update({}); nothing to do */ |
| 1063 | goto done; |
| 1064 | /* Do one big resize at the start, rather than |
| 1065 | * incrementally resizing as we insert new items. Expect |
| 1066 | * that there will be no (or few) overlapping keys. |
| 1067 | */ |
| 1068 | if ((mp->ma_fill + other->ma_used)*3 >= (mp->ma_mask+1)*2) { |
| 1069 | if (dictresize(mp, (mp->ma_used + other->ma_used)*3/2) != 0) |
| 1070 | return NULL; |
| 1071 | } |
| 1072 | for (i = 0; i <= other->ma_mask; i++) { |
| 1073 | entry = &other->ma_table[i]; |
| 1074 | if (entry->me_value != NULL) { |
| 1075 | Py_INCREF(entry->me_key); |
| 1076 | Py_INCREF(entry->me_value); |
| 1077 | insertdict(mp, entry->me_key, entry->me_hash, |
| 1078 | entry->me_value); |
| 1079 | } |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1080 | } |
| 1081 | } |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1082 | else { |
| 1083 | /* Do it the generic, slower way */ |
| 1084 | PyObject *keys = PyMapping_Keys(param); |
| 1085 | PyObject *iter; |
| 1086 | PyObject *key, *value; |
| 1087 | int status; |
| 1088 | |
| 1089 | if (keys == NULL) |
| 1090 | /* Docstring says this is equivalent to E.keys() so |
| 1091 | * if E doesn't have a .keys() method we want |
| 1092 | * AttributeError to percolate up. Might as well |
| 1093 | * do the same for any other error. |
| 1094 | */ |
| 1095 | return NULL; |
| 1096 | |
| 1097 | iter = PyObject_GetIter(keys); |
| 1098 | Py_DECREF(keys); |
| 1099 | if (iter == NULL) |
| 1100 | return NULL; |
| 1101 | |
| 1102 | for (key = PyIter_Next(iter); key; key = PyIter_Next(iter)) { |
| 1103 | value = PyObject_GetItem(param, key); |
| 1104 | if (value == NULL) { |
| 1105 | Py_DECREF(iter); |
| 1106 | Py_DECREF(key); |
| 1107 | return NULL; |
| 1108 | } |
| 1109 | status = PyDict_SetItem((PyObject*)mp, key, value); |
| 1110 | Py_DECREF(key); |
| 1111 | Py_DECREF(value); |
| 1112 | if (status < 0) { |
| 1113 | Py_DECREF(iter); |
| 1114 | return NULL; |
| 1115 | } |
| 1116 | } |
| 1117 | Py_DECREF(iter); |
| 1118 | if (PyErr_Occurred()) |
| 1119 | /* Iterator completed, via error */ |
| 1120 | return NULL; |
| 1121 | } |
| 1122 | |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1123 | done: |
| 1124 | Py_INCREF(Py_None); |
| 1125 | return Py_None; |
| 1126 | } |
| 1127 | |
| 1128 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1129 | dict_copy(register dictobject *mp, PyObject *args) |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1130 | { |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 1131 | if (!PyArg_Parse(args, "")) |
| 1132 | return NULL; |
| 1133 | return PyDict_Copy((PyObject*)mp); |
| 1134 | } |
| 1135 | |
| 1136 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1137 | PyDict_Copy(PyObject *o) |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 1138 | { |
| 1139 | register dictobject *mp; |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1140 | register int i; |
| 1141 | dictobject *copy; |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1142 | dictentry *entry; |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 1143 | |
| 1144 | if (o == NULL || !PyDict_Check(o)) { |
| 1145 | PyErr_BadInternalCall(); |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1146 | return NULL; |
Jeremy Hylton | a12c7a7 | 2000-03-30 22:27:31 +0000 | [diff] [blame] | 1147 | } |
| 1148 | mp = (dictobject *)o; |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1149 | copy = (dictobject *)PyDict_New(); |
| 1150 | if (copy == NULL) |
| 1151 | return NULL; |
| 1152 | if (mp->ma_used > 0) { |
| 1153 | if (dictresize(copy, mp->ma_used*3/2) != 0) |
| 1154 | return NULL; |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 1155 | for (i = 0; i <= mp->ma_mask; i++) { |
Guido van Rossum | e3f5b9c | 1997-05-28 19:15:28 +0000 | [diff] [blame] | 1156 | entry = &mp->ma_table[i]; |
| 1157 | if (entry->me_value != NULL) { |
| 1158 | Py_INCREF(entry->me_key); |
| 1159 | Py_INCREF(entry->me_value); |
| 1160 | insertdict(copy, entry->me_key, entry->me_hash, |
| 1161 | entry->me_value); |
| 1162 | } |
| 1163 | } |
| 1164 | } |
| 1165 | return (PyObject *)copy; |
| 1166 | } |
| 1167 | |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 1168 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1169 | PyDict_Size(PyObject *mp) |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 1170 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1171 | if (mp == NULL || !PyDict_Check(mp)) { |
| 1172 | PyErr_BadInternalCall(); |
Guido van Rossum | b376a4a | 1993-11-23 17:53:17 +0000 | [diff] [blame] | 1173 | return 0; |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 1174 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1175 | return ((dictobject *)mp)->ma_used; |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 1176 | } |
| 1177 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1178 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1179 | PyDict_Keys(PyObject *mp) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1180 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1181 | if (mp == NULL || !PyDict_Check(mp)) { |
| 1182 | PyErr_BadInternalCall(); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1183 | return NULL; |
| 1184 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1185 | return dict_keys((dictobject *)mp, (PyObject *)NULL); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1186 | } |
| 1187 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1188 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1189 | PyDict_Values(PyObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1190 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1191 | if (mp == NULL || !PyDict_Check(mp)) { |
| 1192 | PyErr_BadInternalCall(); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1193 | return NULL; |
| 1194 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1195 | return dict_values((dictobject *)mp, (PyObject *)NULL); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1196 | } |
| 1197 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1198 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1199 | PyDict_Items(PyObject *mp) |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1200 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1201 | if (mp == NULL || !PyDict_Check(mp)) { |
| 1202 | PyErr_BadInternalCall(); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1203 | return NULL; |
| 1204 | } |
Guido van Rossum | a9e7a81 | 1997-05-13 21:02:11 +0000 | [diff] [blame] | 1205 | return dict_items((dictobject *)mp, (PyObject *)NULL); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 1206 | } |
| 1207 | |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1208 | /* Subroutine which returns the smallest key in a for which b's value |
| 1209 | is different or absent. The value is returned too, through the |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1210 | pval argument. Both are NULL if no key in a is found for which b's status |
| 1211 | differs. The refcounts on (and only on) non-NULL *pval and function return |
| 1212 | values must be decremented by the caller (characterize() increments them |
| 1213 | to ensure that mutating comparison and PyDict_GetItem calls can't delete |
| 1214 | them before the caller is done looking at them). */ |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1215 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1216 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1217 | characterize(dictobject *a, dictobject *b, PyObject **pval) |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1218 | { |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1219 | PyObject *akey = NULL; /* smallest key in a s.t. a[akey] != b[akey] */ |
| 1220 | PyObject *aval = NULL; /* a[akey] */ |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 1221 | int i, cmp; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1222 | |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 1223 | for (i = 0; i <= a->ma_mask; i++) { |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1224 | PyObject *thiskey, *thisaval, *thisbval; |
| 1225 | if (a->ma_table[i].me_value == NULL) |
| 1226 | continue; |
| 1227 | thiskey = a->ma_table[i].me_key; |
| 1228 | Py_INCREF(thiskey); /* keep alive across compares */ |
| 1229 | if (akey != NULL) { |
| 1230 | cmp = PyObject_RichCompareBool(akey, thiskey, Py_LT); |
| 1231 | if (cmp < 0) { |
| 1232 | Py_DECREF(thiskey); |
| 1233 | goto Fail; |
| 1234 | } |
| 1235 | if (cmp > 0 || |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 1236 | i > a->ma_mask || |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1237 | a->ma_table[i].me_value == NULL) |
| 1238 | { |
| 1239 | /* Not the *smallest* a key; or maybe it is |
| 1240 | * but the compare shrunk the dict so we can't |
| 1241 | * find its associated value anymore; or |
| 1242 | * maybe it is but the compare deleted the |
| 1243 | * a[thiskey] entry. |
| 1244 | */ |
| 1245 | Py_DECREF(thiskey); |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1246 | continue; |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 1247 | } |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1248 | } |
| 1249 | |
| 1250 | /* Compare a[thiskey] to b[thiskey]; cmp <- true iff equal. */ |
| 1251 | thisaval = a->ma_table[i].me_value; |
| 1252 | assert(thisaval); |
| 1253 | Py_INCREF(thisaval); /* keep alive */ |
| 1254 | thisbval = PyDict_GetItem((PyObject *)b, thiskey); |
| 1255 | if (thisbval == NULL) |
| 1256 | cmp = 0; |
| 1257 | else { |
| 1258 | /* both dicts have thiskey: same values? */ |
| 1259 | cmp = PyObject_RichCompareBool( |
| 1260 | thisaval, thisbval, Py_EQ); |
| 1261 | if (cmp < 0) { |
| 1262 | Py_DECREF(thiskey); |
| 1263 | Py_DECREF(thisaval); |
| 1264 | goto Fail; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1265 | } |
| 1266 | } |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1267 | if (cmp == 0) { |
| 1268 | /* New winner. */ |
| 1269 | Py_XDECREF(akey); |
| 1270 | Py_XDECREF(aval); |
| 1271 | akey = thiskey; |
| 1272 | aval = thisaval; |
| 1273 | } |
| 1274 | else { |
| 1275 | Py_DECREF(thiskey); |
| 1276 | Py_DECREF(thisaval); |
| 1277 | } |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1278 | } |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1279 | *pval = aval; |
| 1280 | return akey; |
| 1281 | |
| 1282 | Fail: |
| 1283 | Py_XDECREF(akey); |
| 1284 | Py_XDECREF(aval); |
| 1285 | *pval = NULL; |
| 1286 | return NULL; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1287 | } |
| 1288 | |
| 1289 | static int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1290 | dict_compare(dictobject *a, dictobject *b) |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1291 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1292 | PyObject *adiff, *bdiff, *aval, *bval; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1293 | int res; |
| 1294 | |
| 1295 | /* Compare lengths first */ |
| 1296 | if (a->ma_used < b->ma_used) |
| 1297 | return -1; /* a is shorter */ |
| 1298 | else if (a->ma_used > b->ma_used) |
| 1299 | return 1; /* b is shorter */ |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1300 | |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1301 | /* Same length -- check all keys */ |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1302 | bdiff = bval = NULL; |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1303 | adiff = characterize(a, b, &aval); |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1304 | if (adiff == NULL) { |
| 1305 | assert(!aval); |
Tim Peters | 3918fb2 | 2001-05-10 18:58:31 +0000 | [diff] [blame] | 1306 | /* Either an error, or a is a subset with the same length so |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1307 | * must be equal. |
| 1308 | */ |
| 1309 | res = PyErr_Occurred() ? -1 : 0; |
| 1310 | goto Finished; |
| 1311 | } |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1312 | bdiff = characterize(b, a, &bval); |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1313 | if (bdiff == NULL && PyErr_Occurred()) { |
| 1314 | assert(!bval); |
| 1315 | res = -1; |
| 1316 | goto Finished; |
| 1317 | } |
| 1318 | res = 0; |
| 1319 | if (bdiff) { |
| 1320 | /* bdiff == NULL "should be" impossible now, but perhaps |
| 1321 | * the last comparison done by the characterize() on a had |
| 1322 | * the side effect of making the dicts equal! |
| 1323 | */ |
| 1324 | res = PyObject_Compare(adiff, bdiff); |
| 1325 | } |
| 1326 | if (res == 0 && bval != NULL) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1327 | res = PyObject_Compare(aval, bval); |
Tim Peters | 95bf939 | 2001-05-10 08:32:44 +0000 | [diff] [blame] | 1328 | |
| 1329 | Finished: |
| 1330 | Py_XDECREF(adiff); |
| 1331 | Py_XDECREF(bdiff); |
| 1332 | Py_XDECREF(aval); |
| 1333 | Py_XDECREF(bval); |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 1334 | return res; |
| 1335 | } |
| 1336 | |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1337 | /* Return 1 if dicts equal, 0 if not, -1 if error. |
| 1338 | * Gets out as soon as any difference is detected. |
| 1339 | * Uses only Py_EQ comparison. |
| 1340 | */ |
| 1341 | static int |
| 1342 | dict_equal(dictobject *a, dictobject *b) |
| 1343 | { |
| 1344 | int i; |
| 1345 | |
| 1346 | if (a->ma_used != b->ma_used) |
| 1347 | /* can't be equal if # of entries differ */ |
| 1348 | return 0; |
Tim Peters | eb28ef2 | 2001-06-02 05:27:19 +0000 | [diff] [blame] | 1349 | |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1350 | /* Same # of entries -- check all of 'em. Exit early on any diff. */ |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 1351 | for (i = 0; i <= a->ma_mask; i++) { |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1352 | PyObject *aval = a->ma_table[i].me_value; |
| 1353 | if (aval != NULL) { |
| 1354 | int cmp; |
| 1355 | PyObject *bval; |
| 1356 | PyObject *key = a->ma_table[i].me_key; |
| 1357 | /* temporarily bump aval's refcount to ensure it stays |
| 1358 | alive until we're done with it */ |
| 1359 | Py_INCREF(aval); |
| 1360 | bval = PyDict_GetItem((PyObject *)b, key); |
| 1361 | if (bval == NULL) { |
| 1362 | Py_DECREF(aval); |
| 1363 | return 0; |
| 1364 | } |
| 1365 | cmp = PyObject_RichCompareBool(aval, bval, Py_EQ); |
| 1366 | Py_DECREF(aval); |
| 1367 | if (cmp <= 0) /* error or not equal */ |
| 1368 | return cmp; |
| 1369 | } |
| 1370 | } |
| 1371 | return 1; |
| 1372 | } |
| 1373 | |
| 1374 | static PyObject * |
| 1375 | dict_richcompare(PyObject *v, PyObject *w, int op) |
| 1376 | { |
| 1377 | int cmp; |
| 1378 | PyObject *res; |
| 1379 | |
| 1380 | if (!PyDict_Check(v) || !PyDict_Check(w)) { |
| 1381 | res = Py_NotImplemented; |
| 1382 | } |
| 1383 | else if (op == Py_EQ || op == Py_NE) { |
| 1384 | cmp = dict_equal((dictobject *)v, (dictobject *)w); |
| 1385 | if (cmp < 0) |
| 1386 | return NULL; |
| 1387 | res = (cmp == (op == Py_EQ)) ? Py_True : Py_False; |
| 1388 | } |
Tim Peters | 4fa58bf | 2001-05-10 21:45:19 +0000 | [diff] [blame] | 1389 | else |
| 1390 | res = Py_NotImplemented; |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1391 | Py_INCREF(res); |
| 1392 | return res; |
| 1393 | } |
| 1394 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1395 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1396 | dict_has_key(register dictobject *mp, PyObject *args) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1397 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1398 | PyObject *key; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1399 | long hash; |
| 1400 | register long ok; |
Fred Drake | 52fccfd | 2000-02-23 15:47:16 +0000 | [diff] [blame] | 1401 | if (!PyArg_ParseTuple(args, "O:has_key", &key)) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1402 | return NULL; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1403 | #ifdef CACHE_HASH |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1404 | if (!PyString_Check(key) || |
| 1405 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 1406 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1407 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1408 | hash = PyObject_Hash(key); |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 1409 | if (hash == -1) |
| 1410 | return NULL; |
| 1411 | } |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 1412 | ok = (mp->ma_lookup)(mp, key, hash)->me_value != NULL; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1413 | return PyInt_FromLong(ok); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1414 | } |
| 1415 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1416 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1417 | dict_get(register dictobject *mp, PyObject *args) |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1418 | { |
| 1419 | PyObject *key; |
Barry Warsaw | 320ac33 | 1997-10-20 17:26:25 +0000 | [diff] [blame] | 1420 | PyObject *failobj = Py_None; |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1421 | PyObject *val = NULL; |
| 1422 | long hash; |
| 1423 | |
Fred Drake | 52fccfd | 2000-02-23 15:47:16 +0000 | [diff] [blame] | 1424 | if (!PyArg_ParseTuple(args, "O|O:get", &key, &failobj)) |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1425 | return NULL; |
| 1426 | |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1427 | #ifdef CACHE_HASH |
| 1428 | if (!PyString_Check(key) || |
| 1429 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
| 1430 | #endif |
| 1431 | { |
| 1432 | hash = PyObject_Hash(key); |
| 1433 | if (hash == -1) |
| 1434 | return NULL; |
| 1435 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 1436 | val = (mp->ma_lookup)(mp, key, hash)->me_value; |
Barry Warsaw | 320ac33 | 1997-10-20 17:26:25 +0000 | [diff] [blame] | 1437 | |
Barry Warsaw | c38c5da | 1997-10-06 17:49:20 +0000 | [diff] [blame] | 1438 | if (val == NULL) |
| 1439 | val = failobj; |
| 1440 | Py_INCREF(val); |
| 1441 | return val; |
| 1442 | } |
| 1443 | |
| 1444 | |
| 1445 | static PyObject * |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1446 | dict_setdefault(register dictobject *mp, PyObject *args) |
| 1447 | { |
| 1448 | PyObject *key; |
| 1449 | PyObject *failobj = Py_None; |
| 1450 | PyObject *val = NULL; |
| 1451 | long hash; |
| 1452 | |
| 1453 | if (!PyArg_ParseTuple(args, "O|O:setdefault", &key, &failobj)) |
| 1454 | return NULL; |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1455 | |
| 1456 | #ifdef CACHE_HASH |
| 1457 | if (!PyString_Check(key) || |
| 1458 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
| 1459 | #endif |
| 1460 | { |
| 1461 | hash = PyObject_Hash(key); |
| 1462 | if (hash == -1) |
| 1463 | return NULL; |
| 1464 | } |
Fred Drake | 1bff34a | 2000-08-31 19:31:38 +0000 | [diff] [blame] | 1465 | val = (mp->ma_lookup)(mp, key, hash)->me_value; |
Guido van Rossum | 164452c | 2000-08-08 16:12:54 +0000 | [diff] [blame] | 1466 | if (val == NULL) { |
| 1467 | val = failobj; |
| 1468 | if (PyDict_SetItem((PyObject*)mp, key, failobj)) |
| 1469 | val = NULL; |
| 1470 | } |
| 1471 | Py_XINCREF(val); |
| 1472 | return val; |
| 1473 | } |
| 1474 | |
| 1475 | |
| 1476 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1477 | dict_clear(register dictobject *mp, PyObject *args) |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 1478 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1479 | if (!PyArg_NoArgs(args)) |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 1480 | return NULL; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1481 | PyDict_Clear((PyObject *)mp); |
| 1482 | Py_INCREF(Py_None); |
| 1483 | return Py_None; |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 1484 | } |
| 1485 | |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1486 | static PyObject * |
| 1487 | dict_popitem(dictobject *mp, PyObject *args) |
| 1488 | { |
| 1489 | int i = 0; |
| 1490 | dictentry *ep; |
| 1491 | PyObject *res; |
| 1492 | |
| 1493 | if (!PyArg_NoArgs(args)) |
| 1494 | return NULL; |
Tim Peters | f4b33f6 | 2001-06-02 05:42:29 +0000 | [diff] [blame] | 1495 | /* Allocate the result tuple before checking the size. Believe it |
| 1496 | * or not, this allocation could trigger a garbage collection which |
| 1497 | * could empty the dict, so if we checked the size first and that |
| 1498 | * happened, the result would be an infinite loop (searching for an |
| 1499 | * entry that no longer exists). Note that the usual popitem() |
| 1500 | * idiom is "while d: k, v = d.popitem()". so needing to throw the |
| 1501 | * tuple away if the dict *is* empty isn't a significant |
| 1502 | * inefficiency -- possible, but unlikely in practice. |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1503 | */ |
| 1504 | res = PyTuple_New(2); |
| 1505 | if (res == NULL) |
| 1506 | return NULL; |
Guido van Rossum | e04eaec | 2001-04-16 00:02:32 +0000 | [diff] [blame] | 1507 | if (mp->ma_used == 0) { |
| 1508 | Py_DECREF(res); |
| 1509 | PyErr_SetString(PyExc_KeyError, |
| 1510 | "popitem(): dictionary is empty"); |
| 1511 | return NULL; |
| 1512 | } |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1513 | /* Set ep to "the first" dict entry with a value. We abuse the hash |
| 1514 | * field of slot 0 to hold a search finger: |
| 1515 | * If slot 0 has a value, use slot 0. |
| 1516 | * Else slot 0 is being used to hold a search finger, |
| 1517 | * and we use its hash value as the first index to look. |
| 1518 | */ |
| 1519 | ep = &mp->ma_table[0]; |
| 1520 | if (ep->me_value == NULL) { |
| 1521 | i = (int)ep->me_hash; |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 1522 | /* The hash field may be a real hash value, or it may be a |
| 1523 | * legit search finger, or it may be a once-legit search |
| 1524 | * finger that's out of bounds now because it wrapped around |
| 1525 | * or the table shrunk -- simply make sure it's in bounds now. |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1526 | */ |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 1527 | if (i > mp->ma_mask || i < 1) |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1528 | i = 1; /* skip slot 0 */ |
| 1529 | while ((ep = &mp->ma_table[i])->me_value == NULL) { |
| 1530 | i++; |
Tim Peters | afb6ae8 | 2001-06-04 21:00:21 +0000 | [diff] [blame] | 1531 | if (i > mp->ma_mask) |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1532 | i = 1; |
| 1533 | } |
| 1534 | } |
Guido van Rossum | a4dd011 | 2001-04-15 22:16:26 +0000 | [diff] [blame] | 1535 | PyTuple_SET_ITEM(res, 0, ep->me_key); |
| 1536 | PyTuple_SET_ITEM(res, 1, ep->me_value); |
| 1537 | Py_INCREF(dummy); |
| 1538 | ep->me_key = dummy; |
| 1539 | ep->me_value = NULL; |
| 1540 | mp->ma_used--; |
| 1541 | assert(mp->ma_table[0].me_value == NULL); |
| 1542 | mp->ma_table[0].me_hash = i + 1; /* next place to start */ |
Guido van Rossum | ba6ab84 | 2000-12-12 22:02:18 +0000 | [diff] [blame] | 1543 | return res; |
| 1544 | } |
| 1545 | |
Jeremy Hylton | 8caad49 | 2000-06-23 14:18:11 +0000 | [diff] [blame] | 1546 | static int |
| 1547 | dict_traverse(PyObject *op, visitproc visit, void *arg) |
| 1548 | { |
| 1549 | int i = 0, err; |
| 1550 | PyObject *pk; |
| 1551 | PyObject *pv; |
| 1552 | |
| 1553 | while (PyDict_Next(op, &i, &pk, &pv)) { |
| 1554 | err = visit(pk, arg); |
| 1555 | if (err) |
| 1556 | return err; |
| 1557 | err = visit(pv, arg); |
| 1558 | if (err) |
| 1559 | return err; |
| 1560 | } |
| 1561 | return 0; |
| 1562 | } |
| 1563 | |
| 1564 | static int |
| 1565 | dict_tp_clear(PyObject *op) |
| 1566 | { |
| 1567 | PyDict_Clear(op); |
| 1568 | return 0; |
| 1569 | } |
| 1570 | |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 1571 | |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 1572 | staticforward PyObject *dictiter_new(dictobject *, binaryfunc); |
| 1573 | |
| 1574 | static PyObject * |
| 1575 | select_key(PyObject *key, PyObject *value) |
| 1576 | { |
| 1577 | Py_INCREF(key); |
| 1578 | return key; |
| 1579 | } |
| 1580 | |
| 1581 | static PyObject * |
| 1582 | select_value(PyObject *key, PyObject *value) |
| 1583 | { |
| 1584 | Py_INCREF(value); |
| 1585 | return value; |
| 1586 | } |
| 1587 | |
| 1588 | static PyObject * |
| 1589 | select_item(PyObject *key, PyObject *value) |
| 1590 | { |
| 1591 | PyObject *res = PyTuple_New(2); |
| 1592 | |
| 1593 | if (res != NULL) { |
| 1594 | Py_INCREF(key); |
| 1595 | Py_INCREF(value); |
| 1596 | PyTuple_SET_ITEM(res, 0, key); |
| 1597 | PyTuple_SET_ITEM(res, 1, value); |
| 1598 | } |
| 1599 | return res; |
| 1600 | } |
| 1601 | |
| 1602 | static PyObject * |
| 1603 | dict_iterkeys(dictobject *dict, PyObject *args) |
| 1604 | { |
| 1605 | if (!PyArg_ParseTuple(args, "")) |
| 1606 | return NULL; |
| 1607 | return dictiter_new(dict, select_key); |
| 1608 | } |
| 1609 | |
| 1610 | static PyObject * |
| 1611 | dict_itervalues(dictobject *dict, PyObject *args) |
| 1612 | { |
| 1613 | if (!PyArg_ParseTuple(args, "")) |
| 1614 | return NULL; |
| 1615 | return dictiter_new(dict, select_value); |
| 1616 | } |
| 1617 | |
| 1618 | static PyObject * |
| 1619 | dict_iteritems(dictobject *dict, PyObject *args) |
| 1620 | { |
| 1621 | if (!PyArg_ParseTuple(args, "")) |
| 1622 | return NULL; |
| 1623 | return dictiter_new(dict, select_item); |
| 1624 | } |
| 1625 | |
| 1626 | |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 1627 | static char has_key__doc__[] = |
| 1628 | "D.has_key(k) -> 1 if D has a key k, else 0"; |
| 1629 | |
| 1630 | static char get__doc__[] = |
| 1631 | "D.get(k[,d]) -> D[k] if D.has_key(k), else d. d defaults to None."; |
| 1632 | |
| 1633 | static char setdefault_doc__[] = |
| 1634 | "D.setdefault(k[,d]) -> D.get(k,d), also set D[k]=d if not D.has_key(k)"; |
| 1635 | |
| 1636 | static char popitem__doc__[] = |
| 1637 | "D.popitem() -> (k, v), remove and return some (key, value) pair as a\n\ |
| 1638 | 2-tuple; but raise KeyError if D is empty"; |
| 1639 | |
| 1640 | static char keys__doc__[] = |
| 1641 | "D.keys() -> list of D's keys"; |
| 1642 | |
| 1643 | static char items__doc__[] = |
| 1644 | "D.items() -> list of D's (key, value) pairs, as 2-tuples"; |
| 1645 | |
| 1646 | static char values__doc__[] = |
| 1647 | "D.values() -> list of D's values"; |
| 1648 | |
| 1649 | static char update__doc__[] = |
| 1650 | "D.update(E) -> None. Update D from E: for k in E.keys(): D[k] = E[k]"; |
| 1651 | |
| 1652 | static char clear__doc__[] = |
| 1653 | "D.clear() -> None. Remove all items from D."; |
| 1654 | |
| 1655 | static char copy__doc__[] = |
| 1656 | "D.copy() -> a shallow copy of D"; |
| 1657 | |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 1658 | static char iterkeys__doc__[] = |
| 1659 | "D.iterkeys() -> an iterator over the keys of D"; |
| 1660 | |
| 1661 | static char itervalues__doc__[] = |
| 1662 | "D.itervalues() -> an iterator over the values of D"; |
| 1663 | |
| 1664 | static char iteritems__doc__[] = |
| 1665 | "D.iteritems() -> an iterator over the (key, value) items of D"; |
| 1666 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1667 | static PyMethodDef mapp_methods[] = { |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 1668 | {"has_key", (PyCFunction)dict_has_key, METH_VARARGS, |
| 1669 | has_key__doc__}, |
| 1670 | {"get", (PyCFunction)dict_get, METH_VARARGS, |
| 1671 | get__doc__}, |
| 1672 | {"setdefault", (PyCFunction)dict_setdefault, METH_VARARGS, |
| 1673 | setdefault_doc__}, |
| 1674 | {"popitem", (PyCFunction)dict_popitem, METH_OLDARGS, |
| 1675 | popitem__doc__}, |
| 1676 | {"keys", (PyCFunction)dict_keys, METH_OLDARGS, |
| 1677 | keys__doc__}, |
| 1678 | {"items", (PyCFunction)dict_items, METH_OLDARGS, |
| 1679 | items__doc__}, |
| 1680 | {"values", (PyCFunction)dict_values, METH_OLDARGS, |
| 1681 | values__doc__}, |
Barry Warsaw | 66a0d1d | 2001-06-26 20:08:32 +0000 | [diff] [blame] | 1682 | {"update", (PyCFunction)dict_update, METH_VARARGS, |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 1683 | update__doc__}, |
| 1684 | {"clear", (PyCFunction)dict_clear, METH_OLDARGS, |
| 1685 | clear__doc__}, |
| 1686 | {"copy", (PyCFunction)dict_copy, METH_OLDARGS, |
| 1687 | copy__doc__}, |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 1688 | {"iterkeys", (PyCFunction)dict_iterkeys, METH_VARARGS, |
| 1689 | iterkeys__doc__}, |
| 1690 | {"itervalues", (PyCFunction)dict_itervalues, METH_VARARGS, |
| 1691 | itervalues__doc__}, |
| 1692 | {"iteritems", (PyCFunction)dict_iteritems, METH_VARARGS, |
| 1693 | iteritems__doc__}, |
Tim Peters | f7f88b1 | 2000-12-13 23:18:45 +0000 | [diff] [blame] | 1694 | {NULL, NULL} /* sentinel */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1695 | }; |
| 1696 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1697 | static PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1698 | dict_getattr(dictobject *mp, char *name) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1699 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1700 | return Py_FindMethod(mapp_methods, (PyObject *)mp, name); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1701 | } |
| 1702 | |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 1703 | static int |
| 1704 | dict_contains(dictobject *mp, PyObject *key) |
| 1705 | { |
| 1706 | long hash; |
| 1707 | |
| 1708 | #ifdef CACHE_HASH |
| 1709 | if (!PyString_Check(key) || |
| 1710 | (hash = ((PyStringObject *) key)->ob_shash) == -1) |
| 1711 | #endif |
| 1712 | { |
| 1713 | hash = PyObject_Hash(key); |
| 1714 | if (hash == -1) |
| 1715 | return -1; |
| 1716 | } |
Tim Peters | dea48ec | 2001-05-22 20:40:22 +0000 | [diff] [blame] | 1717 | return (mp->ma_lookup)(mp, key, hash)->me_value != NULL; |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 1718 | } |
| 1719 | |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 1720 | /* Hack to implement "key in dict" */ |
| 1721 | static PySequenceMethods dict_as_sequence = { |
| 1722 | 0, /* sq_length */ |
| 1723 | 0, /* sq_concat */ |
| 1724 | 0, /* sq_repeat */ |
| 1725 | 0, /* sq_item */ |
| 1726 | 0, /* sq_slice */ |
| 1727 | 0, /* sq_ass_item */ |
| 1728 | 0, /* sq_ass_slice */ |
| 1729 | (objobjproc)dict_contains, /* sq_contains */ |
| 1730 | 0, /* sq_inplace_concat */ |
| 1731 | 0, /* sq_inplace_repeat */ |
| 1732 | }; |
| 1733 | |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 1734 | static PyObject * |
| 1735 | dict_iter(dictobject *dict) |
| 1736 | { |
| 1737 | return dictiter_new(dict, select_key); |
| 1738 | } |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 1739 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1740 | PyTypeObject PyDict_Type = { |
| 1741 | PyObject_HEAD_INIT(&PyType_Type) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1742 | 0, |
Guido van Rossum | 9bfef44 | 1993-03-29 10:43:31 +0000 | [diff] [blame] | 1743 | "dictionary", |
Jeremy Hylton | c5007aa | 2000-06-30 05:02:53 +0000 | [diff] [blame] | 1744 | sizeof(dictobject) + PyGC_HEAD_SIZE, |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1745 | 0, |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 1746 | (destructor)dict_dealloc, /* tp_dealloc */ |
| 1747 | (printfunc)dict_print, /* tp_print */ |
| 1748 | (getattrfunc)dict_getattr, /* tp_getattr */ |
| 1749 | 0, /* tp_setattr */ |
Tim Peters | 4fa58bf | 2001-05-10 21:45:19 +0000 | [diff] [blame] | 1750 | (cmpfunc)dict_compare, /* tp_compare */ |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 1751 | (reprfunc)dict_repr, /* tp_repr */ |
| 1752 | 0, /* tp_as_number */ |
Guido van Rossum | 0dbb4fb | 2001-04-20 16:50:40 +0000 | [diff] [blame] | 1753 | &dict_as_sequence, /* tp_as_sequence */ |
Guido van Rossum | b932420 | 2001-01-18 00:39:02 +0000 | [diff] [blame] | 1754 | &dict_as_mapping, /* tp_as_mapping */ |
| 1755 | 0, /* tp_hash */ |
| 1756 | 0, /* tp_call */ |
| 1757 | 0, /* tp_str */ |
| 1758 | 0, /* tp_getattro */ |
| 1759 | 0, /* tp_setattro */ |
| 1760 | 0, /* tp_as_buffer */ |
| 1761 | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC, /* tp_flags */ |
| 1762 | 0, /* tp_doc */ |
| 1763 | (traverseproc)dict_traverse, /* tp_traverse */ |
| 1764 | (inquiry)dict_tp_clear, /* tp_clear */ |
Tim Peters | e63415e | 2001-05-08 04:38:29 +0000 | [diff] [blame] | 1765 | dict_richcompare, /* tp_richcompare */ |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 1766 | 0, /* tp_weaklistoffset */ |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 1767 | (getiterfunc)dict_iter, /* tp_iter */ |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 1768 | 0, /* tp_iternext */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1769 | }; |
| 1770 | |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1771 | /* For backward compatibility with old dictionary interface */ |
| 1772 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 1773 | PyObject * |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1774 | PyDict_GetItemString(PyObject *v, char *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1775 | { |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1776 | PyObject *kv, *rv; |
| 1777 | kv = PyString_FromString(key); |
| 1778 | if (kv == NULL) |
| 1779 | return NULL; |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1780 | rv = PyDict_GetItem(v, kv); |
| 1781 | Py_DECREF(kv); |
| 1782 | return rv; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1783 | } |
| 1784 | |
| 1785 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1786 | PyDict_SetItemString(PyObject *v, char *key, PyObject *item) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1787 | { |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1788 | PyObject *kv; |
| 1789 | int err; |
| 1790 | kv = PyString_FromString(key); |
| 1791 | if (kv == NULL) |
Guido van Rossum | 037b220 | 1997-05-20 18:35:19 +0000 | [diff] [blame] | 1792 | return -1; |
Guido van Rossum | 4f3bf1e | 1997-09-29 23:31:11 +0000 | [diff] [blame] | 1793 | PyString_InternInPlace(&kv); /* XXX Should we really? */ |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1794 | err = PyDict_SetItem(v, kv, item); |
| 1795 | Py_DECREF(kv); |
| 1796 | return err; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1797 | } |
| 1798 | |
| 1799 | int |
Tim Peters | 1f5871e | 2000-07-04 17:44:48 +0000 | [diff] [blame] | 1800 | PyDict_DelItemString(PyObject *v, char *key) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1801 | { |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1802 | PyObject *kv; |
| 1803 | int err; |
| 1804 | kv = PyString_FromString(key); |
| 1805 | if (kv == NULL) |
Guido van Rossum | 037b220 | 1997-05-20 18:35:19 +0000 | [diff] [blame] | 1806 | return -1; |
Guido van Rossum | 3cca245 | 1997-05-16 14:23:33 +0000 | [diff] [blame] | 1807 | err = PyDict_DelItem(v, kv); |
| 1808 | Py_DECREF(kv); |
| 1809 | return err; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1810 | } |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 1811 | |
| 1812 | /* Dictionary iterator type */ |
| 1813 | |
| 1814 | extern PyTypeObject PyDictIter_Type; /* Forward */ |
| 1815 | |
| 1816 | typedef struct { |
| 1817 | PyObject_HEAD |
| 1818 | dictobject *di_dict; |
Guido van Rossum | b1f35bf | 2001-05-02 15:13:44 +0000 | [diff] [blame] | 1819 | int di_used; |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 1820 | int di_pos; |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 1821 | binaryfunc di_select; |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 1822 | } dictiterobject; |
| 1823 | |
| 1824 | static PyObject * |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 1825 | dictiter_new(dictobject *dict, binaryfunc select) |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 1826 | { |
| 1827 | dictiterobject *di; |
| 1828 | di = PyObject_NEW(dictiterobject, &PyDictIter_Type); |
| 1829 | if (di == NULL) |
| 1830 | return NULL; |
| 1831 | Py_INCREF(dict); |
| 1832 | di->di_dict = dict; |
Guido van Rossum | b1f35bf | 2001-05-02 15:13:44 +0000 | [diff] [blame] | 1833 | di->di_used = dict->ma_used; |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 1834 | di->di_pos = 0; |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 1835 | di->di_select = select; |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 1836 | return (PyObject *)di; |
| 1837 | } |
| 1838 | |
| 1839 | static void |
| 1840 | dictiter_dealloc(dictiterobject *di) |
| 1841 | { |
| 1842 | Py_DECREF(di->di_dict); |
| 1843 | PyObject_DEL(di); |
| 1844 | } |
| 1845 | |
| 1846 | static PyObject * |
| 1847 | dictiter_next(dictiterobject *di, PyObject *args) |
| 1848 | { |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 1849 | PyObject *key, *value; |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 1850 | |
Guido van Rossum | b1f35bf | 2001-05-02 15:13:44 +0000 | [diff] [blame] | 1851 | if (di->di_used != di->di_dict->ma_used) { |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 1852 | PyErr_SetString(PyExc_RuntimeError, |
| 1853 | "dictionary changed size during iteration"); |
| 1854 | return NULL; |
| 1855 | } |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 1856 | if (PyDict_Next((PyObject *)(di->di_dict), &di->di_pos, &key, &value)) { |
| 1857 | return (*di->di_select)(key, value); |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 1858 | } |
| 1859 | PyErr_SetObject(PyExc_StopIteration, Py_None); |
| 1860 | return NULL; |
| 1861 | } |
| 1862 | |
| 1863 | static PyObject * |
| 1864 | dictiter_getiter(PyObject *it) |
| 1865 | { |
| 1866 | Py_INCREF(it); |
| 1867 | return it; |
| 1868 | } |
| 1869 | |
| 1870 | static PyMethodDef dictiter_methods[] = { |
| 1871 | {"next", (PyCFunction)dictiter_next, METH_VARARGS, |
| 1872 | "it.next() -- get the next value, or raise StopIteration"}, |
| 1873 | {NULL, NULL} /* sentinel */ |
| 1874 | }; |
| 1875 | |
| 1876 | static PyObject * |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 1877 | dictiter_getattr(dictiterobject *di, char *name) |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 1878 | { |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 1879 | return Py_FindMethod(dictiter_methods, (PyObject *)di, name); |
| 1880 | } |
| 1881 | |
| 1882 | static PyObject *dictiter_iternext(dictiterobject *di) |
| 1883 | { |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 1884 | PyObject *key, *value; |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 1885 | |
Guido van Rossum | b1f35bf | 2001-05-02 15:13:44 +0000 | [diff] [blame] | 1886 | if (di->di_used != di->di_dict->ma_used) { |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 1887 | PyErr_SetString(PyExc_RuntimeError, |
| 1888 | "dictionary changed size during iteration"); |
| 1889 | return NULL; |
| 1890 | } |
Guido van Rossum | 09e563a | 2001-05-01 12:10:21 +0000 | [diff] [blame] | 1891 | if (PyDict_Next((PyObject *)(di->di_dict), &di->di_pos, &key, &value)) { |
| 1892 | return (*di->di_select)(key, value); |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 1893 | } |
| 1894 | return NULL; |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 1895 | } |
| 1896 | |
| 1897 | PyTypeObject PyDictIter_Type = { |
| 1898 | PyObject_HEAD_INIT(&PyType_Type) |
| 1899 | 0, /* ob_size */ |
| 1900 | "dictionary-iterator", /* tp_name */ |
| 1901 | sizeof(dictiterobject), /* tp_basicsize */ |
| 1902 | 0, /* tp_itemsize */ |
| 1903 | /* methods */ |
| 1904 | (destructor)dictiter_dealloc, /* tp_dealloc */ |
| 1905 | 0, /* tp_print */ |
| 1906 | (getattrfunc)dictiter_getattr, /* tp_getattr */ |
| 1907 | 0, /* tp_setattr */ |
| 1908 | 0, /* tp_compare */ |
| 1909 | 0, /* tp_repr */ |
| 1910 | 0, /* tp_as_number */ |
| 1911 | 0, /* tp_as_sequence */ |
| 1912 | 0, /* tp_as_mapping */ |
| 1913 | 0, /* tp_hash */ |
| 1914 | 0, /* tp_call */ |
| 1915 | 0, /* tp_str */ |
| 1916 | 0, /* tp_getattro */ |
| 1917 | 0, /* tp_setattro */ |
| 1918 | 0, /* tp_as_buffer */ |
| 1919 | Py_TPFLAGS_DEFAULT, /* tp_flags */ |
| 1920 | 0, /* tp_doc */ |
| 1921 | 0, /* tp_traverse */ |
| 1922 | 0, /* tp_clear */ |
| 1923 | 0, /* tp_richcompare */ |
| 1924 | 0, /* tp_weaklistoffset */ |
| 1925 | (getiterfunc)dictiter_getiter, /* tp_iter */ |
Guido van Rossum | 213c7a6 | 2001-04-23 14:08:49 +0000 | [diff] [blame] | 1926 | (iternextfunc)dictiter_iternext, /* tp_iternext */ |
Guido van Rossum | 59d1d2b | 2001-04-20 19:13:02 +0000 | [diff] [blame] | 1927 | }; |