mirror of
https://github.com/kikito/inspect.lua.git
synced 2024-12-15 14:34:21 +00:00
Merge pull request #26 from andreashofer123/process
fix problem with recursive tables when using the 'process' option
This commit is contained in:
commit
833b0bc183
38
inspect.lua
38
inspect.lua
@ -164,29 +164,33 @@ local function makePath(path, ...)
|
||||
return newPath
|
||||
end
|
||||
|
||||
local function processRecursive(process, item, path)
|
||||
if item == nil then return nil end
|
||||
local function processRecursive(process, item, path, visited)
|
||||
|
||||
local processed = process(item, path)
|
||||
if type(processed) == 'table' then
|
||||
local processedCopy = {}
|
||||
local processedKey
|
||||
if item == nil then return nil end
|
||||
if visited[item] then return visited[item] end
|
||||
|
||||
for k,v in pairs(processed) do
|
||||
processedKey = processRecursive(process, k, makePath(path, k, inspect.KEY))
|
||||
if processedKey ~= nil then
|
||||
processedCopy[processedKey] = processRecursive(process, v, makePath(path, processedKey))
|
||||
local processed = process(item, path)
|
||||
if type(processed) == 'table' then
|
||||
local processedCopy = {}
|
||||
visited[item] = processedCopy
|
||||
local processedKey
|
||||
|
||||
for k,v in pairs(processed) do
|
||||
processedKey = processRecursive(process, k, makePath(path, k, inspect.KEY), visited)
|
||||
if processedKey ~= nil then
|
||||
processedCopy[processedKey] = processRecursive(process, v, makePath(path, processedKey), visited)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local mt = processRecursive(process, getmetatable(processed), makePath(path, inspect.METATABLE))
|
||||
setmetatable(processedCopy, mt)
|
||||
processed = processedCopy
|
||||
end
|
||||
return processed
|
||||
local mt = processRecursive(process, getmetatable(processed), makePath(path, inspect.METATABLE), visited)
|
||||
setmetatable(processedCopy, mt)
|
||||
processed = processedCopy
|
||||
end
|
||||
return processed
|
||||
end
|
||||
|
||||
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
local Inspector = {}
|
||||
@ -315,7 +319,7 @@ function inspect.inspect(root, options)
|
||||
local process = options.process
|
||||
|
||||
if process then
|
||||
root = processRecursive(process, root, {})
|
||||
root = processRecursive(process, root, {}, {})
|
||||
end
|
||||
|
||||
local inspector = setmetatable({
|
||||
|
@ -315,6 +315,12 @@ describe( 'inspect', function()
|
||||
}, items)
|
||||
|
||||
end)
|
||||
|
||||
it('handles recursive tables correctly', function()
|
||||
local tbl = { 1,2,3}
|
||||
tbl.loop = tbl
|
||||
inspect(tbl, { process=function(x) return x end})
|
||||
end)
|
||||
end)
|
||||
|
||||
describe('metatables', function()
|
||||
|
Loading…
Reference in New Issue
Block a user