improve to_array

xmake-io · Oct 6, 2024 · 44f05cd · 44f05cd
1 parent 0ee97cd
commit 44f05cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tests/modules/hashset/test.lua b/tests/modules/hashset/test.lua
@@ -21,5 +21,6 @@ function test_hashset(t)
     t:require(h == h2)
     h2:clear()
     t:require(h2:empty())
+    t:require(h == hashset.from(h:to_array()))
 end
 
diff --git a/xmake/core/base/hashset.lua b/xmake/core/base/hashset.lua
@@ -103,9 +103,9 @@ end
 -- convert hashset to an array, nil in the set will be ignored
 function hashset:to_array()
     local result = {}
-    for k, _ in pairs(self._DATA) do
-        if k ~= hashset._NIL then
-            table.insert(result, k)
+    for item in self:items() do
+        if item ~= nil then
+            table.insert(result, item)
         end
     end
     return result