From d372d2ab08b4e1664867670aa05e120a703d8bb8 Mon Sep 17 00:00:00 2001 From: Andreas Hofer Date: Tue, 29 Mar 2016 22:14:10 +0200 Subject: [PATCH] fix problem with recursive tables when using the 'process' option --- inspect.lua | 39 ++++++++++++++++++++++++--------------- spec/inspect_spec.lua | 6 ++++++ 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/inspect.lua b/inspect.lua index 39f43af..96194ea 100644 --- a/inspect.lua +++ b/inspect.lua @@ -165,28 +165,37 @@ local function makePath(path, ...) end local function processRecursive(process, item, path) - if item == nil then return nil end + local visited = {} + + local function processRecursive2(item, path) + 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 - local processed = process(item, path) - if type(processed) == 'table' then - local processedCopy = {} - local processedKey + for k,v in pairs(processed) do + processedKey = processRecursive2(k, makePath(path, k, inspect.KEY)) + if processedKey ~= nil then + processedCopy[processedKey] = processRecursive2(v, makePath(path, processedKey)) + end + 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 mt = processRecursive2(getmetatable(processed), makePath(path, inspect.METATABLE)) + setmetatable(processedCopy, mt) + processed = processedCopy end + return processed end - - local mt = processRecursive(process, getmetatable(processed), makePath(path, inspect.METATABLE)) - setmetatable(processedCopy, mt) - processed = processedCopy - end - return processed + + return processRecursive2(item, path) end + ------------------------------------------------------------------- local Inspector = {} 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()