Kaydet (Commit) 742d8716 authored tarafından Raymond Hettinger's avatar Raymond Hettinger

Put the defines in the logical section and fix indentation.

üst f367962d
...@@ -31,12 +31,6 @@ ...@@ -31,12 +31,6 @@
#include "structmember.h" #include "structmember.h"
#include "stringlib/eq.h" #include "stringlib/eq.h"
/* This must be >= 1 */
#define PERTURB_SHIFT 5
/* This should be >= PySet_MINSIZE - 1 */
#define LINEAR_PROBES 9
/* Object used as dummy key to fill deleted entries */ /* Object used as dummy key to fill deleted entries */
static PyObject _dummy_struct; static PyObject _dummy_struct;
...@@ -49,6 +43,12 @@ PyObject *_PySet_Dummy = dummy; ...@@ -49,6 +43,12 @@ PyObject *_PySet_Dummy = dummy;
/* ======================================================================== */ /* ======================================================================== */
/* ======= Begin logic for probing the hash table ========================= */ /* ======= Begin logic for probing the hash table ========================= */
/* This should be >= PySet_MINSIZE - 1 */
#define LINEAR_PROBES 9
/* This must be >= 1 */
#define PERTURB_SHIFT 5
static setentry * static setentry *
set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash) set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash)
{ {
...@@ -151,8 +151,8 @@ set_lookkey_unicode(PySetObject *so, PyObject *key, Py_hash_t hash) ...@@ -151,8 +151,8 @@ set_lookkey_unicode(PySetObject *so, PyObject *key, Py_hash_t hash)
while (1) { while (1) {
if (entry->key == key if (entry->key == key
|| (entry->hash == hash || (entry->hash == hash
&& entry->key != dummy && entry->key != dummy
&& unicode_eq(entry->key, key))) && unicode_eq(entry->key, key)))
return entry; return entry;
if (entry->key == dummy && freeslot == NULL) if (entry->key == dummy && freeslot == NULL)
freeslot = entry; freeslot = entry;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment