DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Implement quirk of Lua reference impl 'next', where removed key do not immediately become invisible to 'next'

Browse Source
This commit is contained in:
DBotThePony 2024-06-27 21:16:58 +07:00
parent 77a9beb665
commit 5c6efaf03d
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
luna/src/main/java/org/classdump/luna/util/TraversableHashMap.java
View File

@ -46,6 +46,9 @@ public class TraversableHashMap<K, V> implements Map<K, V> {
private final Set<Map.Entry<K, V>> entrySet; private final Set<Map.Entry<K, V>> entrySet;
private K firstKey; private K firstKey;
private K lastKey; private K lastKey;
// replicate 'next' behavior of reference implementation, where removing key from table does not invalidate it immediately
private K lingeringKey;
private K lingeringSuccessor;
/** /**
* Constructs a new empty map. * Constructs a new empty map.
@ -133,10 +136,12 @@ public class TraversableHashMap<K, V> implements Map<K, V> {
Entry<K, V> e = entries.remove(key); Entry<K, V> e = entries.remove(key);
if (e != null) { if (e != null) {
K prevKey = e.getPreviousKey(); K prevKey = e.getPreviousKey();
K nextKey = e.getNextKey(); K nextKey = e.getNextKey();
lingeringKey = (K) key;
lingeringSuccessor = nextKey;
if (prevKey != null) { if (prevKey != null) {
entries.get(prevKey).setNextKey(nextKey); entries.get(prevKey).setNextKey(nextKey);
} else { } else {
@ -202,6 +207,9 @@ public class TraversableHashMap<K, V> implements Map<K, V> {
Objects.requireNonNull(key); Objects.requireNonNull(key);
Entry<K, V> e = entries.get(key); Entry<K, V> e = entries.get(key);
if (e == null) { if (e == null) {
if (key.equals(lingeringKey))
return lingeringSuccessor;
throw new NoSuchElementException(key.toString()); throw new NoSuchElementException(key.toString());
} }
return e.getNextKey(); return e.getNextKey();