mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Improve code clarity by removing two unattractive macros.

Browse source
This commit is contained in:
Raymond Hettinger 2013-09-07 21:01:29 -07:00
parent 8f8839e10a
commit 4ea9080da9
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Objects/setobject.c
View file

@ -45,17 +45,6 @@ static PyObject _dummy_struct;
/* Exported for the gdb plugin's benefit. */ /* Exported for the gdb plugin's benefit. */
PyObject *_PySet_Dummy = dummy; PyObject *_PySet_Dummy = dummy;
#define INIT_NONZERO_SET_SLOTS(so) do { \
(so)->table = (so)->smalltable; \
(so)->mask = PySet_MINSIZE - 1; \
(so)->hash = -1; \
} while(0)
#define EMPTY_TO_MINSIZE(so) do { \
memset((so)->smalltable, 0, sizeof((so)->smalltable)); \
(so)->used = (so)->fill = 0; \
INIT_NONZERO_SET_SLOTS(so); \
} while(0)
/* ======================================================================== */ /* ======================================================================== */
/* ======= Begin logic for probing the hash table ========================= */ /* ======= Begin logic for probing the hash table ========================= */
@ -439,6 +428,17 @@ set_discard_key(PySetObject *so, PyObject *key)
return DISCARD_FOUND; return DISCARD_FOUND;
} }
static void
set_empty_to_minsize(PySetObject *so)
{
memset(so->smalltable, 0, sizeof(so->smalltable));
so->fill = 0;
so->used = 0;
so->mask = PySet_MINSIZE - 1;
so->table = so->smalltable;
so->hash = -1;
}
static int static int
set_clear_internal(PySetObject *so) set_clear_internal(PySetObject *so)
{ {
@ -466,7 +466,7 @@ set_clear_internal(PySetObject *so)
*/ */
fill = so->fill; fill = so->fill;
if (table_is_malloced) if (table_is_malloced)
EMPTY_TO_MINSIZE(so); set_empty_to_minsize(so);
else if (fill > 0) { else if (fill > 0) {
/* It's a small table with something that needs to be cleared. /* It's a small table with something that needs to be cleared.
@ -475,7 +475,7 @@ set_clear_internal(PySetObject *so)
*/ */
memcpy(small_copy, table, sizeof(small_copy)); memcpy(small_copy, table, sizeof(small_copy));
table = small_copy; table = small_copy;
EMPTY_TO_MINSIZE(so); set_empty_to_minsize(so);
} }
/* else it's a small table that's already empty */ /* else it's a small table that's already empty */
@ -1016,11 +1016,13 @@ make_new_set(PyTypeObject *type, PyObject *iterable)
so = (PySetObject *)type->tp_alloc(type, 0); so = (PySetObject *)type->tp_alloc(type, 0);
if (so == NULL) if (so == NULL)
return NULL; return NULL;
/* tp_alloc has already zeroed the structure */
assert(so->table == NULL && so->fill == 0 && so->used == 0);
INIT_NONZERO_SET_SLOTS(so);
so->fill = 0;
so->used = 0;
so->mask = PySet_MINSIZE - 1;
so->table = so->smalltable;
so->lookup = set_lookkey_unicode; so->lookup = set_lookkey_unicode;
so->hash = -1;
so->weakreflist = NULL; so->weakreflist = NULL;
if (iterable != NULL) { if (iterable != NULL) {