cpython-lru_cache-weakref: Objects/dictobject.c annotate

annotate Objects/dictobject.c @ 4566:6403c94de50d legacy-trunk

Added safeguard against failure in __del__.

author	Guido van Rossum <guido@python.org>
date	Wed, 27 Nov 1996 19:39:58 +0000
parents	65d2d8e67da3
children	b3d2990d8a4a

rev	line source
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1 /***********************************************************
2059 866c81068dbd Added 1995 to copyright message. Guido van Rossum <guido@python.org> parents: 2056 diff changeset	2 Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
866c81068dbd Added 1995 to copyright message. Guido van Rossum <guido@python.org> parents: 2056 diff changeset	3 The Netherlands.
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	4
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	5 All Rights Reserved
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	6
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	7 Permission to use, copy, modify, and distribute this software and its
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	8 documentation for any purpose and without fee is hereby granted,
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	9 provided that the above copyright notice appear in all copies and that
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	10 both that copyright notice and this permission notice appear in
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	11 supporting documentation, and that the names of Stichting Mathematisch
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	12 Centrum or CWI or Corporation for National Research Initiatives or
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	13 CNRI not be used in advertising or publicity pertaining to
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	14 distribution of the software without specific, written prior
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	15 permission.
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	16
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	17 While CWI is the initial source for this software, a modified version
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	18 is made available by the Corporation for National Research Initiatives
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	19 (CNRI) at the Internet address ftp://ftp.python.org.
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	20
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	21 STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	22 REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	23 MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	24 CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	25 DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	26 PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	27 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3986 diff changeset	28 PERFORMANCE OF THIS SOFTWARE.
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	29
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	30 ******************************************************************/
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	31
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	32 /* Mapping object implementation; using a hash table */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	33
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1256 diff changeset	34 /* This file should really be called "dictobject.c", since "mapping"
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1256 diff changeset	35 is the generic name for objects with an unorderred arbitrary key
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1256 diff changeset	36 set (just like lists are sequences), but since it improves (and was
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1256 diff changeset	37 originally derived from) a file by that name I had to change its
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1256 diff changeset	38 name. For the user these objects are still called "dictionaries". */
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1256 diff changeset	39
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	40 #include "allobjects.h"
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	41 #include "modsupport.h"
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	42
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	43
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	44 /*
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	45 Table of primes suitable as keys, in ascending order.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	46 The first line are the largest primes less than some powers of two,
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	47 the second line is the largest prime less than 6000,
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	48 the third line is a selection from Knuth, Vol. 3, Sec. 6.1, Table 1,
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	49 and the next three lines were suggested by Steve Kirsch.
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	50 The final value is a sentinel.
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	51 */
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	52 static long primes[] = {
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	53 3, 7, 13, 31, 61, 127, 251, 509, 1021, 2017, 4093,
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	54 5987,
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	55 9551, 15683, 19609, 31397,
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	56 65521L, 131071L, 262139L, 524287L, 1048573L, 2097143L,
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	57 4194301L, 8388593L, 16777213L, 33554393L, 67108859L,
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	58 134217689L, 268435399L, 536870909L, 1073741789L,
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	59 0
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	60 };
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	61
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	62 /* Object used as dummy key to fill deleted entries */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	63 static object dummy; / Initialized by first call to newmappingobject() */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	64
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	65 /*
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	66 Invariant for entries: when in use, de_value is not NULL and de_key is
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	67 not NULL and not dummy; when not in use, de_value is NULL and de_key
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	68 is either NULL or dummy. A dummy key value cannot be replaced by
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	69 NULL, since otherwise other keys may be lost.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	70 */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	71 typedef struct {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	72 long me_hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	73 object *me_key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	74 object *me_value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	75 } mappingentry;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	76
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	77 /*
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	78 To ensure the lookup algorithm terminates, the table size must be a
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	79 prime number and there must be at least one NULL key in the table.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	80 The value ma_fill is the number of non-NULL keys; ma_used is the number
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	81 of non-NULL, non-dummy keys.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	82 To avoid slowing down lookups on a near-full table, we resize the table
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	83 when it is more than half filled.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	84 */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	85 typedef struct {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	86 OB_HEAD
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	87 int ma_fill;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	88 int ma_used;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	89 int ma_size;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	90 mappingentry *ma_table;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	91 } mappingobject;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	92
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	93 object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	94 newmappingobject()
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	95 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	96 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	97 if (dummy == NULL) { /* Auto-initialize dummy */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	98 dummy = newstringobject("<dummy key>");
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	99 if (dummy == NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	100 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	101 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	102 mp = NEWOBJ(mappingobject, &Mappingtype);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	103 if (mp == NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	104 return NULL;
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	105 mp->ma_size = 0;
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	106 mp->ma_table = NULL;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	107 mp->ma_fill = 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	108 mp->ma_used = 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	109 return (object *)mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	110 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	111
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	112 /*
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	113 The basic lookup function used by all operations.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	114 This is essentially Algorithm D from Knuth Vol. 3, Sec. 6.4.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	115 Open addressing is preferred over chaining since the link overhead for
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	116 chaining would be substantial (100% with typical malloc overhead).
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	117
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	118 First a 32-bit hash value, 'sum', is computed from the key string.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	119 The first character is added an extra time shifted by 8 to avoid hashing
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	120 single-character keys (often heavily used variables) too close together.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	121 All arithmetic on sum should ignore overflow.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	122
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	123 The initial probe index is then computed as sum mod the table size.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	124 Subsequent probe indices are incr apart (mod table size), where incr
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	125 is also derived from sum, with the additional requirement that it is
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	126 relative prime to the table size (i.e., 1 <= incr < size, since the size
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	127 is a prime number). My choice for incr is somewhat arbitrary.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	128 */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	129 static mappingentry lookmapping PROTO((mappingobject , object *, long));
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	130 static mappingentry *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	131 lookmapping(mp, key, hash)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	132 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	133 object *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	134 long hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	135 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	136 register int i, incr;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	137 register unsigned long sum = (unsigned long) hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	138 register mappingentry *freeslot = NULL;
3836 fa1480e60ed6 Speedup suggested by Sjoerd Guido van Rossum <guido@python.org> parents: 3287 diff changeset	139 register int size = mp->ma_size;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	140 /* We must come up with (i, incr) such that 0 <= i < ma_size
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	141 and 0 < incr < ma_size and both are a function of hash */
3836 fa1480e60ed6 Speedup suggested by Sjoerd Guido van Rossum <guido@python.org> parents: 3287 diff changeset	142 i = sum % size;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	143 do {
2504 425835b88099 a few peephole optimizations Guido van Rossum <guido@python.org> parents: 2059 diff changeset	144 sum = 3*sum + 1;
3836 fa1480e60ed6 Speedup suggested by Sjoerd Guido van Rossum <guido@python.org> parents: 3287 diff changeset	145 incr = sum % size;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	146 } while (incr == 0);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	147 for (;;) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	148 register mappingentry *ep = &mp->ma_table[i];
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	149 if (ep->me_key == NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	150 if (freeslot != NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	151 return freeslot;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	152 else
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	153 return ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	154 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	155 if (ep->me_key == dummy) {
1406 474823e5f7dc * parsermodule.c, Makefile, config.c: rudimentary interface to the Python Guido van Rossum <guido@python.org> parents: 1405 diff changeset	156 if (freeslot == NULL)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	157 freeslot = ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	158 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	159 else if (ep->me_hash == hash &&
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	160 cmpobject(ep->me_key, key) == 0) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	161 return ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	162 }
3836 fa1480e60ed6 Speedup suggested by Sjoerd Guido van Rossum <guido@python.org> parents: 3287 diff changeset	163 i = (i + incr) % size;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	164 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	165 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	166
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	167 /*
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	168 Internal routine to insert a new item into the table.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	169 Used both by the internal resize routine and by the public insert routine.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	170 Eats a reference to key and one to value.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	171 */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	172 static void insertmapping PROTO((mappingobject , object , long, object *));
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	173 static void
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	174 insertmapping(mp, key, hash, value)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	175 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	176 object *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	177 long hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	178 object *value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	179 {
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	180 object *old_value;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	181 register mappingentry *ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	182 ep = lookmapping(mp, key, hash);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	183 if (ep->me_value != NULL) {
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	184 old_value = ep->me_value;
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	185 ep->me_value = value;
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	186 DECREF(old_value); /* which CAN re-enter */
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	187 DECREF(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	188 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	189 else {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	190 if (ep->me_key == NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	191 mp->ma_fill++;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	192 else
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	193 DECREF(ep->me_key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	194 ep->me_key = key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	195 ep->me_hash = hash;
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	196 ep->me_value = value;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	197 mp->ma_used++;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	198 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	199 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	200
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	201 /*
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	202 Restructure the table by allocating a new table and reinserting all
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	203 items again. When entries have been deleted, the new table may
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	204 actually be smaller than the old one.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	205 */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	206 static int mappingresize PROTO((mappingobject *));
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	207 static int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	208 mappingresize(mp)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	209 mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	210 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	211 register int oldsize = mp->ma_size;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	212 register int newsize;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	213 register mappingentry *oldtable = mp->ma_table;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	214 register mappingentry *newtable;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	215 register mappingentry *ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	216 register int i;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	217 newsize = mp->ma_size;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	218 for (i = 0; ; i++) {
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	219 if (primes[i] <= 0) {
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	220 /* Ran out of primes */
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	221 err_nomem();
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	222 return -1;
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	223 }
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	224 if (primes[i] > mp->ma_used*2) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	225 newsize = primes[i];
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	226 if (newsize != primes[i]) {
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	227 /* Integer truncation */
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	228 err_nomem();
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	229 return -1;
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	230 }
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	231 break;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	232 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	233 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	234 newtable = (mappingentry *) calloc(sizeof(mappingentry), newsize);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	235 if (newtable == NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	236 err_nomem();
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	237 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	238 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	239 mp->ma_size = newsize;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	240 mp->ma_table = newtable;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	241 mp->ma_fill = 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	242 mp->ma_used = 0;
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	243
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	244 /* Make two passes, so we can avoid decrefs
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	245 (and possible side effects) till the table is copied */
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	246 for (i = 0, ep = oldtable; i < oldsize; i++, ep++) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	247 if (ep->me_value != NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	248 insertmapping(mp,ep->me_key,ep->me_hash,ep->me_value);
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	249 }
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	250 for (i = 0, ep = oldtable; i < oldsize; i++, ep++) {
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	251 if (ep->me_value == NULL)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	252 XDECREF(ep->me_key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	253 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	254
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	255 XDEL(oldtable);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	256 return 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	257 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	258
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	259 object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	260 mappinglookup(op, key)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	261 object *op;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	262 object *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	263 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	264 long hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	265 if (!is_mappingobject(op)) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	266 err_badcall();
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	267 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	268 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	269 if (((mappingobject *)op)->ma_table == NULL)
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	270 return NULL;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	271 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	272 if (!is_stringobject(key) \|\| (hash = ((stringobject *) key)->ob_shash) == -1)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	273 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	274 hash = hashobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	275 if (hash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	276 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	277 return lookmapping((mappingobject *)op, key, hash) -> me_value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	278 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	279
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	280 int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	281 mappinginsert(op, key, value)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	282 register object *op;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	283 object *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	284 object *value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	285 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	286 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	287 register long hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	288 if (!is_mappingobject(op)) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	289 err_badcall();
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	290 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	291 }
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	292 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	293 if (!is_stringobject(key) \|\| (hash = ((stringobject *) key)->ob_shash) == -1)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	294 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	295 hash = hashobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	296 if (hash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	297 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	298 mp = (mappingobject *)op;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	299 /* if fill >= 2/3 size, resize */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	300 if (mp->ma_fill3 >= mp->ma_size2) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	301 if (mappingresize(mp) != 0) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	302 if (mp->ma_fill+1 > mp->ma_size)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	303 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	304 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	305 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	306 INCREF(value);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	307 INCREF(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	308 insertmapping(mp, key, hash, value);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	309 return 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	310 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	311
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	312 int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	313 mappingremove(op, key)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	314 object *op;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	315 object *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	316 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	317 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	318 register long hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	319 register mappingentry *ep;
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	320 object old_value, old_key;
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	321
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	322 if (!is_mappingobject(op)) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	323 err_badcall();
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	324 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	325 }
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	326 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	327 if (!is_stringobject(key) \|\| (hash = ((stringobject *) key)->ob_shash) == -1)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	328 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	329 hash = hashobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	330 if (hash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	331 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	332 mp = (mappingobject *)op;
2056 aff5d7d06735 * Objects/mappingobject.c (mappingremove): don't call Guido van Rossum <guido@python.org> parents: 2053 diff changeset	333 if (((mappingobject *)op)->ma_table == NULL)
aff5d7d06735 * Objects/mappingobject.c (mappingremove): don't call Guido van Rossum <guido@python.org> parents: 2053 diff changeset	334 goto empty;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	335 ep = lookmapping(mp, key, hash);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	336 if (ep->me_value == NULL) {
2056 aff5d7d06735 * Objects/mappingobject.c (mappingremove): don't call Guido van Rossum <guido@python.org> parents: 2053 diff changeset	337 empty:
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	338 err_setval(KeyError, key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	339 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	340 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	341 old_key = ep->me_key;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	342 INCREF(dummy);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	343 ep->me_key = dummy;
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	344 old_value = ep->me_value;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	345 ep->me_value = NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	346 mp->ma_used--;
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	347 DECREF(old_value);
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	348 DECREF(old_key);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	349 return 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	350 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	351
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	352 void
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	353 mappingclear(op)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	354 object *op;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	355 {
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	356 int i, n;
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	357 register mappingentry *table;
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	358 mappingobject *mp;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	359 if (!is_mappingobject(op))
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	360 return;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	361 mp = (mappingobject *)op;
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	362 table = mp->ma_table;
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	363 if (table == NULL)
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	364 return;
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	365 n = mp->ma_size;
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	366 mp->ma_size = mp->ma_used = mp->ma_fill = 0;
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	367 mp->ma_table = NULL;
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	368 for (i = 0; i < n; i++) {
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	369 XDECREF(table[i].me_key);
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	370 XDECREF(table[i].me_value);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	371 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	372 DEL(table);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	373 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	374
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	375 int
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	376 mappinggetnext(op, ppos, pkey, pvalue)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	377 object *op;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	378 int *ppos;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	379 object **pkey;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	380 object **pvalue;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	381 {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	382 int i;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	383 register mappingobject *mp;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	384 if (!is_dictobject(op))
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	385 return 0;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	386 mp = (mappingobject *)op;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	387 i = *ppos;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	388 if (i < 0)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	389 return 0;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	390 while (i < mp->ma_size && mp->ma_table[i].me_value == NULL)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	391 i++;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	392 *ppos = i+1;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	393 if (i >= mp->ma_size)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	394 return 0;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	395 if (pkey)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	396 *pkey = mp->ma_table[i].me_key;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	397 if (pvalue)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	398 *pvalue = mp->ma_table[i].me_value;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	399 return 1;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	400 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	401
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	402 /* Methods */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	403
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	404 static void
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	405 mapping_dealloc(mp)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	406 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	407 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	408 register int i;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	409 register mappingentry *ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	410 for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	411 if (ep->me_key != NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	412 DECREF(ep->me_key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	413 if (ep->me_value != NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	414 DECREF(ep->me_value);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	415 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	416 XDEL(mp->ma_table);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	417 DEL(mp);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	418 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	419
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	420 static int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	421 mapping_print(mp, fp, flags)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	422 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	423 register FILE *fp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	424 register int flags;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	425 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	426 register int i;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	427 register int any;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	428 register mappingentry *ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	429 fprintf(fp, "{");
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	430 any = 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	431 for (i = 0, ep = mp->ma_table; i < mp->ma_size; i++, ep++) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	432 if (ep->me_value != NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	433 if (any++ > 0)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	434 fprintf(fp, ", ");
1405 90c5e2bb4da5 * posixmodule.c: added set{uid,gid}. Guido van Rossum <guido@python.org> parents: 1398 diff changeset	435 if (printobject((object *)ep->me_key, fp, 0) != 0)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	436 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	437 fprintf(fp, ": ");
1405 90c5e2bb4da5 * posixmodule.c: added set{uid,gid}. Guido van Rossum <guido@python.org> parents: 1398 diff changeset	438 if (printobject(ep->me_value, fp, 0) != 0)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	439 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	440 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	441 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	442 fprintf(fp, "}");
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	443 return 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	444 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	445
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	446 static object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	447 mapping_repr(mp)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	448 mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	449 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	450 auto object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	451 object sepa, colon;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	452 register int i;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	453 register int any;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	454 register mappingentry *ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	455 v = newstringobject("{");
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	456 sepa = newstringobject(", ");
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	457 colon = newstringobject(": ");
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	458 any = 0;
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	459 for (i = 0, ep = mp->ma_table; i < mp->ma_size && v; i++, ep++) {
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	460 if (ep->me_value != NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	461 if (any++)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	462 joinstring(&v, sepa);
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	463 joinstring_decref(&v, reprobject(ep->me_key));
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	464 joinstring(&v, colon);
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	465 joinstring_decref(&v, reprobject(ep->me_value));
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	466 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	467 }
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	468 joinstring_decref(&v, newstringobject("}"));
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	469 XDECREF(sepa);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	470 XDECREF(colon);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	471 return v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	472 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	473
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	474 static int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	475 mapping_length(mp)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	476 mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	477 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	478 return mp->ma_used;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	479 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	480
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	481 static object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	482 mapping_subscript(mp, key)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	483 mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	484 register object *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	485 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	486 object *v;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	487 long hash;
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	488 if (mp->ma_table == NULL) {
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	489 err_setval(KeyError, key);
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	490 return NULL;
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	491 }
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	492 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	493 if (!is_stringobject(key) \|\| (hash = ((stringobject *) key)->ob_shash) == -1)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	494 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	495 hash = hashobject(key);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	496 if (hash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	497 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	498 v = lookmapping(mp, key, hash) -> me_value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	499 if (v == NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	500 err_setval(KeyError, key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	501 else
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	502 INCREF(v);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	503 return v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	504 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	505
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	506 static int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	507 mapping_ass_sub(mp, v, w)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	508 mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	509 object v, w;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	510 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	511 if (w == NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	512 return mappingremove((object *)mp, v);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	513 else
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	514 return mappinginsert((object *)mp, v, w);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	515 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	516
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	517 static mapping_methods mapping_as_mapping = {
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	518 (inquiry)mapping_length, /mp_length/
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	519 (binaryfunc)mapping_subscript, /mp_subscript/
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	520 (objobjargproc)mapping_ass_sub, /mp_ass_subscript/
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	521 };
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	522
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	523 static object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	524 mapping_keys(mp, args)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	525 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	526 object *args;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	527 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	528 register object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	529 register int i, j;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	530 if (!getnoarg(args))
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	531 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	532 v = newlistobject(mp->ma_used);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	533 if (v == NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	534 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	535 for (i = 0, j = 0; i < mp->ma_size; i++) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	536 if (mp->ma_table[i].me_value != NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	537 object *key = mp->ma_table[i].me_key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	538 INCREF(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	539 setlistitem(v, j, key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	540 j++;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	541 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	542 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	543 return v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	544 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	545
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	546 static object *
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	547 mapping_values(mp, args)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	548 register mappingobject *mp;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	549 object *args;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	550 {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	551 register object *v;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	552 register int i, j;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	553 if (!getnoarg(args))
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	554 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	555 v = newlistobject(mp->ma_used);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	556 if (v == NULL)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	557 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	558 for (i = 0, j = 0; i < mp->ma_size; i++) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	559 if (mp->ma_table[i].me_value != NULL) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	560 object *value = mp->ma_table[i].me_value;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	561 INCREF(value);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	562 setlistitem(v, j, value);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	563 j++;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	564 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	565 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	566 return v;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	567 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	568
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	569 static object *
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	570 mapping_items(mp, args)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	571 register mappingobject *mp;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	572 object *args;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	573 {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	574 register object *v;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	575 register int i, j;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	576 if (!getnoarg(args))
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	577 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	578 v = newlistobject(mp->ma_used);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	579 if (v == NULL)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	580 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	581 for (i = 0, j = 0; i < mp->ma_size; i++) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	582 if (mp->ma_table[i].me_value != NULL) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	583 object *key = mp->ma_table[i].me_key;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	584 object *value = mp->ma_table[i].me_value;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	585 object *item = newtupleobject(2);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	586 if (item == NULL) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	587 DECREF(v);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	588 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	589 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	590 INCREF(key);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	591 settupleitem(item, 0, key);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	592 INCREF(value);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	593 settupleitem(item, 1, value);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	594 setlistitem(v, j, item);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	595 j++;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	596 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	597 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	598 return v;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	599 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	600
1398 1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	601 int
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	602 getmappingsize(mp)
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	603 object *mp;
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	604 {
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	605 if (mp == NULL \|\| !is_mappingobject(mp)) {
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	606 err_badcall();
1413 c914b10bf2ed * timemodule.c: Add hack for Solaris 2. Guido van Rossum <guido@python.org> parents: 1406 diff changeset	607 return 0;
1398 1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	608 }
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	609 return ((mappingobject *)mp)->ma_used;
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	610 }
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	611
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	612 object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	613 getmappingkeys(mp)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	614 object *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	615 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	616 if (mp == NULL \|\| !is_mappingobject(mp)) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	617 err_badcall();
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	618 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	619 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	620 return mapping_keys((mappingobject )mp, (object )NULL);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	621 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	622
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	623 object *
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	624 getmappingvalues(mp)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	625 object *mp;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	626 {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	627 if (mp == NULL \|\| !is_mappingobject(mp)) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	628 err_badcall();
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	629 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	630 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	631 return mapping_values((mappingobject )mp, (object )NULL);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	632 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	633
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	634 object *
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	635 getmappingitems(mp)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	636 object *mp;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	637 {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	638 if (mp == NULL \|\| !is_mappingobject(mp)) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	639 err_badcall();
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	640 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	641 }
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	642 return mapping_items((mappingobject )mp, (object )NULL);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	643 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	644
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	645 static int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	646 mapping_compare(a, b)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	647 mappingobject a, b;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	648 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	649 object akeys, bkeys;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	650 int i, n, res;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	651 if (a == b)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	652 return 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	653 if (a->ma_used == 0) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	654 if (b->ma_used != 0)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	655 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	656 else
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	657 return 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	658 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	659 else {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	660 if (b->ma_used == 0)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	661 return 1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	662 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	663 akeys = mapping_keys(a, (object *)NULL);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	664 bkeys = mapping_keys(b, (object *)NULL);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	665 if (akeys == NULL \|\| bkeys == NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	666 /* Oops, out of memory -- what to do? */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	667 /* For now, sort on address! */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	668 XDECREF(akeys);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	669 XDECREF(bkeys);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	670 if (a < b)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	671 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	672 else
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	673 return 1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	674 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	675 sortlist(akeys);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	676 sortlist(bkeys);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	677 n = a->ma_used < b->ma_used ? a->ma_used : b->ma_used; /* smallest */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	678 res = 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	679 for (i = 0; i < n; i++) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	680 object akey, bkey, aval, bval;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	681 long ahash, bhash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	682 akey = getlistitem(akeys, i);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	683 bkey = getlistitem(bkeys, i);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	684 res = cmpobject(akey, bkey);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	685 if (res != 0)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	686 break;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	687 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	688 if (!is_stringobject(akey) \|\| (ahash = ((stringobject *) akey)->ob_shash) == -1)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	689 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	690 ahash = hashobject(akey);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	691 if (ahash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	692 err_clear(); /* Don't want errors here */
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	693 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	694 if (!is_stringobject(bkey) \|\| (bhash = ((stringobject *) bkey)->ob_shash) == -1)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	695 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	696 bhash = hashobject(bkey);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	697 if (bhash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	698 err_clear(); /* Don't want errors here */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	699 aval = lookmapping(a, akey, ahash) -> me_value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	700 bval = lookmapping(b, bkey, bhash) -> me_value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	701 res = cmpobject(aval, bval);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	702 if (res != 0)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	703 break;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	704 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	705 if (res == 0) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	706 if (a->ma_used < b->ma_used)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	707 res = -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	708 else if (a->ma_used > b->ma_used)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	709 res = 1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	710 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	711 DECREF(akeys);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	712 DECREF(bkeys);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	713 return res;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	714 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	715
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	716 static object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	717 mapping_has_key(mp, args)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	718 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	719 object *args;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	720 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	721 object *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	722 long hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	723 register long ok;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	724 if (!getargs(args, "O", &key))
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	725 return NULL;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	726 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	727 if (!is_stringobject(key) \|\| (hash = ((stringobject *) key)->ob_shash) == -1)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	728 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	729 hash = hashobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	730 if (hash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	731 return NULL;
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	732 ok = mp->ma_size != 0 && lookmapping(mp, key, hash)->me_value != NULL;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	733 return newintobject(ok);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	734 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	735
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	736 static struct methodlist mapp_methods[] = {
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	737 {"has_key", (method)mapping_has_key},
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	738 {"items", (method)mapping_items},
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	739 {"keys", (method)mapping_keys},
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	740 {"values", (method)mapping_values},
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	741 {NULL, NULL} /* sentinel */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	742 };
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	743
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	744 static object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	745 mapping_getattr(mp, name)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	746 mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	747 char *name;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	748 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	749 return findmethod(mapp_methods, (object *)mp, name);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	750 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	751
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	752 typeobject Mappingtype = {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	753 OB_HEAD_INIT(&Typetype)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	754 0,
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1256 diff changeset	755 "dictionary",
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	756 sizeof(mappingobject),
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	757 0,
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	758 (destructor)mapping_dealloc, /tp_dealloc/
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	759 (printfunc)mapping_print, /tp_print/
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	760 (getattrfunc)mapping_getattr, /tp_getattr/
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	761 0, /tp_setattr/
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	762 (cmpfunc)mapping_compare, /tp_compare/
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	763 (reprfunc)mapping_repr, /tp_repr/
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	764 0, /tp_as_number/
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	765 0, /tp_as_sequence/
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	766 &mapping_as_mapping, /tp_as_mapping/
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	767 };
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	768
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	769 /* For backward compatibility with old dictionary interface */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	770
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	771 static object *last_name_object;
3287 e38c09d00806 fix free memory reads in dictlookup et al Guido van Rossum <guido@python.org> parents: 2504 diff changeset	772 static char last_name_char; / NULL or == getstringvalue(last_name_object) */
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	773
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	774 object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	775 getattro(v, name)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	776 object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	777 object *name;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	778 {
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3836 diff changeset	779 if (v->ob_type->tp_getattro != NULL)
9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3836 diff changeset	780 return (*v->ob_type->tp_getattro)(v, name);
9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3836 diff changeset	781
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	782 if (name != last_name_object) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	783 XDECREF(last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	784 INCREF(name);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	785 last_name_object = name;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	786 last_name_char = getstringvalue(name);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	787 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	788 return getattr(v, last_name_char);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	789 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	790
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	791 int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	792 setattro(v, name, value)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	793 object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	794 object *name;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	795 object *value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	796 {
3986 9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3836 diff changeset	797 if (v->ob_type->tp_setattro != NULL)
9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3836 diff changeset	798 return (*v->ob_type->tp_setattro)(v, name, value);
9c2cbf306864 Support for tp_getattro, tp_setattro (Sjoerd) Guido van Rossum <guido@python.org> parents: 3836 diff changeset	799
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	800 if (name != last_name_object) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	801 XDECREF(last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	802 INCREF(name);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	803 last_name_object = name;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	804 last_name_char = getstringvalue(name);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	805 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	806 return setattr(v, last_name_char, value);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	807 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	808
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	809 object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	810 dictlookup(v, key)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	811 object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	812 char *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	813 {
3287 e38c09d00806 fix free memory reads in dictlookup et al Guido van Rossum <guido@python.org> parents: 2504 diff changeset	814 if (key != last_name_char) {
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	815 XDECREF(last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	816 last_name_object = newstringobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	817 if (last_name_object == NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	818 last_name_char = NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	819 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	820 }
3287 e38c09d00806 fix free memory reads in dictlookup et al Guido van Rossum <guido@python.org> parents: 2504 diff changeset	821 last_name_char = getstringvalue(last_name_object);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	822 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	823 return mappinglookup(v, last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	824 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	825
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	826 int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	827 dictinsert(v, key, item)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	828 object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	829 char *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	830 object *item;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	831 {
3287 e38c09d00806 fix free memory reads in dictlookup et al Guido van Rossum <guido@python.org> parents: 2504 diff changeset	832 if (key != last_name_char) {
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	833 XDECREF(last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	834 last_name_object = newstringobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	835 if (last_name_object == NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	836 last_name_char = NULL;
1330 409ea74feb21 Minor fixes / changes for Mac compatibility. Guido van Rossum <guido@python.org> parents: 1288 diff changeset	837 return -1;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	838 }
3287 e38c09d00806 fix free memory reads in dictlookup et al Guido van Rossum <guido@python.org> parents: 2504 diff changeset	839 last_name_char = getstringvalue(last_name_object);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	840 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	841 return mappinginsert(v, last_name_object, item);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	842 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	843
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	844 int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	845 dictremove(v, key)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	846 object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	847 char *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	848 {
3287 e38c09d00806 fix free memory reads in dictlookup et al Guido van Rossum <guido@python.org> parents: 2504 diff changeset	849 if (key != last_name_char) {
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	850 XDECREF(last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	851 last_name_object = newstringobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	852 if (last_name_object == NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	853 last_name_char = NULL;
1330 409ea74feb21 Minor fixes / changes for Mac compatibility. Guido van Rossum <guido@python.org> parents: 1288 diff changeset	854 return -1;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	855 }
3287 e38c09d00806 fix free memory reads in dictlookup et al Guido van Rossum <guido@python.org> parents: 2504 diff changeset	856 last_name_char = getstringvalue(last_name_object);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	857 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	858 return mappingremove(v, last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	859 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/dictobject.c @ 4566:6403c94de50d legacy-trunk