From: Jo-Philipp Wich Date: Tue, 25 Dec 2012 02:28:20 +0000 (+0000) Subject: libs/core: make luci.util.spairs(), kspairs() and vspairs() return the sequential... X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=33fba71fc94b84c33b1e600da9b195eac49b2e31;hp=9297ef38c47c4e5dea67e98c794d951cacc2d936 libs/core: make luci.util.spairs(), kspairs() and vspairs() return the sequential index as 3rd variable --- diff --git a/libs/core/luasrc/util.lua b/libs/core/luasrc/util.lua index e285777c3..da761e219 100644 --- a/libs/core/luasrc/util.lua +++ b/libs/core/luasrc/util.lua @@ -4,9 +4,6 @@ LuCI - Utility library Description: Several common useful Lua functions -FileId: -$Id$ - License: Copyright 2008 Steven Barth @@ -609,6 +606,7 @@ end function _sortiter( t, f ) local keys = { } + local k, v for k, v in pairs(t) do keys[#keys+1] = k end @@ -620,7 +618,7 @@ function _sortiter( t, f ) return function() _pos = _pos + 1 if _pos <= #keys then - return keys[_pos], t[keys[_pos]] + return keys[_pos], t[keys[_pos]], _pos end end end