diff --git a/inspect.lua b/inspect.lua index 39f43af..4b654b2 100644 --- a/inspect.lua +++ b/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 processed = process(item, path) - if type(processed) == 'table' then - local processedCopy = {} - local processedKey - - 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 function processRecursive(process, item, path, visited) + + if item == nil then return nil end + if visited[item] then return visited[item] end + + 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({ diff --git a/spec/inspect_spec.lua b/spec/inspect_spec.lua index 9a81642..78b0a7b 100644 --- a/spec/inspect_spec.lua +++ b/spec/inspect_spec.lua @@ -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()