2022-02-08 21:56:03 +00:00
|
|
|
-- inspect.tl
|
|
|
|
local record inspect
|
|
|
|
_VERSION: string
|
|
|
|
_URL: string
|
|
|
|
_DESCRIPTION: string
|
|
|
|
_LICENSE: string
|
|
|
|
KEY: table
|
|
|
|
METATABLE: table
|
|
|
|
|
|
|
|
type ProcessFunction = function(any, {any}): any
|
|
|
|
|
|
|
|
record Options
|
|
|
|
depth: integer
|
|
|
|
newline: string
|
|
|
|
indent: string
|
|
|
|
process: ProcessFunction
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
inspect._VERSION = 'inspect.lua 3.1.0'
|
|
|
|
inspect._URL = 'http://github.com/kikito/inspect.lua'
|
|
|
|
inspect._DESCRIPTION = 'human-readable representations of tables'
|
|
|
|
inspect._LICENSE = [[
|
|
|
|
MIT LICENSE
|
|
|
|
|
|
|
|
Copyright (c) 2022 Enrique García Cota
|
|
|
|
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
copy of this software and associated documentation files (the
|
|
|
|
"Software"), to deal in the Software without restriction, including
|
|
|
|
without limitation the rights to use, copy, modify, merge, publish,
|
|
|
|
distribute, sublicense, and/or sell copies of the Software, and to
|
|
|
|
permit persons to whom the Software is furnished to do so, subject to
|
|
|
|
the following conditions:
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be included
|
|
|
|
in all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
|
|
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
|
|
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
|
|
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
|
|
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
|
|
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
]]
|
|
|
|
inspect.KEY = setmetatable({}, {__tostring = function(): string return 'inspect.KEY' end})
|
|
|
|
inspect.METATABLE = setmetatable({}, {__tostring = function(): string return 'inspect.METATABLE' end})
|
|
|
|
|
|
|
|
local tostring = tostring
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
local rep = string.rep
|
|
|
|
local match = string.match
|
|
|
|
local char = string.char
|
|
|
|
local gsub = string.gsub
|
|
|
|
local fmt = string.format
|
2022-02-08 21:56:03 +00:00
|
|
|
|
2023-01-22 21:03:37 +00:00
|
|
|
local _rawget: function(table, any): any
|
|
|
|
if rawget then
|
|
|
|
_rawget = rawget
|
|
|
|
else
|
|
|
|
_rawget = function(t: table, k: any): any return t[k] end
|
|
|
|
end
|
|
|
|
|
2022-02-08 21:56:03 +00:00
|
|
|
local function rawpairs(t: table): function, table, nil
|
|
|
|
return next, t, nil
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Apostrophizes the string if it has quotes, but not aphostrophes
|
|
|
|
-- Otherwise, it returns a regular quoted string
|
|
|
|
local function smartQuote(str: string): string
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
if match(str, '"') and not match(str, "'") then
|
2022-02-08 21:56:03 +00:00
|
|
|
return "'" .. str .. "'"
|
|
|
|
end
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
return '"' .. gsub(str, '"', '\\"') .. '"'
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
-- \a => '\\a', \0 => '\\0', 31 => '\31'
|
|
|
|
local shortControlCharEscapes: {string:string} = {
|
|
|
|
["\a"] = "\\a", ["\b"] = "\\b", ["\f"] = "\\f", ["\n"] = "\\n",
|
|
|
|
["\r"] = "\\r", ["\t"] = "\\t", ["\v"] = "\\v", ["\127"] = "\\127",
|
|
|
|
}
|
|
|
|
local longControlCharEscapes: {string:string} = {["\127"]="\127"} -- \a => nil, \0 => \000, 31 => \031
|
|
|
|
for i=0, 31 do
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
local ch: string = char(i)
|
2022-02-08 21:56:03 +00:00
|
|
|
if not shortControlCharEscapes[ch] then
|
|
|
|
shortControlCharEscapes[ch] = "\\"..i
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
longControlCharEscapes[ch] = fmt("\\%03d", i)
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
local function escape(str: string): string
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
return (gsub(gsub(gsub(str,"\\", "\\\\"),
|
|
|
|
"(%c)%f[0-9]", longControlCharEscapes),
|
|
|
|
"%c", shortControlCharEscapes))
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
|
2023-01-19 12:16:48 +00:00
|
|
|
local luaKeywords: {string:boolean} = {
|
|
|
|
['and'] = true,
|
|
|
|
['break'] = true,
|
|
|
|
['do'] = true,
|
|
|
|
['else'] = true,
|
|
|
|
['elseif'] = true,
|
|
|
|
['end'] = true,
|
|
|
|
['false'] = true,
|
|
|
|
['for'] = true,
|
|
|
|
['function'] = true,
|
|
|
|
['goto'] = true,
|
|
|
|
['if'] = true,
|
|
|
|
['in'] = true,
|
|
|
|
['local'] = true,
|
|
|
|
['nil'] = true,
|
|
|
|
['not'] = true,
|
|
|
|
['or'] = true,
|
|
|
|
['repeat'] = true,
|
|
|
|
['return'] = true,
|
|
|
|
['then'] = true,
|
|
|
|
['true'] = true,
|
|
|
|
['until'] = true,
|
|
|
|
['while'] = true,
|
|
|
|
}
|
|
|
|
|
2022-02-08 21:56:03 +00:00
|
|
|
local function isIdentifier(str: any): boolean
|
2023-01-19 12:16:48 +00:00
|
|
|
return str is string
|
|
|
|
and not not str:match("^[_%a][_%a%d]*$")
|
|
|
|
and not luaKeywords[str]
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
local flr = math.floor
|
|
|
|
local function isSequenceKey(k: any, sequenceLength: integer): boolean
|
|
|
|
return k is number
|
|
|
|
and flr(k) == k
|
|
|
|
and 1 <= (k)
|
|
|
|
and k <= sequenceLength
|
|
|
|
end
|
|
|
|
|
|
|
|
local defaultTypeOrders: {string:integer} = {
|
|
|
|
['number'] = 1, ['boolean'] = 2, ['string'] = 3, ['table'] = 4,
|
|
|
|
['function'] = 5, ['userdata'] = 6, ['thread'] = 7
|
|
|
|
}
|
|
|
|
|
|
|
|
local function sortKeys(a:any, b:any): boolean
|
|
|
|
local ta, tb: string, string = type(a), type(b)
|
|
|
|
|
|
|
|
-- strings and numbers are sorted numerically/alphabetically
|
|
|
|
if ta == tb and (ta == 'string' or ta == 'number') then
|
|
|
|
return (a as string) < (b as string)
|
|
|
|
end
|
|
|
|
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
local dta: integer = defaultTypeOrders[ta] or 100
|
|
|
|
local dtb: integer = defaultTypeOrders[tb] or 100
|
|
|
|
-- Default types are compared according to defaultTypeOrders
|
|
|
|
-- Custom types are compared alphabetically
|
|
|
|
return dta == dtb and ta < tb or dta < dtb
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
local function getKeys(t: table): {any}, integer, integer
|
|
|
|
-- seqLen counts the "array-like" keys
|
|
|
|
local seqLen: integer = 1
|
2023-01-22 21:03:37 +00:00
|
|
|
while _rawget(t, seqLen) ~= nil do
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
seqLen = seqLen + 1
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
seqLen = seqLen - 1
|
2022-02-08 21:56:03 +00:00
|
|
|
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
local keys, keysLen: {any}, integer = {}, 0
|
|
|
|
for k in rawpairs(t) do
|
|
|
|
if not isSequenceKey(k, seqLen) then
|
|
|
|
keysLen = keysLen + 1
|
|
|
|
keys[keysLen] = k
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
table.sort(keys, sortKeys)
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
return keys, keysLen, seqLen
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
local function countCycles(x: any, cycles: {any:integer}): nil
|
|
|
|
if x is table then
|
|
|
|
if cycles[x] then
|
|
|
|
cycles[x] = cycles[x] + 1
|
2022-02-08 21:56:03 +00:00
|
|
|
else
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
cycles[x] = 1
|
|
|
|
for k,v in rawpairs(x) do
|
|
|
|
countCycles(k, cycles)
|
|
|
|
countCycles(v, cycles)
|
|
|
|
end
|
|
|
|
countCycles(getmetatable(x), cycles)
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
local function makePath(path: {any}, a: any, b: any): {any}
|
|
|
|
local newPath: {any} = {}
|
|
|
|
local len: integer = #path
|
|
|
|
for i=1, len do newPath[i] = path[i] end
|
|
|
|
|
|
|
|
newPath[len + 1] = a
|
|
|
|
newPath[len + 2] = b
|
|
|
|
|
|
|
|
return newPath
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
local function processRecursive(process: inspect.ProcessFunction,
|
|
|
|
item: any,
|
|
|
|
path: {any},
|
|
|
|
visited: {any:any}): any
|
|
|
|
if item == nil then return nil end
|
|
|
|
if visited[item] then return visited[item] end
|
|
|
|
|
|
|
|
local processed: any = process(item, path)
|
|
|
|
if processed is table then
|
|
|
|
local processedCopy = {}
|
|
|
|
visited[item] = processedCopy
|
|
|
|
local processedKey: any
|
|
|
|
|
|
|
|
for k,v in rawpairs(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
|
|
|
|
|
|
|
|
local mt = processRecursive(process, getmetatable(processed), makePath(path, inspect.METATABLE), visited)
|
|
|
|
if type(mt) ~= 'table' then mt = nil end -- ignore not nil/table __metatable field
|
|
|
|
setmetatable(processedCopy, mt as metatable<{any:any}>)
|
|
|
|
processed = processedCopy
|
|
|
|
end
|
|
|
|
return processed
|
|
|
|
end
|
|
|
|
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
local function puts(buf: table, str:string): nil
|
|
|
|
buf.n = buf.n as integer + 1
|
|
|
|
buf[buf.n as integer] = str
|
|
|
|
end
|
2022-02-08 21:56:03 +00:00
|
|
|
|
|
|
|
-------------------------------------------------------------------
|
|
|
|
|
|
|
|
local type Inspector = record
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
buf: table
|
2022-02-08 21:56:03 +00:00
|
|
|
depth: integer
|
|
|
|
level: integer
|
|
|
|
ids: {any:integer}
|
|
|
|
newline: string
|
|
|
|
indent: string
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
cycles: {table: integer}
|
|
|
|
puts: function(string)
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
local Inspector_mt = {__index = Inspector}
|
|
|
|
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
local function tabify(inspector: Inspector)
|
|
|
|
puts(inspector.buf, inspector.newline .. rep(inspector.indent, inspector.level))
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
function Inspector:getId(v: any): string
|
|
|
|
local id: integer = self.ids[v]
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
local ids = self.ids
|
2022-02-08 21:56:03 +00:00
|
|
|
if not id then
|
|
|
|
local tv: string = type(v)
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
id = (ids[tv] or 0) + 1
|
|
|
|
ids[v], ids[tv] = id, id
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
return tostring(id)
|
|
|
|
end
|
|
|
|
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
function Inspector:putValue(v: any)
|
|
|
|
local buf = self.buf
|
|
|
|
local tv: string = type(v)
|
|
|
|
if tv == 'string' then
|
|
|
|
puts(buf, smartQuote(escape(v as string)))
|
|
|
|
elseif tv == 'number' or tv == 'boolean' or tv == 'nil' or
|
|
|
|
tv == 'cdata' or tv == 'ctype' then
|
|
|
|
puts(buf, tostring(v as number))
|
|
|
|
elseif tv == 'table' and not self.ids[v] then
|
|
|
|
local t = v as table
|
|
|
|
|
|
|
|
if t == inspect.KEY or t == inspect.METATABLE then
|
|
|
|
puts(buf, tostring(t))
|
|
|
|
elseif self.level >= self.depth then
|
|
|
|
puts(buf, '{...}')
|
|
|
|
else
|
|
|
|
if self.cycles[t] > 1 then puts(buf, fmt('<%d>', self:getId(t))) end
|
|
|
|
|
|
|
|
local keys, keysLen, seqLen = getKeys(t)
|
|
|
|
|
|
|
|
puts(buf, '{')
|
|
|
|
self.level = self.level + 1
|
|
|
|
|
|
|
|
for i = 1, seqLen + keysLen do
|
|
|
|
if i > 1 then puts(buf, ',') end
|
|
|
|
if i <= seqLen then
|
|
|
|
puts(buf, ' ')
|
|
|
|
self:putValue(t[i])
|
|
|
|
else
|
|
|
|
local k = keys[i - seqLen]
|
|
|
|
tabify(self)
|
|
|
|
if isIdentifier(k) then
|
|
|
|
puts(buf, k as string)
|
|
|
|
else
|
|
|
|
puts(buf, "[")
|
|
|
|
self:putValue(k)
|
|
|
|
puts(buf, "]")
|
|
|
|
end
|
|
|
|
puts(buf, ' = ')
|
|
|
|
self:putValue(t[k])
|
|
|
|
end
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
local mt = getmetatable(t)
|
2022-02-08 21:56:03 +00:00
|
|
|
if type(mt) == 'table' then
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
if seqLen + keysLen > 0 then puts(buf, ',') end
|
|
|
|
tabify(self)
|
|
|
|
puts(buf, '<metatable> = ')
|
|
|
|
self:putValue(mt)
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
self.level = self.level - 1
|
2022-02-08 21:56:03 +00:00
|
|
|
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
if keysLen > 0 or type(mt) == 'table' then -- result is multi-lined. Justify closing }
|
|
|
|
tabify(self)
|
|
|
|
elseif seqLen > 0 then -- array tables have one extra space before closing }
|
|
|
|
puts(buf, ' ')
|
|
|
|
end
|
|
|
|
|
|
|
|
puts(buf, '}')
|
|
|
|
end
|
2022-02-08 21:56:03 +00:00
|
|
|
|
|
|
|
else
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
puts(buf, fmt('<%s %d>', tv, self:getId(v)))
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
-------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
function inspect.inspect(root: any, options: inspect.Options): string
|
|
|
|
options = options or {}
|
|
|
|
|
|
|
|
local depth: integer = options.depth or (math.huge as integer)
|
|
|
|
local newline: string = options.newline or '\n'
|
|
|
|
local indent: string = options.indent or ' '
|
|
|
|
local process: inspect.ProcessFunction = options.process
|
|
|
|
|
|
|
|
if process then
|
|
|
|
root = processRecursive(process, root, {}, {})
|
|
|
|
end
|
|
|
|
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
local cycles = {}
|
|
|
|
countCycles(root, cycles)
|
|
|
|
|
2022-02-08 21:56:03 +00:00
|
|
|
local inspector = setmetatable({
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
buf = { n = 0 },
|
|
|
|
ids = {},
|
|
|
|
cycles = cycles,
|
2022-02-08 21:56:03 +00:00
|
|
|
depth = depth,
|
|
|
|
level = 0,
|
|
|
|
newline = newline,
|
|
|
|
indent = indent,
|
|
|
|
} as Inspector, Inspector_mt)
|
|
|
|
|
|
|
|
inspector:putValue(root)
|
|
|
|
|
(perf) introduce perf test harness and refactor (#54)
Made a lot of backwards-compatible changes and simplifications to the code that I had wanted to do for a lot of time, while also keeping an eye in performance. The new changes improved overall performance on my limited, dev-machine-only, luajit-only tests.
Before:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.054246,0.140177,0.149759,0.323062,0.441312,0.607064,0.296031,0.458631,0.105668,1.717528,2.047272
```
After:
```
$ luajit perf.lua
nil,string,empty,sequence,record,hybrid,recursive,meta,process,complex,big
0.036804,0.188984,0.099349,0.247425,0.342079,0.452339,0.203801,0.288931,0.169462,1.010763,1.616462
```
2022-03-18 12:44:36 +00:00
|
|
|
return table.concat(inspector.buf as {string})
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
setmetatable(inspect, {
|
|
|
|
__call = function(_, root: any, options: inspect.Options): string
|
|
|
|
return inspect.inspect(root, options)
|
|
|
|
end
|
|
|
|
})
|
|
|
|
|
|
|
|
return inspect
|