diff options
Diffstat (limited to 'src/if_py_both.h')
| -rw-r--r-- | src/if_py_both.h | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index 5bd6a0e67..8eb77470a 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -1792,11 +1792,10 @@ DictionaryContains(DictionaryObject *self, PyObject *keyObject) typedef struct { - hashitem_T *ht_array; - long_u ht_used; - hashtab_T *ht; - hashitem_T *hi; - long_u todo; + int dii_changed; + hashtab_T *dii_ht; + hashitem_T *dii_hi; + long_u dii_todo; } dictiterinfo_T; static PyObject * @@ -1804,23 +1803,22 @@ DictionaryIterNext(dictiterinfo_T **dii) { PyObject *ret; - if (!(*dii)->todo) + if (!(*dii)->dii_todo) return NULL; - if ((*dii)->ht->ht_array != (*dii)->ht_array || - (*dii)->ht->ht_used != (*dii)->ht_used) + if ((*dii)->dii_ht->ht_changed != (*dii)->dii_changed) { PyErr_SET_STRING(PyExc_RuntimeError, N_("hashtab changed during iteration")); return NULL; } - while (((*dii)->todo) && HASHITEM_EMPTY((*dii)->hi)) - ++((*dii)->hi); + while (((*dii)->dii_todo) && HASHITEM_EMPTY((*dii)->dii_hi)) + ++((*dii)->dii_hi); - --((*dii)->todo); + --((*dii)->dii_todo); - if (!(ret = PyBytes_FromString((char *)(*dii)->hi->hi_key))) + if (!(ret = PyBytes_FromString((char *)(*dii)->dii_hi->hi_key))) return NULL; return ret; @@ -1839,11 +1837,10 @@ DictionaryIter(DictionaryObject *self) } ht = &self->dict->dv_hashtab; - dii->ht_array = ht->ht_array; - dii->ht_used = ht->ht_used; - dii->ht = ht; - dii->hi = dii->ht_array; - dii->todo = dii->ht_used; + dii->dii_changed = ht->ht_changed; + dii->dii_ht = ht; + dii->dii_hi = ht->ht_array; + dii->dii_todo = ht->ht_used; return IterNew(dii, (destructorfun) PyMem_Free, (nextfun) DictionaryIterNext, |