make List compatible CJson

Author: yanghuan

CSharp.lua/CoreSystem.Lua/CoreSystem/Array.lua

@@ -55,6 +55,8 @@ local null = {}
 local arrayEnumerator
 local arrayFromTable
 
+local versions = setmetatable({}, { __mode = "k" })
+
 local function throwFailedVersion()
   throw(InvalidOperationException("Collection was modified; enumeration operation may not execute."))
 end
@@ -87,9 +89,9 @@ local function unWrap(v)
 end
 
 local function ipairs(t)
-  local version = t.version
+  local version = versions[t]
   return function (t, i)
-    if version ~= t.version then
+    if version ~= versions[t] then
       throwFailedVersion()
     end
     local v = t[i]
@@ -169,13 +171,13 @@ local function set(t, index, v)
     throw(ArgumentOutOfRangeException("index"))
   end
   t[index] = v == nil and null or v
-  t.version = t.version + 1
+  versions[t] = (versions[t] or 0) + 1
 end
 
 local function add(t, v)
   local n = #t
   t[n + 1] = v == nil and null or v
-  t.version = t.version + 1
+  versions[t] = (versions[t] or 0) + 1
   return n
 end
 
@@ -190,7 +192,7 @@ local function addRange(t, collection)
       count = count + 1
     end
   end
-  t.version = t.version + 1
+  versions[t] = (versions[t] or 0) + 1
 end
 
 local function unset()
@@ -313,7 +315,7 @@ local function removeRange(t, index, count)
       tmove(t, index + count + 1, n, index + 1)
     end
     fill(t, n - count + 1, n, nil)
-    t.version = t.version + 1
+    versions[t] = (versions[t] or 0) + 1
   end
 end
 
@@ -356,7 +358,7 @@ end
 local function sort(t, comparer)
   if #t > 1 then
     tsort(t, getComp(t, comparer))
-    t.version = t.version + 1
+    versions[t] = (versions[t] or 0) + 1
   end
 end
 
@@ -373,7 +375,7 @@ end, {
   end,
   MoveNext = function (this)
     local t = this.list
-    if this.version ~= t.version then
+    if this.version ~= versions[t] then
       throwFailedVersion()
     end
     local index = this.index
@@ -394,7 +396,7 @@ end, {
 
 arrayEnumerator = function (t, T)
   if not T then T = t.__genericT__ end
-  return setmetatable({ list = t, index = 1, version = t.version, currnet = T:default() }, ArrayEnumerator(T))
+  return setmetatable({ list = t, index = 1, version = versions[t], currnet = T:default() }, ArrayEnumerator(T))
 end
 
 local ArrayReverseEnumerator = define("System.ArrayReverseEnumerator", function (T)
@@ -410,7 +412,7 @@ end, {
   end,
   MoveNext = function (this)
     local t = this.list
-    if this.version ~= t.version then
+    if this.version ~= versions[t] then
       throwFailedVersion()
     end
     local index = this.index
@@ -431,7 +433,7 @@ end, {
 
 local function reverseEnumerator(t)
   local T = t.__genericT__
-  return setmetatable({ list = t, index = #t, version = t.version, currnet = T:default() }, ArrayReverseEnumerator(T))
+  return setmetatable({ list = t, index = #t, version = versions[t], currnet = T:default() }, ArrayReverseEnumerator(T))
 end
 
 local function checkArrayIndex(index1, index2)
@@ -476,7 +478,7 @@ Array = {
       for i = 1, size do
         t[i] = nil
       end
-      t.version = t.version + 1
+      versions[t] = (versions[t] or 0) + 1
     end
   end,
   findAll = function (t, match)
@@ -494,7 +496,7 @@ Array = {
       throw(ArgumentOutOfRangeException("index"))
     end
     tinsert(t, index + 1, v == nil and null or v)
-    t.version = t.version + 1
+    versions[t] = (versions[t] or 0) + 1
   end,
   insertRange = function (t, index, collection) 
     if collection == nil then throw(ArgumentNullException("collection")) end
@@ -521,7 +523,7 @@ Array = {
         tinsert(t, index, v == nil and null or v)
       end
     end
-    t.version = t.version + 1
+    versions[t] = (versions[t] or 0) + 1
   end,
   last = function (t)
     local n = #t
@@ -535,7 +537,7 @@ Array = {
     if #t == 0 then throw(InvalidOperationException()) end
     local v = t[1]
     tremove(t, 1)
-    t.version = t.version + 1
+    versions[t] = (versions[t] or 0) + 1
     if v ~= null then
       return v
     end
@@ -554,7 +556,7 @@ Array = {
     local index = indexOf(t, v)
     if index >= 0 then
       tremove(t, index + 1)
-      t.version = t.version + 1
+      versions[t] = (versions[t] or 0) + 1
       return true
     end
     return false
@@ -599,7 +601,7 @@ Array = {
     if v == nil then
       throw(ArgumentOutOfRangeException("index"))
     end
-    t.version = t.version + 1
+    versions[t] = (versions[t] or 0) + 1
   end,
   getRange = function (t, index, count)
     if count < 0 or index > #t - count then
@@ -609,9 +611,7 @@ Array = {
     tmove(t, index + 1, index + count, 1, list)
     return setmetatable(list, System.List(t.__genericT__))
   end,
-  reverseEnumerator = function (t)
-    return setmetatable({ list = t, index = #t, version = t.version }, ArrayReverseEnumerator)
-  end,
+  reverseEnumerator = reverseEnumerator,
   getCount = lengthFn,
   getSyncRoot = System.identityFn,
   getLongLength = lengthFn,
@@ -834,7 +834,7 @@ Array = {
       i = i + 1
       j = j - 1
     end
-    t.version = t.version + 1
+    versions[t] = (versions[t] or 0) + 1
   end,
   Sort = function (t, ...)
     if t == nil then throw(ArgumentNullException("array")) end
@@ -857,7 +857,7 @@ Array = {
           tsort(arr, comp)
           tmove(arr, 1, count, index + 1, t)
         end
-        t.version = t.version + 1
+        versions[t] = (versions[t] or 0) + 1
       end
     end
   end,

CSharp.lua/CoreSystem.Lua/CoreSystem/Collections/List.lua

@@ -19,8 +19,7 @@ local falseFn = System.falseFn
 local lengthFn = System.lengthFn
 local Array = System.Array
 
-local List = { 
-  version = 0,
+local List = {
   __ctor__ = Array.ctorList,
   getCapacity = lengthFn,
   getCount = lengthFn,

CSharp.lua/CoreSystem.Lua/CoreSystem/Collections/Queue.lua

@@ -18,7 +18,6 @@ local System = System
 local Array = System.Array
 
 local Queue = {
-  version = 0,
   __ctor__ = Array.ctorList,
   getCount = Array.getLength,
   Clear = Array.clear,

CSharp.lua/CoreSystem.Lua/CoreSystem/Collections/Stack.lua

@@ -18,7 +18,6 @@ local System = System
 local Array = System.Array
 
 local Stack = {
-  version = 0,
   __ctor__ = Array.ctorList,
   getCount = Array.getLength,
   Clear = Array.clear,