library-mirrors/serpent
1
0
Fork 0
mirror of https://github.com/pkulchenko/serpent.git synced 2024-11-21 23:24:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated formatting.

Browse Source
This commit is contained in:
Paul Kulchenko 2022-05-21 11:33:08 -07:00
parent b987a79adc
commit ed98a21db6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/serpent.lua
View File

@ -56,7 +56,8 @@ local function s(t, opts)
(name ~= nil and sname..space..'='..space or '') (name ~= nil and sname..space..'='..space or '')
if seen[t] then -- already seen this element if seen[t] then -- already seen this element
sref[#sref+1] = spath..space..'='..space..seen[t] sref[#sref+1] = spath..space..'='..space..seen[t]
return tag..'nil'..comment('ref', level) end return tag..'nil'..comment('ref', level)
end
-- protect from those cases where __tostring may fail -- protect from those cases where __tostring may fail
if type(mt) == 'table' and metatostring ~= false then if type(mt) == 'table' and metatostring ~= false then
local to, tr = pcall(function() return mt.__tostring(t) end) local to, tr = pcall(function() return mt.__tostring(t) end)
@ -76,7 +77,10 @@ local function s(t, opts)
for key = 1, maxn do o[key] = key end for key = 1, maxn do o[key] = key end
if not maxnum or #o < maxnum then if not maxnum or #o < maxnum then
local n = #o -- n = n + 1; o[n] is much faster than o[#o+1] on large tables local n = #o -- n = n + 1; o[n] is much faster than o[#o+1] on large tables
for key in pairs(t) do if o[key] ~= key then n = n + 1; o[n] = key end end end for key in pairs(t) do
if o[key] ~= key then n = n + 1; o[n] = key end
end
end
if maxnum and #o > maxnum then o[maxnum+1] = nil end if maxnum and #o > maxnum then o[maxnum+1] = nil end
if opts.sortkeys and #o > maxn then alphanumsort(o, t, opts.sortkeys) end if opts.sortkeys and #o > maxn then alphanumsort(o, t, opts.sortkeys) end
local sparse = sparse and #o > maxn -- disable sparsness if only numeric keys (shorter output) local sparse = sparse and #o > maxn -- disable sparsness if only numeric keys (shorter output)
@ -91,7 +95,8 @@ local function s(t, opts)
if not seen[key] and not globals[key] then if not seen[key] and not globals[key] then
sref[#sref+1] = 'placeholder' sref[#sref+1] = 'placeholder'
local sname = safename(iname, gensym(key)) -- iname is table for local variables local sname = safename(iname, gensym(key)) -- iname is table for local variables
sref[#sref] = val2str(key,sname,indent,sname,iname,true) end sref[#sref] = val2str(key,sname,indent,sname,iname,true)
end
sref[#sref+1] = 'placeholder' sref[#sref+1] = 'placeholder'
local path = seen[t]..'['..tostring(seen[key] or globals[key] or gensym(key))..']' local path = seen[t]..'['..tostring(seen[key] or globals[key] or gensym(key))..']'
sref[#sref] = path..space..'='..space..tostring(seen[value] or val2str(value,nil,indent,path)) sref[#sref] = path..space..'='..space..tostring(seen[value] or val2str(value,nil,indent,path))