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

annotate Objects/dictobject.c @ 79675:c0a2294de787 2.7

Issue #16199: Backport 2to3 typo fix from 3.2.

author	Chris Jerdonek <chris.jerdonek@gmail.com>
date	Thu, 11 Oct 2012 16:15:46 -0700
parents	5c52e7c6d868
children	6a582cdfee41

rev	line source
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1
10461 4abc5abaec9a Vladimir Marangozov contributed updated comments. Guido van Rossum <guido@python.org> parents: 9487 diff changeset	2 /* Dictionary object implementation using a hash table */
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1256 diff changeset	3
28946 dbdeb734ff97 Add a reference to dictnotes.txt. It does no good if you don't know it's Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	4 /* The distribution includes a separate file, Objects/dictnotes.txt,
36164 50886d42b444 Fixed English in a comment; trimmed trailing whitespace; Tim Peters <tim.peters@gmail.com> parents: 35636 diff changeset	5 describing explorations into dictionary design and optimization.
28946 dbdeb734ff97 Add a reference to dictnotes.txt. It does no good if you don't know it's Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	6 It covers typical dictionary use patterns, the parameters for
dbdeb734ff97 Add a reference to dictnotes.txt. It does no good if you don't know it's Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	7 tuning dictionaries, and several ideas for possible optimizations.
dbdeb734ff97 Add a reference to dictnotes.txt. It does no good if you don't know it's Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	8 */
dbdeb734ff97 Add a reference to dictnotes.txt. It does no good if you don't know it's Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	9
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	10 #include "Python.h"
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	11
5053 219bdd8afb38 Changed the lookup algorithm again, based on Reimer Behrends's post. Guido van Rossum <guido@python.org> parents: 5038 diff changeset	12
40257 9ab7a7736ca0 Bug #1576657: when setting a KeyError for a tuple key, make sure that Georg Brandl <georg@python.org> parents: 40225 diff changeset	13 /* Set a key error with the specified argument, wrapping it in a
9ab7a7736ca0 Bug #1576657: when setting a KeyError for a tuple key, make sure that Georg Brandl <georg@python.org> parents: 40225 diff changeset	14 * tuple automatically so that tuple keys are not unpacked as the
9ab7a7736ca0 Bug #1576657: when setting a KeyError for a tuple key, make sure that Georg Brandl <georg@python.org> parents: 40225 diff changeset	15 * exception arguments. */
9ab7a7736ca0 Bug #1576657: when setting a KeyError for a tuple key, make sure that Georg Brandl <georg@python.org> parents: 40225 diff changeset	16 static void
9ab7a7736ca0 Bug #1576657: when setting a KeyError for a tuple key, make sure that Georg Brandl <georg@python.org> parents: 40225 diff changeset	17 set_key_error(PyObject *arg)
9ab7a7736ca0 Bug #1576657: when setting a KeyError for a tuple key, make sure that Georg Brandl <georg@python.org> parents: 40225 diff changeset	18 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	19 PyObject *tup;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	20 tup = PyTuple_Pack(1, arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	21 if (!tup)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	22 return; /* caller will expect error to be set anyway */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	23 PyErr_SetObject(PyExc_KeyError, tup);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	24 Py_DECREF(tup);
40257 9ab7a7736ca0 Bug #1576657: when setting a KeyError for a tuple key, make sure that Georg Brandl <georg@python.org> parents: 40225 diff changeset	25 }
9ab7a7736ca0 Bug #1576657: when setting a KeyError for a tuple key, make sure that Georg Brandl <georg@python.org> parents: 40225 diff changeset	26
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	27 /* Define this out if you don't want conversion statistics on exit. */
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	28 #undef SHOW_CONVERSION_COUNTS
2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	29
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	30 /* See large comment block below. This must be >= 1. */
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	31 #define PERTURB_SHIFT 5
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	32
5053 219bdd8afb38 Changed the lookup algorithm again, based on Reimer Behrends's post. Guido van Rossum <guido@python.org> parents: 5038 diff changeset	33 /*
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	34 Major subtleties ahead: Most hash schemes depend on having a "good" hash
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	35 function, in the sense of simulating randomness. Python doesn't: its most
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	36 important hash functions (for strings and ints) are very regular in common
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	37 cases:
17973 2f2ee5daa60d Implement an old idea of Christian Tismer's: use polynomial division Tim Peters <tim.peters@gmail.com> parents: 17964 diff changeset	38
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	39 >>> map(hash, (0, 1, 2, 3))
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	40 [0, 1, 2, 3]
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	41 >>> map(hash, ("namea", "nameb", "namec", "named"))
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	42 [-1658398457, -1658398460, -1658398459, -1658398462]
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	43 >>>
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	44
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	45 This isn't necessarily bad! To the contrary, in a table of size 2**i, taking
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	46 the low-order i bits as the initial table index is extremely fast, and there
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	47 are no collisions at all for dicts indexed by a contiguous range of ints.
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	48 The same is approximately true when keys are "consecutive" strings. So this
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	49 gives better-than-random behavior in common cases, and that's very desirable.
17973 2f2ee5daa60d Implement an old idea of Christian Tismer's: use polynomial division Tim Peters <tim.peters@gmail.com> parents: 17964 diff changeset	50
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	51 OTOH, when collisions occur, the tendency to fill contiguous slices of the
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	52 hash table makes a good collision resolution strategy crucial. Taking only
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	53 the last i bits of the hash code is also vulnerable: for example, consider
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	54 [i << 16 for i in range(20000)] as a set of keys. Since ints are their own
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	55 hash codes, and this fits in a dict of size 2**15, the last 15 bits of every
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	56 hash code are all 0: they all map to the same table index.
17973 2f2ee5daa60d Implement an old idea of Christian Tismer's: use polynomial division Tim Peters <tim.peters@gmail.com> parents: 17964 diff changeset	57
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	58 But catering to unusual cases should not slow the usual ones, so we just take
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	59 the last i bits anyway. It's up to collision resolution to do the rest. If
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	60 we usually find the key we're looking for on the first try (and, it turns
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	61 out, we usually do -- the table load factor is kept under 2/3, so the odds
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	62 are solidly in our favor), then it makes best sense to keep the initial index
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	63 computation dirt cheap.
17973 2f2ee5daa60d Implement an old idea of Christian Tismer's: use polynomial division Tim Peters <tim.peters@gmail.com> parents: 17964 diff changeset	64
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	65 The first half of collision resolution is to visit table indices via this
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	66 recurrence:
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	67
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	68 j = ((5j) + 1) mod 2*i
17973 2f2ee5daa60d Implement an old idea of Christian Tismer's: use polynomial division Tim Peters <tim.peters@gmail.com> parents: 17964 diff changeset	69
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	70 For any initial j in range(2i), repeating that 2i times generates each
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	71 int in range(2**i) exactly once (see any text on random-number generation for
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	72 proof). By itself, this doesn't help much: like linear probing (setting
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	73 j += 1, or j -= 1, on each loop trip), it scans the table entries in a fixed
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	74 order. This would be bad, except that's not the only thing we do, and it's
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	75 actually good in the common cases where hash keys are consecutive. In an
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	76 example that's really too small to make this entirely clear, for a table of
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	77 size 2**3 the order of indices is:
17973 2f2ee5daa60d Implement an old idea of Christian Tismer's: use polynomial division Tim Peters <tim.peters@gmail.com> parents: 17964 diff changeset	78
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	79 0 -> 1 -> 6 -> 7 -> 4 -> 5 -> 2 -> 3 -> 0 [and here it's repeating]
17973 2f2ee5daa60d Implement an old idea of Christian Tismer's: use polynomial division Tim Peters <tim.peters@gmail.com> parents: 17964 diff changeset	80
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	81 If two things come in at index 5, the first place we look after is index 2,
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	82 not 6, so if another comes in at index 6 the collision at 5 didn't hurt it.
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	83 Linear probing is deadly in this case because there the fixed probe order
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	84 is the same as the order consecutive keys are likely to arrive. But it's
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	85 extremely unlikely hash codes will follow a 5*j+1 recurrence by accident,
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	86 and certain that consecutive hash codes do not.
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	87
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	88 The other half of the strategy is to get the other bits of the hash code
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	89 into play. This is done by initializing a (unsigned) vrbl "perturb" to the
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	90 full hash code, and changing the recurrence to:
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	91
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	92 j = (5*j) + 1 + perturb;
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	93 perturb >>= PERTURB_SHIFT;
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	94 use j % 2**i as the next table index;
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	95
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	96 Now the probe sequence depends (eventually) on every bit in the hash code,
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	97 and the pseudo-scrambling property of recurring on 5*j+1 is more valuable,
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	98 because it quickly magnifies small differences in the bits that didn't affect
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	99 the initial index. Note that because perturb is unsigned, if the recurrence
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	100 is executed often enough perturb eventually becomes and remains 0. At that
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	101 point (very rarely reached) the recurrence is on (just) 5*j+1 again, and
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	102 that's certain to find an empty slot eventually (since it generates every int
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	103 in range(2**i), and we make sure there's always at least one empty slot).
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	104
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	105 Selecting a good value for PERTURB_SHIFT is a balancing act. You want it
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	106 small so that the high bits of the hash code continue to affect the probe
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	107 sequence across iterations; but you want it large so that in really bad cases
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	108 the high-order hash bits have an effect on early iterations. 5 was "the
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	109 best" in minimizing total collisions across experiments Tim Peters ran (on
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	110 both normal and pathological cases), but 4 and 6 weren't significantly worse.
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	111
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	112 Historical: Reimer Behrends contributed the idea of using a polynomial-based
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	113 approach, using repeated multiplication by x in GF(2**n) where an irreducible
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	114 polynomial for each table size was chosen such that x was a primitive root.
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	115 Christian Tismer later extended that to use division by x instead, as an
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	116 efficient way to get the high bits of the hash code into play. This scheme
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	117 also gave excellent collision statistics, but was more expensive: two
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	118 if-tests were required inside the loop; computing "the next" index took about
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	119 the same number of operations but without as much potential parallelism
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	120 (e.g., computing 5*j can go on at the same time as computing 1+perturb in the
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	121 above, and then shifting perturb can be done while the table index is being
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	122 masked); and the PyDictObject struct required a member to hold the table's
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	123 polynomial. In Tim's experiments the current scheme ran faster, produced
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	124 equally good collision statistics, needed less code & used less memory.
38499 494cab563c11 Convert relevant dict internals to Py_ssize_t. Tim Peters <tim.peters@gmail.com> parents: 37756 diff changeset	125
494cab563c11 Convert relevant dict internals to Py_ssize_t. Tim Peters <tim.peters@gmail.com> parents: 37756 diff changeset	126 Theoretical Python 2.5 headache: hash codes are only C "long", but
494cab563c11 Convert relevant dict internals to Py_ssize_t. Tim Peters <tim.peters@gmail.com> parents: 37756 diff changeset	127 sizeof(Py_ssize_t) > sizeof(long) may be possible. In that case, and if a
494cab563c11 Convert relevant dict internals to Py_ssize_t. Tim Peters <tim.peters@gmail.com> parents: 37756 diff changeset	128 dict is genuinely huge, then only the slots directly reachable via indexing
494cab563c11 Convert relevant dict internals to Py_ssize_t. Tim Peters <tim.peters@gmail.com> parents: 37756 diff changeset	129 by a C long can be the first slot in a probe sequence. The probe sequence
494cab563c11 Convert relevant dict internals to Py_ssize_t. Tim Peters <tim.peters@gmail.com> parents: 37756 diff changeset	130 will still eventually reach every slot in the table, but the collision rate
494cab563c11 Convert relevant dict internals to Py_ssize_t. Tim Peters <tim.peters@gmail.com> parents: 37756 diff changeset	131 on initial probes may be much higher than this scheme was designed for.
494cab563c11 Convert relevant dict internals to Py_ssize_t. Tim Peters <tim.peters@gmail.com> parents: 37756 diff changeset	132 Getting a hash code as fat as Py_ssize_t is the only real cure. But in
494cab563c11 Convert relevant dict internals to Py_ssize_t. Tim Peters <tim.peters@gmail.com> parents: 37756 diff changeset	133 practice, this probably won't make a lick of difference for many years (at
494cab563c11 Convert relevant dict internals to Py_ssize_t. Tim Peters <tim.peters@gmail.com> parents: 37756 diff changeset	134 which point everyone will have terabytes of RAM on 64-bit boxes).
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	135 */
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	136
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	137 /* Object used as dummy key to fill deleted entries */
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	138 static PyObject dummy = NULL; / Initialized by first call to newPyDictObject() */
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	139
37638 65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	140 #ifdef Py_REF_DEBUG
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	141 PyObject *
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	142 _PyDict_Dummy(void)
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	143 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	144 return dummy;
37638 65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	145 }
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	146 #endif
65ecb83ea7dd Ignore the references to the dummy objects used as deleted keys Armin Rigo <arigo@tunes.org> parents: 37304 diff changeset	147
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	148 /* forward declarations */
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	149 static PyDictEntry *
8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	150 lookdict_string(PyDictObject mp, PyObject key, long hash);
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	151
2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	152 #ifdef SHOW_CONVERSION_COUNTS
2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	153 static long created = 0L;
2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	154 static long converted = 0L;
2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	155
2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	156 static void
2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	157 show_counts(void)
2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	158 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	159 fprintf(stderr, "created %ld string dicts\n", created);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	160 fprintf(stderr, "converted %ld to normal dicts\n", converted);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	161 fprintf(stderr, "%.2f%% conversion rate\n", (100.0*converted)/created);
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	162 }
2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	163 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	164
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	165 /* Debug statistic to compare allocations with reuse through the free list */
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	166 #undef SHOW_ALLOC_COUNT
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	167 #ifdef SHOW_ALLOC_COUNT
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	168 static size_t count_alloc = 0;
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	169 static size_t count_reuse = 0;
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	170
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	171 static void
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	172 show_alloc(void)
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	173 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	174 fprintf(stderr, "Dict allocations: %" PY_FORMAT_SIZE_T "d\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	175 count_alloc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	176 fprintf(stderr, "Dict reuse through freelist: %" PY_FORMAT_SIZE_T
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	177 "d\n", count_reuse);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	178 fprintf(stderr, "%.2f%% reuse rate\n\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	179 (100.0*count_reuse/(count_alloc+count_reuse)));
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	180 }
2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	181 #endif
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	182
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	183 /* Debug statistic to count GC tracking of dicts */
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	184 #ifdef SHOW_TRACK_COUNT
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	185 static Py_ssize_t count_untracked = 0;
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	186 static Py_ssize_t count_tracked = 0;
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	187
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	188 static void
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	189 show_track(void)
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	190 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	191 fprintf(stderr, "Dicts created: %" PY_FORMAT_SIZE_T "d\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	192 count_tracked + count_untracked);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	193 fprintf(stderr, "Dicts tracked by the GC: %" PY_FORMAT_SIZE_T
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	194 "d\n", count_tracked);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	195 fprintf(stderr, "%.2f%% dict tracking rate\n\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	196 (100.0*count_tracked/(count_untracked+count_tracked)));
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	197 }
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	198 #endif
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	199
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	200
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	201 /* Initialization macros.
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	202 There are two ways to create a dict: PyDict_New() is the main C API
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	203 function, and the tp_new slot maps to dict_new(). In the latter case we
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	204 can save a little time over what PyDict_New does because it's guaranteed
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	205 that the PyDictObject struct is already zeroed out.
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	206 Everyone except dict_new() should use EMPTY_TO_MINSIZE (unless they have
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	207 an excellent reason not to).
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	208 */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	209
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	210 #define INIT_NONZERO_DICT_SLOTS(mp) do { \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	211 (mp)->ma_table = (mp)->ma_smalltable; \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	212 (mp)->ma_mask = PyDict_MINSIZE - 1; \
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	213 } while(0)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	214
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	215 #define EMPTY_TO_MINSIZE(mp) do { \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	216 memset((mp)->ma_smalltable, 0, sizeof((mp)->ma_smalltable)); \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	217 (mp)->ma_used = (mp)->ma_fill = 0; \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	218 INIT_NONZERO_DICT_SLOTS(mp); \
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	219 } while(0)
16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	220
31677 7bb030066ea4 Dictionary optimizations: Raymond Hettinger <python@rcn.com> parents: 31620 diff changeset	221 /* Dictionary reuse scheme to save calls to malloc, free, and memset */
45191 920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44949 diff changeset	222 #ifndef PyDict_MAXFREELIST
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44949 diff changeset	223 #define PyDict_MAXFREELIST 80
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44949 diff changeset	224 #endif
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44949 diff changeset	225 static PyDictObject *free_list[PyDict_MAXFREELIST];
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44949 diff changeset	226 static int numfree = 0;
31677 7bb030066ea4 Dictionary optimizations: Raymond Hettinger <python@rcn.com> parents: 31620 diff changeset	227
45229 262263737bce Deallocate content of the dict free list on interpreter shutdown Christian Heimes <christian@cheimes.de> parents: 45217 diff changeset	228 void
262263737bce Deallocate content of the dict free list on interpreter shutdown Christian Heimes <christian@cheimes.de> parents: 45217 diff changeset	229 PyDict_Fini(void)
262263737bce Deallocate content of the dict free list on interpreter shutdown Christian Heimes <christian@cheimes.de> parents: 45217 diff changeset	230 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	231 PyDictObject *op;
45229 262263737bce Deallocate content of the dict free list on interpreter shutdown Christian Heimes <christian@cheimes.de> parents: 45217 diff changeset	232
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	233 while (numfree) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	234 op = free_list[--numfree];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	235 assert(PyDict_CheckExact(op));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	236 PyObject_GC_Del(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	237 }
45229 262263737bce Deallocate content of the dict free list on interpreter shutdown Christian Heimes <christian@cheimes.de> parents: 45217 diff changeset	238 }
31677 7bb030066ea4 Dictionary optimizations: Raymond Hettinger <python@rcn.com> parents: 31620 diff changeset	239
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	240 PyObject *
13660 a1ce07218781 Miscelaneous ANSIfications. I'm assuming here 'main' should take (int, Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	241 PyDict_New(void)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	242 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	243 register PyDictObject *mp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	244 if (dummy == NULL) { /* Auto-initialize dummy */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	245 dummy = PyString_FromString("<dummy key>");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	246 if (dummy == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	247 return NULL;
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	248 #ifdef SHOW_CONVERSION_COUNTS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	249 Py_AtExit(show_counts);
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	250 #endif
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	251 #ifdef SHOW_ALLOC_COUNT
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	252 Py_AtExit(show_alloc);
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	253 #endif
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	254 #ifdef SHOW_TRACK_COUNT
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	255 Py_AtExit(show_track);
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	256 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	257 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	258 if (numfree) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	259 mp = free_list[--numfree];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	260 assert (mp != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	261 assert (Py_TYPE(mp) == &PyDict_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	262 _Py_NewReference((PyObject *)mp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	263 if (mp->ma_fill) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	264 EMPTY_TO_MINSIZE(mp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	265 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	266 /* At least set ma_table and ma_mask; these are wrong
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	267 if an empty but presized dict is added to freelist */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	268 INIT_NONZERO_DICT_SLOTS(mp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	269 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	270 assert (mp->ma_used == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	271 assert (mp->ma_table == mp->ma_smalltable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	272 assert (mp->ma_mask == PyDict_MINSIZE - 1);
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	273 #ifdef SHOW_ALLOC_COUNT
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	274 count_reuse++;
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	275 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	276 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	277 mp = PyObject_GC_New(PyDictObject, &PyDict_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	278 if (mp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	279 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	280 EMPTY_TO_MINSIZE(mp);
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	281 #ifdef SHOW_ALLOC_COUNT
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	282 count_alloc++;
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	283 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	284 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	285 mp->ma_lookup = lookdict_string;
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	286 #ifdef SHOW_TRACK_COUNT
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	287 count_untracked++;
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	288 #endif
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	289 #ifdef SHOW_CONVERSION_COUNTS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	290 ++created;
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	291 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	292 return (PyObject *)mp;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	293 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	294
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	295 /*
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	296 The basic lookup function used by all operations.
5053 219bdd8afb38 Changed the lookup algorithm again, based on Reimer Behrends's post. Guido van Rossum <guido@python.org> parents: 5038 diff changeset	297 This is based on Algorithm D from Knuth Vol. 3, Sec. 6.4.
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	298 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	299 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	300
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	301 The initial probe index is computed as hash mod the table size. Subsequent
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	302 probe indices are computed as explained earlier.
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	303
10461 4abc5abaec9a Vladimir Marangozov contributed updated comments. Guido van Rossum <guido@python.org> parents: 9487 diff changeset	304 All arithmetic on hash should ignore overflow.
5053 219bdd8afb38 Changed the lookup algorithm again, based on Reimer Behrends's post. Guido van Rossum <guido@python.org> parents: 5038 diff changeset	305
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	306 (The details in this version are due to Tim Peters, building on many past
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	307 contributions by Reimer Behrends, Jyrki Alakuijala, Vladimir Marangozov and
9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	308 Christian Tismer).
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	309
38540 d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	310 lookdict() is general-purpose, and may return NULL if (and only if) a
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	311 comparison raises an exception (this was new in Python 2.5).
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	312 lookdict_string() below is specialized to string keys, comparison of which can
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	313 never raise an exception; that function can never return NULL. For both, when
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	314 the key isn't found a PyDictEntry* is returned for which the me_value field is
38540 d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	315 NULL; this is the slot in the dict at which the key would have been found, and
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	316 the caller can (if it wishes) add the <key, value> pair to the returned
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	317 PyDictEntry*.
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	318 */
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	319 static PyDictEntry *
8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	320 lookdict(PyDictObject mp, PyObject key, register long hash)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	321 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	322 register size_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	323 register size_t perturb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	324 register PyDictEntry *freeslot;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	325 register size_t mask = (size_t)mp->ma_mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	326 PyDictEntry *ep0 = mp->ma_table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	327 register PyDictEntry *ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	328 register int cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	329 PyObject *startkey;
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	330
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	331 i = (size_t)hash & mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	332 ep = &ep0[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	333 if (ep->me_key == NULL \|\| ep->me_key == key)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	334 return ep;
18022 bd1c4fe977cb lookdict: Reduce obfuscating code duplication with a judicious goto. Tim Peters <tim.peters@gmail.com> parents: 18019 diff changeset	335
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	336 if (ep->me_key == dummy)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	337 freeslot = ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	338 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	339 if (ep->me_hash == hash) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	340 startkey = ep->me_key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	341 Py_INCREF(startkey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	342 cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	343 Py_DECREF(startkey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	344 if (cmp < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	345 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	346 if (ep0 == mp->ma_table && ep->me_key == startkey) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	347 if (cmp > 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	348 return ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	349 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	350 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	351 /* The compare did major nasty stuff to the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	352 * dict: start over.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	353 * XXX A clever adversary could prevent this
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	354 * XXX from terminating.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	355 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	356 return lookdict(mp, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	357 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	358 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	359 freeslot = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	360 }
17973 2f2ee5daa60d Implement an old idea of Christian Tismer's: use polynomial division Tim Peters <tim.peters@gmail.com> parents: 17964 diff changeset	361
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	362 /* In the loop, me_key == dummy is by far (factor of 100s) the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	363 least likely outcome, so test for that last. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	364 for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	365 i = (i << 2) + i + perturb + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	366 ep = &ep0[i & mask];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	367 if (ep->me_key == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	368 return freeslot == NULL ? ep : freeslot;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	369 if (ep->me_key == key)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	370 return ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	371 if (ep->me_hash == hash && ep->me_key != dummy) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	372 startkey = ep->me_key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	373 Py_INCREF(startkey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	374 cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	375 Py_DECREF(startkey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	376 if (cmp < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	377 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	378 if (ep0 == mp->ma_table && ep->me_key == startkey) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	379 if (cmp > 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	380 return ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	381 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	382 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	383 /* The compare did major nasty stuff to the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	384 * dict: start over.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	385 * XXX A clever adversary could prevent this
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	386 * XXX from terminating.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	387 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	388 return lookdict(mp, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	389 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	390 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	391 else if (ep->me_key == dummy && freeslot == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	392 freeslot = ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	393 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	394 assert(0); /* NOT REACHED */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	395 return 0;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	396 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	397
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	398 /*
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	399 * Hacked up version of lookdict which can assume keys are always strings;
38540 d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	400 * this assumption allows testing for errors during PyObject_RichCompareBool()
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	401 * to be dropped; string-string comparisons never raise exceptions. This also
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	402 * means we don't need to go through PyObject_RichCompareBool(); we can always
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	403 * use _PyString_Eq() directly.
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	404 *
38540 d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	405 * This is valuable because dicts with only string keys are very common.
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	406 */
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	407 static PyDictEntry *
8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	408 lookdict_string(PyDictObject mp, PyObject key, register long hash)
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	409 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	410 register size_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	411 register size_t perturb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	412 register PyDictEntry *freeslot;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	413 register size_t mask = (size_t)mp->ma_mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	414 PyDictEntry *ep0 = mp->ma_table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	415 register PyDictEntry *ep;
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	416
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	417 /* Make sure this function doesn't have to handle non-string keys,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	418 including subclasses of str; e.g., one reason to subclass
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	419 strings is to override __eq__, and for speed we don't cater to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	420 that here. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	421 if (!PyString_CheckExact(key)) {
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	422 #ifdef SHOW_CONVERSION_COUNTS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	423 ++converted;
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	424 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	425 mp->ma_lookup = lookdict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	426 return lookdict(mp, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	427 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	428 i = hash & mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	429 ep = &ep0[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	430 if (ep->me_key == NULL \|\| ep->me_key == key)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	431 return ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	432 if (ep->me_key == dummy)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	433 freeslot = ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	434 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	435 if (ep->me_hash == hash && _PyString_Eq(ep->me_key, key))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	436 return ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	437 freeslot = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	438 }
17973 2f2ee5daa60d Implement an old idea of Christian Tismer's: use polynomial division Tim Peters <tim.peters@gmail.com> parents: 17964 diff changeset	439
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	440 /* In the loop, me_key == dummy is by far (factor of 100s) the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	441 least likely outcome, so test for that last. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	442 for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	443 i = (i << 2) + i + perturb + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	444 ep = &ep0[i & mask];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	445 if (ep->me_key == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	446 return freeslot == NULL ? ep : freeslot;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	447 if (ep->me_key == key
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	448 \|\| (ep->me_hash == hash
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	449 && ep->me_key != dummy
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	450 && _PyString_Eq(ep->me_key, key)))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	451 return ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	452 if (ep->me_key == dummy && freeslot == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	453 freeslot = ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	454 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	455 assert(0); /* NOT REACHED */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	456 return 0;
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	457 }
2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	458
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	459 #ifdef SHOW_TRACK_COUNT
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	460 #define INCREASE_TRACK_COUNT \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	461 (count_tracked++, count_untracked--);
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	462 #define DECREASE_TRACK_COUNT \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	463 (count_tracked--, count_untracked++);
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	464 #else
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	465 #define INCREASE_TRACK_COUNT
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	466 #define DECREASE_TRACK_COUNT
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	467 #endif
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	468
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	469 #define MAINTAIN_TRACKING(mp, key, value) \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	470 do { \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	471 if (!_PyObject_GC_IS_TRACKED(mp)) { \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	472 if (_PyObject_GC_MAY_BE_TRACKED(key) \|\| \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	473 _PyObject_GC_MAY_BE_TRACKED(value)) { \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	474 _PyObject_GC_TRACK(mp); \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	475 INCREASE_TRACK_COUNT \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	476 } \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	477 } \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	478 } while(0)
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	479
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	480 void
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	481 _PyDict_MaybeUntrack(PyObject *op)
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	482 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	483 PyDictObject *mp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	484 PyObject *value;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	485 Py_ssize_t mask, i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	486 PyDictEntry *ep;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	487
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	488 if (!PyDict_CheckExact(op) \|\| !_PyObject_GC_IS_TRACKED(op))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	489 return;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	490
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	491 mp = (PyDictObject *) op;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	492 ep = mp->ma_table;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	493 mask = mp->ma_mask;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	494 for (i = 0; i <= mask; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	495 if ((value = ep[i].me_value) == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	496 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	497 if (_PyObject_GC_MAY_BE_TRACKED(value) \|\|
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	498 _PyObject_GC_MAY_BE_TRACKED(ep[i].me_key))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	499 return;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	500 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	501 DECREASE_TRACK_COUNT
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	502 _PyObject_GC_UNTRACK(op);
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	503 }
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	504
14310 2db807f345bc Slight performance hack that also avoids requiring the existence of thread Fred Drake <fdrake@acm.org> parents: 14307 diff changeset	505 /*
75301 5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	506 Internal routine to insert a new item into the table when you have entry object.
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	507 Used by insertdict.
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	508 */
38536 175cbdf9a5fb [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). Armin Rigo <arigo@tunes.org> parents: 38504 diff changeset	509 static int
75301 5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	510 insertdict_by_entry(register PyDictObject mp, PyObject key, long hash,
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	511 PyDictEntry ep, PyObject value)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	512 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	513 PyObject *old_value;
75301 5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	514
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	515 MAINTAIN_TRACKING(mp, key, value);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	516 if (ep->me_value != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	517 old_value = ep->me_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	518 ep->me_value = value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	519 Py_DECREF(old_value); /* which CAN re-enter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	520 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	521 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	522 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	523 if (ep->me_key == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	524 mp->ma_fill++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	525 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	526 assert(ep->me_key == dummy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	527 Py_DECREF(dummy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	528 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	529 ep->me_key = key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	530 ep->me_hash = (Py_ssize_t)hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	531 ep->me_value = value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	532 mp->ma_used++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	533 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	534 return 0;
38536 175cbdf9a5fb [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). Armin Rigo <arigo@tunes.org> parents: 38504 diff changeset	535 }
175cbdf9a5fb [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). Armin Rigo <arigo@tunes.org> parents: 38504 diff changeset	536
75301 5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	537
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	538 /*
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	539 Internal routine to insert a new item into the table.
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	540 Used both by the internal resize routine and by the public insert routine.
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	541 Eats a reference to key and one to value.
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	542 Returns -1 if an error occurred, or 0 on success.
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	543 */
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	544 static int
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	545 insertdict(register PyDictObject mp, PyObject key, long hash, PyObject *value)
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	546 {
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	547 register PyDictEntry *ep;
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	548
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	549 assert(mp->ma_lookup != NULL);
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	550 ep = mp->ma_lookup(mp, key, hash);
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	551 if (ep == NULL) {
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	552 Py_DECREF(key);
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	553 Py_DECREF(value);
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	554 return -1;
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	555 }
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	556 return insertdict_by_entry(mp, key, hash, ep, value);
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	557 }
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	558
38536 175cbdf9a5fb [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). Armin Rigo <arigo@tunes.org> parents: 38504 diff changeset	559 /*
175cbdf9a5fb [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). Armin Rigo <arigo@tunes.org> parents: 38504 diff changeset	560 Internal routine used by dictresize() to insert an item which is
175cbdf9a5fb [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). Armin Rigo <arigo@tunes.org> parents: 38504 diff changeset	561 known to be absent from the dict. This routine also assumes that
175cbdf9a5fb [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). Armin Rigo <arigo@tunes.org> parents: 38504 diff changeset	562 the dict contains no deleted entries. Besides the performance benefit,
175cbdf9a5fb [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). Armin Rigo <arigo@tunes.org> parents: 38504 diff changeset	563 using insertdict() in dictresize() is dangerous (SF bug #1456209).
38540 d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	564 Note that no refcounts are changed by this routine; if needed, the caller
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	565 is responsible for incref'ing `key` and `value`.
38536 175cbdf9a5fb [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). Armin Rigo <arigo@tunes.org> parents: 38504 diff changeset	566 */
175cbdf9a5fb [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). Armin Rigo <arigo@tunes.org> parents: 38504 diff changeset	567 static void
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	568 insertdict_clean(register PyDictObject mp, PyObject key, long hash,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	569 PyObject *value)
38536 175cbdf9a5fb [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). Armin Rigo <arigo@tunes.org> parents: 38504 diff changeset	570 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	571 register size_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	572 register size_t perturb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	573 register size_t mask = (size_t)mp->ma_mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	574 PyDictEntry *ep0 = mp->ma_table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	575 register PyDictEntry *ep;
38536 175cbdf9a5fb [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). Armin Rigo <arigo@tunes.org> parents: 38504 diff changeset	576
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	577 MAINTAIN_TRACKING(mp, key, value);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	578 i = hash & mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	579 ep = &ep0[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	580 for (perturb = hash; ep->me_key != NULL; perturb >>= PERTURB_SHIFT) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	581 i = (i << 2) + i + perturb + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	582 ep = &ep0[i & mask];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	583 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	584 assert(ep->me_value == NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	585 mp->ma_fill++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	586 ep->me_key = key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	587 ep->me_hash = (Py_ssize_t)hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	588 ep->me_value = value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	589 mp->ma_used++;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	590 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	591
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	592 /*
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	593 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	594 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	595 actually be smaller than the old one.
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	596 */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	597 static int
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	598 dictresize(PyDictObject *mp, Py_ssize_t minused)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	599 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	600 Py_ssize_t newsize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	601 PyDictEntry oldtable, newtable, *ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	602 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	603 int is_oldtable_malloced;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	604 PyDictEntry small_copy[PyDict_MINSIZE];
17861 335fbdee7cf8 Bugfix candidate. Tim Peters <tim.peters@gmail.com> parents: 17852 diff changeset	605
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	606 assert(minused >= 0);
17962 d86b245e0858 Jack Jansen hit a bug in the new dict code, reported on python-dev. Tim Peters <tim.peters@gmail.com> parents: 17930 diff changeset	607
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	608 /* Find the smallest table size > minused. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	609 for (newsize = PyDict_MINSIZE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	610 newsize <= minused && newsize > 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	611 newsize <<= 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	612 ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	613 if (newsize <= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	614 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	615 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	616 }
17962 d86b245e0858 Jack Jansen hit a bug in the new dict code, reported on python-dev. Tim Peters <tim.peters@gmail.com> parents: 17930 diff changeset	617
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	618 /* Get space for a new table. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	619 oldtable = mp->ma_table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	620 assert(oldtable != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	621 is_oldtable_malloced = oldtable != mp->ma_smalltable;
17962 d86b245e0858 Jack Jansen hit a bug in the new dict code, reported on python-dev. Tim Peters <tim.peters@gmail.com> parents: 17930 diff changeset	622
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	623 if (newsize == PyDict_MINSIZE) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	624 /* A large table is shrinking, or we can't get any smaller. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	625 newtable = mp->ma_smalltable;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	626 if (newtable == oldtable) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	627 if (mp->ma_fill == mp->ma_used) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	628 /* No dummies, so no point doing anything. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	629 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	630 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	631 /* We're not going to resize it, but rebuild the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	632 table anyway to purge old dummy entries.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	633 Subtle: This is necessary if fill==size,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	634 as lookdict needs at least one virgin slot to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	635 terminate failing searches. If fill < size, it's
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	636 merely desirable, as dummies slow searches. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	637 assert(mp->ma_fill > mp->ma_used);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	638 memcpy(small_copy, oldtable, sizeof(small_copy));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	639 oldtable = small_copy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	640 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	641 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	642 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	643 newtable = PyMem_NEW(PyDictEntry, newsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	644 if (newtable == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	645 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	646 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	647 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	648 }
17962 d86b245e0858 Jack Jansen hit a bug in the new dict code, reported on python-dev. Tim Peters <tim.peters@gmail.com> parents: 17930 diff changeset	649
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	650 /* Make the dict empty, using the new table. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	651 assert(newtable != oldtable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	652 mp->ma_table = newtable;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	653 mp->ma_mask = newsize - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	654 memset(newtable, 0, sizeof(PyDictEntry) * newsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	655 mp->ma_used = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	656 i = mp->ma_fill;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	657 mp->ma_fill = 0;
17962 d86b245e0858 Jack Jansen hit a bug in the new dict code, reported on python-dev. Tim Peters <tim.peters@gmail.com> parents: 17930 diff changeset	658
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	659 /* Copy the data over; this is refcount-neutral for active entries;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	660 dummy entries aren't copied over, of course */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	661 for (ep = oldtable; i > 0; ep++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	662 if (ep->me_value != NULL) { /* active entry */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	663 --i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	664 insertdict_clean(mp, ep->me_key, (long)ep->me_hash,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	665 ep->me_value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	666 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	667 else if (ep->me_key != NULL) { /* dummy entry */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	668 --i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	669 assert(ep->me_key == dummy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	670 Py_DECREF(ep->me_key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	671 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	672 /* else key == value == NULL: nothing to do */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	673 }
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	674
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	675 if (is_oldtable_malloced)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	676 PyMem_DEL(oldtable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	677 return 0;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	678 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	679
44339 7ac117b3be37 Give meaning to the oparg for BUILD_MAP: estimated size of the dictionary. Raymond Hettinger <python@rcn.com> parents: 44056 diff changeset	680 /* Create a new dictionary pre-sized to hold an estimated number of elements.
7ac117b3be37 Give meaning to the oparg for BUILD_MAP: estimated size of the dictionary. Raymond Hettinger <python@rcn.com> parents: 44056 diff changeset	681 Underestimates are okay because the dictionary will resize as necessary.
7ac117b3be37 Give meaning to the oparg for BUILD_MAP: estimated size of the dictionary. Raymond Hettinger <python@rcn.com> parents: 44056 diff changeset	682 Overestimates just mean the dictionary will be more sparse than usual.
7ac117b3be37 Give meaning to the oparg for BUILD_MAP: estimated size of the dictionary. Raymond Hettinger <python@rcn.com> parents: 44056 diff changeset	683 */
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	684
44339 7ac117b3be37 Give meaning to the oparg for BUILD_MAP: estimated size of the dictionary. Raymond Hettinger <python@rcn.com> parents: 44056 diff changeset	685 PyObject *
7ac117b3be37 Give meaning to the oparg for BUILD_MAP: estimated size of the dictionary. Raymond Hettinger <python@rcn.com> parents: 44056 diff changeset	686 _PyDict_NewPresized(Py_ssize_t minused)
7ac117b3be37 Give meaning to the oparg for BUILD_MAP: estimated size of the dictionary. Raymond Hettinger <python@rcn.com> parents: 44056 diff changeset	687 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	688 PyObject *op = PyDict_New();
44339 7ac117b3be37 Give meaning to the oparg for BUILD_MAP: estimated size of the dictionary. Raymond Hettinger <python@rcn.com> parents: 44056 diff changeset	689
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	690 if (minused>5 && op != NULL && dictresize((PyDictObject *)op, minused) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	691 Py_DECREF(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	692 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	693 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	694 return op;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	695 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	696
38540 d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	697 /* Note that, for historical reasons, PyDict_GetItem() suppresses all errors
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	698 * that may occur (originally dicts supported only string keys, and exceptions
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	699 * weren't possible). So, while the original intent was that a NULL return
39376 efa80633309d Typo fixes Andrew M. Kuchling <amk@amk.ca> parents: 39127 diff changeset	700 * meant the key wasn't present, in reality it can mean that, or that an error
38540 d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	701 * (suppressed) occurred while computing the key's hash, or that some error
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	702 * (suppressed) occurred when comparing keys in the dict's internal probe
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	703 * sequence. A nasty example of the latter is when a Python-coded comparison
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	704 * function hits a stack-depth error, which can cause this to return NULL
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	705 * even if the key is present.
d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	706 */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	707 PyObject *
13341 3f1bd4782628 Removed Py_PROTO and switched to ANSI C declarations in the dict Tim Peters <tim.peters@gmail.com> parents: 13265 diff changeset	708 PyDict_GetItem(PyObject op, PyObject key)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	709 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	710 long hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	711 PyDictObject mp = (PyDictObject )op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	712 PyDictEntry *ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	713 PyThreadState *tstate;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	714 if (!PyDict_Check(op))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	715 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	716 if (!PyString_CheckExact(key) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	717 (hash = ((PyStringObject *) key)->ob_shash) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	718 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	719 hash = PyObject_Hash(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	720 if (hash == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	721 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	722 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	723 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	724 }
38536 175cbdf9a5fb [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). Armin Rigo <arigo@tunes.org> parents: 38504 diff changeset	725
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	726 /* We can arrive here with a NULL tstate during initialization: try
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	727 running "python -Wi" for an example related to string interning.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	728 Let's just hope that no exception occurs then... This must be
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	729 _PyThreadState_Current and not PyThreadState_GET() because in debug
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	730 mode, the latter complains if tstate is NULL. */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	731 tstate = _PyThreadState_Current;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	732 if (tstate != NULL && tstate->curexc_type != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	733 /* preserve the existing exception */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	734 PyObject err_type, err_value, *err_tb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	735 PyErr_Fetch(&err_type, &err_value, &err_tb);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	736 ep = (mp->ma_lookup)(mp, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	737 /* ignore errors */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	738 PyErr_Restore(err_type, err_value, err_tb);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	739 if (ep == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	740 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	741 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	742 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	743 ep = (mp->ma_lookup)(mp, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	744 if (ep == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	745 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	746 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	747 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	748 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	749 return ep->me_value;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	750 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	751
75301 5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	752 static int
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	753 dict_set_item_by_hash_or_entry(register PyObject op, PyObject key,
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	754 long hash, PyDictEntry ep, PyObject value)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	755 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	756 register PyDictObject *mp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	757 register Py_ssize_t n_used;
17535 83c7b4b75668 Tentative fix for a problem that Tim discovered at the last moment, Guido van Rossum <guido@python.org> parents: 17115 diff changeset	758
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	759 mp = (PyDictObject *)op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	760 assert(mp->ma_fill <= mp->ma_mask); /* at least one empty slot */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	761 n_used = mp->ma_used;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	762 Py_INCREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	763 Py_INCREF(key);
75301 5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	764 if (ep == NULL) {
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	765 if (insertdict(mp, key, hash, value) != 0)
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	766 return -1;
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	767 }
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	768 else {
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	769 if (insertdict_by_entry(mp, key, hash, ep, value) != 0)
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	770 return -1;
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	771 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	772 /* If we added a key, we can safely resize. Otherwise just return!
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	773 * If fill >= 2/3 size, adjust size. Normally, this doubles or
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	774 * quaduples the size, but it's also possible for the dict to shrink
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	775 * (if ma_fill is much larger than ma_used, meaning a lot of dict
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	776 * keys have been * deleted).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	777 *
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	778 * Quadrupling the size improves average dictionary sparseness
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	779 * (reducing collisions) at the cost of some memory and iteration
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	780 * speed (which loops over every possible entry). It also halves
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	781 * the number of expensive resize operations in a growing dictionary.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	782 *
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	783 * Very large dictionaries (over 50K items) use doubling instead.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	784 * This may help applications with severe memory constraints.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	785 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	786 if (!(mp->ma_used > n_used && mp->ma_fill3 >= (mp->ma_mask+1)2))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	787 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	788 return dictresize(mp, (mp->ma_used > 50000 ? 2 : 4) * mp->ma_used);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	789 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	790
75301 5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	791 /* CAUTION: PyDict_SetItem() must guarantee that it won't resize the
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	792 * dictionary if it's merely replacing the value for an existing key.
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	793 * This means that it's safe to loop over a dictionary with PyDict_Next()
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	794 * and occasionally replace a value -- but you can't insert new keys or
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	795 * remove them.
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	796 */
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	797 int
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	798 PyDict_SetItem(register PyObject op, PyObject key, PyObject *value)
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	799 {
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	800 register long hash;
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	801
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	802 if (!PyDict_Check(op)) {
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	803 PyErr_BadInternalCall();
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	804 return -1;
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	805 }
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	806 assert(key);
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	807 assert(value);
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	808 if (PyString_CheckExact(key)) {
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	809 hash = ((PyStringObject *)key)->ob_shash;
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	810 if (hash == -1)
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	811 hash = PyObject_Hash(key);
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	812 }
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	813 else {
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	814 hash = PyObject_Hash(key);
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	815 if (hash == -1)
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	816 return -1;
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	817 }
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	818 return dict_set_item_by_hash_or_entry(op, key, hash, NULL, value);
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	819 }
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	820
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	821 int
13341 3f1bd4782628 Removed Py_PROTO and switched to ANSI C declarations in the dict Tim Peters <tim.peters@gmail.com> parents: 13265 diff changeset	822 PyDict_DelItem(PyObject op, PyObject key)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	823 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	824 register PyDictObject *mp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	825 register long hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	826 register PyDictEntry *ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	827 PyObject old_value, old_key;
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1848 diff changeset	828
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	829 if (!PyDict_Check(op)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	830 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	831 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	832 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	833 assert(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	834 if (!PyString_CheckExact(key) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	835 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	836 hash = PyObject_Hash(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	837 if (hash == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	838 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	839 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	840 mp = (PyDictObject *)op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	841 ep = (mp->ma_lookup)(mp, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	842 if (ep == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	843 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	844 if (ep->me_value == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	845 set_key_error(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	846 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	847 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	848 old_key = ep->me_key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	849 Py_INCREF(dummy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	850 ep->me_key = dummy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	851 old_value = ep->me_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	852 ep->me_value = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	853 mp->ma_used--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	854 Py_DECREF(old_value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	855 Py_DECREF(old_key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	856 return 0;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	857 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	858
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	859 void
13341 3f1bd4782628 Removed Py_PROTO and switched to ANSI C declarations in the dict Tim Peters <tim.peters@gmail.com> parents: 13265 diff changeset	860 PyDict_Clear(PyObject *op)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	861 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	862 PyDictObject *mp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	863 PyDictEntry ep, table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	864 int table_is_malloced;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	865 Py_ssize_t fill;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	866 PyDictEntry small_copy[PyDict_MINSIZE];
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	867 #ifdef Py_DEBUG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	868 Py_ssize_t i, n;
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	869 #endif
16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	870
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	871 if (!PyDict_Check(op))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	872 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	873 mp = (PyDictObject *)op;
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	874 #ifdef Py_DEBUG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	875 n = mp->ma_mask + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	876 i = 0;
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	877 #endif
16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	878
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	879 table = mp->ma_table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	880 assert(table != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	881 table_is_malloced = table != mp->ma_smalltable;
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	882
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	883 /* This is delicate. During the process of clearing the dict,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	884 * decrefs can cause the dict to mutate. To avoid fatal confusion
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	885 * (voice of experience), we have to make the dict empty before
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	886 * clearing the slots, and never refer to anything via mp->xxx while
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	887 * clearing.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	888 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	889 fill = mp->ma_fill;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	890 if (table_is_malloced)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	891 EMPTY_TO_MINSIZE(mp);
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	892
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	893 else if (fill > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	894 /* It's a small table with something that needs to be cleared.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	895 * Afraid the only safe way is to copy the dict entries into
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	896 * another small table first.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	897 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	898 memcpy(small_copy, table, sizeof(small_copy));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	899 table = small_copy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	900 EMPTY_TO_MINSIZE(mp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	901 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	902 /* else it's a small table that's already empty */
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	903
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	904 /* Now we can finally clear things. If C had refcounts, we could
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	905 * assert that the refcount on table is 1 now, i.e. that this function
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	906 * has unique access to it, so decref side-effects can't alter it.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	907 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	908 for (ep = table; fill > 0; ++ep) {
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	909 #ifdef Py_DEBUG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	910 assert(i < n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	911 ++i;
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	912 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	913 if (ep->me_key) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	914 --fill;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	915 Py_DECREF(ep->me_key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	916 Py_XDECREF(ep->me_value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	917 }
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	918 #ifdef Py_DEBUG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	919 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	920 assert(ep->me_value == NULL);
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	921 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	922 }
17920 16005b285576 SF patch #425242: Patch which "inlines" small dictionaries. Tim Peters <tim.peters@gmail.com> parents: 17861 diff changeset	923
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	924 if (table_is_malloced)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	925 PyMem_DEL(table);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	926 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	927
27901 55adf08a213a cPickle.c, load_build(): Taught cPickle how to pick apart Tim Peters <tim.peters@gmail.com> parents: 26818 diff changeset	928 /*
55adf08a213a cPickle.c, load_build(): Taught cPickle how to pick apart Tim Peters <tim.peters@gmail.com> parents: 26818 diff changeset	929 * Iterate over a dict. Use like so:
55adf08a213a cPickle.c, load_build(): Taught cPickle how to pick apart Tim Peters <tim.peters@gmail.com> parents: 26818 diff changeset	930 *
38499 494cab563c11 Convert relevant dict internals to Py_ssize_t. Tim Peters <tim.peters@gmail.com> parents: 37756 diff changeset	931 * Py_ssize_t i;
27901 55adf08a213a cPickle.c, load_build(): Taught cPickle how to pick apart Tim Peters <tim.peters@gmail.com> parents: 26818 diff changeset	932 * PyObject key, value;
55adf08a213a cPickle.c, load_build(): Taught cPickle how to pick apart Tim Peters <tim.peters@gmail.com> parents: 26818 diff changeset	933 * i = 0; # important! i should not otherwise be changed by you
27902 81b2bcbfe39b Add closing ) in comment Neal Norwitz <nnorwitz@gmail.com> parents: 27901 diff changeset	934 * while (PyDict_Next(yourdict, &i, &key, &value)) {
27901 55adf08a213a cPickle.c, load_build(): Taught cPickle how to pick apart Tim Peters <tim.peters@gmail.com> parents: 26818 diff changeset	935 * Refer to borrowed references in key and value.
55adf08a213a cPickle.c, load_build(): Taught cPickle how to pick apart Tim Peters <tim.peters@gmail.com> parents: 26818 diff changeset	936 * }
55adf08a213a cPickle.c, load_build(): Taught cPickle how to pick apart Tim Peters <tim.peters@gmail.com> parents: 26818 diff changeset	937 *
55adf08a213a cPickle.c, load_build(): Taught cPickle how to pick apart Tim Peters <tim.peters@gmail.com> parents: 26818 diff changeset	938 * CAUTION: In general, it isn't safe to use PyDict_Next in a loop that
17115 e1214f9e12a3 Make PyDict_Next safe to use for loops that merely modify the values Tim Peters <tim.peters@gmail.com> parents: 15974 diff changeset	939 * mutates the dict. One exception: it is safe if the loop merely changes
e1214f9e12a3 Make PyDict_Next safe to use for loops that merely modify the values Tim Peters <tim.peters@gmail.com> parents: 15974 diff changeset	940 * the values associated with the keys (but doesn't insert new keys or
e1214f9e12a3 Make PyDict_Next safe to use for loops that merely modify the values Tim Peters <tim.peters@gmail.com> parents: 15974 diff changeset	941 * delete keys), via PyDict_SetItem().
e1214f9e12a3 Make PyDict_Next safe to use for loops that merely modify the values Tim Peters <tim.peters@gmail.com> parents: 15974 diff changeset	942 */
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	943 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	944 PyDict_Next(PyObject op, Py_ssize_t ppos, PyObject pkey, PyObject pvalue)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	945 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	946 register Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	947 register Py_ssize_t mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	948 register PyDictEntry *ep;
31677 7bb030066ea4 Dictionary optimizations: Raymond Hettinger <python@rcn.com> parents: 31620 diff changeset	949
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	950 if (!PyDict_Check(op))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	951 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	952 i = *ppos;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	953 if (i < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	954 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	955 ep = ((PyDictObject *)op)->ma_table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	956 mask = ((PyDictObject *)op)->ma_mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	957 while (i <= mask && ep[i].me_value == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	958 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	959 *ppos = i+1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	960 if (i > mask)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	961 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	962 if (pkey)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	963 *pkey = ep[i].me_key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	964 if (pvalue)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	965 *pvalue = ep[i].me_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	966 return 1;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	967 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	968
40864 b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	969 /* Internal version of PyDict_Next that returns a hash value in addition to the key and value.*/
b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	970 int
b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	971 _PyDict_Next(PyObject op, Py_ssize_t ppos, PyObject pkey, PyObject pvalue, long *phash)
b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	972 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	973 register Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	974 register Py_ssize_t mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	975 register PyDictEntry *ep;
40864 b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	976
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	977 if (!PyDict_Check(op))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	978 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	979 i = *ppos;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	980 if (i < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	981 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	982 ep = ((PyDictObject *)op)->ma_table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	983 mask = ((PyDictObject *)op)->ma_mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	984 while (i <= mask && ep[i].me_value == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	985 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	986 *ppos = i+1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	987 if (i > mask)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	988 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	989 *phash = (long)(ep[i].me_hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	990 if (pkey)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	991 *pkey = ep[i].me_key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	992 if (pvalue)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	993 *pvalue = ep[i].me_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	994 return 1;
40864 b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	995 }
b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	996
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	997 /* Methods */
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	998
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	999 static void
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1000 dict_dealloc(register PyDictObject *mp)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1001 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1002 register PyDictEntry *ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1003 Py_ssize_t fill = mp->ma_fill;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1004 PyObject_GC_UnTrack(mp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1005 Py_TRASHCAN_SAFE_BEGIN(mp)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1006 for (ep = mp->ma_table; fill > 0; ep++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1007 if (ep->me_key) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1008 --fill;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1009 Py_DECREF(ep->me_key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1010 Py_XDECREF(ep->me_value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1011 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1012 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1013 if (mp->ma_table != mp->ma_smalltable)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1014 PyMem_DEL(mp->ma_table);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1015 if (numfree < PyDict_MAXFREELIST && Py_TYPE(mp) == &PyDict_Type)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1016 free_list[numfree++] = mp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1017 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1018 Py_TYPE(mp)->tp_free((PyObject *)mp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1019 Py_TRASHCAN_SAFE_END(mp)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1020 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1021
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1022 static int
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1023 dict_print(register PyDictObject mp, register FILE fp, register int flags)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1024 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1025 register Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1026 register Py_ssize_t any;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1027 int status;
7985 ab4f64561fba Use Py_Repr{Enter,Leave} to display recursive dictionaries in finite space. Guido van Rossum <guido@python.org> parents: 6490 diff changeset	1028
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1029 status = Py_ReprEnter((PyObject*)mp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1030 if (status != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1031 if (status < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1032 return status;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1033 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1034 fprintf(fp, "{...}");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1035 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1036 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1037 }
7985 ab4f64561fba Use Py_Repr{Enter,Leave} to display recursive dictionaries in finite space. Guido van Rossum <guido@python.org> parents: 6490 diff changeset	1038
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1039 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1040 fprintf(fp, "{");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1041 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1042 any = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1043 for (i = 0; i <= mp->ma_mask; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1044 PyDictEntry *ep = mp->ma_table + i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1045 PyObject *pvalue = ep->me_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1046 if (pvalue != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1047 /* Prevent PyObject_Repr from deleting value during
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1048 key format */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1049 Py_INCREF(pvalue);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1050 if (any++ > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1051 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1052 fprintf(fp, ", ");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1053 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1054 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1055 if (PyObject_Print((PyObject *)ep->me_key, fp, 0)!=0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1056 Py_DECREF(pvalue);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1057 Py_ReprLeave((PyObject*)mp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1058 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1059 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1060 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1061 fprintf(fp, ": ");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1062 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1063 if (PyObject_Print(pvalue, fp, 0) != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1064 Py_DECREF(pvalue);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1065 Py_ReprLeave((PyObject*)mp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1066 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1067 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1068 Py_DECREF(pvalue);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1069 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1070 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1071 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1072 fprintf(fp, "}");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1073 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1074 Py_ReprLeave((PyObject*)mp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1075 return 0;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1076 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1077
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	1078 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1079 dict_repr(PyDictObject *mp)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1080 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1081 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1082 PyObject s, temp, *colon = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1083 PyObject pieces = NULL, result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1084 PyObject key, value;
7985 ab4f64561fba Use Py_Repr{Enter,Leave} to display recursive dictionaries in finite space. Guido van Rossum <guido@python.org> parents: 6490 diff changeset	1085
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1086 i = Py_ReprEnter((PyObject *)mp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1087 if (i != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1088 return i > 0 ? PyString_FromString("{...}") : NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1089 }
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18032 diff changeset	1090
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1091 if (mp->ma_used == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1092 result = PyString_FromString("{}");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1093 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1094 }
7985 ab4f64561fba Use Py_Repr{Enter,Leave} to display recursive dictionaries in finite space. Guido van Rossum <guido@python.org> parents: 6490 diff changeset	1095
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1096 pieces = PyList_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1097 if (pieces == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1098 goto Done;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18032 diff changeset	1099
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1100 colon = PyString_FromString(": ");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1101 if (colon == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1102 goto Done;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18032 diff changeset	1103
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1104 /* Do repr() on each key+value pair, and insert ": " between them.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1105 Note that repr may mutate the dict. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1106 i = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1107 while (PyDict_Next((PyObject *)mp, &i, &key, &value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1108 int status;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1109 /* Prevent repr from deleting value during key format. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1110 Py_INCREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1111 s = PyObject_Repr(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1112 PyString_Concat(&s, colon);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1113 PyString_ConcatAndDel(&s, PyObject_Repr(value));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1114 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1115 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1116 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1117 status = PyList_Append(pieces, s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1118 Py_DECREF(s); /* append created a new ref */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1119 if (status < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1120 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1121 }
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18032 diff changeset	1122
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1123 /* Add "{}" decorations to the first and last items. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1124 assert(PyList_GET_SIZE(pieces) > 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1125 s = PyString_FromString("{");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1126 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1127 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1128 temp = PyList_GET_ITEM(pieces, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1129 PyString_ConcatAndDel(&s, temp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1130 PyList_SET_ITEM(pieces, 0, s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1131 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1132 goto Done;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18032 diff changeset	1133
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1134 s = PyString_FromString("}");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1135 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1136 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1137 temp = PyList_GET_ITEM(pieces, PyList_GET_SIZE(pieces) - 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1138 PyString_ConcatAndDel(&temp, s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1139 PyList_SET_ITEM(pieces, PyList_GET_SIZE(pieces) - 1, temp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1140 if (temp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1141 goto Done;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18032 diff changeset	1142
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1143 /* Paste them all together with ", " between. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1144 s = PyString_FromString(", ");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1145 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1146 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1147 result = _PyString_Join(s, pieces);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1148 Py_DECREF(s);
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18032 diff changeset	1149
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18032 diff changeset	1150 Done:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1151 Py_XDECREF(pieces);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1152 Py_XDECREF(colon);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1153 Py_ReprLeave((PyObject *)mp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1154 return result;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1155 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1156
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1157 static Py_ssize_t
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1158 dict_length(PyDictObject *mp)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1159 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1160 return mp->ma_used;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1161 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1162
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	1163 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1164 dict_subscript(PyDictObject mp, register PyObject key)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1165 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1166 PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1167 long hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1168 PyDictEntry *ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1169 assert(mp->ma_table != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1170 if (!PyString_CheckExact(key) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1171 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1172 hash = PyObject_Hash(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1173 if (hash == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1174 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1175 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1176 ep = (mp->ma_lookup)(mp, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1177 if (ep == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1178 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1179 v = ep->me_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1180 if (v == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1181 if (!PyDict_CheckExact(mp)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1182 /* Look up __missing__ method if we're a subclass. */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	1183 PyObject missing, res;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1184 static PyObject *missing_str = NULL;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	1185 missing = _PyObject_LookupSpecial((PyObject *)mp,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	1186 "__missing__",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	1187 &missing_str);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	1188 if (missing != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	1189 res = PyObject_CallFunctionObjArgs(missing,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	1190 key, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	1191 Py_DECREF(missing);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	1192 return res;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	1193 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	1194 else if (PyErr_Occurred())
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	1195 return NULL;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1196 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1197 set_key_error(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1198 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1199 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1200 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1201 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1202 return v;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1203 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1204
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1205 static int
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1206 dict_ass_sub(PyDictObject mp, PyObject v, PyObject *w)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1207 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1208 if (w == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1209 return PyDict_DelItem((PyObject *)mp, v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1210 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1211 return PyDict_SetItem((PyObject *)mp, v, w);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1212 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1213
5505 47fa00877924 Renamed from mappingobject.c to dictobject.c. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1214 static PyMappingMethods dict_as_mapping = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1215 (lenfunc)dict_length, /mp_length/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1216 (binaryfunc)dict_subscript, /mp_subscript/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1217 (objobjargproc)dict_ass_sub, /mp_ass_subscript/
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1218 };
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1219
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	1220 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1221 dict_keys(register PyDictObject *mp)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1222 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1223 register PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1224 register Py_ssize_t i, j;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1225 PyDictEntry *ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1226 Py_ssize_t mask, n;
17535 83c7b4b75668 Tentative fix for a problem that Tim discovered at the last moment, Guido van Rossum <guido@python.org> parents: 17115 diff changeset	1227
83c7b4b75668 Tentative fix for a problem that Tim discovered at the last moment, Guido van Rossum <guido@python.org> parents: 17115 diff changeset	1228 again:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1229 n = mp->ma_used;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1230 v = PyList_New(n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1231 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1232 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1233 if (n != mp->ma_used) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1234 /* Durnit. The allocations caused the dict to resize.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1235 * Just start over, this shouldn't normally happen.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1236 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1237 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1238 goto again;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1239 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1240 ep = mp->ma_table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1241 mask = mp->ma_mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1242 for (i = 0, j = 0; i <= mask; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1243 if (ep[i].me_value != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1244 PyObject *key = ep[i].me_key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1245 Py_INCREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1246 PyList_SET_ITEM(v, j, key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1247 j++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1248 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1249 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1250 assert(j == n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1251 return v;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1252 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1253
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	1254 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1255 dict_values(register PyDictObject *mp)
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1256 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1257 register PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1258 register Py_ssize_t i, j;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1259 PyDictEntry *ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1260 Py_ssize_t mask, n;
17535 83c7b4b75668 Tentative fix for a problem that Tim discovered at the last moment, Guido van Rossum <guido@python.org> parents: 17115 diff changeset	1261
83c7b4b75668 Tentative fix for a problem that Tim discovered at the last moment, Guido van Rossum <guido@python.org> parents: 17115 diff changeset	1262 again:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1263 n = mp->ma_used;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1264 v = PyList_New(n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1265 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1266 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1267 if (n != mp->ma_used) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1268 /* Durnit. The allocations caused the dict to resize.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1269 * Just start over, this shouldn't normally happen.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1270 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1271 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1272 goto again;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1273 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1274 ep = mp->ma_table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1275 mask = mp->ma_mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1276 for (i = 0, j = 0; i <= mask; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1277 if (ep[i].me_value != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1278 PyObject *value = ep[i].me_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1279 Py_INCREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1280 PyList_SET_ITEM(v, j, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1281 j++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1282 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1283 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1284 assert(j == n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1285 return v;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1286 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1287
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	1288 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1289 dict_items(register PyDictObject *mp)
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1290 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1291 register PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1292 register Py_ssize_t i, j, n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1293 Py_ssize_t mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1294 PyObject item, key, *value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1295 PyDictEntry *ep;
17535 83c7b4b75668 Tentative fix for a problem that Tim discovered at the last moment, Guido van Rossum <guido@python.org> parents: 17115 diff changeset	1296
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1297 /* Preallocate the list of tuples, to avoid allocations during
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1298 * the loop over the items, which could trigger GC, which
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1299 * could resize the dict. :-(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1300 */
17535 83c7b4b75668 Tentative fix for a problem that Tim discovered at the last moment, Guido van Rossum <guido@python.org> parents: 17115 diff changeset	1301 again:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1302 n = mp->ma_used;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1303 v = PyList_New(n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1304 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1305 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1306 for (i = 0; i < n; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1307 item = PyTuple_New(2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1308 if (item == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1309 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1310 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1311 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1312 PyList_SET_ITEM(v, i, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1313 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1314 if (n != mp->ma_used) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1315 /* Durnit. The allocations caused the dict to resize.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1316 * Just start over, this shouldn't normally happen.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1317 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1318 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1319 goto again;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1320 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1321 /* Nothing we do below makes any function calls. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1322 ep = mp->ma_table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1323 mask = mp->ma_mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1324 for (i = 0, j = 0; i <= mask; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1325 if ((value=ep[i].me_value) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1326 key = ep[i].me_key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1327 item = PyList_GET_ITEM(v, j);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1328 Py_INCREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1329 PyTuple_SET_ITEM(item, 0, key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1330 Py_INCREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1331 PyTuple_SET_ITEM(item, 1, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1332 j++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1333 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1334 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1335 assert(j == n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1336 return v;
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1337 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1338
5658 1265ca44f04b Added dict.absorb() and dict.copy(). Guido van Rossum <guido@python.org> parents: 5609 diff changeset	1339 static PyObject *
26583 8991f78817c7 SF 548651: Fix the METH_CLASS implementation. Tim Peters <tim.peters@gmail.com> parents: 26562 diff changeset	1340 dict_fromkeys(PyObject cls, PyObject args)
26437 57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	1341 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1342 PyObject *seq;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1343 PyObject *value = Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1344 PyObject it; / iter(seq) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1345 PyObject *key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1346 PyObject *d;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1347 int status;
26437 57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	1348
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1349 if (!PyArg_UnpackTuple(args, "fromkeys", 1, 2, &seq, &value))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1350 return NULL;
26437 57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	1351
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1352 d = PyObject_CallObject(cls, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1353 if (d == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1354 return NULL;
26437 57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	1355
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1356 if (PyDict_CheckExact(d) && PyDict_CheckExact(seq)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1357 PyDictObject mp = (PyDictObject )d;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1358 PyObject *oldvalue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1359 Py_ssize_t pos = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1360 PyObject *key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1361 long hash;
43783 9f17a9a5b5ae Optimize dict.fromkeys() with dict inputs. Useful for resetting bag/muliset counts for example. Raymond Hettinger <python@rcn.com> parents: 43515 diff changeset	1362
73102 5d7164febff1 Issue #13018: Fix reference leaks in error paths in dictobject.c. Petri Lehtinen <petri@digip.org> parents: 68588 diff changeset	1363 if (dictresize(mp, Py_SIZE(seq))) {
5d7164febff1 Issue #13018: Fix reference leaks in error paths in dictobject.c. Petri Lehtinen <petri@digip.org> parents: 68588 diff changeset	1364 Py_DECREF(d);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1365 return NULL;
73102 5d7164febff1 Issue #13018: Fix reference leaks in error paths in dictobject.c. Petri Lehtinen <petri@digip.org> parents: 68588 diff changeset	1366 }
26437 57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	1367
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1368 while (_PyDict_Next(seq, &pos, &key, &oldvalue, &hash)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1369 Py_INCREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1370 Py_INCREF(value);
73102 5d7164febff1 Issue #13018: Fix reference leaks in error paths in dictobject.c. Petri Lehtinen <petri@digip.org> parents: 68588 diff changeset	1371 if (insertdict(mp, key, hash, value)) {
5d7164febff1 Issue #13018: Fix reference leaks in error paths in dictobject.c. Petri Lehtinen <petri@digip.org> parents: 68588 diff changeset	1372 Py_DECREF(d);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1373 return NULL;
73102 5d7164febff1 Issue #13018: Fix reference leaks in error paths in dictobject.c. Petri Lehtinen <petri@digip.org> parents: 68588 diff changeset	1374 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1375 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1376 return d;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1377 }
41249 50a6b33c9d2c Extend work on rev 52962 and 53830 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. Raymond Hettinger <python@rcn.com> parents: 40864 diff changeset	1378
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1379 if (PyDict_CheckExact(d) && PyAnySet_CheckExact(seq)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1380 PyDictObject mp = (PyDictObject )d;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1381 Py_ssize_t pos = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1382 PyObject *key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1383 long hash;
41249 50a6b33c9d2c Extend work on rev 52962 and 53830 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. Raymond Hettinger <python@rcn.com> parents: 40864 diff changeset	1384
73102 5d7164febff1 Issue #13018: Fix reference leaks in error paths in dictobject.c. Petri Lehtinen <petri@digip.org> parents: 68588 diff changeset	1385 if (dictresize(mp, PySet_GET_SIZE(seq))) {
5d7164febff1 Issue #13018: Fix reference leaks in error paths in dictobject.c. Petri Lehtinen <petri@digip.org> parents: 68588 diff changeset	1386 Py_DECREF(d);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1387 return NULL;
73102 5d7164febff1 Issue #13018: Fix reference leaks in error paths in dictobject.c. Petri Lehtinen <petri@digip.org> parents: 68588 diff changeset	1388 }
41249 50a6b33c9d2c Extend work on rev 52962 and 53830 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. Raymond Hettinger <python@rcn.com> parents: 40864 diff changeset	1389
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1390 while (_PySet_NextEntry(seq, &pos, &key, &hash)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1391 Py_INCREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1392 Py_INCREF(value);
73102 5d7164febff1 Issue #13018: Fix reference leaks in error paths in dictobject.c. Petri Lehtinen <petri@digip.org> parents: 68588 diff changeset	1393 if (insertdict(mp, key, hash, value)) {
5d7164febff1 Issue #13018: Fix reference leaks in error paths in dictobject.c. Petri Lehtinen <petri@digip.org> parents: 68588 diff changeset	1394 Py_DECREF(d);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1395 return NULL;
73102 5d7164febff1 Issue #13018: Fix reference leaks in error paths in dictobject.c. Petri Lehtinen <petri@digip.org> parents: 68588 diff changeset	1396 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1397 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1398 return d;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1399 }
41248 ec6fb091039b Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability. Raymond Hettinger <python@rcn.com> parents: 40908 diff changeset	1400
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1401 it = PyObject_GetIter(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1402 if (it == NULL){
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1403 Py_DECREF(d);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1404 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1405 }
26437 57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	1406
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1407 if (PyDict_CheckExact(d)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1408 while ((key = PyIter_Next(it)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1409 status = PyDict_SetItem(d, key, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1410 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1411 if (status < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1412 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1413 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1414 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1415 while ((key = PyIter_Next(it)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1416 status = PyObject_SetItem(d, key, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1417 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1418 if (status < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1419 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1420 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1421 }
26437 57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	1422
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1423 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1424 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1425 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1426 return d;
26437 57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	1427
57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	1428 Fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1429 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1430 Py_DECREF(d);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1431 return NULL;
26437 57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	1432 }
57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	1433
31616 5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 31545 diff changeset	1434 static int
5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 31545 diff changeset	1435 dict_update_common(PyObject self, PyObject args, PyObject kwds, char methname)
5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 31545 diff changeset	1436 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1437 PyObject *arg = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1438 int result = 0;
31616 5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 31545 diff changeset	1439
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1440 if (!PyArg_UnpackTuple(args, methname, 0, 1, &arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1441 result = -1;
31616 5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 31545 diff changeset	1442
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1443 else if (arg != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1444 if (PyObject_HasAttrString(arg, "keys"))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1445 result = PyDict_Merge(self, arg, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1446 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1447 result = PyDict_MergeFromSeq2(self, arg, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1448 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1449 if (result == 0 && kwds != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1450 result = PyDict_Merge(self, kwds, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1451 return result;
31616 5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 31545 diff changeset	1452 }
5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 31545 diff changeset	1453
26437 57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	1454 static PyObject *
31616 5b3898d9ba59 SF #904720: dict.update should take a 2-tuple sequence like dict.__init_ Raymond Hettinger <python@rcn.com> parents: 31545 diff changeset	1455 dict_update(PyObject self, PyObject args, PyObject *kwds)
5658 1265ca44f04b Added dict.absorb() and dict.copy(). Guido van Rossum <guido@python.org> parents: 5609 diff changeset	1456 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1457 if (dict_update_common(self, args, kwds, "update") != -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1458 Py_RETURN_NONE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1459 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	1460 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	1461
19150 3f34f724f014 Add PyDict_Merge(a, b, override): Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1462 /* Update unconditionally replaces existing items.
3f34f724f014 Add PyDict_Merge(a, b, override): Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1463 Merge has a 3rd argument 'override'; if set, it acts like Update,
20683 505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1464 otherwise it leaves existing items unchanged.
505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1465
505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1466 PyDict_{Update,Merge} update/merge from a mapping object.
505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1467
21348 12310d643d8d SF bug #491415 PyDict_UpdateFromSeq2() unused Tim Peters <tim.peters@gmail.com> parents: 21155 diff changeset	1468 PyDict_MergeFromSeq2 updates/merges from any iterable object
20683 505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1469 producing iterable objects of length 2.
505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1470 */
505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1471
21348 12310d643d8d SF bug #491415 PyDict_UpdateFromSeq2() unused Tim Peters <tim.peters@gmail.com> parents: 21155 diff changeset	1472 int
20683 505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1473 PyDict_MergeFromSeq2(PyObject d, PyObject seq2, int override)
505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1474 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1475 PyObject it; / iter(seq2) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1476 Py_ssize_t i; /* index into seq2 of current element */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1477 PyObject item; / seq2[i] */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1478 PyObject fast; / item as a 2-tuple or 2-list */
20683 505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1479
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1480 assert(d != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1481 assert(PyDict_Check(d));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1482 assert(seq2 != NULL);
20683 505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1483
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1484 it = PyObject_GetIter(seq2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1485 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1486 return -1;
20683 505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1487
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1488 for (i = 0; ; ++i) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1489 PyObject key, value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1490 Py_ssize_t n;
20683 505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1491
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1492 fast = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1493 item = PyIter_Next(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1494 if (item == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1495 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1496 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1497 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1498 }
20683 505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1499
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1500 /* Convert item to sequence, and verify length 2. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1501 fast = PySequence_Fast(item, "");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1502 if (fast == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1503 if (PyErr_ExceptionMatches(PyExc_TypeError))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1504 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1505 "cannot convert dictionary update "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1506 "sequence element #%zd to a sequence",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1507 i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1508 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1509 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1510 n = PySequence_Fast_GET_SIZE(fast);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1511 if (n != 2) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1512 PyErr_Format(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1513 "dictionary update sequence element #%zd "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1514 "has length %zd; 2 is required",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1515 i, n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1516 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1517 }
20683 505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1518
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1519 /* Update/merge with this (key, value) pair. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1520 key = PySequence_Fast_GET_ITEM(fast, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1521 value = PySequence_Fast_GET_ITEM(fast, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1522 if (override \|\| PyDict_GetItem(d, key) == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1523 int status = PyDict_SetItem(d, key, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1524 if (status < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1525 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1526 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1527 Py_DECREF(fast);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1528 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1529 }
20683 505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1530
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1531 i = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1532 goto Return;
20683 505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1533 Fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1534 Py_XDECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1535 Py_XDECREF(fast);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1536 i = -1;
20683 505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1537 Return:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1538 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1539 return Py_SAFE_DOWNCAST(i, Py_ssize_t, int);
20683 505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1540 }
505dd34e0eeb Generalize dictionary() to accept a sequence of 2-sequences. At the Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	1541
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	1542 int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	1543 PyDict_Update(PyObject a, PyObject b)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	1544 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1545 return PyDict_Merge(a, b, 1);
19150 3f34f724f014 Add PyDict_Merge(a, b, override): Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1546 }
3f34f724f014 Add PyDict_Merge(a, b, override): Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1547
3f34f724f014 Add PyDict_Merge(a, b, override): Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1548 int
3f34f724f014 Add PyDict_Merge(a, b, override): Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1549 PyDict_Merge(PyObject a, PyObject b, int override)
3f34f724f014 Add PyDict_Merge(a, b, override): Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1550 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1551 register PyDictObject mp, other;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1552 register Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1553 PyDictEntry *entry;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	1554
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1555 /* We accept for the argument either a concrete dictionary object,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1556 * or an abstract "mapping" object. For the former, we can do
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1557 * things quite efficiently. For the latter, we only require that
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1558 * PyMapping_Keys() and PyObject_GetItem() be supported.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1559 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1560 if (a == NULL \|\| !PyDict_Check(a) \|\| b == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1561 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1562 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1563 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1564 mp = (PyDictObject*)a;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1565 if (PyDict_Check(b)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1566 other = (PyDictObject*)b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1567 if (other == mp \|\| other->ma_used == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1568 /* a.update(a) or a.update({}); nothing to do */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1569 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1570 if (mp->ma_used == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1571 /* Since the target dict is empty, PyDict_GetItem()
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1572 * always returns NULL. Setting override to 1
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1573 * skips the unnecessary test.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1574 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1575 override = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1576 /* Do one big resize at the start, rather than
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1577 * incrementally resizing as we insert new items. Expect
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1578 * that there will be no (or few) overlapping keys.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1579 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1580 if ((mp->ma_fill + other->ma_used)3 >= (mp->ma_mask+1)2) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1581 if (dictresize(mp, (mp->ma_used + other->ma_used)*2) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1582 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1583 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1584 for (i = 0; i <= other->ma_mask; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1585 entry = &other->ma_table[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1586 if (entry->me_value != NULL &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1587 (override \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1588 PyDict_GetItem(a, entry->me_key) == NULL)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1589 Py_INCREF(entry->me_key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1590 Py_INCREF(entry->me_value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1591 if (insertdict(mp, entry->me_key,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1592 (long)entry->me_hash,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1593 entry->me_value) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1594 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1595 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1596 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1597 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1598 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1599 /* Do it the generic, slower way */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1600 PyObject *keys = PyMapping_Keys(b);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1601 PyObject *iter;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1602 PyObject key, value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1603 int status;
18283 1f1d2c50b3c7 dict_update(): Generalize this method so {}.update() accepts any Barry Warsaw <barry@python.org> parents: 18131 diff changeset	1604
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1605 if (keys == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1606 /* Docstring says this is equivalent to E.keys() so
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1607 * if E doesn't have a .keys() method we want
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1608 * AttributeError to percolate up. Might as well
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1609 * do the same for any other error.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1610 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1611 return -1;
18283 1f1d2c50b3c7 dict_update(): Generalize this method so {}.update() accepts any Barry Warsaw <barry@python.org> parents: 18131 diff changeset	1612
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1613 iter = PyObject_GetIter(keys);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1614 Py_DECREF(keys);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1615 if (iter == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1616 return -1;
18283 1f1d2c50b3c7 dict_update(): Generalize this method so {}.update() accepts any Barry Warsaw <barry@python.org> parents: 18131 diff changeset	1617
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1618 for (key = PyIter_Next(iter); key; key = PyIter_Next(iter)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1619 if (!override && PyDict_GetItem(a, key) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1620 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1621 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1622 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1623 value = PyObject_GetItem(b, key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1624 if (value == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1625 Py_DECREF(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1626 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1627 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1628 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1629 status = PyDict_SetItem(a, key, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1630 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1631 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1632 if (status < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1633 Py_DECREF(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1634 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1635 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1636 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1637 Py_DECREF(iter);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1638 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1639 /* Iterator completed, via error */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1640 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1641 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1642 return 0;
5658 1265ca44f04b Added dict.absorb() and dict.copy(). Guido van Rossum <guido@python.org> parents: 5609 diff changeset	1643 }
1265ca44f04b Added dict.absorb() and dict.copy(). Guido van Rossum <guido@python.org> parents: 5609 diff changeset	1644
1265ca44f04b Added dict.absorb() and dict.copy(). Guido van Rossum <guido@python.org> parents: 5609 diff changeset	1645 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1646 dict_copy(register PyDictObject *mp)
5658 1265ca44f04b Added dict.absorb() and dict.copy(). Guido van Rossum <guido@python.org> parents: 5609 diff changeset	1647 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1648 return PyDict_Copy((PyObject*)mp);
12126 e6214ad2a60c Add PyDict_Copy() function to C API for dicts. It returns a new Jeremy Hylton <jeremy@alum.mit.edu> parents: 11999 diff changeset	1649 }
e6214ad2a60c Add PyDict_Copy() function to C API for dicts. It returns a new Jeremy Hylton <jeremy@alum.mit.edu> parents: 11999 diff changeset	1650
e6214ad2a60c Add PyDict_Copy() function to C API for dicts. It returns a new Jeremy Hylton <jeremy@alum.mit.edu> parents: 11999 diff changeset	1651 PyObject *
13341 3f1bd4782628 Removed Py_PROTO and switched to ANSI C declarations in the dict Tim Peters <tim.peters@gmail.com> parents: 13265 diff changeset	1652 PyDict_Copy(PyObject *o)
12126 e6214ad2a60c Add PyDict_Copy() function to C API for dicts. It returns a new Jeremy Hylton <jeremy@alum.mit.edu> parents: 11999 diff changeset	1653 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1654 PyObject *copy;
12126 e6214ad2a60c Add PyDict_Copy() function to C API for dicts. It returns a new Jeremy Hylton <jeremy@alum.mit.edu> parents: 11999 diff changeset	1655
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1656 if (o == NULL \|\| !PyDict_Check(o)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1657 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1658 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1659 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1660 copy = PyDict_New();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1661 if (copy == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1662 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1663 if (PyDict_Merge(copy, o, 1) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1664 return copy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1665 Py_DECREF(copy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1666 return NULL;
5658 1265ca44f04b Added dict.absorb() and dict.copy(). Guido van Rossum <guido@python.org> parents: 5609 diff changeset	1667 }
1265ca44f04b Added dict.absorb() and dict.copy(). Guido van Rossum <guido@python.org> parents: 5609 diff changeset	1668
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1669 Py_ssize_t
13341 3f1bd4782628 Removed Py_PROTO and switched to ANSI C declarations in the dict Tim Peters <tim.peters@gmail.com> parents: 13265 diff changeset	1670 PyDict_Size(PyObject *mp)
1398 1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	1671 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1672 if (mp == NULL \|\| !PyDict_Check(mp)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1673 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1674 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1675 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1676 return ((PyDictObject *)mp)->ma_used;
1398 1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	1677 }
1d841587aede Added getmappingsize(). (Needed by previous checkin of posixmodule.c) Guido van Rossum <guido@python.org> parents: 1356 diff changeset	1678
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	1679 PyObject *
13341 3f1bd4782628 Removed Py_PROTO and switched to ANSI C declarations in the dict Tim Peters <tim.peters@gmail.com> parents: 13265 diff changeset	1680 PyDict_Keys(PyObject *mp)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1681 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1682 if (mp == NULL \|\| !PyDict_Check(mp)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1683 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1684 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1685 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1686 return dict_keys((PyDictObject *)mp);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1687 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1688
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	1689 PyObject *
13341 3f1bd4782628 Removed Py_PROTO and switched to ANSI C declarations in the dict Tim Peters <tim.peters@gmail.com> parents: 13265 diff changeset	1690 PyDict_Values(PyObject *mp)
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1691 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1692 if (mp == NULL \|\| !PyDict_Check(mp)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1693 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1694 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1695 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1696 return dict_values((PyDictObject *)mp);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1697 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1698
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	1699 PyObject *
13341 3f1bd4782628 Removed Py_PROTO and switched to ANSI C declarations in the dict Tim Peters <tim.peters@gmail.com> parents: 13265 diff changeset	1700 PyDict_Items(PyObject *mp)
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1701 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1702 if (mp == NULL \|\| !PyDict_Check(mp)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1703 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1704 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1705 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1706 return dict_items((PyDictObject *)mp);
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1707 }
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1708
4586 b3d2990d8a4a Experimental new implementation of dictionary comparison. This Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1709 /* Subroutine which returns the smallest key in a for which b's value
b3d2990d8a4a Experimental new implementation of dictionary comparison. This Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1710 is different or absent. The value is returned too, through the
17756 a06a704260e9 SF bug #422121 Insecurities in dict comparison. Tim Peters <tim.peters@gmail.com> parents: 17704 diff changeset	1711 pval argument. Both are NULL if no key in a is found for which b's status
a06a704260e9 SF bug #422121 Insecurities in dict comparison. Tim Peters <tim.peters@gmail.com> parents: 17704 diff changeset	1712 differs. The refcounts on (and only on) non-NULL *pval and function return
a06a704260e9 SF bug #422121 Insecurities in dict comparison. Tim Peters <tim.peters@gmail.com> parents: 17704 diff changeset	1713 values must be decremented by the caller (characterize() increments them
a06a704260e9 SF bug #422121 Insecurities in dict comparison. Tim Peters <tim.peters@gmail.com> parents: 17704 diff changeset	1714 to ensure that mutating comparison and PyDict_GetItem calls can't delete
a06a704260e9 SF bug #422121 Insecurities in dict comparison. Tim Peters <tim.peters@gmail.com> parents: 17704 diff changeset	1715 them before the caller is done looking at them). */
4586 b3d2990d8a4a Experimental new implementation of dictionary comparison. This Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1716
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	1717 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1718 characterize(PyDictObject a, PyDictObject b, PyObject **pval)
4586 b3d2990d8a4a Experimental new implementation of dictionary comparison. This Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1719 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1720 PyObject akey = NULL; / smallest key in a s.t. a[akey] != b[akey] */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1721 PyObject aval = NULL; / a[akey] */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1722 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1723 int cmp;
4586 b3d2990d8a4a Experimental new implementation of dictionary comparison. This Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1724
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1725 for (i = 0; i <= a->ma_mask; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1726 PyObject thiskey, thisaval, *thisbval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1727 if (a->ma_table[i].me_value == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1728 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1729 thiskey = a->ma_table[i].me_key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1730 Py_INCREF(thiskey); /* keep alive across compares */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1731 if (akey != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1732 cmp = PyObject_RichCompareBool(akey, thiskey, Py_LT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1733 if (cmp < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1734 Py_DECREF(thiskey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1735 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1736 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1737 if (cmp > 0 \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1738 i > a->ma_mask \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1739 a->ma_table[i].me_value == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1740 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1741 /* Not the smallest a key; or maybe it is
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1742 * but the compare shrunk the dict so we can't
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1743 * find its associated value anymore; or
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1744 * maybe it is but the compare deleted the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1745 * a[thiskey] entry.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1746 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1747 Py_DECREF(thiskey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1748 continue;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1749 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1750 }
17756 a06a704260e9 SF bug #422121 Insecurities in dict comparison. Tim Peters <tim.peters@gmail.com> parents: 17704 diff changeset	1751
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1752 /* Compare a[thiskey] to b[thiskey]; cmp <- true iff equal. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1753 thisaval = a->ma_table[i].me_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1754 assert(thisaval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1755 Py_INCREF(thisaval); /* keep alive */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1756 thisbval = PyDict_GetItem((PyObject *)b, thiskey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1757 if (thisbval == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1758 cmp = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1759 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1760 /* both dicts have thiskey: same values? */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1761 cmp = PyObject_RichCompareBool(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1762 thisaval, thisbval, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1763 if (cmp < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1764 Py_DECREF(thiskey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1765 Py_DECREF(thisaval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1766 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1767 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1768 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1769 if (cmp == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1770 /* New winner. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1771 Py_XDECREF(akey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1772 Py_XDECREF(aval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1773 akey = thiskey;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1774 aval = thisaval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1775 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1776 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1777 Py_DECREF(thiskey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1778 Py_DECREF(thisaval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1779 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1780 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1781 *pval = aval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1782 return akey;
17756 a06a704260e9 SF bug #422121 Insecurities in dict comparison. Tim Peters <tim.peters@gmail.com> parents: 17704 diff changeset	1783
a06a704260e9 SF bug #422121 Insecurities in dict comparison. Tim Peters <tim.peters@gmail.com> parents: 17704 diff changeset	1784 Fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1785 Py_XDECREF(akey);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1786 Py_XDECREF(aval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1787 *pval = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1788 return NULL;
4586 b3d2990d8a4a Experimental new implementation of dictionary comparison. This Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1789 }
b3d2990d8a4a Experimental new implementation of dictionary comparison. This Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1790
b3d2990d8a4a Experimental new implementation of dictionary comparison. This Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1791 static int
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1792 dict_compare(PyDictObject a, PyDictObject b)
4586 b3d2990d8a4a Experimental new implementation of dictionary comparison. This Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1793 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1794 PyObject adiff, bdiff, aval, bval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1795 int res;
4586 b3d2990d8a4a Experimental new implementation of dictionary comparison. This Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1796
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1797 /* Compare lengths first */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1798 if (a->ma_used < b->ma_used)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1799 return -1; /* a is shorter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1800 else if (a->ma_used > b->ma_used)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1801 return 1; /* b is shorter */
17756 a06a704260e9 SF bug #422121 Insecurities in dict comparison. Tim Peters <tim.peters@gmail.com> parents: 17704 diff changeset	1802
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1803 /* Same length -- check all keys */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1804 bdiff = bval = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1805 adiff = characterize(a, b, &aval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1806 if (adiff == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1807 assert(!aval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1808 /* Either an error, or a is a subset with the same length so
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1809 * must be equal.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1810 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1811 res = PyErr_Occurred() ? -1 : 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1812 goto Finished;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1813 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1814 bdiff = characterize(b, a, &bval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1815 if (bdiff == NULL && PyErr_Occurred()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1816 assert(!bval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1817 res = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1818 goto Finished;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1819 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1820 res = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1821 if (bdiff) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1822 /* bdiff == NULL "should be" impossible now, but perhaps
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1823 * the last comparison done by the characterize() on a had
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1824 * the side effect of making the dicts equal!
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1825 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1826 res = PyObject_Compare(adiff, bdiff);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1827 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1828 if (res == 0 && bval != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1829 res = PyObject_Compare(aval, bval);
17756 a06a704260e9 SF bug #422121 Insecurities in dict comparison. Tim Peters <tim.peters@gmail.com> parents: 17704 diff changeset	1830
a06a704260e9 SF bug #422121 Insecurities in dict comparison. Tim Peters <tim.peters@gmail.com> parents: 17704 diff changeset	1831 Finished:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1832 Py_XDECREF(adiff);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1833 Py_XDECREF(bdiff);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1834 Py_XDECREF(aval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1835 Py_XDECREF(bval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1836 return res;
4586 b3d2990d8a4a Experimental new implementation of dictionary comparison. This Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1837 }
b3d2990d8a4a Experimental new implementation of dictionary comparison. This Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1838
17704 b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1839 /* Return 1 if dicts equal, 0 if not, -1 if error.
b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1840 * Gets out as soon as any difference is detected.
b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1841 * Uses only Py_EQ comparison.
b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1842 */
b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1843 static int
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1844 dict_equal(PyDictObject a, PyDictObject b)
17704 b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1845 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1846 Py_ssize_t i;
17704 b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1847
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1848 if (a->ma_used != b->ma_used)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1849 /* can't be equal if # of entries differ */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1850 return 0;
18014 9f97167f1643 New collision resolution scheme: no polynomials, simpler, faster, less Tim Peters <tim.peters@gmail.com> parents: 17973 diff changeset	1851
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1852 /* Same # of entries -- check all of 'em. Exit early on any diff. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1853 for (i = 0; i <= a->ma_mask; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1854 PyObject *aval = a->ma_table[i].me_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1855 if (aval != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1856 int cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1857 PyObject *bval;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1858 PyObject *key = a->ma_table[i].me_key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1859 /* temporarily bump aval's refcount to ensure it stays
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1860 alive until we're done with it */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1861 Py_INCREF(aval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1862 /* ditto for key */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1863 Py_INCREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1864 bval = PyDict_GetItem((PyObject *)b, key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1865 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1866 if (bval == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1867 Py_DECREF(aval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1868 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1869 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1870 cmp = PyObject_RichCompareBool(aval, bval, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1871 Py_DECREF(aval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1872 if (cmp <= 0) /* error or not equal */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1873 return cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1874 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1875 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1876 return 1;
17704 b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1877 }
b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1878
b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1879 static PyObject *
b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1880 dict_richcompare(PyObject v, PyObject w, int op)
b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1881 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1882 int cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1883 PyObject *res;
17704 b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1884
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1885 if (!PyDict_Check(v) \|\| !PyDict_Check(w)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1886 res = Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1887 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1888 else if (op == Py_EQ \|\| op == Py_NE) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1889 cmp = dict_equal((PyDictObject )v, (PyDictObject )w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1890 if (cmp < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1891 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1892 res = (cmp == (op == Py_EQ)) ? Py_True : Py_False;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1893 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1894 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1895 /* Py3K warning if comparison isn't == or != */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1896 if (PyErr_WarnPy3k("dict inequality comparisons not supported "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1897 "in 3.x", 1) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1898 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1899 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1900 res = Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1901 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1902 Py_INCREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1903 return res;
17704 b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1904 }
b41f6ef6ea8f SF patch #421922: Implement rich comparison for dicts. Tim Peters <tim.peters@gmail.com> parents: 17656 diff changeset	1905
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	1906 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1907 dict_contains(register PyDictObject mp, PyObject key)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1908 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1909 long hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1910 PyDictEntry *ep;
38540 d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	1911
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1912 if (!PyString_CheckExact(key) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1913 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1914 hash = PyObject_Hash(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1915 if (hash == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1916 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1917 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1918 ep = (mp->ma_lookup)(mp, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1919 if (ep == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1920 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1921 return PyBool_FromLong(ep->me_value != NULL);
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1922 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	1923
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	1924 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1925 dict_has_key(register PyDictObject mp, PyObject key)
6395 22dae2637e08 dict_get(): New method for item access with different semantics than Barry Warsaw <barry@python.org> parents: 6351 diff changeset	1926 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1927 if (PyErr_WarnPy3k("dict.has_key() not supported in 3.x; "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1928 "use the in operator", 1) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1929 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1930 return dict_contains(mp, key);
6395 22dae2637e08 dict_get(): New method for item access with different semantics than Barry Warsaw <barry@python.org> parents: 6351 diff changeset	1931 }
22dae2637e08 dict_get(): New method for item access with different semantics than Barry Warsaw <barry@python.org> parents: 6351 diff changeset	1932
22dae2637e08 dict_get(): New method for item access with different semantics than Barry Warsaw <barry@python.org> parents: 6351 diff changeset	1933 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1934 dict_get(register PyDictObject mp, PyObject args)
13892 2190b7599837 Barry's patch to implement the new setdefault() method. Guido van Rossum <guido@python.org> parents: 13660 diff changeset	1935 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1936 PyObject *key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1937 PyObject *failobj = Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1938 PyObject *val = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1939 long hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1940 PyDictEntry *ep;
13892 2190b7599837 Barry's patch to implement the new setdefault() method. Guido van Rossum <guido@python.org> parents: 13660 diff changeset	1941
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1942 if (!PyArg_UnpackTuple(args, "get", 1, 2, &key, &failobj))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1943 return NULL;
13892 2190b7599837 Barry's patch to implement the new setdefault() method. Guido van Rossum <guido@python.org> parents: 13660 diff changeset	1944
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1945 if (!PyString_CheckExact(key) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1946 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1947 hash = PyObject_Hash(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1948 if (hash == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1949 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1950 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1951 ep = (mp->ma_lookup)(mp, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1952 if (ep == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1953 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1954 val = ep->me_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1955 if (val == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1956 val = failobj;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1957 Py_INCREF(val);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1958 return val;
13892 2190b7599837 Barry's patch to implement the new setdefault() method. Guido van Rossum <guido@python.org> parents: 13660 diff changeset	1959 }
2190b7599837 Barry's patch to implement the new setdefault() method. Guido van Rossum <guido@python.org> parents: 13660 diff changeset	1960
2190b7599837 Barry's patch to implement the new setdefault() method. Guido van Rossum <guido@python.org> parents: 13660 diff changeset	1961
2190b7599837 Barry's patch to implement the new setdefault() method. Guido van Rossum <guido@python.org> parents: 13660 diff changeset	1962 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1963 dict_setdefault(register PyDictObject mp, PyObject args)
5209 2ec9c933afb8 Add clear() method to dictionary objects. Guido van Rossum <guido@python.org> parents: 5059 diff changeset	1964 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1965 PyObject *key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1966 PyObject *failobj = Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1967 PyObject *val = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1968 long hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1969 PyDictEntry *ep;
13892 2190b7599837 Barry's patch to implement the new setdefault() method. Guido van Rossum <guido@python.org> parents: 13660 diff changeset	1970
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1971 if (!PyArg_UnpackTuple(args, "setdefault", 1, 2, &key, &failobj))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1972 return NULL;
13892 2190b7599837 Barry's patch to implement the new setdefault() method. Guido van Rossum <guido@python.org> parents: 13660 diff changeset	1973
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1974 if (!PyString_CheckExact(key) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1975 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1976 hash = PyObject_Hash(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1977 if (hash == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1978 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1979 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1980 ep = (mp->ma_lookup)(mp, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1981 if (ep == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1982 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1983 val = ep->me_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1984 if (val == NULL) {
75301 5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	1985 if (dict_set_item_by_hash_or_entry((PyObject*)mp, key, hash, ep,
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	1986 failobj) == 0)
5c52e7c6d868 Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Antoine Pitrou <solipsis@pitrou.net> parents: 74046 diff changeset	1987 val = failobj;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1988 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1989 Py_XINCREF(val);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1990 return val;
5209 2ec9c933afb8 Add clear() method to dictionary objects. Guido van Rossum <guido@python.org> parents: 5059 diff changeset	1991 }
2ec9c933afb8 Add clear() method to dictionary objects. Guido van Rossum <guido@python.org> parents: 5059 diff changeset	1992
13892 2190b7599837 Barry's patch to implement the new setdefault() method. Guido van Rossum <guido@python.org> parents: 13660 diff changeset	1993
15520 8854d9d5add5 Add popitem() -- SF patch #102733. Guido van Rossum <guido@python.org> parents: 15463 diff changeset	1994 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	1995 dict_clear(register PyDictObject *mp)
22994 196dfa7ed348 Add Raymond Hettinger's d.pop(). See SF patch 539949. Guido van Rossum <guido@python.org> parents: 22973 diff changeset	1996 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1997 PyDict_Clear((PyObject *)mp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1998 Py_RETURN_NONE;
22994 196dfa7ed348 Add Raymond Hettinger's d.pop(). See SF patch 539949. Guido van Rossum <guido@python.org> parents: 22973 diff changeset	1999 }
196dfa7ed348 Add Raymond Hettinger's d.pop(). See SF patch 539949. Guido van Rossum <guido@python.org> parents: 22973 diff changeset	2000
196dfa7ed348 Add Raymond Hettinger's d.pop(). See SF patch 539949. Guido van Rossum <guido@python.org> parents: 22973 diff changeset	2001 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	2002 dict_pop(PyDictObject mp, PyObject args)
15520 8854d9d5add5 Add popitem() -- SF patch #102733. Guido van Rossum <guido@python.org> parents: 15463 diff changeset	2003 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2004 long hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2005 PyDictEntry *ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2006 PyObject old_value, old_key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2007 PyObject key, deflt = NULL;
22994 196dfa7ed348 Add Raymond Hettinger's d.pop(). See SF patch 539949. Guido van Rossum <guido@python.org> parents: 22973 diff changeset	2008
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2009 if(!PyArg_UnpackTuple(args, "pop", 1, 2, &key, &deflt))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2010 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2011 if (mp->ma_used == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2012 if (deflt) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2013 Py_INCREF(deflt);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2014 return deflt;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2015 }
65755 0a2ec174fbcd Issue 10221: Improve error message for dict.pop(). Raymond Hettinger <python@rcn.com> parents: 61463 diff changeset	2016 set_key_error(key);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2017 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2018 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2019 if (!PyString_CheckExact(key) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2020 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2021 hash = PyObject_Hash(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2022 if (hash == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2023 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2024 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2025 ep = (mp->ma_lookup)(mp, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2026 if (ep == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2027 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2028 if (ep->me_value == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2029 if (deflt) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2030 Py_INCREF(deflt);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2031 return deflt;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2032 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2033 set_key_error(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2034 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2035 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2036 old_key = ep->me_key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2037 Py_INCREF(dummy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2038 ep->me_key = dummy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2039 old_value = ep->me_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2040 ep->me_value = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2041 mp->ma_used--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2042 Py_DECREF(old_key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2043 return old_value;
22994 196dfa7ed348 Add Raymond Hettinger's d.pop(). See SF patch 539949. Guido van Rossum <guido@python.org> parents: 22973 diff changeset	2044 }
15520 8854d9d5add5 Add popitem() -- SF patch #102733. Guido van Rossum <guido@python.org> parents: 15463 diff changeset	2045
22994 196dfa7ed348 Add Raymond Hettinger's d.pop(). See SF patch 539949. Guido van Rossum <guido@python.org> parents: 22973 diff changeset	2046 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	2047 dict_popitem(PyDictObject *mp)
15520 8854d9d5add5 Add popitem() -- SF patch #102733. Guido van Rossum <guido@python.org> parents: 15463 diff changeset	2048 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2049 Py_ssize_t i = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2050 PyDictEntry *ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2051 PyObject *res;
15520 8854d9d5add5 Add popitem() -- SF patch #102733. Guido van Rossum <guido@python.org> parents: 15463 diff changeset	2052
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2053 /* Allocate the result tuple before checking the size. Believe it
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2054 * or not, this allocation could trigger a garbage collection which
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2055 * could empty the dict, so if we checked the size first and that
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2056 * happened, the result would be an infinite loop (searching for an
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2057 * entry that no longer exists). Note that the usual popitem()
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2058 * idiom is "while d: k, v = d.popitem()". so needing to throw the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2059 * tuple away if the dict is empty isn't a significant
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2060 * inefficiency -- possible, but unlikely in practice.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2061 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2062 res = PyTuple_New(2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2063 if (res == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2064 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2065 if (mp->ma_used == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2066 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2067 PyErr_SetString(PyExc_KeyError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2068 "popitem(): dictionary is empty");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2069 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2070 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2071 /* Set ep to "the first" dict entry with a value. We abuse the hash
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2072 * field of slot 0 to hold a search finger:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2073 * If slot 0 has a value, use slot 0.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2074 * Else slot 0 is being used to hold a search finger,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2075 * and we use its hash value as the first index to look.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2076 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2077 ep = &mp->ma_table[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2078 if (ep->me_value == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2079 i = ep->me_hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2080 /* The hash field may be a real hash value, or it may be a
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2081 * legit search finger, or it may be a once-legit search
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2082 * finger that's out of bounds now because it wrapped around
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2083 * or the table shrunk -- simply make sure it's in bounds now.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2084 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2085 if (i > mp->ma_mask \|\| i < 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2086 i = 1; /* skip slot 0 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2087 while ((ep = &mp->ma_table[i])->me_value == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2088 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2089 if (i > mp->ma_mask)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2090 i = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2091 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2092 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2093 PyTuple_SET_ITEM(res, 0, ep->me_key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2094 PyTuple_SET_ITEM(res, 1, ep->me_value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2095 Py_INCREF(dummy);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2096 ep->me_key = dummy;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2097 ep->me_value = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2098 mp->ma_used--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2099 assert(mp->ma_table[0].me_value == NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2100 mp->ma_table[0].me_hash = i + 1; /* next place to start */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2101 return res;
15520 8854d9d5add5 Add popitem() -- SF patch #102733. Guido van Rossum <guido@python.org> parents: 15463 diff changeset	2102 }
8854d9d5add5 Add popitem() -- SF patch #102733. Guido van Rossum <guido@python.org> parents: 15463 diff changeset	2103
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2104 static int
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2105 dict_traverse(PyObject op, visitproc visit, void arg)
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2106 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2107 Py_ssize_t i = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2108 PyObject *pk;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2109 PyObject *pv;
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2110
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2111 while (PyDict_Next(op, &i, &pk, &pv)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2112 Py_VISIT(pk);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2113 Py_VISIT(pv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2114 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2115 return 0;
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2116 }
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2117
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2118 static int
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2119 dict_tp_clear(PyObject *op)
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2120 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2121 PyDict_Clear(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2122 return 0;
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2123 }
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12576 diff changeset	2124
15560 143646bafd1b Add long-overdue docstrings to dict methods. Tim Peters <tim.peters@gmail.com> parents: 15554 diff changeset	2125
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2126 extern PyTypeObject PyDictIterKey_Type; /* Forward */
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2127 extern PyTypeObject PyDictIterValue_Type; /* Forward */
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2128 extern PyTypeObject PyDictIterItem_Type; /* Forward */
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	2129 static PyObject dictiter_new(PyDictObject , PyTypeObject *);
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2130
5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2131 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	2132 dict_iterkeys(PyDictObject *dict)
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2133 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2134 return dictiter_new(dict, &PyDictIterKey_Type);
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2135 }
5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2136
5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2137 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	2138 dict_itervalues(PyDictObject *dict)
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2139 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2140 return dictiter_new(dict, &PyDictIterValue_Type);
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2141 }
5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2142
5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2143 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	2144 dict_iteritems(PyDictObject *dict)
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2145 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2146 return dictiter_new(dict, &PyDictIterItem_Type);
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2147 }
5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2148
5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2149 static PyObject *
47419 88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47294 diff changeset	2150 dict_sizeof(PyDictObject *mp)
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2151 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2152 Py_ssize_t res;
47419 88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47294 diff changeset	2153
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2154 res = sizeof(PyDictObject);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2155 if (mp->ma_table != mp->ma_smalltable)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2156 res = res + (mp->ma_mask + 1) * sizeof(PyDictEntry);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2157 return PyInt_FromSsize_t(res);
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2158 }
5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2159
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2160 PyDoc_STRVAR(has_key__doc__,
30265 51744279458f SF patch #798467: Update docstring of has_key for bool changes Raymond Hettinger <python@rcn.com> parents: 29003 diff changeset	2161 "D.has_key(k) -> True if D has a key k, else False");
15560 143646bafd1b Add long-overdue docstrings to dict methods. Tim Peters <tim.peters@gmail.com> parents: 15554 diff changeset	2162
31172 e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 31019 diff changeset	2163 PyDoc_STRVAR(contains__doc__,
e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 31019 diff changeset	2164 "D.__contains__(k) -> True if D has a key k, else False");
e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 31019 diff changeset	2165
e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 31019 diff changeset	2166 PyDoc_STRVAR(getitem__doc__, "x.__getitem__(y) <==> x[y]");
e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 31019 diff changeset	2167
47419 88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47294 diff changeset	2168 PyDoc_STRVAR(sizeof__doc__,
47421 a65f095b27f3 Some style nits. Also clarify in the docstrings what __sizeof__ does. Georg Brandl <georg@python.org> parents: 47419 diff changeset	2169 "D.__sizeof__() -> size of D in memory, in bytes");
47419 88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47294 diff changeset	2170
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2171 PyDoc_STRVAR(get__doc__,
25115 4ea081100305 In doc strings, use 'k in D' rather than D.has_key(k). Guido van Rossum <guido@python.org> parents: 24901 diff changeset	2172 "D.get(k[,d]) -> D[k] if k in D, else d. d defaults to None.");
15560 143646bafd1b Add long-overdue docstrings to dict methods. Tim Peters <tim.peters@gmail.com> parents: 15554 diff changeset	2173
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2174 PyDoc_STRVAR(setdefault_doc__,
25115 4ea081100305 In doc strings, use 'k in D' rather than D.has_key(k). Guido van Rossum <guido@python.org> parents: 24901 diff changeset	2175 "D.setdefault(k[,d]) -> D.get(k,d), also set D[k]=d if k not in D");
15560 143646bafd1b Add long-overdue docstrings to dict methods. Tim Peters <tim.peters@gmail.com> parents: 15554 diff changeset	2176
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2177 PyDoc_STRVAR(pop__doc__,
49677 82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 48209 diff changeset	2178 "D.pop(k[,d]) -> v, remove specified key and return the corresponding value.\n\
28211 92e3b611dc9f SF patch #693753: fix for bug 639806: default for dict.pop Raymond Hettinger <python@rcn.com> parents: 27902 diff changeset	2179 If key is not found, d is returned if given, otherwise KeyError is raised");
22994 196dfa7ed348 Add Raymond Hettinger's d.pop(). See SF patch 539949. Guido van Rossum <guido@python.org> parents: 22973 diff changeset	2180
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2181 PyDoc_STRVAR(popitem__doc__,
15560 143646bafd1b Add long-overdue docstrings to dict methods. Tim Peters <tim.peters@gmail.com> parents: 15554 diff changeset	2182 "D.popitem() -> (k, v), remove and return some (key, value) pair as a\n\
49677 82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 48209 diff changeset	2183 2-tuple; but raise KeyError if D is empty.");
15560 143646bafd1b Add long-overdue docstrings to dict methods. Tim Peters <tim.peters@gmail.com> parents: 15554 diff changeset	2184
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2185 PyDoc_STRVAR(keys__doc__,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2186 "D.keys() -> list of D's keys");
15560 143646bafd1b Add long-overdue docstrings to dict methods. Tim Peters <tim.peters@gmail.com> parents: 15554 diff changeset	2187
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2188 PyDoc_STRVAR(items__doc__,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2189 "D.items() -> list of D's (key, value) pairs, as 2-tuples");
15560 143646bafd1b Add long-overdue docstrings to dict methods. Tim Peters <tim.peters@gmail.com> parents: 15554 diff changeset	2190
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2191 PyDoc_STRVAR(values__doc__,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2192 "D.values() -> list of D's values");
15560 143646bafd1b Add long-overdue docstrings to dict methods. Tim Peters <tim.peters@gmail.com> parents: 15554 diff changeset	2193
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2194 PyDoc_STRVAR(update__doc__,
74046 d9bb270feb58 Small clarification in docstring of dict.update(): the positional argument is not required. Georg Brandl <georg@python.org> parents: 73102 diff changeset	2195 "D.update([E, ]**F) -> None. Update D from dict/iterable E and F.\n"
d9bb270feb58 Small clarification in docstring of dict.update(): the positional argument is not required. Georg Brandl <georg@python.org> parents: 73102 diff changeset	2196 "If E present and has a .keys() method, does: for k in E: D[k] = E[k]\n\
d9bb270feb58 Small clarification in docstring of dict.update(): the positional argument is not required. Georg Brandl <georg@python.org> parents: 73102 diff changeset	2197 If E present and lacks .keys() method, does: for (k, v) in E: D[k] = v\n\
49677 82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 48209 diff changeset	2198 In either case, this is followed by: for k in F: D[k] = F[k]");
15560 143646bafd1b Add long-overdue docstrings to dict methods. Tim Peters <tim.peters@gmail.com> parents: 15554 diff changeset	2199
26437 57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	2200 PyDoc_STRVAR(fromkeys__doc__,
57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	2201 "dict.fromkeys(S[,v]) -> New dict with keys from S and values equal to v.\n\
57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	2202 v defaults to None.");
57d03375aead SF Patch 643443. Added dict.fromkeys(iterable, value=None), a class Raymond Hettinger <python@rcn.com> parents: 26366 diff changeset	2203
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2204 PyDoc_STRVAR(clear__doc__,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2205 "D.clear() -> None. Remove all items from D.");
15560 143646bafd1b Add long-overdue docstrings to dict methods. Tim Peters <tim.peters@gmail.com> parents: 15554 diff changeset	2206
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2207 PyDoc_STRVAR(copy__doc__,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2208 "D.copy() -> a shallow copy of D");
15560 143646bafd1b Add long-overdue docstrings to dict methods. Tim Peters <tim.peters@gmail.com> parents: 15554 diff changeset	2209
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2210 PyDoc_STRVAR(iterkeys__doc__,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2211 "D.iterkeys() -> an iterator over the keys of D");
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2212
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2213 PyDoc_STRVAR(itervalues__doc__,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2214 "D.itervalues() -> an iterator over the values of D");
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2215
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2216 PyDoc_STRVAR(iteritems__doc__,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2217 "D.iteritems() -> an iterator over the (key, value) items of D");
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2218
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2219 /* Forward */
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2220 static PyObject dictkeys_new(PyObject );
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2221 static PyObject dictitems_new(PyObject );
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2222 static PyObject dictvalues_new(PyObject );
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2223
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2224 PyDoc_STRVAR(viewkeys__doc__,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2225 "D.viewkeys() -> a set-like object providing a view on D's keys");
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2226 PyDoc_STRVAR(viewitems__doc__,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2227 "D.viewitems() -> a set-like object providing a view on D's items");
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2228 PyDoc_STRVAR(viewvalues__doc__,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2229 "D.viewvalues() -> an object providing a view on D's values");
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2230
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	2231 static PyMethodDef mapp_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2232 {"__contains__",(PyCFunction)dict_contains, METH_O \| METH_COEXIST,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2233 contains__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2234 {"__getitem__", (PyCFunction)dict_subscript, METH_O \| METH_COEXIST,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2235 getitem__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2236 {"__sizeof__", (PyCFunction)dict_sizeof, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2237 sizeof__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2238 {"has_key", (PyCFunction)dict_has_key, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2239 has_key__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2240 {"get", (PyCFunction)dict_get, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2241 get__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2242 {"setdefault", (PyCFunction)dict_setdefault, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2243 setdefault_doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2244 {"pop", (PyCFunction)dict_pop, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2245 pop__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2246 {"popitem", (PyCFunction)dict_popitem, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2247 popitem__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2248 {"keys", (PyCFunction)dict_keys, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2249 keys__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2250 {"items", (PyCFunction)dict_items, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2251 items__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2252 {"values", (PyCFunction)dict_values, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2253 values__doc__},
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2254 {"viewkeys", (PyCFunction)dictkeys_new, METH_NOARGS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2255 viewkeys__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2256 {"viewitems", (PyCFunction)dictitems_new, METH_NOARGS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2257 viewitems__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2258 {"viewvalues", (PyCFunction)dictvalues_new, METH_NOARGS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2259 viewvalues__doc__},
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2260 {"update", (PyCFunction)dict_update, METH_VARARGS \| METH_KEYWORDS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2261 update__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2262 {"fromkeys", (PyCFunction)dict_fromkeys, METH_VARARGS \| METH_CLASS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2263 fromkeys__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2264 {"clear", (PyCFunction)dict_clear, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2265 clear__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2266 {"copy", (PyCFunction)dict_copy, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2267 copy__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2268 {"iterkeys", (PyCFunction)dict_iterkeys, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2269 iterkeys__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2270 {"itervalues", (PyCFunction)dict_itervalues, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2271 itervalues__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2272 {"iteritems", (PyCFunction)dict_iteritems, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2273 iteritems__doc__},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2274 {NULL, NULL} /* sentinel */
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2275 };
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2276
38540 d7dd528427c0 Armin committed his patch while I was reviewing it (I'm sure Tim Peters <tim.peters@gmail.com> parents: 38536 diff changeset	2277 /* Return 1 if `key` is in dict `op`, 0 if not, and -1 on error. */
31019 b2fd7af17186 Expose dict_contains() and PyDict_Contains() with is about 10% faster Raymond Hettinger <python@rcn.com> parents: 30265 diff changeset	2278 int
b2fd7af17186 Expose dict_contains() and PyDict_Contains() with is about 10% faster Raymond Hettinger <python@rcn.com> parents: 30265 diff changeset	2279 PyDict_Contains(PyObject op, PyObject key)
17594 bf94af396b1e Implement, test and document "key in dict" and "key not in dict". Guido van Rossum <guido@python.org> parents: 17536 diff changeset	2280 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2281 long hash;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2282 PyDictObject mp = (PyDictObject )op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2283 PyDictEntry *ep;
17594 bf94af396b1e Implement, test and document "key in dict" and "key not in dict". Guido van Rossum <guido@python.org> parents: 17536 diff changeset	2284
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2285 if (!PyString_CheckExact(key) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2286 (hash = ((PyStringObject *) key)->ob_shash) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2287 hash = PyObject_Hash(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2288 if (hash == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2289 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2290 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2291 ep = (mp->ma_lookup)(mp, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2292 return ep == NULL ? -1 : (ep->me_value != NULL);
17594 bf94af396b1e Implement, test and document "key in dict" and "key not in dict". Guido van Rossum <guido@python.org> parents: 17536 diff changeset	2293 }
bf94af396b1e Implement, test and document "key in dict" and "key not in dict". Guido van Rossum <guido@python.org> parents: 17536 diff changeset	2294
40864 b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	2295 /* Internal version of PyDict_Contains used when the hash value is already known */
b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	2296 int
b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	2297 _PyDict_Contains(PyObject op, PyObject key, long hash)
b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	2298 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2299 PyDictObject mp = (PyDictObject )op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2300 PyDictEntry *ep;
40864 b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	2301
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2302 ep = (mp->ma_lookup)(mp, key, hash);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2303 return ep == NULL ? -1 : (ep->me_value != NULL);
40864 b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	2304 }
b0f8e9b0cc19 Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash(). Raymond Hettinger <python@rcn.com> parents: 40756 diff changeset	2305
17594 bf94af396b1e Implement, test and document "key in dict" and "key not in dict". Guido van Rossum <guido@python.org> parents: 17536 diff changeset	2306 /* Hack to implement "key in dict" */
bf94af396b1e Implement, test and document "key in dict" and "key not in dict". Guido van Rossum <guido@python.org> parents: 17536 diff changeset	2307 static PySequenceMethods dict_as_sequence = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2308 0, /* sq_length */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2309 0, /* sq_concat */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2310 0, /* sq_repeat */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2311 0, /* sq_item */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2312 0, /* sq_slice */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2313 0, /* sq_ass_item */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2314 0, /* sq_ass_slice */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2315 PyDict_Contains, /* sq_contains */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2316 0, /* sq_inplace_concat */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2317 0, /* sq_inplace_repeat */
17594 bf94af396b1e Implement, test and document "key in dict" and "key not in dict". Guido van Rossum <guido@python.org> parents: 17536 diff changeset	2318 };
bf94af396b1e Implement, test and document "key in dict" and "key not in dict". Guido van Rossum <guido@python.org> parents: 17536 diff changeset	2319
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2320 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	2321 dict_new(PyTypeObject type, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	2322 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2323 PyObject *self;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	2324
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2325 assert(type != NULL && type->tp_alloc != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2326 self = type->tp_alloc(type, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2327 if (self != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2328 PyDictObject d = (PyDictObject )self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2329 /* It's guaranteed that tp->alloc zeroed out the struct. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2330 assert(d->ma_table == NULL && d->ma_fill == 0 && d->ma_used == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2331 INIT_NONZERO_DICT_SLOTS(d);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2332 d->ma_lookup = lookdict_string;
68588 cd8d3c2d3bce #11565: Fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 68256 diff changeset	2333 /* The object has been implicitly tracked by tp_alloc */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2334 if (type == &PyDict_Type)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2335 _PyObject_GC_UNTRACK(d);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	2336 #ifdef SHOW_CONVERSION_COUNTS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2337 ++created;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	2338 #endif
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	2339 #ifdef SHOW_TRACK_COUNT
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2340 if (_PyObject_GC_IS_TRACKED(d))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2341 count_tracked++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2342 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2343 count_untracked++;
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 50424 diff changeset	2344 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2345 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2346 return self;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	2347 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	2348
19658 2fa615dfc464 Make dictionary() a real constructor. Accepts at most one argument, "a Tim Peters <tim.peters@gmail.com> parents: 19581 diff changeset	2349 static int
2fa615dfc464 Make dictionary() a real constructor. Accepts at most one argument, "a Tim Peters <tim.peters@gmail.com> parents: 19581 diff changeset	2350 dict_init(PyObject self, PyObject args, PyObject *kwds)
2fa615dfc464 Make dictionary() a real constructor. Accepts at most one argument, "a Tim Peters <tim.peters@gmail.com> parents: 19581 diff changeset	2351 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2352 return dict_update_common(self, args, kwds, "dict");
21155 bca53a37a8a5 Fix of SF bug #475877 (Mutable subtype instances are hashable). Guido van Rossum <guido@python.org> parents: 20754 diff changeset	2353 }
bca53a37a8a5 Fix of SF bug #475877 (Mutable subtype instances are hashable). Guido van Rossum <guido@python.org> parents: 20754 diff changeset	2354
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18283 diff changeset	2355 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	2356 dict_iter(PyDictObject *dict)
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2357 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2358 return dictiter_new(dict, &PyDictIterKey_Type);
17644 5dbfe8316236 Add experimental iterkeys(), itervalues(), iteritems() to dict Guido van Rossum <guido@python.org> parents: 17617 diff changeset	2359 }
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2360
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22994 diff changeset	2361 PyDoc_STRVAR(dictionary_doc,
59223 0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 50424 diff changeset	2362 "dict() -> new empty dictionary\n"
20754 272336648d1f Rename "dictionary" (type and constructor) to "dict". Tim Peters <tim.peters@gmail.com> parents: 20724 diff changeset	2363 "dict(mapping) -> new dictionary initialized from a mapping object's\n"
59223 0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 50424 diff changeset	2364 " (key, value) pairs\n"
0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 50424 diff changeset	2365 "dict(iterable) -> new dictionary initialized as if via:\n"
20724 f224632d0260 dictionary() constructor: Tim Peters <tim.peters@gmail.com> parents: 20683 diff changeset	2366 " d = {}\n"
59223 0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 50424 diff changeset	2367 " for k, v in iterable:\n"
26366 08b720cd387e Patch #642500 with slight modifications: allow keyword arguments in Just van Rossum <just@letterror.com> parents: 25115 diff changeset	2368 " d[k] = v\n"
08b720cd387e Patch #642500 with slight modifications: allow keyword arguments in Just van Rossum <just@letterror.com> parents: 25115 diff changeset	2369 "dict(**kwargs) -> new dictionary initialized with the name=value pairs\n"
08b720cd387e Patch #642500 with slight modifications: allow keyword arguments in Just van Rossum <just@letterror.com> parents: 25115 diff changeset	2370 " in the keyword argument list. For example: dict(one=1, two=2)");
19658 2fa615dfc464 Make dictionary() a real constructor. Accepts at most one argument, "a Tim Peters <tim.peters@gmail.com> parents: 19581 diff changeset	2371
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	2372 PyTypeObject PyDict_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2373 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2374 "dict",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2375 sizeof(PyDictObject),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2376 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2377 (destructor)dict_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2378 (printfunc)dict_print, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2379 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2380 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2381 (cmpfunc)dict_compare, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2382 (reprfunc)dict_repr, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2383 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2384 &dict_as_sequence, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2385 &dict_as_mapping, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2386 (hashfunc)PyObject_HashNotImplemented, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2387 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2388 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2389 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2390 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2391 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2392 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2393 Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_DICT_SUBCLASS, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2394 dictionary_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2395 dict_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2396 dict_tp_clear, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2397 dict_richcompare, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2398 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2399 (getiterfunc)dict_iter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2400 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2401 mapp_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2402 0, /* tp_members */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2403 0, /* tp_getset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2404 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2405 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2406 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2407 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2408 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2409 dict_init, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2410 PyType_GenericAlloc, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2411 dict_new, /* tp_new */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2412 PyObject_GC_Del, /* tp_free */
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2413 };
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2414
5540 a0cc005eccd7 Got rid of all the last_name_* bogosities. I don't think the Guido van Rossum <guido@python.org> parents: 5505 diff changeset	2415 /* For backward compatibility with old dictionary interface */
a0cc005eccd7 Got rid of all the last_name_* bogosities. I don't think the Guido van Rossum <guido@python.org> parents: 5505 diff changeset	2416
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5310 diff changeset	2417 PyObject *
26599 ecea8410178e Constify char* API. Fixes #651363. 2.2 candidate. Martin v. Löwis <martin@v.loewis.de> parents: 26583 diff changeset	2418 PyDict_GetItemString(PyObject v, const char key)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2419 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2420 PyObject kv, rv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2421 kv = PyString_FromString(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2422 if (kv == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2423 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2424 rv = PyDict_GetItem(v, kv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2425 Py_DECREF(kv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2426 return rv;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2427 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2428
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2429 int
26599 ecea8410178e Constify char* API. Fixes #651363. 2.2 candidate. Martin v. Löwis <martin@v.loewis.de> parents: 26583 diff changeset	2430 PyDict_SetItemString(PyObject v, const char key, PyObject *item)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2431 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2432 PyObject *kv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2433 int err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2434 kv = PyString_FromString(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2435 if (kv == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2436 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2437 PyString_InternInPlace(&kv); /* XXX Should we really? */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2438 err = PyDict_SetItem(v, kv, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2439 Py_DECREF(kv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2440 return err;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2441 }
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2442
7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2443 int
26599 ecea8410178e Constify char* API. Fixes #651363. 2.2 candidate. Martin v. Löwis <martin@v.loewis.de> parents: 26583 diff changeset	2444 PyDict_DelItemString(PyObject v, const char key)
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2445 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2446 PyObject *kv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2447 int err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2448 kv = PyString_FromString(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2449 if (kv == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2450 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2451 err = PyDict_DelItem(v, kv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2452 Py_DECREF(kv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2453 return err;
1256 7aa9613ffd36 Generalized version of dictionaries, with compatibility hacks. Guido van Rossum <guido@python.org> parents: diff changeset	2454 }
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2455
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2456 /* Dictionary iterator types */
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2457
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2458 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2459 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2460 PyDictObject di_dict; / Set to NULL when iterator is exhausted */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2461 Py_ssize_t di_used;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2462 Py_ssize_t di_pos;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2463 PyObject* di_result; /* reusable result tuple for iteritems */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2464 Py_ssize_t len;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2465 } dictiterobject;
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2466
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2467 static PyObject *
43515 8c5e60ddaa82 Remove file-level typedefs that were inconsistently used throughout the file. Brett Cannon <bcannon@gmail.com> parents: 43378 diff changeset	2468 dictiter_new(PyDictObject dict, PyTypeObject itertype)
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2469 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2470 dictiterobject *di;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2471 di = PyObject_GC_New(dictiterobject, itertype);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2472 if (di == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2473 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2474 Py_INCREF(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2475 di->di_dict = dict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2476 di->di_used = dict->ma_used;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2477 di->di_pos = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2478 di->len = dict->ma_used;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2479 if (itertype == &PyDictIterItem_Type) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2480 di->di_result = PyTuple_Pack(2, Py_None, Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2481 if (di->di_result == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2482 Py_DECREF(di);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2483 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2484 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2485 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2486 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2487 di->di_result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2488 _PyObject_GC_TRACK(di);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2489 return (PyObject *)di;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2490 }
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2491
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2492 static void
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2493 dictiter_dealloc(dictiterobject *di)
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2494 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2495 Py_XDECREF(di->di_dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2496 Py_XDECREF(di->di_result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2497 PyObject_GC_Del(di);
50424 df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49677 diff changeset	2498 }
df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49677 diff changeset	2499
df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49677 diff changeset	2500 static int
df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49677 diff changeset	2501 dictiter_traverse(dictiterobject di, visitproc visit, void arg)
df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49677 diff changeset	2502 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2503 Py_VISIT(di->di_dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2504 Py_VISIT(di->di_result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2505 return 0;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2506 }
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2507
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35350 diff changeset	2508 static PyObject *
31683 c32381f4dc6f Make the new dictionary iterators transparent with respect to length. Raymond Hettinger <python@rcn.com> parents: 31680 diff changeset	2509 dictiter_len(dictiterobject *di)
c32381f4dc6f Make the new dictionary iterators transparent with respect to length. Raymond Hettinger <python@rcn.com> parents: 31680 diff changeset	2510 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2511 Py_ssize_t len = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2512 if (di->di_dict != NULL && di->di_used == di->di_dict->ma_used)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2513 len = di->len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2514 return PyInt_FromSize_t(len);
31683 c32381f4dc6f Make the new dictionary iterators transparent with respect to length. Raymond Hettinger <python@rcn.com> parents: 31680 diff changeset	2515 }
c32381f4dc6f Make the new dictionary iterators transparent with respect to length. Raymond Hettinger <python@rcn.com> parents: 31680 diff changeset	2516
36484 20f75d5e79e9 Renamed _length_cue() to __length_hint__(). See: Armin Rigo <arigo@tunes.org> parents: 36164 diff changeset	2517 PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35350 diff changeset	2518
e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35350 diff changeset	2519 static PyMethodDef dictiter_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2520 {"__length_hint__", (PyCFunction)dictiter_len, METH_NOARGS, length_hint_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2521 {NULL, NULL} /* sentinel */
31683 c32381f4dc6f Make the new dictionary iterators transparent with respect to length. Raymond Hettinger <python@rcn.com> parents: 31680 diff changeset	2522 };
c32381f4dc6f Make the new dictionary iterators transparent with respect to length. Raymond Hettinger <python@rcn.com> parents: 31680 diff changeset	2523
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2524 static PyObject dictiter_iternextkey(dictiterobject di)
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2525 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2526 PyObject *key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2527 register Py_ssize_t i, mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2528 register PyDictEntry *ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2529 PyDictObject *d = di->di_dict;
17617 aac65f50df6f Mondo changes to the iterator stuff, without changing how Python code Guido van Rossum <guido@python.org> parents: 17597 diff changeset	2530
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2531 if (d == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2532 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2533 assert (PyDict_Check(d));
24259 2f60f90ce309 Make StopIteration a sink state. This is done by clearing out the Guido van Rossum <guido@python.org> parents: 23832 diff changeset	2534
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2535 if (di->di_used != d->ma_used) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2536 PyErr_SetString(PyExc_RuntimeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2537 "dictionary changed size during iteration");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2538 di->di_used = -1; /* Make this state sticky */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2539 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2540 }
24259 2f60f90ce309 Make StopIteration a sink state. This is done by clearing out the Guido van Rossum <guido@python.org> parents: 23832 diff changeset	2541
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2542 i = di->di_pos;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2543 if (i < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2544 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2545 ep = d->ma_table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2546 mask = d->ma_mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2547 while (i <= mask && ep[i].me_value == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2548 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2549 di->di_pos = i+1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2550 if (i > mask)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2551 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2552 di->len--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2553 key = ep[i].me_key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2554 Py_INCREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2555 return key;
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2556
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2557 fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2558 Py_DECREF(d);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2559 di->di_dict = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2560 return NULL;
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2561 }
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2562
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2563 PyTypeObject PyDictIterKey_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2564 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2565 "dictionary-keyiterator", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2566 sizeof(dictiterobject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2567 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2568 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2569 (destructor)dictiter_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2570 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2571 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2572 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2573 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2574 0, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2575 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2576 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2577 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2578 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2579 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2580 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2581 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2582 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2583 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2584 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2585 0, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2586 (traverseproc)dictiter_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2587 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2588 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2589 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2590 PyObject_SelfIter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2591 (iternextfunc)dictiter_iternextkey, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2592 dictiter_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2593 0,
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2594 };
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2595
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2596 static PyObject dictiter_iternextvalue(dictiterobject di)
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2597 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2598 PyObject *value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2599 register Py_ssize_t i, mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2600 register PyDictEntry *ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2601 PyDictObject *d = di->di_dict;
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2602
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2603 if (d == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2604 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2605 assert (PyDict_Check(d));
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2606
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2607 if (di->di_used != d->ma_used) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2608 PyErr_SetString(PyExc_RuntimeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2609 "dictionary changed size during iteration");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2610 di->di_used = -1; /* Make this state sticky */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2611 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2612 }
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2613
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2614 i = di->di_pos;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2615 mask = d->ma_mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2616 if (i < 0 \|\| i > mask)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2617 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2618 ep = d->ma_table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2619 while ((value=ep[i].me_value) == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2620 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2621 if (i > mask)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2622 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2623 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2624 di->di_pos = i+1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2625 di->len--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2626 Py_INCREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2627 return value;
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2628
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2629 fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2630 Py_DECREF(d);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2631 di->di_dict = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2632 return NULL;
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2633 }
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2634
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2635 PyTypeObject PyDictIterValue_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2636 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2637 "dictionary-valueiterator", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2638 sizeof(dictiterobject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2639 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2640 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2641 (destructor)dictiter_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2642 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2643 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2644 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2645 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2646 0, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2647 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2648 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2649 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2650 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2651 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2652 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2653 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2654 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2655 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2656 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2657 0, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2658 (traverseproc)dictiter_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2659 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2660 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2661 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2662 PyObject_SelfIter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2663 (iternextfunc)dictiter_iternextvalue, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2664 dictiter_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2665 0,
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17595 diff changeset	2666 };
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2667
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2668 static PyObject dictiter_iternextitem(dictiterobject di)
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2669 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2670 PyObject key, value, *result = di->di_result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2671 register Py_ssize_t i, mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2672 register PyDictEntry *ep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2673 PyDictObject *d = di->di_dict;
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2674
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2675 if (d == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2676 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2677 assert (PyDict_Check(d));
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2678
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2679 if (di->di_used != d->ma_used) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2680 PyErr_SetString(PyExc_RuntimeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2681 "dictionary changed size during iteration");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2682 di->di_used = -1; /* Make this state sticky */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2683 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2684 }
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2685
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2686 i = di->di_pos;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2687 if (i < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2688 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2689 ep = d->ma_table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2690 mask = d->ma_mask;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2691 while (i <= mask && ep[i].me_value == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2692 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2693 di->di_pos = i+1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2694 if (i > mask)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2695 goto fail;
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2696
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2697 if (result->ob_refcnt == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2698 Py_INCREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2699 Py_DECREF(PyTuple_GET_ITEM(result, 0));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2700 Py_DECREF(PyTuple_GET_ITEM(result, 1));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2701 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2702 result = PyTuple_New(2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2703 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2704 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2705 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2706 di->len--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2707 key = ep[i].me_key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2708 value = ep[i].me_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2709 Py_INCREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2710 Py_INCREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2711 PyTuple_SET_ITEM(result, 0, key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2712 PyTuple_SET_ITEM(result, 1, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2713 return result;
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2714
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2715 fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2716 Py_DECREF(d);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2717 di->di_dict = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2718 return NULL;
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2719 }
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2720
bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2721 PyTypeObject PyDictIterItem_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2722 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2723 "dictionary-itemiterator", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2724 sizeof(dictiterobject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2725 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2726 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2727 (destructor)dictiter_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2728 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2729 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2730 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2731 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2732 0, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2733 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2734 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2735 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2736 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2737 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2738 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2739 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2740 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2741 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2742 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2743 0, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2744 (traverseproc)dictiter_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2745 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2746 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2747 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2748 PyObject_SelfIter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2749 (iternextfunc)dictiter_iternextitem, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2750 dictiter_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2751 0,
31680 bb3bccb3b77d Optimize dictionary iterators. Raymond Hettinger <python@rcn.com> parents: 31677 diff changeset	2752 };
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2753
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2754 /***********************************************/
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2755 /* View objects for keys(), items(), values(). */
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2756 /***********************************************/
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2757
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2758 /* The instance lay-out is the same for all three; but the type differs. */
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2759
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2760 typedef struct {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2761 PyObject_HEAD
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2762 PyDictObject *dv_dict;
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2763 } dictviewobject;
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2764
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2765
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2766 static void
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2767 dictview_dealloc(dictviewobject *dv)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2768 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2769 Py_XDECREF(dv->dv_dict);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2770 PyObject_GC_Del(dv);
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2771 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2772
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2773 static int
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2774 dictview_traverse(dictviewobject dv, visitproc visit, void arg)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2775 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2776 Py_VISIT(dv->dv_dict);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2777 return 0;
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2778 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2779
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2780 static Py_ssize_t
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2781 dictview_len(dictviewobject *dv)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2782 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2783 Py_ssize_t len = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2784 if (dv->dv_dict != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2785 len = dv->dv_dict->ma_used;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2786 return len;
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2787 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2788
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2789 static PyObject *
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2790 dictview_new(PyObject dict, PyTypeObject type)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2791 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2792 dictviewobject *dv;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2793 if (dict == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2794 PyErr_BadInternalCall();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2795 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2796 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2797 if (!PyDict_Check(dict)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2798 /* XXX Get rid of this restriction later */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2799 PyErr_Format(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2800 "%s() requires a dict argument, not '%s'",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2801 type->tp_name, dict->ob_type->tp_name);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2802 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2803 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2804 dv = PyObject_GC_New(dictviewobject, type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2805 if (dv == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2806 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2807 Py_INCREF(dict);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2808 dv->dv_dict = (PyDictObject *)dict;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2809 _PyObject_GC_TRACK(dv);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2810 return (PyObject *)dv;
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2811 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2812
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2813 /* TODO(guido): The views objects are not complete:
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2814
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2815 * support more set operations
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2816 * support arbitrary mappings?
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2817 - either these should be static or exported in dictobject.h
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2818 - if public then they should probably be in builtins
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2819 */
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2820
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2821 /* Return 1 if self is a subset of other, iterating over self;
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2822 0 if not; -1 if an error occurred. */
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2823 static int
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2824 all_contained_in(PyObject self, PyObject other)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2825 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2826 PyObject *iter = PyObject_GetIter(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2827 int ok = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2828
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2829 if (iter == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2830 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2831 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2832 PyObject *next = PyIter_Next(iter);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2833 if (next == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2834 if (PyErr_Occurred())
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2835 ok = -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2836 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2837 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2838 ok = PySequence_Contains(other, next);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2839 Py_DECREF(next);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2840 if (ok <= 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2841 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2842 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2843 Py_DECREF(iter);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2844 return ok;
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2845 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2846
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2847 static PyObject *
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2848 dictview_richcompare(PyObject self, PyObject other, int op)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2849 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2850 Py_ssize_t len_self, len_other;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2851 int ok;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2852 PyObject *result;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2853
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2854 assert(self != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2855 assert(PyDictViewSet_Check(self));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2856 assert(other != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2857
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2858 if (!PyAnySet_Check(other) && !PyDictViewSet_Check(other)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2859 Py_INCREF(Py_NotImplemented);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2860 return Py_NotImplemented;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2861 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2862
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2863 len_self = PyObject_Size(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2864 if (len_self < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2865 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2866 len_other = PyObject_Size(other);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2867 if (len_other < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2868 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2869
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2870 ok = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2871 switch(op) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2872
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2873 case Py_NE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2874 case Py_EQ:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2875 if (len_self == len_other)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2876 ok = all_contained_in(self, other);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2877 if (op == Py_NE && ok >= 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2878 ok = !ok;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2879 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2880
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2881 case Py_LT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2882 if (len_self < len_other)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2883 ok = all_contained_in(self, other);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2884 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2885
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2886 case Py_LE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2887 if (len_self <= len_other)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2888 ok = all_contained_in(self, other);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2889 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2890
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2891 case Py_GT:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2892 if (len_self > len_other)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2893 ok = all_contained_in(other, self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2894 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2895
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2896 case Py_GE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2897 if (len_self >= len_other)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2898 ok = all_contained_in(other, self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2899 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2900
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2901 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2902 if (ok < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2903 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2904 result = ok ? Py_True : Py_False;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2905 Py_INCREF(result);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2906 return result;
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2907 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2908
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2909 static PyObject *
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2910 dictview_repr(dictviewobject *dv)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2911 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2912 PyObject *seq;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2913 PyObject *seq_str;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2914 PyObject *result;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2915
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2916 seq = PySequence_List((PyObject *)dv);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2917 if (seq == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2918 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2919
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2920 seq_str = PyObject_Repr(seq);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2921 result = PyString_FromFormat("%s(%s)", Py_TYPE(dv)->tp_name,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2922 PyString_AS_STRING(seq_str));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2923 Py_DECREF(seq_str);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2924 Py_DECREF(seq);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2925 return result;
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2926 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2927
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2928 /* dict_keys */
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2929
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2930 static PyObject *
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2931 dictkeys_iter(dictviewobject *dv)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2932 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2933 if (dv->dv_dict == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2934 Py_RETURN_NONE;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2935 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2936 return dictiter_new(dv->dv_dict, &PyDictIterKey_Type);
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2937 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2938
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2939 static int
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2940 dictkeys_contains(dictviewobject dv, PyObject obj)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2941 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2942 if (dv->dv_dict == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2943 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2944 return PyDict_Contains((PyObject *)dv->dv_dict, obj);
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2945 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2946
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2947 static PySequenceMethods dictkeys_as_sequence = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2948 (lenfunc)dictview_len, /* sq_length */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2949 0, /* sq_concat */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2950 0, /* sq_repeat */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2951 0, /* sq_item */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2952 0, /* sq_slice */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2953 0, /* sq_ass_item */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2954 0, /* sq_ass_slice */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2955 (objobjproc)dictkeys_contains, /* sq_contains */
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2956 };
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2957
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2958 static PyObject*
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2959 dictviews_sub(PyObject* self, PyObject *other)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2960 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2961 PyObject *result = PySet_New(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2962 PyObject *tmp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2963 if (result == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2964 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2965
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2966 tmp = PyObject_CallMethod(result, "difference_update", "O", other);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2967 if (tmp == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2968 Py_DECREF(result);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2969 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2970 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2971
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2972 Py_DECREF(tmp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2973 return result;
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2974 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2975
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2976 static PyObject*
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2977 dictviews_and(PyObject* self, PyObject *other)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2978 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2979 PyObject *result = PySet_New(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2980 PyObject *tmp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2981 if (result == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2982 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2983
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2984 tmp = PyObject_CallMethod(result, "intersection_update", "O", other);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2985 if (tmp == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2986 Py_DECREF(result);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2987 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2988 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2989
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2990 Py_DECREF(tmp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2991 return result;
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2992 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2993
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2994 static PyObject*
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2995 dictviews_or(PyObject* self, PyObject *other)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	2996 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2997 PyObject *result = PySet_New(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2998 PyObject *tmp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	2999 if (result == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3000 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3001
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3002 tmp = PyObject_CallMethod(result, "update", "O", other);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3003 if (tmp == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3004 Py_DECREF(result);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3005 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3006 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3007
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3008 Py_DECREF(tmp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3009 return result;
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3010 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3011
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3012 static PyObject*
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3013 dictviews_xor(PyObject* self, PyObject *other)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3014 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3015 PyObject *result = PySet_New(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3016 PyObject *tmp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3017 if (result == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3018 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3019
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3020 tmp = PyObject_CallMethod(result, "symmetric_difference_update", "O",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3021 other);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3022 if (tmp == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3023 Py_DECREF(result);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3024 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3025 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3026
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3027 Py_DECREF(tmp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3028 return result;
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3029 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3030
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3031 static PyNumberMethods dictviews_as_number = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3032 0, /nb_add/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3033 (binaryfunc)dictviews_sub, /nb_subtract/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3034 0, /nb_multiply/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3035 0, /nb_divide/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3036 0, /nb_remainder/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3037 0, /nb_divmod/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3038 0, /nb_power/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3039 0, /nb_negative/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3040 0, /nb_positive/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3041 0, /nb_absolute/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3042 0, /nb_nonzero/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3043 0, /nb_invert/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3044 0, /nb_lshift/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3045 0, /nb_rshift/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3046 (binaryfunc)dictviews_and, /nb_and/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3047 (binaryfunc)dictviews_xor, /nb_xor/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3048 (binaryfunc)dictviews_or, /nb_or/
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3049 };
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3050
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3051 static PyMethodDef dictkeys_methods[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3052 {NULL, NULL} /* sentinel */
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3053 };
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3054
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3055 PyTypeObject PyDictKeys_Type = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3056 PyVarObject_HEAD_INIT(&PyType_Type, 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3057 "dict_keys", /* tp_name */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3058 sizeof(dictviewobject), /* tp_basicsize */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3059 0, /* tp_itemsize */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3060 /* methods */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3061 (destructor)dictview_dealloc, /* tp_dealloc */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3062 0, /* tp_print */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3063 0, /* tp_getattr */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3064 0, /* tp_setattr */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3065 0, /* tp_reserved */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3066 (reprfunc)dictview_repr, /* tp_repr */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3067 &dictviews_as_number, /* tp_as_number */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3068 &dictkeys_as_sequence, /* tp_as_sequence */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3069 0, /* tp_as_mapping */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3070 0, /* tp_hash */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3071 0, /* tp_call */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3072 0, /* tp_str */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3073 PyObject_GenericGetAttr, /* tp_getattro */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3074 0, /* tp_setattro */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3075 0, /* tp_as_buffer */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3076 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3077 Py_TPFLAGS_CHECKTYPES, /* tp_flags */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3078 0, /* tp_doc */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3079 (traverseproc)dictview_traverse, /* tp_traverse */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3080 0, /* tp_clear */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3081 dictview_richcompare, /* tp_richcompare */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3082 0, /* tp_weaklistoffset */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3083 (getiterfunc)dictkeys_iter, /* tp_iter */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3084 0, /* tp_iternext */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3085 dictkeys_methods, /* tp_methods */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3086 0,
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3087 };
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3088
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3089 static PyObject *
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3090 dictkeys_new(PyObject *dict)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3091 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3092 return dictview_new(dict, &PyDictKeys_Type);
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3093 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3094
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3095 /* dict_items */
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3096
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3097 static PyObject *
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3098 dictitems_iter(dictviewobject *dv)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3099 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3100 if (dv->dv_dict == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3101 Py_RETURN_NONE;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3102 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3103 return dictiter_new(dv->dv_dict, &PyDictIterItem_Type);
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3104 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3105
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3106 static int
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3107 dictitems_contains(dictviewobject dv, PyObject obj)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3108 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3109 PyObject key, value, *found;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3110 if (dv->dv_dict == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3111 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3112 if (!PyTuple_Check(obj) \|\| PyTuple_GET_SIZE(obj) != 2)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3113 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3114 key = PyTuple_GET_ITEM(obj, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3115 value = PyTuple_GET_ITEM(obj, 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3116 found = PyDict_GetItem((PyObject *)dv->dv_dict, key);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3117 if (found == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3118 if (PyErr_Occurred())
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3119 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3120 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3121 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3122 return PyObject_RichCompareBool(value, found, Py_EQ);
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3123 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3124
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3125 static PySequenceMethods dictitems_as_sequence = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3126 (lenfunc)dictview_len, /* sq_length */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3127 0, /* sq_concat */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3128 0, /* sq_repeat */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3129 0, /* sq_item */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3130 0, /* sq_slice */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3131 0, /* sq_ass_item */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3132 0, /* sq_ass_slice */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3133 (objobjproc)dictitems_contains, /* sq_contains */
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3134 };
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3135
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3136 static PyMethodDef dictitems_methods[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3137 {NULL, NULL} /* sentinel */
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3138 };
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3139
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3140 PyTypeObject PyDictItems_Type = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3141 PyVarObject_HEAD_INIT(&PyType_Type, 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3142 "dict_items", /* tp_name */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3143 sizeof(dictviewobject), /* tp_basicsize */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3144 0, /* tp_itemsize */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3145 /* methods */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3146 (destructor)dictview_dealloc, /* tp_dealloc */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3147 0, /* tp_print */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3148 0, /* tp_getattr */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3149 0, /* tp_setattr */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3150 0, /* tp_reserved */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3151 (reprfunc)dictview_repr, /* tp_repr */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3152 &dictviews_as_number, /* tp_as_number */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3153 &dictitems_as_sequence, /* tp_as_sequence */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3154 0, /* tp_as_mapping */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3155 0, /* tp_hash */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3156 0, /* tp_call */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3157 0, /* tp_str */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3158 PyObject_GenericGetAttr, /* tp_getattro */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3159 0, /* tp_setattro */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3160 0, /* tp_as_buffer */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3161 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3162 Py_TPFLAGS_CHECKTYPES, /* tp_flags */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3163 0, /* tp_doc */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3164 (traverseproc)dictview_traverse, /* tp_traverse */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3165 0, /* tp_clear */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3166 dictview_richcompare, /* tp_richcompare */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3167 0, /* tp_weaklistoffset */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3168 (getiterfunc)dictitems_iter, /* tp_iter */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3169 0, /* tp_iternext */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3170 dictitems_methods, /* tp_methods */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3171 0,
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3172 };
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3173
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3174 static PyObject *
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3175 dictitems_new(PyObject *dict)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3176 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3177 return dictview_new(dict, &PyDictItems_Type);
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3178 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3179
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3180 /* dict_values */
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3181
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3182 static PyObject *
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3183 dictvalues_iter(dictviewobject *dv)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3184 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3185 if (dv->dv_dict == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3186 Py_RETURN_NONE;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3187 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3188 return dictiter_new(dv->dv_dict, &PyDictIterValue_Type);
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3189 }
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3190
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3191 static PySequenceMethods dictvalues_as_sequence = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3192 (lenfunc)dictview_len, /* sq_length */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3193 0, /* sq_concat */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3194 0, /* sq_repeat */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3195 0, /* sq_item */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3196 0, /* sq_slice */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3197 0, /* sq_ass_item */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3198 0, /* sq_ass_slice */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3199 (objobjproc)0, /* sq_contains */
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3200 };
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3201
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3202 static PyMethodDef dictvalues_methods[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3203 {NULL, NULL} /* sentinel */
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3204 };
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3205
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3206 PyTypeObject PyDictValues_Type = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3207 PyVarObject_HEAD_INIT(&PyType_Type, 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3208 "dict_values", /* tp_name */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3209 sizeof(dictviewobject), /* tp_basicsize */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3210 0, /* tp_itemsize */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3211 /* methods */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3212 (destructor)dictview_dealloc, /* tp_dealloc */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3213 0, /* tp_print */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3214 0, /* tp_getattr */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3215 0, /* tp_setattr */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3216 0, /* tp_reserved */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3217 (reprfunc)dictview_repr, /* tp_repr */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3218 0, /* tp_as_number */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3219 &dictvalues_as_sequence, /* tp_as_sequence */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3220 0, /* tp_as_mapping */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3221 0, /* tp_hash */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3222 0, /* tp_call */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3223 0, /* tp_str */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3224 PyObject_GenericGetAttr, /* tp_getattro */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3225 0, /* tp_setattro */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3226 0, /* tp_as_buffer */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3227 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3228 0, /* tp_doc */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3229 (traverseproc)dictview_traverse, /* tp_traverse */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3230 0, /* tp_clear */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3231 0, /* tp_richcompare */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3232 0, /* tp_weaklistoffset */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3233 (getiterfunc)dictvalues_iter, /* tp_iter */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3234 0, /* tp_iternext */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3235 dictvalues_methods, /* tp_methods */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3236 0,
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3237 };
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3238
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3239 static PyObject *
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3240 dictvalues_new(PyObject *dict)
d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3241 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61207 diff changeset	3242 return dictview_new(dict, &PyDictValues_Type);
58256 d9805a96351c Issue #1967: Backport dictionary views. Alexandre Vassalotti <alexandre@peadrop.com> parents: 55437 diff changeset	3243 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/dictobject.c @ 79675:c0a2294de787 2.7