Skip to content

Commit 1ca6da2

Browse files
committed
change key word "__inherits__" to "base"
1 parent 2140d72 commit 1ca6da2

32 files changed

+88
-88
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ end
368368

369369
local ArrayEnumerator = define("System.ArrayEnumerator", function (T)
370370
return {
371-
__inherits__ = { IEnumerator_1(T) }
371+
base = { IEnumerator_1(T) }
372372
}
373373
end, {
374374
getCurrent = System.getCurrent,
@@ -405,7 +405,7 @@ end
405405

406406
local ArrayReverseEnumerator = define("System.ArrayReverseEnumerator", function (T)
407407
return {
408-
__inherits__ = { IEnumerator_1(T) }
408+
base = { IEnumerator_1(T) }
409409
}
410410
end, {
411411
getCurrent = System.getCurrent,
@@ -1042,7 +1042,7 @@ end
10421042

10431043
System.defArray("System.Array", function(T)
10441044
return {
1045-
__inherits__ = { System.ICloneable, System.IList_1(T), System.IReadOnlyList_1(T), System.IList },
1045+
base = { System.ICloneable, System.IList_1(T), System.IReadOnlyList_1(T), System.IList },
10461046
__genericT__ = T
10471047
}
10481048
end, Array, MultiArray)
@@ -1074,7 +1074,7 @@ System.yield = cyield
10741074
local YieldEnumerable
10751075
YieldEnumerable = define("System.YieldEnumerable", function (T)
10761076
return {
1077-
__inherits__ = { System.IEnumerable_1(T), System.IEnumerator_1(T), System.IDisposable },
1077+
base = { System.IEnumerable_1(T), System.IEnumerator_1(T), System.IDisposable },
10781078
__genericT__ = T
10791079
}
10801080
end, {
@@ -1152,7 +1152,7 @@ local ReadOnlyCollection = {
11521152

11531153
define("System.ReadOnlyCollection", function (T)
11541154
return {
1155-
__inherits__ = { System.IList_1(T), System.IList, System.IReadOnlyList_1(T) },
1155+
base = { System.IList_1(T), System.IList, System.IReadOnlyList_1(T) },
11561156
__genericT__ = T
11571157
}
11581158
end, ReadOnlyCollection)

CSharp.lua/CoreSystem.Lua/CoreSystem/Boolean.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ local Boolean = System.defStc("System.Boolean", {
103103
end
104104
return false, false
105105
end,
106-
__inherits__ = function (_, T)
106+
base = function (_, T)
107107
return { System.IComparable, System.IConvertible, System.IComparable_1(T), System.IEquatable_1(T) }
108108
end
109109
})

CSharp.lua/CoreSystem.Lua/CoreSystem/Char.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ local Char = System.defStc("System.Char", {
222222
end
223223
return c >= 0xD800 and c <= 0xDFFF
224224
end,
225-
__inherits__ = function (_, T)
225+
base = function (_, T)
226226
return { System.IComparable, System.IComparable_1(T), System.IEquatable_1(T) }
227227
end
228228
})

CSharp.lua/CoreSystem.Lua/CoreSystem/Collections/Dictionary.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ end
197197

198198
local DictionaryCollection = define("System.Collections.Generic.DictionaryCollection", function (T)
199199
return {
200-
__inherits__ = { System.ICollection_1(T), System.IReadOnlyCollection_1(T), System.ICollection },
200+
base = { System.ICollection_1(T), System.IReadOnlyCollection_1(T), System.ICollection },
201201
__genericT__ = T
202202
}
203203
end, {
@@ -400,7 +400,7 @@ end
400400

401401
System.Dictionary = define("System.Collections.Generic.Dictionary", function(TKey, TValue)
402402
return {
403-
__inherits__ = { System.IDictionary_2(TKey, TValue), System.IDictionary, System.IReadOnlyDictionary_2(TKey, TValue) },
403+
base = { System.IDictionary_2(TKey, TValue), System.IDictionary, System.IReadOnlyDictionary_2(TKey, TValue) },
404404
__genericT__ = KeyValuePairFn(TKey, TValue),
405405
__genericTKey__ = TKey,
406406
__genericTValue__ = TValue,

CSharp.lua/CoreSystem.Lua/CoreSystem/Collections/EqualityComparer.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ EqualityComparer = define("System.EqualityComparer", function (T)
4848
local defaultComparer
4949
return {
5050
__genericT__ = T,
51-
__inherits__ = { System.IEqualityComparer_1(T), System.IEqualityComparer },
51+
base = { System.IEqualityComparer_1(T), System.IEqualityComparer },
5252
getDefault = function ()
5353
local comparer = defaultComparer
5454
if comparer == nil then
@@ -93,7 +93,7 @@ end
9393
define("System.Comparer", (function ()
9494
local Comparer
9595
Comparer = {
96-
__inherits__ = { System.IComparer },
96+
base = { System.IComparer },
9797
static = function (this)
9898
local default = Comparer()
9999
this.Default = default
@@ -108,7 +108,7 @@ local Comparer, ComparisonComparer
108108

109109
ComparisonComparer = define("System.ComparisonComparer", function (T)
110110
return {
111-
__inherits__ = { Comparer(T) },
111+
base = { Comparer(T) },
112112
__ctor__ = function (this, comparison)
113113
this.comparison = comparison
114114
end,
@@ -158,7 +158,7 @@ Comparer = define("System.Comparer_1", function (T)
158158

159159
return {
160160
__genericT__ = T,
161-
__inherits__ = { System.IComparer_1(T), System.IComparer },
161+
base = { System.IComparer_1(T), System.IComparer },
162162
getDefault = getDefault,
163163
getDefaultInvariant = getDefault,
164164
Compare = Compare,

CSharp.lua/CoreSystem.Lua/CoreSystem/Collections/HashSet.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ end
308308

309309
System.HashSet = System.define("System.Collections.Generic.HashSet", function(T)
310310
return {
311-
__inherits__ = { System.ICollection_1(T), System.ISet_1(T) },
311+
base = { System.ICollection_1(T), System.ISet_1(T) },
312312
__genericT__ = T,
313313
__genericTKey__ = T,
314314
__len = HashSet.getCount

CSharp.lua/CoreSystem.Lua/CoreSystem/Collections/LinkedList.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ end
339339

340340
System.LinkedList = define("System.Collections.Generic.LinkedList", function(T)
341341
return {
342-
__inherits__ = { System.ICollection_1(T), System.ICollection },
342+
base = { System.ICollection_1(T), System.ICollection },
343343
__genericT__ = T,
344344
__len = LinkedList.getCount
345345
}

CSharp.lua/CoreSystem.Lua/CoreSystem/Collections/Linq.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ local tsort = table.sort
4949

5050
local InternalEnumerable = define("System.Linq.InternalEnumerable", function(T)
5151
return {
52-
__inherits__ = { IEnumerable_1(T) }
52+
base = { IEnumerable_1(T) }
5353
}
5454
end)
5555

@@ -60,7 +60,7 @@ end
6060

6161
local InternalEnumerator = define("System.Linq.InternalEnumerator", function(T)
6262
return {
63-
__inherits__ = { IEnumerator_1(T) }
63+
base = { IEnumerator_1(T) }
6464
}
6565
end)
6666

@@ -259,7 +259,7 @@ end
259259

260260
local IGrouping = System.defInf("System.Linq.IGrouping")
261261
local Grouping = define("System.Linq.Grouping", {
262-
__inherits__ = { IGrouping },
262+
base = { IGrouping },
263263
GetEnumerator = arrayEnumerator,
264264
getKey = function (this)
265265
return this.key

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ end
6565

6666
System.List = System.define("System.Collections.Generic.List", function(T)
6767
return {
68-
__inherits__ = { System.IList_1(T), System.IReadOnlyList_1(T), System.IList },
68+
base = { System.IList_1(T), System.IReadOnlyList_1(T), System.IList },
6969
__genericT__ = T,
7070
}
7171
end, List)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ end
3737

3838
System.Queue = System.define("System.Collections.Generic.Queue", function(T)
3939
return {
40-
__inherits__ = { System.IEnumerable_1(T), System.ICollection },
40+
base = { System.IEnumerable_1(T), System.ICollection },
4141
__genericT__ = T,
4242
}
4343
end, Queue)

0 commit comments

Comments
 (0)