Skip to content

Commit

Permalink
Fix naming of unsplit -> combined
Browse files Browse the repository at this point in the history
  • Loading branch information
DinoV committed Jan 31, 2024
1 parent dabbed9 commit 398cb23
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Objects/dictobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ insert_into_dictkeys(PyDictKeysObject *keys, PyObject *name)


static inline int
insert_unsplit_dict(PyInterpreterState *interp, PyDictObject *mp,
insert_combined_dict(PyInterpreterState *interp, PyDictObject *mp,
Py_hash_t hash, PyObject *key, PyObject *value, int unicode)
{
if (mp->ma_keys->dk_usable <= 0) {
Expand Down Expand Up @@ -1311,7 +1311,7 @@ insert_split_dict(PyInterpreterState *interp, PyDictObject *mp,
assert(!_PyDict_HasSplitTable(mp));
assert(DK_IS_UNICODE(keys));
UNLOCK_KEYS(keys);
return insert_unsplit_dict(interp, mp, hash, key, value, 1);
return insert_combined_dict(interp, mp, hash, key, value, 1);
}

Py_ssize_t hashpos = find_empty_slot(keys, hash);
Expand Down Expand Up @@ -1390,7 +1390,7 @@ insertdict(PyInterpreterState *interp, PyDictObject *mp,

int unicode = DK_IS_UNICODE(mp->ma_keys);
if (!unicode || !_PyDict_HasSplitTable(mp)) {
if (insert_unsplit_dict(interp, mp, hash, key, value, unicode) < 0) {
if (insert_combined_dict(interp, mp, hash, key, value, unicode) < 0) {
goto Fail;
}
} else {
Expand Down Expand Up @@ -3536,7 +3536,7 @@ PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj)

int unicode = DK_IS_UNICODE(mp->ma_keys);
if (!unicode || !_PyDict_HasSplitTable(mp)) {
if (insert_unsplit_dict(interp, mp, hash, Py_NewRef(key), Py_NewRef(value), unicode) < 0) {
if (insert_combined_dict(interp, mp, hash, Py_NewRef(key), Py_NewRef(value), unicode) < 0) {
Py_DECREF(key);
Py_DECREF(value);
return NULL;
Expand Down

0 comments on commit 398cb23

Please sign in to comment.