library-mirrors/inspect.lua
1
0
Fork 0
mirror of https://github.com/kikito/inspect.lua.git synced 2024-12-15 14:34:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed function processRecursive

Browse Source
This commit is contained in:
Andreas Hofer 2016-04-03 19:43:01 +02:00
parent 89588bd4d9
commit 1f54536b56
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
inspect.lua
View File

@ -164,34 +164,29 @@ local function makePath(path, ...)
return newPath return newPath
end end
local function processRecursive(process, item, path) local function processRecursive(process, item, path, visited)
local visited = {}
local function processRecursive2(item2, path2) if item == nil then return nil end
if item2 == nil then return nil end if visited[item] then return visited[item] end
if visited[item2] then return visited[item2] end
local processed = process(item, path)
local processed = process(item2, path2) if type(processed) == 'table' then
if type(processed) == 'table' then local processedCopy = {}
local processedCopy = {} visited[item] = processedCopy
visited[item2] = processedCopy local processedKey
local processedKey
for k,v in pairs(processed) do for k,v in pairs(processed) do
processedKey = processRecursive2(k, makePath(path2, k, inspect.KEY)) processedKey = processRecursive(process, k, makePath(path, k, inspect.KEY), visited)
if processedKey ~= nil then if processedKey ~= nil then
processedCopy[processedKey] = processRecursive2(v, makePath(path2, processedKey)) processedCopy[processedKey] = processRecursive(process, v, makePath(path, processedKey), visited)
end
end end
local mt = processRecursive2(getmetatable(processed), makePath(path2, inspect.METATABLE))
setmetatable(processedCopy, mt)
processed = processedCopy
end end
return processed
local mt = processRecursive(process, getmetatable(processed), makePath(path, inspect.METATABLE), visited)
setmetatable(processedCopy, mt)
processed = processedCopy
end end
return processed
return processRecursive2(item, path)
end end
@ -324,7 +319,7 @@ function inspect.inspect(root, options)
local process = options.process local process = options.process
if process then if process then
root = processRecursive(process, root, {}) root = processRecursive(process, root, {}, {})
end end
local inspector = setmetatable({ local inspector = setmetatable({