[Python-checkins] CVS: python/dist/src/Objects bufferobject.c,2.16,2.17 dictobject.c,2.121,2.122 stringobject.c,2.151,2.152
Tim Peters
tim_one@users.sourceforge.net
Thu, 28 Mar 2002 19:29:10 -0800
Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv21495/python/Objects
Modified Files:
bufferobject.c dictobject.c stringobject.c
Log Message:
Remove the CACHE_HASH and INTERN_STRINGS preprocessor symbols.
Index: bufferobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/bufferobject.c,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -d -r2.16 -r2.17
*** bufferobject.c 19 Oct 2001 13:49:35 -0000 2.16
--- bufferobject.c 29 Mar 2002 03:29:07 -0000 2.17
***************
*** 11,17 ****
int b_size;
int b_readonly;
- #ifdef CACHE_HASH
long b_hash;
- #endif
} PyBufferObject;
--- 11,15 ----
***************
*** 37,43 ****
b->b_size = size;
b->b_readonly = readonly;
- #ifdef CACHE_HASH
b->b_hash = -1;
- #endif
return (PyObject *) b;
--- 35,39 ----
***************
*** 153,159 ****
b->b_size = size;
b->b_readonly = 0;
- #ifdef CACHE_HASH
b->b_hash = -1;
- #endif
return o;
--- 149,153 ----
***************
*** 212,219 ****
register long x;
- #ifdef CACHE_HASH
if ( self->b_hash != -1 )
return self->b_hash;
- #endif
if ( !self->b_readonly )
--- 206,211 ----
***************
*** 232,238 ****
if (x == -1)
x = -2;
- #ifdef CACHE_HASH
self->b_hash = x;
- #endif
return x;
}
--- 224,228 ----
Index: dictobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/dictobject.c,v
retrieving revision 2.121
retrieving revision 2.122
diff -C2 -d -r2.121 -r2.122
*** dictobject.c 28 Mar 2002 20:34:58 -0000 2.121
--- dictobject.c 29 Mar 2002 03:29:07 -0000 2.122
***************
*** 481,488 ****
return NULL;
}
- #ifdef CACHE_HASH
if (!PyString_CheckExact(key) ||
(hash = ((PyStringObject *) key)->ob_shash) == -1)
- #endif
{
hash = PyObject_Hash(key);
--- 481,486 ----
***************
*** 513,526 ****
}
mp = (dictobject *)op;
- #ifdef CACHE_HASH
if (PyString_CheckExact(key)) {
- #ifdef INTERN_STRINGS
if (((PyStringObject *)key)->ob_sinterned != NULL) {
key = ((PyStringObject *)key)->ob_sinterned;
hash = ((PyStringObject *)key)->ob_shash;
}
! else
! #endif
! {
hash = ((PyStringObject *)key)->ob_shash;
if (hash == -1)
--- 511,520 ----
}
mp = (dictobject *)op;
if (PyString_CheckExact(key)) {
if (((PyStringObject *)key)->ob_sinterned != NULL) {
key = ((PyStringObject *)key)->ob_sinterned;
hash = ((PyStringObject *)key)->ob_shash;
}
! else {
hash = ((PyStringObject *)key)->ob_shash;
if (hash == -1)
***************
*** 528,534 ****
}
}
! else
! #endif
! {
hash = PyObject_Hash(key);
if (hash == -1)
--- 522,526 ----
}
}
! else {
hash = PyObject_Hash(key);
if (hash == -1)
***************
*** 565,573 ****
return -1;
}
- #ifdef CACHE_HASH
if (!PyString_CheckExact(key) ||
! (hash = ((PyStringObject *) key)->ob_shash) == -1)
! #endif
! {
hash = PyObject_Hash(key);
if (hash == -1)
--- 557,562 ----
return -1;
}
if (!PyString_CheckExact(key) ||
! (hash = ((PyStringObject *) key)->ob_shash) == -1) {
hash = PyObject_Hash(key);
if (hash == -1)
***************
*** 845,853 ****
long hash;
assert(mp->ma_table != NULL);
- #ifdef CACHE_HASH
if (!PyString_CheckExact(key) ||
! (hash = ((PyStringObject *) key)->ob_shash) == -1)
! #endif
! {
hash = PyObject_Hash(key);
if (hash == -1)
--- 834,839 ----
long hash;
assert(mp->ma_table != NULL);
if (!PyString_CheckExact(key) ||
! (hash = ((PyStringObject *) key)->ob_shash) == -1) {
hash = PyObject_Hash(key);
if (hash == -1)
***************
*** 1437,1445 ****
long hash;
register long ok;
- #ifdef CACHE_HASH
if (!PyString_CheckExact(key) ||
! (hash = ((PyStringObject *) key)->ob_shash) == -1)
! #endif
! {
hash = PyObject_Hash(key);
if (hash == -1)
--- 1423,1428 ----
long hash;
register long ok;
if (!PyString_CheckExact(key) ||
! (hash = ((PyStringObject *) key)->ob_shash) == -1) {
hash = PyObject_Hash(key);
if (hash == -1)
***************
*** 1461,1469 ****
return NULL;
- #ifdef CACHE_HASH
if (!PyString_CheckExact(key) ||
! (hash = ((PyStringObject *) key)->ob_shash) == -1)
! #endif
! {
hash = PyObject_Hash(key);
if (hash == -1)
--- 1444,1449 ----
return NULL;
if (!PyString_CheckExact(key) ||
! (hash = ((PyStringObject *) key)->ob_shash) == -1) {
hash = PyObject_Hash(key);
if (hash == -1)
***************
*** 1490,1498 ****
return NULL;
- #ifdef CACHE_HASH
if (!PyString_CheckExact(key) ||
! (hash = ((PyStringObject *) key)->ob_shash) == -1)
! #endif
! {
hash = PyObject_Hash(key);
if (hash == -1)
--- 1470,1475 ----
return NULL;
if (!PyString_CheckExact(key) ||
! (hash = ((PyStringObject *) key)->ob_shash) == -1) {
hash = PyObject_Hash(key);
if (hash == -1)
***************
*** 1726,1734 ****
long hash;
- #ifdef CACHE_HASH
if (!PyString_CheckExact(key) ||
! (hash = ((PyStringObject *) key)->ob_shash) == -1)
! #endif
! {
hash = PyObject_Hash(key);
if (hash == -1)
--- 1703,1708 ----
long hash;
if (!PyString_CheckExact(key) ||
! (hash = ((PyStringObject *) key)->ob_shash) == -1) {
hash = PyObject_Hash(key);
if (hash == -1)
Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.151
retrieving revision 2.152
diff -C2 -d -r2.151 -r2.152
*** stringobject.c 22 Mar 2002 15:30:10 -0000 2.151
--- stringobject.c 29 Mar 2002 03:29:07 -0000 2.152
***************
*** 73,82 ****
return PyErr_NoMemory();
PyObject_INIT_VAR(op, &PyString_Type, size);
- #ifdef CACHE_HASH
op->ob_shash = -1;
- #endif
- #ifdef INTERN_STRINGS
op->ob_sinterned = NULL;
- #endif
if (str != NULL)
memcpy(op->ob_sval, str, size);
--- 73,78 ----
***************
*** 136,145 ****
return PyErr_NoMemory();
PyObject_INIT_VAR(op, &PyString_Type, size);
- #ifdef CACHE_HASH
op->ob_shash = -1;
- #endif
- #ifdef INTERN_STRINGS
op->ob_sinterned = NULL;
- #endif
memcpy(op->ob_sval, str, size+1);
#ifndef DONT_SHARE_SHORT_STRINGS
--- 132,137 ----
***************
*** 738,747 ****
return PyErr_NoMemory();
PyObject_INIT_VAR(op, &PyString_Type, size);
- #ifdef CACHE_HASH
op->ob_shash = -1;
- #endif
- #ifdef INTERN_STRINGS
op->ob_sinterned = NULL;
- #endif
memcpy(op->ob_sval, a->ob_sval, (int) a->ob_size);
memcpy(op->ob_sval + a->ob_size, b->ob_sval, (int) b->ob_size);
--- 730,735 ----
***************
*** 785,794 ****
return PyErr_NoMemory();
PyObject_INIT_VAR(op, &PyString_Type, size);
- #ifdef CACHE_HASH
op->ob_shash = -1;
- #endif
- #ifdef INTERN_STRINGS
op->ob_sinterned = NULL;
- #endif
for (i = 0; i < size; i += a->ob_size)
memcpy(op->ob_sval+i, a->ob_sval, (int) a->ob_size);
--- 773,778 ----
***************
*** 946,958 ****
register long x;
- #ifdef CACHE_HASH
if (a->ob_shash != -1)
return a->ob_shash;
- #ifdef INTERN_STRINGS
if (a->ob_sinterned != NULL)
return (a->ob_shash =
((PyStringObject *)(a->ob_sinterned))->ob_shash);
- #endif
- #endif
len = a->ob_size;
p = (unsigned char *) a->ob_sval;
--- 930,938 ----
***************
*** 963,969 ****
if (x == -1)
x = -2;
- #ifdef CACHE_HASH
a->ob_shash = x;
- #endif
return x;
}
--- 943,947 ----
***************
*** 2731,2742 ****
if (pnew != NULL) {
memcpy(PyString_AS_STRING(pnew), PyString_AS_STRING(tmp), n+1);
- #ifdef CACHE_HASH
((PyStringObject *)pnew)->ob_shash =
((PyStringObject *)tmp)->ob_shash;
- #endif
- #ifdef INTERN_STRINGS
((PyStringObject *)pnew)->ob_sinterned =
((PyStringObject *)tmp)->ob_sinterned;
- #endif
}
Py_DECREF(tmp);
--- 2709,2716 ----
***************
*** 3580,3584 ****
- #ifdef INTERN_STRINGS
/* This dictionary will leak at PyString_Fini() time. That's acceptable
--- 3554,3557 ----
***************
*** 3657,3662 ****
}
- #endif
-
void
PyString_Fini(void)
--- 3630,3633 ----
***************
*** 3671,3675 ****
nullstring = NULL;
#endif
- #ifdef INTERN_STRINGS
if (interned) {
int pos, changed;
--- 3642,3645 ----
***************
*** 3686,3693 ****
} while (changed);
}
- #endif
}
- #ifdef INTERN_STRINGS
void _Py_ReleaseInternedStrings(void)
{
--- 3656,3661 ----
***************
*** 3699,3701 ****
}
}
- #endif /* INTERN_STRINGS */
--- 3667,3668 ----