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

annotate Objects/mappingobject.c @ 3044:7e7bb00a0a2e legacy-trunk

Added functionality: locate CW projects, copy them, empty them and binhex them.

author	Jack Jansen <jack.jansen@cwi.nl>
date	Thu, 31 Aug 1995 13:47:14 +0000
parents	425835b88099
children	e38c09d00806

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
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	7 Permission to use, copy, modify, and distribute this software and its
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	8 documentation for any purpose and without fee is hereby granted,
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
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	10 both that copyright notice and this permission notice appear in
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
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	12 Centrum or CWI not be used in advertising or publicity pertaining to
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	13 distribution of the software without specific, written prior permission.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	14
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	15 STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	16 THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	17 FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	18 FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	19 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	20 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	21 OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	22
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	23 ******************************************************************/
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	24
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	25 /* Mapping object implementation; using a hash table */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	26
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1256 diff changeset	27 /* 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	28 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	29 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	30 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	31 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	32
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	33 #include "allobjects.h"
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	34 #include "modsupport.h"
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	35
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	36
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	37 /*
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	38 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	39 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	40 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	41 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	42 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	43 The final value is a sentinel.
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	44 */
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	45 static long primes[] = {
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	46 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	47 5987,
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	48 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	49 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	50 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	51 134217689L, 268435399L, 536870909L, 1073741789L,
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	52 0
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	53 };
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	54
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	55 /* 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	56 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	57
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	58 /*
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	59 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	60 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	61 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	62 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	63 */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	64 typedef struct {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	65 long me_hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	66 object *me_key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	67 object *me_value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	68 } mappingentry;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	69
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 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	72 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	73 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	74 of non-NULL, non-dummy keys.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	75 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	76 when it is more than half filled.
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 typedef struct {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	79 OB_HEAD
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	80 int ma_fill;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	81 int ma_used;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	82 int ma_size;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	83 mappingentry *ma_table;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	84 } mappingobject;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	85
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	86 object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	87 newmappingobject()
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	88 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	89 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	90 if (dummy == NULL) { /* Auto-initialize dummy */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	91 dummy = newstringobject("<dummy key>");
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	92 if (dummy == NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	93 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	94 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	95 mp = NEWOBJ(mappingobject, &Mappingtype);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	96 if (mp == NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	97 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	98 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	99 mp->ma_table = NULL;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	100 mp->ma_fill = 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	101 mp->ma_used = 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	102 return (object *)mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	103 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	104
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	105 /*
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	106 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	107 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	108 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	109 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	110
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	111 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	112 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	113 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	114 All arithmetic on sum should ignore overflow.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	115
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	116 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	117 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	118 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	119 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	120 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	121 */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	122 static mappingentry lookmapping PROTO((mappingobject , object *, long));
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	123 static mappingentry *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	124 lookmapping(mp, key, hash)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	125 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	126 object *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	127 long hash;
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 register int i, incr;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	130 register unsigned long sum = (unsigned long) hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	131 register mappingentry *freeslot = NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	132 /* 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	133 and 0 < incr < ma_size and both are a function of hash */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	134 i = sum % mp->ma_size;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	135 do {
2504 425835b88099 a few peephole optimizations Guido van Rossum <guido@python.org> parents: 2059 diff changeset	136 sum = 3*sum + 1;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	137 incr = sum % mp->ma_size;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	138 } while (incr == 0);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	139 for (;;) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	140 register mappingentry *ep = &mp->ma_table[i];
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	141 if (ep->me_key == NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	142 if (freeslot != NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	143 return freeslot;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	144 else
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	145 return ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	146 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	147 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	148 if (freeslot == NULL)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	149 freeslot = ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	150 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	151 else if (ep->me_hash == hash &&
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	152 cmpobject(ep->me_key, key) == 0) {
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 i = (i + incr) % mp->ma_size;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	156 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	157 }
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 /*
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	160 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	161 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	162 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	163 */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	164 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	165 static void
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	166 insertmapping(mp, key, hash, value)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	167 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	168 object *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	169 long hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	170 object *value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	171 {
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	172 object *old_value;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	173 register mappingentry *ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	174 ep = lookmapping(mp, key, hash);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	175 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	176 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	177 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	178 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	179 DECREF(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	180 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	181 else {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	182 if (ep->me_key == NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	183 mp->ma_fill++;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	184 else
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	185 DECREF(ep->me_key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	186 ep->me_key = key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	187 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	188 ep->me_value = value;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	189 mp->ma_used++;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	190 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	191 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	192
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	193 /*
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	194 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	195 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	196 actually be smaller than the old one.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	197 */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	198 static int mappingresize PROTO((mappingobject *));
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	199 static int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	200 mappingresize(mp)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	201 mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	202 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	203 register int oldsize = mp->ma_size;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	204 register int newsize;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	205 register mappingentry *oldtable = mp->ma_table;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	206 register mappingentry *newtable;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	207 register mappingentry *ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	208 register int i;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	209 newsize = mp->ma_size;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	210 for (i = 0; ; i++) {
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	211 if (primes[i] <= 0) {
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	212 /* Ran out of primes */
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	213 err_nomem();
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	214 return -1;
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	215 }
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	216 if (primes[i] > mp->ma_used*2) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	217 newsize = primes[i];
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	218 if (newsize != primes[i]) {
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	219 /* Integer truncation */
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	220 err_nomem();
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	221 return -1;
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	222 }
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	223 break;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	224 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	225 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	226 newtable = (mappingentry *) calloc(sizeof(mappingentry), newsize);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	227 if (newtable == NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	228 err_nomem();
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	229 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	230 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	231 mp->ma_size = newsize;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	232 mp->ma_table = newtable;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	233 mp->ma_fill = 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	234 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	235
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	236 /* 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	237 (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	238 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	239 if (ep->me_value != NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	240 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	241 }
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	242 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	243 if (ep->me_value == NULL)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	244 XDECREF(ep->me_key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	245 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	246
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	247 XDEL(oldtable);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	248 return 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	249 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	250
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	251 object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	252 mappinglookup(op, key)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	253 object *op;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	254 object *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	255 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	256 long hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	257 if (!is_mappingobject(op)) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	258 err_badcall();
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	259 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	260 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	261 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	262 return NULL;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	263 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	264 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	265 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	266 hash = hashobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	267 if (hash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	268 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	269 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	270 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	271
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	272 int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	273 mappinginsert(op, key, value)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	274 register object *op;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	275 object *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	276 object *value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	277 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	278 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	279 register long hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	280 if (!is_mappingobject(op)) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	281 err_badcall();
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	282 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	283 }
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	284 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	285 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	286 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	287 hash = hashobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	288 if (hash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	289 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	290 mp = (mappingobject *)op;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	291 /* if fill >= 2/3 size, resize */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	292 if (mp->ma_fill3 >= mp->ma_size2) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	293 if (mappingresize(mp) != 0) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	294 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	295 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	296 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	297 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	298 INCREF(value);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	299 INCREF(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	300 insertmapping(mp, key, hash, value);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	301 return 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	302 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	303
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	304 int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	305 mappingremove(op, key)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	306 object *op;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	307 object *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	308 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	309 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	310 register long hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	311 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	312 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	313
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	314 if (!is_mappingobject(op)) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	315 err_badcall();
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	316 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	317 }
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	318 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	319 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	320 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	321 hash = hashobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	322 if (hash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	323 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	324 mp = (mappingobject *)op;
2056 aff5d7d06735 * Objects/mappingobject.c (mappingremove): don't call Guido van Rossum <guido@python.org> parents: 2053 diff changeset	325 if (((mappingobject *)op)->ma_table == NULL)
aff5d7d06735 * Objects/mappingobject.c (mappingremove): don't call Guido van Rossum <guido@python.org> parents: 2053 diff changeset	326 goto empty;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	327 ep = lookmapping(mp, key, hash);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	328 if (ep->me_value == NULL) {
2056 aff5d7d06735 * Objects/mappingobject.c (mappingremove): don't call Guido van Rossum <guido@python.org> parents: 2053 diff changeset	329 empty:
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	330 err_setval(KeyError, key);
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 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	333 old_key = ep->me_key;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	334 INCREF(dummy);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	335 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	336 old_value = ep->me_value;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	337 ep->me_value = NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	338 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	339 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	340 DECREF(old_key);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	341 return 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	342 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	343
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	344 void
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	345 mappingclear(op)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	346 object *op;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	347 {
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	348 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	349 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	350 mappingobject *mp;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	351 if (!is_mappingobject(op))
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	352 return;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	353 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	354 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	355 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	356 return;
de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	357 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	358 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	359 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	360 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	361 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	362 XDECREF(table[i].me_value);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	363 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	364 DEL(table);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	365 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	366
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	367 int
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	368 mappinggetnext(op, ppos, pkey, pvalue)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	369 object *op;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	370 int *ppos;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	371 object **pkey;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	372 object **pvalue;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	373 {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	374 int i;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	375 register mappingobject *mp;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	376 if (!is_dictobject(op))
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	377 return 0;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	378 mp = (mappingobject *)op;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	379 i = *ppos;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	380 if (i < 0)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	381 return 0;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	382 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	383 i++;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	384 *ppos = i+1;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	385 if (i >= mp->ma_size)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	386 return 0;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	387 if (pkey)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	388 *pkey = mp->ma_table[i].me_key;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	389 if (pvalue)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	390 *pvalue = mp->ma_table[i].me_value;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	391 return 1;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	392 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	393
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	394 /* Methods */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	395
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	396 static void
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	397 mapping_dealloc(mp)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	398 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	399 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	400 register int i;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	401 register mappingentry *ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	402 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	403 if (ep->me_key != NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	404 DECREF(ep->me_key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	405 if (ep->me_value != NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	406 DECREF(ep->me_value);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	407 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	408 XDEL(mp->ma_table);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	409 DEL(mp);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	410 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	411
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	412 static int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	413 mapping_print(mp, fp, flags)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	414 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	415 register FILE *fp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	416 register int flags;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	417 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	418 register int i;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	419 register int any;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	420 register mappingentry *ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	421 fprintf(fp, "{");
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	422 any = 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	423 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	424 if (ep->me_value != NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	425 if (any++ > 0)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	426 fprintf(fp, ", ");
1405 90c5e2bb4da5 * posixmodule.c: added set{uid,gid}. Guido van Rossum <guido@python.org> parents: 1398 diff changeset	427 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	428 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	429 fprintf(fp, ": ");
1405 90c5e2bb4da5 * posixmodule.c: added set{uid,gid}. Guido van Rossum <guido@python.org> parents: 1398 diff changeset	430 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	431 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	432 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	433 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	434 fprintf(fp, "}");
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	435 return 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	436 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	437
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	438 static object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	439 mapping_repr(mp)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	440 mappingobject *mp;
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 auto object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	443 object sepa, colon;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	444 register int i;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	445 register int any;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	446 register mappingentry *ep;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	447 v = newstringobject("{");
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	448 sepa = newstringobject(", ");
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	449 colon = newstringobject(": ");
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	450 any = 0;
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	451 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	452 if (ep->me_value != NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	453 if (any++)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	454 joinstring(&v, sepa);
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	455 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	456 joinstring(&v, colon);
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	457 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	458 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	459 }
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	460 joinstring_decref(&v, newstringobject("}"));
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	461 XDECREF(sepa);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	462 XDECREF(colon);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	463 return v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	464 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	465
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	466 static int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	467 mapping_length(mp)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	468 mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	469 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	470 return mp->ma_used;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	471 }
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 static object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	474 mapping_subscript(mp, key)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	475 mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	476 register object *key;
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 object *v;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	479 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	480 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	481 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	482 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	483 }
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	484 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	485 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	486 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	487 hash = hashobject(key);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	488 if (hash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	489 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	490 v = lookmapping(mp, key, hash) -> me_value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	491 if (v == NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	492 err_setval(KeyError, key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	493 else
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	494 INCREF(v);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	495 return v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	496 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	497
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	498 static int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	499 mapping_ass_sub(mp, v, w)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	500 mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	501 object v, w;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	502 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	503 if (w == NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	504 return mappingremove((object *)mp, v);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	505 else
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	506 return mappinginsert((object *)mp, v, w);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	507 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	508
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	509 static mapping_methods mapping_as_mapping = {
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	510 (inquiry)mapping_length, /mp_length/
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	511 (binaryfunc)mapping_subscript, /mp_subscript/
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	512 (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	513 };
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	514
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	515 static object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	516 mapping_keys(mp, args)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	517 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	518 object *args;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	519 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	520 register object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	521 register int i, j;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	522 if (!getnoarg(args))
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	523 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	524 v = newlistobject(mp->ma_used);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	525 if (v == NULL)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	526 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	527 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	528 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	529 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	530 INCREF(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	531 setlistitem(v, j, key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	532 j++;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	533 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	534 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	535 return v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	536 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	537
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	538 static object *
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	539 mapping_values(mp, args)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	540 register mappingobject *mp;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	541 object *args;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	542 {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	543 register object *v;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	544 register int i, j;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	545 if (!getnoarg(args))
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	546 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	547 v = newlistobject(mp->ma_used);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	548 if (v == NULL)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	549 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	550 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	551 if (mp->ma_table[i].me_value != NULL) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	552 object *value = mp->ma_table[i].me_value;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	553 INCREF(value);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	554 setlistitem(v, j, value);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	555 j++;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	556 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	557 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	558 return v;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	559 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	560
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	561 static object *
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	562 mapping_items(mp, args)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	563 register mappingobject *mp;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	564 object *args;
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 register object *v;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	567 register int i, j;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	568 if (!getnoarg(args))
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	569 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	570 v = newlistobject(mp->ma_used);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	571 if (v == NULL)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	572 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	573 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	574 if (mp->ma_table[i].me_value != NULL) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	575 object *key = mp->ma_table[i].me_key;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	576 object *value = mp->ma_table[i].me_value;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	577 object *item = newtupleobject(2);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	578 if (item == NULL) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	579 DECREF(v);
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 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	582 INCREF(key);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	583 settupleitem(item, 0, key);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	584 INCREF(value);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	585 settupleitem(item, 1, value);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	586 setlistitem(v, j, item);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	587 j++;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	588 }
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 return v;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	591 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	592
1398 1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	593 int
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	594 getmappingsize(mp)
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	595 object *mp;
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	596 {
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	597 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	598 err_badcall();
1413 c914b10bf2ed * timemodule.c: Add hack for Solaris 2. Guido van Rossum <guido@python.org> parents: 1406 diff changeset	599 return 0;
1398 1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	600 }
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	601 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	602 }
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	603
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	604 object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	605 getmappingkeys(mp)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	606 object *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	607 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	608 if (mp == NULL \|\| !is_mappingobject(mp)) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	609 err_badcall();
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	610 return NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	611 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	612 return mapping_keys((mappingobject )mp, (object )NULL);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	613 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	614
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	615 object *
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	616 getmappingvalues(mp)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	617 object *mp;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	618 {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	619 if (mp == NULL \|\| !is_mappingobject(mp)) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	620 err_badcall();
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	621 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	622 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	623 return mapping_values((mappingobject )mp, (object )NULL);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	624 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	625
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	626 object *
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	627 getmappingitems(mp)
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	628 object *mp;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	629 {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	630 if (mp == NULL \|\| !is_mappingobject(mp)) {
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	631 err_badcall();
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	632 return NULL;
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	633 }
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	634 return mapping_items((mappingobject )mp, (object )NULL);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	635 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	636
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	637 static int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	638 mapping_compare(a, b)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	639 mappingobject a, b;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	640 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	641 object akeys, bkeys;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	642 int i, n, res;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	643 if (a == b)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	644 return 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	645 if (a->ma_used == 0) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	646 if (b->ma_used != 0)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	647 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	648 else
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	649 return 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	650 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	651 else {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	652 if (b->ma_used == 0)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	653 return 1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	654 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	655 akeys = mapping_keys(a, (object *)NULL);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	656 bkeys = mapping_keys(b, (object *)NULL);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	657 if (akeys == NULL \|\| bkeys == NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	658 /* Oops, out of memory -- what to do? */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	659 /* For now, sort on address! */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	660 XDECREF(akeys);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	661 XDECREF(bkeys);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	662 if (a < b)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	663 return -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	664 else
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	665 return 1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	666 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	667 sortlist(akeys);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	668 sortlist(bkeys);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	669 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	670 res = 0;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	671 for (i = 0; i < n; i++) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	672 object akey, bkey, aval, bval;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	673 long ahash, bhash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	674 akey = getlistitem(akeys, i);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	675 bkey = getlistitem(bkeys, i);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	676 res = cmpobject(akey, bkey);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	677 if (res != 0)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	678 break;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	679 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	680 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	681 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	682 ahash = hashobject(akey);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	683 if (ahash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	684 err_clear(); /* Don't want errors here */
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	685 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	686 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	687 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	688 bhash = hashobject(bkey);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	689 if (bhash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	690 err_clear(); /* Don't want errors here */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	691 aval = lookmapping(a, akey, ahash) -> me_value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	692 bval = lookmapping(b, bkey, bhash) -> me_value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	693 res = cmpobject(aval, bval);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	694 if (res != 0)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	695 break;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	696 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	697 if (res == 0) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	698 if (a->ma_used < b->ma_used)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	699 res = -1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	700 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	701 res = 1;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	702 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	703 DECREF(akeys);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	704 DECREF(bkeys);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	705 return res;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	706 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	707
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	708 static object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	709 mapping_has_key(mp, args)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	710 register mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	711 object *args;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	712 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	713 object *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	714 long hash;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	715 register long ok;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	716 if (!getargs(args, "O", &key))
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	717 return NULL;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	718 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1330 diff changeset	719 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	720 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	721 hash = hashobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	722 if (hash == -1)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	723 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	724 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	725 return newintobject(ok);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	726 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	727
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	728 static struct methodlist mapp_methods[] = {
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	729 {"has_key", (method)mapping_has_key},
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	730 {"items", (method)mapping_items},
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	731 {"keys", (method)mapping_keys},
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	732 {"values", (method)mapping_values},
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	733 {NULL, NULL} /* sentinel */
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 object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	737 mapping_getattr(mp, name)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	738 mappingobject *mp;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	739 char *name;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	740 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	741 return findmethod(mapp_methods, (object *)mp, name);
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 typeobject Mappingtype = {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	745 OB_HEAD_INIT(&Typetype)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	746 0,
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1256 diff changeset	747 "dictionary",
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	748 sizeof(mappingobject),
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	749 0,
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	750 (destructor)mapping_dealloc, /tp_dealloc/
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	751 (printfunc)mapping_print, /tp_print/
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	752 (getattrfunc)mapping_getattr, /tp_getattr/
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	753 0, /tp_setattr/
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	754 (cmpfunc)mapping_compare, /tp_compare/
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1414 diff changeset	755 (reprfunc)mapping_repr, /tp_repr/
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	756 0, /tp_as_number/
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	757 0, /tp_as_sequence/
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	758 &mapping_as_mapping, /tp_as_mapping/
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	759 };
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	760
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	761 /* For backward compatibility with old dictionary interface */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	762
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	763 static object *last_name_object;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	764 static char *last_name_char;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	765
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	766 object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	767 getattro(v, name)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	768 object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	769 object *name;
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 if (name != last_name_object) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	772 XDECREF(last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	773 INCREF(name);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	774 last_name_object = name;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	775 last_name_char = getstringvalue(name);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	776 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	777 return getattr(v, last_name_char);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	778 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	779
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	780 int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	781 setattro(v, name, value)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	782 object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	783 object *name;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	784 object *value;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	785 {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	786 if (name != last_name_object) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	787 XDECREF(last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	788 INCREF(name);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	789 last_name_object = name;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	790 last_name_char = getstringvalue(name);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	791 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	792 return setattr(v, last_name_char, value);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	793 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	794
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	795 object *
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	796 dictlookup(v, key)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	797 object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	798 char *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	799 {
1414 2852edb4fffe Fix lay-out of previous fix. Guido van Rossum <guido@python.org> parents: 1413 diff changeset	800 if (key != last_name_char \|\|
2852edb4fffe Fix lay-out of previous fix. Guido van Rossum <guido@python.org> parents: 1413 diff changeset	801 strcmp(key, getstringvalue(last_name_object)) != 0) {
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	802 XDECREF(last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	803 last_name_object = newstringobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	804 if (last_name_object == NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	805 last_name_char = NULL;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	806 return NULL;
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 last_name_char = key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	809 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	810 return mappinglookup(v, last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	811 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	812
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	813 int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	814 dictinsert(v, key, item)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	815 object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	816 char *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	817 object *item;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	818 {
1414 2852edb4fffe Fix lay-out of previous fix. Guido van Rossum <guido@python.org> parents: 1413 diff changeset	819 if (key != last_name_char \|\|
2852edb4fffe Fix lay-out of previous fix. Guido van Rossum <guido@python.org> parents: 1413 diff changeset	820 strcmp(key, getstringvalue(last_name_object)) != 0) {
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	821 XDECREF(last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	822 last_name_object = newstringobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	823 if (last_name_object == NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	824 last_name_char = NULL;
1330 409ea74feb21 Minor fixes / changes for Mac compatibility. Guido van Rossum <guido@python.org> parents: 1288 diff changeset	825 return -1;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	826 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	827 last_name_char = key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	828 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	829 return mappinginsert(v, last_name_object, item);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	830 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	831
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	832 int
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	833 dictremove(v, key)
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	834 object *v;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	835 char *key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	836 {
1413 c914b10bf2ed * timemodule.c: Add hack for Solaris 2. Guido van Rossum <guido@python.org> parents: 1406 diff changeset	837 if (key != last_name_char \|\|
c914b10bf2ed * timemodule.c: Add hack for Solaris 2. Guido van Rossum <guido@python.org> parents: 1406 diff changeset	838 strcmp(key, getstringvalue(last_name_object)) != 0) {
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	839 XDECREF(last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	840 last_name_object = newstringobject(key);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	841 if (last_name_object == NULL) {
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	842 last_name_char = NULL;
1330 409ea74feb21 Minor fixes / changes for Mac compatibility. Guido van Rossum <guido@python.org> parents: 1288 diff changeset	843 return -1;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	844 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	845 last_name_char = key;
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	846 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	847 return mappingremove(v, last_name_object);
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	848 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/mappingobject.c @ 3044:7e7bb00a0a2e legacy-trunk