diff options
| author | Gregory P. Smith <greg@krypto.org> | 2012-01-14 23:31:34 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2012-01-14 23:31:34 (GMT) |
| commit | 63e6c3222f563cfb156de6e92199e9e35ad5d832 (patch) | |
| tree | af145dbe59f9ec446a9892e94064bf6b989c4086 | |
| parent | 515687a7eda26d733c747e08205a1d861bc70673 (diff) | |
| download | cpython-63e6c3222f563cfb156de6e92199e9e35ad5d832.zip cpython-63e6c3222f563cfb156de6e92199e9e35ad5d832.tar.gz cpython-63e6c3222f563cfb156de6e92199e9e35ad5d832.tar.bz2 | |
Consolidate the occurrances of the prime used as the multiplier when hashing
to a single #define instead of having several copies in several files.
This excludes the Modules/ tree (datetime and expat both have a copy
for their own purposes with no need for it to be the same).
| -rw-r--r-- | Include/pyport.h | 5 | ||||
| -rw-r--r-- | Objects/bytesobject.c | 2 | ||||
| -rw-r--r-- | Objects/tupleobject.c | 2 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/Include/pyport.h b/Include/pyport.h index 62aa53a..269ba68 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -131,6 +131,9 @@ Used in: PY_LONG_LONG #endif #endif +/* Prime multiplier used in string and various other hashes. */ +#define _PyHASH_MULTIPLIER 1000003 /* 0xf4243 */ + /* Parameters used for the numeric hash implementation. See notes for _PyHash_Double in Objects/object.c. Numeric hashes are based on reduction modulo the prime 2**_PyHASH_BITS - 1. */ @@ -143,7 +146,7 @@ Used in: PY_LONG_LONG #define _PyHASH_MODULUS (((size_t)1 << _PyHASH_BITS) - 1) #define _PyHASH_INF 314159 #define _PyHASH_NAN 0 -#define _PyHASH_IMAG 1000003UL +#define _PyHASH_IMAG _PyHASH_MULTIPLIER /* uintptr_t is the C9X name for an unsigned integral type such that a * legitimate void* can be cast to uintptr_t and then back to void* again diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index b10cb5d..8249e5f 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -881,7 +881,7 @@ bytes_hash(PyBytesObject *a) p = (unsigned char *) a->ob_sval; x = *p << 7; while (--len >= 0) - x = (1000003*x) ^ *p++; + x = (_PyHASH_MULTIPLIER*x) ^ *p++; x ^= Py_SIZE(a); if (x == -1) x = -2; diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index 8aacd12..f6dbc31 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -315,7 +315,7 @@ tuplehash(PyTupleObject *v) register Py_hash_t x, y; register Py_ssize_t len = Py_SIZE(v); register PyObject **p; - Py_hash_t mult = 1000003L; + Py_hash_t mult = _PyHASH_MULTIPLIER; x = 0x345678L; p = v->ob_item; while (--len >= 0) { diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index c4cfe1b..20528b9 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -7666,7 +7666,7 @@ unicode_hash(PyUnicodeObject *self) p = self->str; x = *p << 7; while (--len >= 0) - x = (1000003*x) ^ *p++; + x = (_PyHASH_MULTIPLIER*x) ^ *p++; x ^= Py_SIZE(self); if (x == -1) x = -2; |