From ce295301fc35b85d01d503195bc04678a3737f7f Mon Sep 17 00:00:00 2001
From: BLUELOVETH <blueloveTH@foxmail.com>
Date: Mon, 7 Aug 2023 21:40:52 +0800
Subject: [PATCH] fix a bug of `dict` orders

---
 src/dict.cpp     | 13 +++++++++----
 tests/07_dict.py | 10 +++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/dict.cpp b/src/dict.cpp
index de71e33d..905c0209 100644
--- a/src/dict.cpp
+++ b/src/dict.cpp
@@ -63,24 +63,29 @@ namespace pkpy{
 
     void Dict::_rehash(){
         Item* old_items = _items;
-        int old_capacity = _capacity;
+        ItemNode* old_nodes = _nodes;
+        int old_head_idx = _head_idx;
+
         _capacity *= 2;
         _mask = _capacity - 1;
         _size = 0;
         _critical_size = _capacity*__LoadFactor+0.5f;
         _head_idx = -1;
         _tail_idx = -1;
-        pool64.dealloc(_nodes);
+        
         _items = (Item*)pool128.alloc(_capacity * sizeof(Item));
         memset(_items, 0, _capacity * sizeof(Item));
         _nodes = (ItemNode*)pool64.alloc(_capacity * sizeof(ItemNode));
         memset(_nodes, -1, _capacity * sizeof(ItemNode));
 
-        for(int i=0; i<old_capacity; i++){
-            if(old_items[i].first == nullptr) continue;
+        // copy old items to new dict
+        int i = old_head_idx;
+        while(i != -1){
             set(old_items[i].first, old_items[i].second);
+            i = old_nodes[i].next;
         }
         pool128.dealloc(old_items);
+        pool64.dealloc(old_nodes);
     }
 
 
diff --git a/tests/07_dict.py b/tests/07_dict.py
index 9bf024e5..ac9ebb7e 100644
--- a/tests/07_dict.py
+++ b/tests/07_dict.py
@@ -80,4 +80,12 @@ for i in range(1000):
 assert len(a) == 1000
 for i in range(1000):
     del a[i]
-assert len(a) == 0
\ No newline at end of file
+assert len(a) == 0
+
+a = {
+    str(i): i
+    for i in range(10)
+}
+
+for i, s in enumerate(a):
+    assert s == str(i)
\ No newline at end of file