Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1 | /*********************************************************** |
Guido van Rossum | 6610ad9 | 1995-01-04 19:07:38 +0000 | [diff] [blame] | 2 | Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam, |
| 3 | The Netherlands. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 4 | |
| 5 | All Rights Reserved |
| 6 | |
Guido van Rossum | d266eb4 | 1996-10-25 14:44:06 +0000 | [diff] [blame] | 7 | Permission to use, copy, modify, and distribute this software and its |
| 8 | documentation for any purpose and without fee is hereby granted, |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 9 | provided that the above copyright notice appear in all copies and that |
Guido van Rossum | d266eb4 | 1996-10-25 14:44:06 +0000 | [diff] [blame] | 10 | both that copyright notice and this permission notice appear in |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 11 | supporting documentation, and that the names of Stichting Mathematisch |
Guido van Rossum | d266eb4 | 1996-10-25 14:44:06 +0000 | [diff] [blame] | 12 | Centrum or CWI or Corporation for National Research Initiatives or |
| 13 | CNRI not be used in advertising or publicity pertaining to |
| 14 | distribution of the software without specific, written prior |
| 15 | permission. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 16 | |
Guido van Rossum | d266eb4 | 1996-10-25 14:44:06 +0000 | [diff] [blame] | 17 | While CWI is the initial source for this software, a modified version |
| 18 | is made available by the Corporation for National Research Initiatives |
| 19 | (CNRI) at the Internet address ftp://ftp.python.org. |
| 20 | |
| 21 | STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH |
| 22 | REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF |
| 23 | MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH |
| 24 | CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL |
| 25 | DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR |
| 26 | PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER |
| 27 | TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR |
| 28 | PERFORMANCE OF THIS SOFTWARE. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 29 | |
| 30 | ******************************************************************/ |
| 31 | |
| 32 | /* Mapping object implementation; using a hash table */ |
| 33 | |
Guido van Rossum | 9bfef44 | 1993-03-29 10:43:31 +0000 | [diff] [blame] | 34 | /* This file should really be called "dictobject.c", since "mapping" |
| 35 | is the generic name for objects with an unorderred arbitrary key |
| 36 | set (just like lists are sequences), but since it improves (and was |
| 37 | originally derived from) a file by that name I had to change its |
| 38 | name. For the user these objects are still called "dictionaries". */ |
| 39 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 40 | #include "allobjects.h" |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 41 | #include "modsupport.h" |
| 42 | |
| 43 | |
| 44 | /* |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 45 | * MINSIZE is the minimum size of a mapping. |
| 46 | */ |
| 47 | |
| 48 | #define MINSIZE 4 |
| 49 | |
| 50 | /* |
| 51 | Table of irreducible polynomials to efficiently cycle through |
| 52 | GF(2^n)-{0}, 2<=n<=30. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 53 | */ |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 54 | static long polys[] = { |
Guido van Rossum | 9e5656c | 1997-01-29 04:45:16 +0000 | [diff] [blame] | 55 | 4 + 3, |
| 56 | 8 + 3, |
| 57 | 16 + 3, |
| 58 | 32 + 5, |
| 59 | 64 + 3, |
| 60 | 128 + 3, |
| 61 | 256 + 29, |
| 62 | 512 + 17, |
| 63 | 1024 + 9, |
| 64 | 2048 + 5, |
| 65 | 4096 + 83, |
| 66 | 8192 + 27, |
| 67 | 16384 + 43, |
| 68 | 32768 + 3, |
| 69 | 65536 + 45, |
| 70 | 131072 + 9, |
| 71 | 262144 + 39, |
| 72 | 524288 + 39, |
| 73 | 1048576 + 9, |
| 74 | 2097152 + 5, |
| 75 | 4194304 + 3, |
| 76 | 8388608 + 33, |
| 77 | 16777216 + 27, |
| 78 | 33554432 + 9, |
| 79 | 67108864 + 71, |
| 80 | 134217728 + 39, |
| 81 | 268435456 + 9, |
| 82 | 536870912 + 5, |
| 83 | 1073741824 + 83, |
| 84 | 0 |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 85 | }; |
| 86 | |
| 87 | /* Object used as dummy key to fill deleted entries */ |
| 88 | static object *dummy; /* Initialized by first call to newmappingobject() */ |
| 89 | |
| 90 | /* |
| 91 | Invariant for entries: when in use, de_value is not NULL and de_key is |
| 92 | not NULL and not dummy; when not in use, de_value is NULL and de_key |
| 93 | is either NULL or dummy. A dummy key value cannot be replaced by |
| 94 | NULL, since otherwise other keys may be lost. |
| 95 | */ |
| 96 | typedef struct { |
| 97 | long me_hash; |
| 98 | object *me_key; |
| 99 | object *me_value; |
Guido van Rossum | 3648884 | 1997-04-11 19:14:07 +0000 | [diff] [blame] | 100 | #ifdef USE_CACHE_ALIGNED |
| 101 | long aligner; |
| 102 | #endif |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 103 | } mappingentry; |
| 104 | |
| 105 | /* |
| 106 | To ensure the lookup algorithm terminates, the table size must be a |
| 107 | prime number and there must be at least one NULL key in the table. |
| 108 | The value ma_fill is the number of non-NULL keys; ma_used is the number |
| 109 | of non-NULL, non-dummy keys. |
| 110 | To avoid slowing down lookups on a near-full table, we resize the table |
| 111 | when it is more than half filled. |
| 112 | */ |
| 113 | typedef struct { |
| 114 | OB_HEAD |
| 115 | int ma_fill; |
| 116 | int ma_used; |
| 117 | int ma_size; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 118 | int ma_poly; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 119 | mappingentry *ma_table; |
| 120 | } mappingobject; |
| 121 | |
| 122 | object * |
| 123 | newmappingobject() |
| 124 | { |
| 125 | register mappingobject *mp; |
| 126 | if (dummy == NULL) { /* Auto-initialize dummy */ |
| 127 | dummy = newstringobject("<dummy key>"); |
| 128 | if (dummy == NULL) |
| 129 | return NULL; |
| 130 | } |
| 131 | mp = NEWOBJ(mappingobject, &Mappingtype); |
| 132 | if (mp == NULL) |
| 133 | return NULL; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 134 | mp->ma_size = 0; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 135 | mp->ma_poly = 0; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 136 | mp->ma_table = NULL; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 137 | mp->ma_fill = 0; |
| 138 | mp->ma_used = 0; |
| 139 | return (object *)mp; |
| 140 | } |
| 141 | |
| 142 | /* |
| 143 | The basic lookup function used by all operations. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 144 | 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] | 145 | Open addressing is preferred over chaining since the link overhead for |
| 146 | chaining would be substantial (100% with typical malloc overhead). |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 147 | However, instead of going through the table at constant steps, we cycle |
| 148 | through the values of GF(2^n)-{0}. This avoids modulo computations, being |
| 149 | much cheaper on RISC machines, without leading to clustering. |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 150 | |
| 151 | First a 32-bit hash value, 'sum', is computed from the key string. |
| 152 | The first character is added an extra time shifted by 8 to avoid hashing |
| 153 | single-character keys (often heavily used variables) too close together. |
| 154 | All arithmetic on sum should ignore overflow. |
| 155 | |
| 156 | The initial probe index is then computed as sum mod the table size. |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 157 | Subsequent probe indices use the values of x^i in GF(2^n) as an offset, |
| 158 | where x is a root. The initial value is derived from sum, too. |
| 159 | |
| 160 | (This version is due to Reimer Behrends, some ideas are also due to |
| 161 | Jyrki Alakuijala.) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 162 | */ |
| 163 | static mappingentry *lookmapping PROTO((mappingobject *, object *, long)); |
| 164 | static mappingentry * |
| 165 | lookmapping(mp, key, hash) |
Guido van Rossum | 7d18159 | 1997-01-16 21:06:45 +0000 | [diff] [blame] | 166 | mappingobject *mp; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 167 | object *key; |
| 168 | long hash; |
| 169 | { |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 170 | register int i; |
| 171 | register unsigned incr; |
| 172 | register unsigned long sum = (unsigned long) hash; |
| 173 | register mappingentry *freeslot = NULL; |
Guido van Rossum | 2095d24 | 1997-04-09 19:41:24 +0000 | [diff] [blame] | 174 | register unsigned int mask = mp->ma_size-1; |
Guido van Rossum | efb4609 | 1997-01-29 15:53:56 +0000 | [diff] [blame] | 175 | mappingentry *ep0 = mp->ma_table; |
| 176 | register mappingentry *ep; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 177 | /* We must come up with (i, incr) such that 0 <= i < ma_size |
| 178 | and 0 < incr < ma_size and both are a function of hash */ |
| 179 | i = (~sum) & mask; |
| 180 | /* We use ~sum instead if sum, as degenerate hash functions, such |
| 181 | as for ints <sigh>, can have lots of leading zeros. It's not |
| 182 | really a performance risk, but better safe than sorry. */ |
Guido van Rossum | efb4609 | 1997-01-29 15:53:56 +0000 | [diff] [blame] | 183 | ep = &ep0[i]; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 184 | if (ep->me_key == NULL) |
Guido van Rossum | 7d18159 | 1997-01-16 21:06:45 +0000 | [diff] [blame] | 185 | return ep; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 186 | if (ep->me_key == dummy) |
Guido van Rossum | 7d18159 | 1997-01-16 21:06:45 +0000 | [diff] [blame] | 187 | freeslot = ep; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 188 | else if (ep->me_key == key || |
| 189 | (ep->me_hash == hash && cmpobject(ep->me_key, key) == 0)) { |
| 190 | return ep; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 191 | } |
Guido van Rossum | efb4609 | 1997-01-29 15:53:56 +0000 | [diff] [blame] | 192 | /* Derive incr from sum, just to make it more arbitrary. Note that |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 193 | incr must not be 0, or we will get into an infinite loop.*/ |
Guido van Rossum | efb4609 | 1997-01-29 15:53:56 +0000 | [diff] [blame] | 194 | incr = (sum ^ (sum >> 3)) & mask; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 195 | if (!incr) |
| 196 | incr = mask; |
| 197 | if (incr > mask) /* Cycle through GF(2^n)-{0} */ |
| 198 | incr ^= mp->ma_poly; /* This will implicitly clear the |
| 199 | highest bit */ |
| 200 | for (;;) { |
Guido van Rossum | efb4609 | 1997-01-29 15:53:56 +0000 | [diff] [blame] | 201 | ep = &ep0[(i+incr)&mask]; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 202 | if (ep->me_key == NULL) { |
| 203 | if (freeslot != NULL) |
| 204 | return freeslot; |
| 205 | else |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 206 | return ep; |
| 207 | } |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 208 | if (ep->me_key == dummy) { |
| 209 | if (freeslot == NULL) |
| 210 | freeslot = ep; |
| 211 | } |
| 212 | else if (ep->me_key == key || |
| 213 | (ep->me_hash == hash && |
| 214 | cmpobject(ep->me_key, key) == 0)) { |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 215 | return ep; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 216 | } |
| 217 | /* Cycle through GF(2^n)-{0} */ |
| 218 | incr = incr << 1; |
| 219 | if (incr > mask) |
| 220 | incr ^= mp->ma_poly; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 221 | } |
| 222 | } |
| 223 | |
| 224 | /* |
| 225 | Internal routine to insert a new item into the table. |
| 226 | Used both by the internal resize routine and by the public insert routine. |
| 227 | Eats a reference to key and one to value. |
| 228 | */ |
| 229 | static void insertmapping PROTO((mappingobject *, object *, long, object *)); |
| 230 | static void |
| 231 | insertmapping(mp, key, hash, value) |
| 232 | register mappingobject *mp; |
| 233 | object *key; |
| 234 | long hash; |
| 235 | object *value; |
| 236 | { |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 237 | object *old_value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 238 | register mappingentry *ep; |
| 239 | ep = lookmapping(mp, key, hash); |
| 240 | if (ep->me_value != NULL) { |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 241 | old_value = ep->me_value; |
| 242 | ep->me_value = value; |
| 243 | DECREF(old_value); /* which **CAN** re-enter */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 244 | DECREF(key); |
| 245 | } |
| 246 | else { |
| 247 | if (ep->me_key == NULL) |
| 248 | mp->ma_fill++; |
| 249 | else |
| 250 | DECREF(ep->me_key); |
| 251 | ep->me_key = key; |
| 252 | ep->me_hash = hash; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 253 | ep->me_value = value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 254 | mp->ma_used++; |
| 255 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 256 | } |
| 257 | |
| 258 | /* |
| 259 | Restructure the table by allocating a new table and reinserting all |
| 260 | items again. When entries have been deleted, the new table may |
| 261 | actually be smaller than the old one. |
| 262 | */ |
| 263 | static int mappingresize PROTO((mappingobject *)); |
| 264 | static int |
| 265 | mappingresize(mp) |
| 266 | mappingobject *mp; |
| 267 | { |
| 268 | register int oldsize = mp->ma_size; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 269 | register int newsize, newpoly; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 270 | register mappingentry *oldtable = mp->ma_table; |
| 271 | register mappingentry *newtable; |
| 272 | register mappingentry *ep; |
| 273 | register int i; |
| 274 | newsize = mp->ma_size; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 275 | for (i = 0, newsize = MINSIZE; ; i++, newsize <<= 1) { |
| 276 | if (i > sizeof(polys)/sizeof(polys[0])) { |
| 277 | /* Ran out of polynomials */ |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 278 | err_nomem(); |
| 279 | return -1; |
| 280 | } |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 281 | if (newsize > mp->ma_used*2) { |
| 282 | newpoly = polys[i]; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 283 | break; |
| 284 | } |
| 285 | } |
| 286 | newtable = (mappingentry *) calloc(sizeof(mappingentry), newsize); |
| 287 | if (newtable == NULL) { |
| 288 | err_nomem(); |
| 289 | return -1; |
| 290 | } |
| 291 | mp->ma_size = newsize; |
Guido van Rossum | 16e93a8 | 1997-01-28 00:00:11 +0000 | [diff] [blame] | 292 | mp->ma_poly = newpoly; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 293 | mp->ma_table = newtable; |
| 294 | mp->ma_fill = 0; |
| 295 | mp->ma_used = 0; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 296 | |
| 297 | /* Make two passes, so we can avoid decrefs |
| 298 | (and possible side effects) till the table is copied */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 299 | for (i = 0, ep = oldtable; i < oldsize; i++, ep++) { |
| 300 | if (ep->me_value != NULL) |
| 301 | insertmapping(mp,ep->me_key,ep->me_hash,ep->me_value); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 302 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 303 | for (i = 0, ep = oldtable; i < oldsize; i++, ep++) { |
| 304 | if (ep->me_value == NULL) |
| 305 | XDECREF(ep->me_key); |
| 306 | } |
| 307 | |
| 308 | XDEL(oldtable); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 309 | return 0; |
| 310 | } |
| 311 | |
| 312 | object * |
| 313 | mappinglookup(op, key) |
| 314 | object *op; |
| 315 | object *key; |
| 316 | { |
| 317 | long hash; |
| 318 | if (!is_mappingobject(op)) { |
| 319 | err_badcall(); |
| 320 | return NULL; |
| 321 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 322 | if (((mappingobject *)op)->ma_table == NULL) |
| 323 | return NULL; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 324 | #ifdef CACHE_HASH |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 325 | if (!is_stringobject(key) || |
| 326 | (hash = ((stringobject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 327 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 328 | { |
| 329 | hash = hashobject(key); |
| 330 | if (hash == -1) |
| 331 | return NULL; |
| 332 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 333 | return lookmapping((mappingobject *)op, key, hash) -> me_value; |
| 334 | } |
| 335 | |
| 336 | int |
| 337 | mappinginsert(op, key, value) |
| 338 | register object *op; |
| 339 | object *key; |
| 340 | object *value; |
| 341 | { |
| 342 | register mappingobject *mp; |
| 343 | register long hash; |
| 344 | if (!is_mappingobject(op)) { |
| 345 | err_badcall(); |
| 346 | return -1; |
| 347 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 348 | mp = (mappingobject *)op; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 349 | #ifdef CACHE_HASH |
| 350 | if (is_stringobject(key)) { |
| 351 | #ifdef INTERN_STRINGS |
| 352 | if (((stringobject *)key)->ob_sinterned != NULL) { |
| 353 | key = ((stringobject *)key)->ob_sinterned; |
| 354 | hash = ((stringobject *)key)->ob_shash; |
| 355 | } |
| 356 | else |
| 357 | #endif |
| 358 | { |
| 359 | hash = ((stringobject *)key)->ob_shash; |
| 360 | if (hash == -1) |
| 361 | hash = hashobject(key); |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 362 | } |
| 363 | } |
| 364 | else |
| 365 | #endif |
| 366 | { |
| 367 | hash = hashobject(key); |
| 368 | if (hash == -1) |
| 369 | return -1; |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 370 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 371 | /* if fill >= 2/3 size, resize */ |
| 372 | if (mp->ma_fill*3 >= mp->ma_size*2) { |
| 373 | if (mappingresize(mp) != 0) { |
| 374 | if (mp->ma_fill+1 > mp->ma_size) |
| 375 | return -1; |
| 376 | } |
| 377 | } |
| 378 | INCREF(value); |
| 379 | INCREF(key); |
| 380 | insertmapping(mp, key, hash, value); |
| 381 | return 0; |
| 382 | } |
| 383 | |
| 384 | int |
| 385 | mappingremove(op, key) |
| 386 | object *op; |
| 387 | object *key; |
| 388 | { |
| 389 | register mappingobject *mp; |
| 390 | register long hash; |
| 391 | register mappingentry *ep; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 392 | object *old_value, *old_key; |
| 393 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 394 | if (!is_mappingobject(op)) { |
| 395 | err_badcall(); |
| 396 | return -1; |
| 397 | } |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 398 | #ifdef CACHE_HASH |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 399 | if (!is_stringobject(key) || |
| 400 | (hash = ((stringobject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 401 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 402 | { |
| 403 | hash = hashobject(key); |
| 404 | if (hash == -1) |
| 405 | return -1; |
| 406 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 407 | mp = (mappingobject *)op; |
Guido van Rossum | efc8713 | 1995-01-02 19:42:39 +0000 | [diff] [blame] | 408 | if (((mappingobject *)op)->ma_table == NULL) |
| 409 | goto empty; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 410 | ep = lookmapping(mp, key, hash); |
| 411 | if (ep->me_value == NULL) { |
Guido van Rossum | efc8713 | 1995-01-02 19:42:39 +0000 | [diff] [blame] | 412 | empty: |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 413 | err_setval(KeyError, key); |
| 414 | return -1; |
| 415 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 416 | old_key = ep->me_key; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 417 | INCREF(dummy); |
| 418 | ep->me_key = dummy; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 419 | old_value = ep->me_value; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 420 | ep->me_value = NULL; |
| 421 | mp->ma_used--; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 422 | DECREF(old_value); |
| 423 | DECREF(old_key); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 424 | return 0; |
| 425 | } |
| 426 | |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 427 | void |
| 428 | mappingclear(op) |
| 429 | object *op; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 430 | { |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 431 | int i, n; |
| 432 | register mappingentry *table; |
| 433 | mappingobject *mp; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 434 | if (!is_mappingobject(op)) |
| 435 | return; |
| 436 | mp = (mappingobject *)op; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 437 | table = mp->ma_table; |
| 438 | if (table == NULL) |
| 439 | return; |
| 440 | n = mp->ma_size; |
| 441 | mp->ma_size = mp->ma_used = mp->ma_fill = 0; |
| 442 | mp->ma_table = NULL; |
| 443 | for (i = 0; i < n; i++) { |
| 444 | XDECREF(table[i].me_key); |
| 445 | XDECREF(table[i].me_value); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 446 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 447 | DEL(table); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 448 | } |
| 449 | |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 450 | int |
| 451 | mappinggetnext(op, ppos, pkey, pvalue) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 452 | object *op; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 453 | int *ppos; |
| 454 | object **pkey; |
| 455 | object **pvalue; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 456 | { |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 457 | int i; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 458 | register mappingobject *mp; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 459 | if (!is_dictobject(op)) |
| 460 | return 0; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 461 | mp = (mappingobject *)op; |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 462 | i = *ppos; |
| 463 | if (i < 0) |
| 464 | return 0; |
| 465 | while (i < mp->ma_size && mp->ma_table[i].me_value == NULL) |
| 466 | i++; |
| 467 | *ppos = i+1; |
| 468 | if (i >= mp->ma_size) |
| 469 | return 0; |
| 470 | if (pkey) |
| 471 | *pkey = mp->ma_table[i].me_key; |
| 472 | if (pvalue) |
| 473 | *pvalue = mp->ma_table[i].me_value; |
| 474 | return 1; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 475 | } |
| 476 | |
| 477 | /* Methods */ |
| 478 | |
| 479 | static void |
| 480 | mapping_dealloc(mp) |
| 481 | register mappingobject *mp; |
| 482 | { |
| 483 | register int i; |
| 484 | register mappingentry *ep; |
| 485 | for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) { |
| 486 | if (ep->me_key != NULL) |
| 487 | DECREF(ep->me_key); |
| 488 | if (ep->me_value != NULL) |
| 489 | DECREF(ep->me_value); |
| 490 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 491 | XDEL(mp->ma_table); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 492 | DEL(mp); |
| 493 | } |
| 494 | |
| 495 | static int |
| 496 | mapping_print(mp, fp, flags) |
| 497 | register mappingobject *mp; |
| 498 | register FILE *fp; |
| 499 | register int flags; |
| 500 | { |
| 501 | register int i; |
| 502 | register int any; |
| 503 | register mappingentry *ep; |
| 504 | fprintf(fp, "{"); |
| 505 | any = 0; |
| 506 | for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) { |
| 507 | if (ep->me_value != NULL) { |
| 508 | if (any++ > 0) |
| 509 | fprintf(fp, ", "); |
Guido van Rossum | a3d78fb | 1993-11-10 09:23:53 +0000 | [diff] [blame] | 510 | if (printobject((object *)ep->me_key, fp, 0) != 0) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 511 | return -1; |
| 512 | fprintf(fp, ": "); |
Guido van Rossum | a3d78fb | 1993-11-10 09:23:53 +0000 | [diff] [blame] | 513 | if (printobject(ep->me_value, fp, 0) != 0) |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 514 | return -1; |
| 515 | } |
| 516 | } |
| 517 | fprintf(fp, "}"); |
| 518 | return 0; |
| 519 | } |
| 520 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 521 | static object * |
| 522 | mapping_repr(mp) |
| 523 | mappingobject *mp; |
| 524 | { |
| 525 | auto object *v; |
| 526 | object *sepa, *colon; |
| 527 | register int i; |
| 528 | register int any; |
| 529 | register mappingentry *ep; |
| 530 | v = newstringobject("{"); |
| 531 | sepa = newstringobject(", "); |
| 532 | colon = newstringobject(": "); |
| 533 | any = 0; |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 534 | 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] | 535 | if (ep->me_value != NULL) { |
| 536 | if (any++) |
| 537 | joinstring(&v, sepa); |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 538 | joinstring_decref(&v, reprobject(ep->me_key)); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 539 | joinstring(&v, colon); |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 540 | joinstring_decref(&v, reprobject(ep->me_value)); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 541 | } |
| 542 | } |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 543 | joinstring_decref(&v, newstringobject("}")); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 544 | XDECREF(sepa); |
| 545 | XDECREF(colon); |
| 546 | return v; |
| 547 | } |
| 548 | |
| 549 | static int |
| 550 | mapping_length(mp) |
| 551 | mappingobject *mp; |
| 552 | { |
| 553 | return mp->ma_used; |
| 554 | } |
| 555 | |
| 556 | static object * |
| 557 | mapping_subscript(mp, key) |
| 558 | mappingobject *mp; |
| 559 | register object *key; |
| 560 | { |
| 561 | object *v; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 562 | long hash; |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 563 | if (mp->ma_table == NULL) { |
| 564 | err_setval(KeyError, key); |
| 565 | return NULL; |
| 566 | } |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 567 | #ifdef CACHE_HASH |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 568 | if (!is_stringobject(key) || |
| 569 | (hash = ((stringobject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 570 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 571 | { |
| 572 | hash = hashobject(key); |
| 573 | if (hash == -1) |
| 574 | return NULL; |
| 575 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 576 | v = lookmapping(mp, key, hash) -> me_value; |
| 577 | if (v == NULL) |
| 578 | err_setval(KeyError, key); |
| 579 | else |
| 580 | INCREF(v); |
| 581 | return v; |
| 582 | } |
| 583 | |
| 584 | static int |
| 585 | mapping_ass_sub(mp, v, w) |
| 586 | mappingobject *mp; |
| 587 | object *v, *w; |
| 588 | { |
| 589 | if (w == NULL) |
| 590 | return mappingremove((object *)mp, v); |
| 591 | else |
| 592 | return mappinginsert((object *)mp, v, w); |
| 593 | } |
| 594 | |
| 595 | static mapping_methods mapping_as_mapping = { |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 596 | (inquiry)mapping_length, /*mp_length*/ |
| 597 | (binaryfunc)mapping_subscript, /*mp_subscript*/ |
| 598 | (objobjargproc)mapping_ass_sub, /*mp_ass_subscript*/ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 599 | }; |
| 600 | |
| 601 | static object * |
| 602 | mapping_keys(mp, args) |
| 603 | register mappingobject *mp; |
| 604 | object *args; |
| 605 | { |
| 606 | register object *v; |
| 607 | register int i, j; |
| 608 | if (!getnoarg(args)) |
| 609 | return NULL; |
| 610 | v = newlistobject(mp->ma_used); |
| 611 | if (v == NULL) |
| 612 | return NULL; |
| 613 | for (i = 0, j = 0; i < mp->ma_size; i++) { |
| 614 | if (mp->ma_table[i].me_value != NULL) { |
| 615 | object *key = mp->ma_table[i].me_key; |
| 616 | INCREF(key); |
| 617 | setlistitem(v, j, key); |
| 618 | j++; |
| 619 | } |
| 620 | } |
| 621 | return v; |
| 622 | } |
| 623 | |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 624 | static object * |
| 625 | mapping_values(mp, args) |
| 626 | register mappingobject *mp; |
| 627 | object *args; |
| 628 | { |
| 629 | register object *v; |
| 630 | register int i, j; |
| 631 | if (!getnoarg(args)) |
| 632 | return NULL; |
| 633 | v = newlistobject(mp->ma_used); |
| 634 | if (v == NULL) |
| 635 | return NULL; |
| 636 | for (i = 0, j = 0; i < mp->ma_size; i++) { |
| 637 | if (mp->ma_table[i].me_value != NULL) { |
| 638 | object *value = mp->ma_table[i].me_value; |
| 639 | INCREF(value); |
| 640 | setlistitem(v, j, value); |
| 641 | j++; |
| 642 | } |
| 643 | } |
| 644 | return v; |
| 645 | } |
| 646 | |
| 647 | static object * |
| 648 | mapping_items(mp, args) |
| 649 | register mappingobject *mp; |
| 650 | object *args; |
| 651 | { |
| 652 | register object *v; |
| 653 | register int i, j; |
| 654 | if (!getnoarg(args)) |
| 655 | return NULL; |
| 656 | v = newlistobject(mp->ma_used); |
| 657 | if (v == NULL) |
| 658 | return NULL; |
| 659 | for (i = 0, j = 0; i < mp->ma_size; i++) { |
| 660 | if (mp->ma_table[i].me_value != NULL) { |
| 661 | object *key = mp->ma_table[i].me_key; |
| 662 | object *value = mp->ma_table[i].me_value; |
| 663 | object *item = newtupleobject(2); |
| 664 | if (item == NULL) { |
| 665 | DECREF(v); |
| 666 | return NULL; |
| 667 | } |
| 668 | INCREF(key); |
| 669 | settupleitem(item, 0, key); |
| 670 | INCREF(value); |
| 671 | settupleitem(item, 1, value); |
| 672 | setlistitem(v, j, item); |
| 673 | j++; |
| 674 | } |
| 675 | } |
| 676 | return v; |
| 677 | } |
| 678 | |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 679 | int |
| 680 | getmappingsize(mp) |
| 681 | object *mp; |
| 682 | { |
| 683 | if (mp == NULL || !is_mappingobject(mp)) { |
| 684 | err_badcall(); |
Guido van Rossum | b376a4a | 1993-11-23 17:53:17 +0000 | [diff] [blame] | 685 | return 0; |
Guido van Rossum | 4199fac | 1993-11-05 10:18:44 +0000 | [diff] [blame] | 686 | } |
| 687 | return ((mappingobject *)mp)->ma_used; |
| 688 | } |
| 689 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 690 | object * |
| 691 | getmappingkeys(mp) |
| 692 | object *mp; |
| 693 | { |
| 694 | if (mp == NULL || !is_mappingobject(mp)) { |
| 695 | err_badcall(); |
| 696 | return NULL; |
| 697 | } |
| 698 | return mapping_keys((mappingobject *)mp, (object *)NULL); |
| 699 | } |
| 700 | |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 701 | object * |
| 702 | getmappingvalues(mp) |
| 703 | object *mp; |
| 704 | { |
| 705 | if (mp == NULL || !is_mappingobject(mp)) { |
| 706 | err_badcall(); |
| 707 | return NULL; |
| 708 | } |
| 709 | return mapping_values((mappingobject *)mp, (object *)NULL); |
| 710 | } |
| 711 | |
| 712 | object * |
| 713 | getmappingitems(mp) |
| 714 | object *mp; |
| 715 | { |
| 716 | if (mp == NULL || !is_mappingobject(mp)) { |
| 717 | err_badcall(); |
| 718 | return NULL; |
| 719 | } |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 720 | return mapping_items((mappingobject *)mp, (object *)NULL); |
Guido van Rossum | 2583165 | 1993-05-19 14:50:45 +0000 | [diff] [blame] | 721 | } |
| 722 | |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 723 | #define NEWCMP |
| 724 | |
| 725 | #ifdef NEWCMP |
| 726 | |
| 727 | /* Subroutine which returns the smallest key in a for which b's value |
| 728 | is different or absent. The value is returned too, through the |
| 729 | pval argument. No reference counts are incremented. */ |
| 730 | |
| 731 | static object * |
| 732 | characterize(a, b, pval) |
| 733 | mappingobject *a; |
| 734 | mappingobject *b; |
| 735 | object **pval; |
| 736 | { |
| 737 | object *diff = NULL; |
| 738 | int i; |
| 739 | |
| 740 | *pval = NULL; |
| 741 | for (i = 0; i < a->ma_size; i++) { |
| 742 | if (a->ma_table[i].me_value != NULL) { |
| 743 | object *key = a->ma_table[i].me_key; |
| 744 | object *aval, *bval; |
| 745 | if (diff != NULL && cmpobject(key, diff) > 0) |
| 746 | continue; |
| 747 | aval = a->ma_table[i].me_value; |
| 748 | bval = mappinglookup((object *)b, key); |
| 749 | if (bval == NULL || cmpobject(aval, bval) != 0) { |
| 750 | diff = key; |
| 751 | *pval = aval; |
| 752 | } |
| 753 | } |
| 754 | } |
| 755 | return diff; |
| 756 | } |
| 757 | |
| 758 | static int |
| 759 | mapping_compare(a, b) |
| 760 | mappingobject *a, *b; |
| 761 | { |
| 762 | object *adiff, *bdiff, *aval, *bval; |
| 763 | int res; |
| 764 | |
| 765 | /* Compare lengths first */ |
| 766 | if (a->ma_used < b->ma_used) |
| 767 | return -1; /* a is shorter */ |
| 768 | else if (a->ma_used > b->ma_used) |
| 769 | return 1; /* b is shorter */ |
| 770 | /* Same length -- check all keys */ |
| 771 | adiff = characterize(a, b, &aval); |
| 772 | if (adiff == NULL) |
| 773 | return 0; /* a is a subset with the same length */ |
| 774 | bdiff = characterize(b, a, &bval); |
| 775 | /* bdiff == NULL would be impossible now */ |
| 776 | res = cmpobject(adiff, bdiff); |
| 777 | if (res == 0) |
| 778 | res = cmpobject(aval, bval); |
| 779 | return res; |
| 780 | } |
| 781 | |
| 782 | #else /* !NEWCMP */ |
| 783 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 784 | static int |
| 785 | mapping_compare(a, b) |
| 786 | mappingobject *a, *b; |
| 787 | { |
| 788 | object *akeys, *bkeys; |
| 789 | int i, n, res; |
| 790 | if (a == b) |
| 791 | return 0; |
| 792 | if (a->ma_used == 0) { |
| 793 | if (b->ma_used != 0) |
| 794 | return -1; |
| 795 | else |
| 796 | return 0; |
| 797 | } |
| 798 | else { |
| 799 | if (b->ma_used == 0) |
| 800 | return 1; |
| 801 | } |
| 802 | akeys = mapping_keys(a, (object *)NULL); |
| 803 | bkeys = mapping_keys(b, (object *)NULL); |
| 804 | if (akeys == NULL || bkeys == NULL) { |
| 805 | /* Oops, out of memory -- what to do? */ |
| 806 | /* For now, sort on address! */ |
| 807 | XDECREF(akeys); |
| 808 | XDECREF(bkeys); |
| 809 | if (a < b) |
| 810 | return -1; |
| 811 | else |
| 812 | return 1; |
| 813 | } |
| 814 | sortlist(akeys); |
| 815 | sortlist(bkeys); |
| 816 | n = a->ma_used < b->ma_used ? a->ma_used : b->ma_used; /* smallest */ |
| 817 | res = 0; |
| 818 | for (i = 0; i < n; i++) { |
| 819 | object *akey, *bkey, *aval, *bval; |
| 820 | long ahash, bhash; |
| 821 | akey = getlistitem(akeys, i); |
| 822 | bkey = getlistitem(bkeys, i); |
| 823 | res = cmpobject(akey, bkey); |
| 824 | if (res != 0) |
| 825 | break; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 826 | #ifdef CACHE_HASH |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 827 | if (!is_stringobject(akey) || |
| 828 | (ahash = ((stringobject *) akey)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 829 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 830 | { |
| 831 | ahash = hashobject(akey); |
| 832 | if (ahash == -1) |
| 833 | err_clear(); /* Don't want errors here */ |
| 834 | } |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 835 | #ifdef CACHE_HASH |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 836 | if (!is_stringobject(bkey) || |
| 837 | (bhash = ((stringobject *) bkey)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 838 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 839 | { |
| 840 | bhash = hashobject(bkey); |
| 841 | if (bhash == -1) |
| 842 | err_clear(); /* Don't want errors here */ |
| 843 | } |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 844 | aval = lookmapping(a, akey, ahash) -> me_value; |
| 845 | bval = lookmapping(b, bkey, bhash) -> me_value; |
| 846 | res = cmpobject(aval, bval); |
| 847 | if (res != 0) |
| 848 | break; |
| 849 | } |
| 850 | if (res == 0) { |
| 851 | if (a->ma_used < b->ma_used) |
| 852 | res = -1; |
| 853 | else if (a->ma_used > b->ma_used) |
| 854 | res = 1; |
| 855 | } |
| 856 | DECREF(akeys); |
| 857 | DECREF(bkeys); |
| 858 | return res; |
| 859 | } |
| 860 | |
Guido van Rossum | a0a69b8 | 1996-12-05 21:55:55 +0000 | [diff] [blame] | 861 | #endif /* !NEWCMP */ |
| 862 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 863 | static object * |
| 864 | mapping_has_key(mp, args) |
| 865 | register mappingobject *mp; |
| 866 | object *args; |
| 867 | { |
| 868 | object *key; |
| 869 | long hash; |
| 870 | register long ok; |
| 871 | if (!getargs(args, "O", &key)) |
| 872 | return NULL; |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 873 | #ifdef CACHE_HASH |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 874 | if (!is_stringobject(key) || |
| 875 | (hash = ((stringobject *) key)->ob_shash) == -1) |
Sjoerd Mullender | 3bb8a05 | 1993-10-22 12:04:32 +0000 | [diff] [blame] | 876 | #endif |
Guido van Rossum | ca756f2 | 1997-01-23 19:39:29 +0000 | [diff] [blame] | 877 | { |
| 878 | hash = hashobject(key); |
| 879 | if (hash == -1) |
| 880 | return NULL; |
| 881 | } |
Guido van Rossum | d7047b3 | 1995-01-02 19:07:15 +0000 | [diff] [blame] | 882 | ok = mp->ma_size != 0 && lookmapping(mp, key, hash)->me_value != NULL; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 883 | return newintobject(ok); |
| 884 | } |
| 885 | |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 886 | static object * |
| 887 | mapping_clear(mp, args) |
| 888 | register mappingobject *mp; |
| 889 | object *args; |
| 890 | { |
| 891 | if (!getnoarg(args)) |
| 892 | return NULL; |
| 893 | mappingclear((object *)mp); |
| 894 | INCREF(None); |
| 895 | return None; |
| 896 | } |
| 897 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 898 | static struct methodlist mapp_methods[] = { |
Guido van Rossum | fb8f1ca | 1997-03-21 21:55:12 +0000 | [diff] [blame] | 899 | {"clear", (method)mapping_clear}, |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 900 | {"has_key", (method)mapping_has_key}, |
| 901 | {"items", (method)mapping_items}, |
| 902 | {"keys", (method)mapping_keys}, |
| 903 | {"values", (method)mapping_values}, |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 904 | {NULL, NULL} /* sentinel */ |
| 905 | }; |
| 906 | |
| 907 | static object * |
| 908 | mapping_getattr(mp, name) |
| 909 | mappingobject *mp; |
| 910 | char *name; |
| 911 | { |
| 912 | return findmethod(mapp_methods, (object *)mp, name); |
| 913 | } |
| 914 | |
| 915 | typeobject Mappingtype = { |
| 916 | OB_HEAD_INIT(&Typetype) |
| 917 | 0, |
Guido van Rossum | 9bfef44 | 1993-03-29 10:43:31 +0000 | [diff] [blame] | 918 | "dictionary", |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 919 | sizeof(mappingobject), |
| 920 | 0, |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 921 | (destructor)mapping_dealloc, /*tp_dealloc*/ |
| 922 | (printfunc)mapping_print, /*tp_print*/ |
| 923 | (getattrfunc)mapping_getattr, /*tp_getattr*/ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 924 | 0, /*tp_setattr*/ |
Guido van Rossum | 1d5735e | 1994-08-30 08:27:36 +0000 | [diff] [blame] | 925 | (cmpfunc)mapping_compare, /*tp_compare*/ |
| 926 | (reprfunc)mapping_repr, /*tp_repr*/ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 927 | 0, /*tp_as_number*/ |
| 928 | 0, /*tp_as_sequence*/ |
| 929 | &mapping_as_mapping, /*tp_as_mapping*/ |
| 930 | }; |
| 931 | |
| 932 | /* For backward compatibility with old dictionary interface */ |
| 933 | |
| 934 | static object *last_name_object; |
Guido van Rossum | 992ded8 | 1995-12-08 01:16:31 +0000 | [diff] [blame] | 935 | static char *last_name_char; /* NULL or == getstringvalue(last_name_object) */ |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 936 | |
| 937 | object * |
| 938 | getattro(v, name) |
| 939 | object *v; |
| 940 | object *name; |
| 941 | { |
Guido van Rossum | d8eb1b3 | 1996-08-09 20:52:03 +0000 | [diff] [blame] | 942 | if (v->ob_type->tp_getattro != NULL) |
| 943 | return (*v->ob_type->tp_getattro)(v, name); |
| 944 | |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 945 | if (name != last_name_object) { |
| 946 | XDECREF(last_name_object); |
| 947 | INCREF(name); |
| 948 | last_name_object = name; |
| 949 | last_name_char = getstringvalue(name); |
| 950 | } |
| 951 | return getattr(v, last_name_char); |
| 952 | } |
| 953 | |
| 954 | int |
| 955 | setattro(v, name, value) |
| 956 | object *v; |
| 957 | object *name; |
| 958 | object *value; |
| 959 | { |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 960 | int err; |
| 961 | INCREF(name); |
| 962 | PyString_InternInPlace(&name); |
Guido van Rossum | d8eb1b3 | 1996-08-09 20:52:03 +0000 | [diff] [blame] | 963 | if (v->ob_type->tp_setattro != NULL) |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 964 | err = (*v->ob_type->tp_setattro)(v, name, value); |
| 965 | else { |
| 966 | if (name != last_name_object) { |
| 967 | XDECREF(last_name_object); |
| 968 | INCREF(name); |
| 969 | last_name_object = name; |
| 970 | last_name_char = getstringvalue(name); |
| 971 | } |
| 972 | err = setattr(v, last_name_char, value); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 973 | } |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 974 | DECREF(name); |
| 975 | return err; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 976 | } |
| 977 | |
| 978 | object * |
| 979 | dictlookup(v, key) |
| 980 | object *v; |
| 981 | char *key; |
| 982 | { |
Guido van Rossum | 992ded8 | 1995-12-08 01:16:31 +0000 | [diff] [blame] | 983 | if (key != last_name_char) { |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 984 | XDECREF(last_name_object); |
| 985 | last_name_object = newstringobject(key); |
| 986 | if (last_name_object == NULL) { |
| 987 | last_name_char = NULL; |
| 988 | return NULL; |
| 989 | } |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 990 | PyString_InternInPlace(&last_name_object); |
Guido van Rossum | 992ded8 | 1995-12-08 01:16:31 +0000 | [diff] [blame] | 991 | last_name_char = getstringvalue(last_name_object); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 992 | } |
| 993 | return mappinglookup(v, last_name_object); |
| 994 | } |
| 995 | |
| 996 | int |
| 997 | dictinsert(v, key, item) |
| 998 | object *v; |
| 999 | char *key; |
| 1000 | object *item; |
| 1001 | { |
Guido van Rossum | 992ded8 | 1995-12-08 01:16:31 +0000 | [diff] [blame] | 1002 | if (key != last_name_char) { |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1003 | XDECREF(last_name_object); |
| 1004 | last_name_object = newstringobject(key); |
| 1005 | if (last_name_object == NULL) { |
| 1006 | last_name_char = NULL; |
Guido van Rossum | 1fc238a | 1993-07-29 08:25:09 +0000 | [diff] [blame] | 1007 | return -1; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1008 | } |
Guido van Rossum | 2a61e74 | 1997-01-18 07:55:05 +0000 | [diff] [blame] | 1009 | PyString_InternInPlace(&last_name_object); |
Guido van Rossum | 992ded8 | 1995-12-08 01:16:31 +0000 | [diff] [blame] | 1010 | last_name_char = getstringvalue(last_name_object); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1011 | } |
| 1012 | return mappinginsert(v, last_name_object, item); |
| 1013 | } |
| 1014 | |
| 1015 | int |
| 1016 | dictremove(v, key) |
| 1017 | object *v; |
| 1018 | char *key; |
| 1019 | { |
Guido van Rossum | 992ded8 | 1995-12-08 01:16:31 +0000 | [diff] [blame] | 1020 | if (key != last_name_char) { |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1021 | XDECREF(last_name_object); |
| 1022 | last_name_object = newstringobject(key); |
| 1023 | if (last_name_object == NULL) { |
| 1024 | last_name_char = NULL; |
Guido van Rossum | 1fc238a | 1993-07-29 08:25:09 +0000 | [diff] [blame] | 1025 | return -1; |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1026 | } |
Guido van Rossum | 992ded8 | 1995-12-08 01:16:31 +0000 | [diff] [blame] | 1027 | last_name_char = getstringvalue(last_name_object); |
Guido van Rossum | 4b1302b | 1993-03-27 18:11:32 +0000 | [diff] [blame] | 1028 | } |
| 1029 | return mappingremove(v, last_name_object); |
| 1030 | } |