|
@@ -10,12 +10,12 @@ class PairTools {
|
|
|
untyped __lua__("for k,v in _G.pairs(table) do func(k,v) end");
|
|
|
}
|
|
|
public static function ipairsMap<A,B>(table:Table<Dynamic,A>, func : Int->A->B) : Table<Int,B> {
|
|
|
- var ret : Table<Int,B> = cast {};
|
|
|
+ var ret : Table<Int,B> = Table.create();
|
|
|
untyped __lua__( "for i,v in _G.ipairs(table) do ret[i] = func(i,v) end;");
|
|
|
return ret;
|
|
|
}
|
|
|
public static function pairsMap<A,B,C>(table:Table<A,B>, func : A->B->C->C) : Table<A,C> {
|
|
|
- var ret : Table<A,C> = cast {};
|
|
|
+ var ret : Table<A,C> = Table.create();
|
|
|
untyped __lua__( "for k,v in _G.pairs(table) do ret[k] = func(k,v) end;");
|
|
|
return ret;
|
|
|
}
|
|
@@ -30,7 +30,7 @@ class PairTools {
|
|
|
|
|
|
|
|
|
public static function ipairsConcat<T>(table1:Table<Int,T>, table2:Table<Int,T>){
|
|
|
- var ret:Table<Int,T> = cast {};
|
|
|
+ var ret:Table<Int,T> = Table.create();
|
|
|
ipairsFold(table1, function(a,b,c:Table<Int,T>){ c[a] = b; return c;}, ret);
|
|
|
var size = lua.Table.maxn(ret);
|
|
|
ipairsFold(table2, function(a,b,c:Table<Int,T>){ c[a + size] = b; return c;}, ret);
|
|
@@ -52,7 +52,7 @@ class PairTools {
|
|
|
}
|
|
|
|
|
|
public static function copy<A,B>(table1:Table<A,B>) : Table<A,B> {
|
|
|
- var ret : Table<A,B> = cast {};
|
|
|
+ var ret : Table<A,B> = Table.create();
|
|
|
untyped __lua__("for k,v in _G.pairs(table1) do ret[k] = v end");
|
|
|
return ret;
|
|
|
}
|