diff options
| author | sebres <sebres@users.sourceforge.net> | 2024-04-12 21:51:40 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2024-04-12 21:51:40 (GMT) |
| commit | 6508b65399000d941e47f1f1c50ce1359b1621d5 (patch) | |
| tree | d79a02eb640a2c7bc0f63d08ef0fac06ccfb08e7 /generic/tclHash.c | |
| parent | 42dcfe9f62c31bcf0543c3c1b3316fc28543f6e9 (diff) | |
| parent | 95ba4d90b35db89ffba05ae1e25f9d1d03e7df55 (diff) | |
| download | tcl-6508b65399000d941e47f1f1c50ce1359b1621d5.zip tcl-6508b65399000d941e47f1f1c50ce1359b1621d5.tar.gz tcl-6508b65399000d941e47f1f1c50ce1359b1621d5.tar.bz2 | |
merge 8.6
Diffstat (limited to 'generic/tclHash.c')
| -rw-r--r-- | generic/tclHash.c | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/generic/tclHash.c b/generic/tclHash.c index 385b9e4..742691c 100644 --- a/generic/tclHash.c +++ b/generic/tclHash.c @@ -304,20 +304,34 @@ CreateHashEntry( if (typePtr->compareKeysProc) { Tcl_CompareHashKeysProc *compareKeysProc = typePtr->compareKeysProc; - - for (hPtr = tablePtr->buckets[index]; hPtr != NULL; - hPtr = hPtr->nextPtr) { - if (hash != PTR2UINT(hPtr->hash)) { - continue; + if (typePtr->flags & TCL_HASH_KEY_DIRECT_COMPARE) { + for (hPtr = tablePtr->buckets[index]; hPtr != NULL; + hPtr = hPtr->nextPtr) { + if (hash != PTR2UINT(hPtr->hash)) { + continue; + } + /* if keys pointers or values are equal */ + if ((key == hPtr->key.oneWordValue) + || compareKeysProc((void *) key, hPtr) + ) { + if (newPtr) { + *newPtr = 0; + } + return hPtr; + } } - /* if keys pointers or values are equal */ - if ((key == hPtr->key.oneWordValue) - || compareKeysProc((void *) key, hPtr) - ) { - if (newPtr) { - *newPtr = 0; + } else { /* no direct compare */ + for (hPtr = tablePtr->buckets[index]; hPtr != NULL; + hPtr = hPtr->nextPtr) { + if (hash != PTR2UINT(hPtr->hash)) { + continue; + } + if (compareKeysProc((void *) key, hPtr)) { + if (newPtr) { + *newPtr = 0; + } + return hPtr; } - return hPtr; } } } else { |