Merge branch 'main' of https://github.com/JomiXedYu/JxCode.LuaSharp into main

Author: Jomixedyu

SysLib/Collections/Dictionary.lua

@@ -44,9 +44,9 @@ function Dictionary:Remove(key)
 end
 
 function Dictionary:Clear()
-    for _, key in ipairs(self.m_index) do
-        self:Remove(key)
-    end
+    self.m_count = 0
+    self.m_dict = {}
+    self.m_index = {}
 end
 
 ---@return number

SysLib/Collections/List.lua

@@ -1,7 +1,7 @@
 -------------------ModuleInfo-------------------
 --- Author       : jxy
 --- Date         : 2020/02/16 00:00
---- Description  : 数组封装类，可以用lua迭代器访问
+--- Description  : 数组封装类
 --- https://github.com/JomiXedYu/JxCode.LuaSharp
 ------------------------------------------------
 ---@class SysLib.Collections.List : SysLib.Object
@@ -21,8 +21,8 @@ function List:Add(item)
     self.m_arr[self.m_count] = item
 end
 
-function List:AddRange(ienumerator)
-    for item in each(ienumerator) do
+function List:AddRange(enumerable)
+    for item in each(enumerable) do
         self:Add(item)
     end
 end
@@ -49,6 +49,7 @@ function List:Clear()
     for i = 1, self.m_count do
         self.m_arr[i] = nil
     end
+    self.m_count = 0
 end
 
 ---@return boolean

Test/Container/DictionaryTest.lua

@@ -42,3 +42,4 @@ assert(e3 == 6)
 dict:Remove("user2")
 assert(dict:GetCount() == 2)
 dict:Clear()
+assert(dict:GetCount() == 0)

Test/Container/ListTest.lua

@@ -1,36 +1,51 @@
 
 local list = List.New()
-list:Add("item1")
-list:Add("item2")
+list:Add("i1")
+list:Add("i2")
 list:Add(nil)
-list:Add("item3")
-
-assert(list:GetCount() == 4)
+list:AddTableRange({"i3", "i4"})
+assert(list:GetCount() == 5)
 
 --可以使用三种遍历方式
 
 -- 1.ForEach方法
-Console.WriteLine("ForEachMemberFunction:")
+local it1 = ""
 list:ForEach(function(item)
-    Console.WriteLine(item)
+    if not item then
+        it1 = it1.."nil"
+    else
+        it1 = it1..item
+    end
 end)
+assert(it1 == "i1i2nili3i4")
 
 -- 2.迭代器
-Console.WriteLine("Enumerator:")
+local it2 = ""
 for index, value in list:GetEnumerator() do
-    Console.WriteLine(value)
+    if not value then
+        it2 = it2.."nil"
+    else
+        it2 = it2..value
+    end
 end
+assert(it2 == "i1i2nili3i4")
 
 -- 3.或者使用each
-Console.WriteLine("Each:")
+local it3 = ""
 for index, value in each(list) do
-    Console.WriteLine(value)
+    if not value then
+        it3 = it3.."nil"
+    else
+        it3 = it3..value
+    end
 end
+assert(it3 == "i1i2nili3i4")
 
-Console.WriteLine("item2 IndexOf:", list:IndexOf("item2")) -- 2
-Console.WriteLine("item4 IndexOf:", list:IndexOf("item4")) -- -1
+assert(list:IndexOf("i2") == 2)
+assert(list:IndexOf("i4") == 5)
+assert(list:IndexOf("i5") == -1)
 
---使用GetCount或#获得数量
 list:RemoveAt(2)
-Console.WriteLine("RemoveAt:", list:GetCount())
-list:Clear()
+assert(list:GetCount() == 4)
+list:Clear()
+assert(list:GetCount() == 0)

Test/Container/QueueTest.lua

@@ -1,21 +1,21 @@
 local queue = Queue.New()
 
-queue:Enqueue("value1")
-queue:Enqueue("value2")
-queue:Enqueue("value3")
+queue:Enqueue("v1")
+queue:Enqueue("v2")
 
-Console.WriteLine("Count:", queue:GetCount())
+assert(queue:GetCount() == 2)
 
+local it = ""
 queue:ForEach(function(item)
-    Console.WriteLine("item: ", item) 
+    it = it .. item
 end)
 
-Console.WriteLine("Peek:", queue:Peek())
+assert(it == "v1v2")
 
-Console.WriteLine("Dequeue:", queue:Dequeue())
-Console.WriteLine("Dequeue:", queue:Dequeue())
-
-Console.WriteLine("Count:", queue:GetCount())
+assert(queue:Peek() == "v1")
+assert(queue:Dequeue() == "v1")
+assert(queue:Peek() == "v2")
+assert(queue:GetCount() == 1)
 
 queue:Clear()
-Console.WriteLine("Clear:", queue:GetCount())
+assert(queue:GetCount() == 0)

Test/Container/StackTest.lua

@@ -1,19 +1,14 @@
 local stack = Stack.New()
 
-stack:Push("one")
-stack:Push("two")
-stack:Push("three")
+stack:Push("v1")
+stack:Push("v2")
 
+assert(stack:GetCount() == 2)
 
-Console.WriteLine("Count:", stack:GetCount())
-
-Console.WriteLine("Peek:", stack:Peek())
-
-Console.WriteLine("Pop:", stack:Pop())
-Console.WriteLine("Pop:", stack:Pop())
-
-Console.WriteLine("Count:", stack:GetCount())
+assert(stack:Peek() == "v2")
+assert(stack:Pop() == "v2")
+assert(stack:Peek() == "v1")
+assert(stack:GetCount() == 1)
 
 stack:Clear()
-
-Console.WriteLine("Clear:", stack:GetCount())
+assert(stack:GetCount() == 0)