oreolek/steed
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix in for_each

Browse source
This commit is contained in:
p.kosyh 2011-07-25 18:00:08 +00:00
parent 8419527e6d
commit 56253d8fd1
2 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -2,6 +2,7 @@ instead (1.4.5) unstable; urgency=low
* bug fix in rnd() w/o parameter;
* callpush/callpop/cctx moved to stead;
* bug fix in for_each;
-- Peter Kosyh <p.kosyh@gmail.com> Thu, 14 Jul 2011 16:18:00 +0400

35
stead/stead.lua
View file

@ -305,7 +305,7 @@ end
stead.fmt = fmt
-- integer lists
stead.inext = function(t, k)
local inext = function(t, k)
local v
k, v = stead.next(t, k);
while k and not tonumber(k) do
@ -317,15 +317,15 @@ stead.inext = function(t, k)
return k, v
end
stead.ilist = function(s, var)
return stead.inext, s, nil;
local ilist = function(s, var)
return inext, s, nil;
end
stead.ordered_i = function(t)
local ordered_i = function(t)
local ordered = {};
local i,v, max;
max = 0;
for i,v in stead.ilist(t) do
for i,v in ilist(t) do
stead.table.insert(ordered, i);
max = max + 1;
end
@ -335,10 +335,10 @@ stead.ordered_i = function(t)
return ordered;
end
stead.onext = function(t, k)
local onext = function(t, k)
local v
if not k then
k = stead.ordered_i(t);
k = ordered_i(t);
end
if k.i > k.max then
return nil
@ -349,7 +349,7 @@ stead.onext = function(t, k)
end
function opairs(s, var)
return stead.onext, s, nil;
return onext, s, nil;
end
function isPlayer(v)
@ -1640,27 +1640,22 @@ function isEnableAutosave()
end
function for_each(o, n, f, fv, ...)
local call_list = {}
local k,v
if type(o) ~= 'table' then
return
end
stead.object = n;
for k,v in pairs(o) do
if fv(v) then
local i = tonumber(k);
local nn
if i then
nn = n.."["..i.."]"
else
if n == '_G' then
nn = k;
else
nn = n.."."..k;
end
end
f(k, v, ...);
stead.table.insert(call_list, { k = k, v = v });
end
end
for k, v in ipairs(call_list) do
f(v.k, v.v, ...);
end
end
function isCode(s)