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