2022-02-08 21:56:03 +00:00
|
|
|
local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local math = _tl_compat and _tl_compat.math or math; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
|
|
|
|
local inspect = {Options = {}, }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
]]
|
|
|
|
|
|
|
|
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-05-20 23:24:44 +00:00
|
|
|
local concat = table.concat
|
2014-09-13 10:12:41 +00:00
|
|
|
|
2018-03-11 22:50:30 +00:00
|
|
|
local function rawpairs(t)
|
2022-02-08 21:56:03 +00:00
|
|
|
return next, t, nil
|
2018-03-11 22:50:30 +00:00
|
|
|
end
|
|
|
|
|
2022-02-08 21:56:03 +00:00
|
|
|
|
|
|
|
|
2011-04-23 19:00:41 +00:00
|
|
|
local function smartQuote(str)
|
(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, '"', '\\"') .. '"'
|
2011-04-23 19:00:41 +00:00
|
|
|
end
|
|
|
|
|
2022-02-08 21:56:03 +00:00
|
|
|
|
2016-04-10 11:52:01 +00:00
|
|
|
local shortControlCharEscapes = {
|
2022-02-08 21:56:03 +00:00
|
|
|
["\a"] = "\\a", ["\b"] = "\\b", ["\f"] = "\\f", ["\n"] = "\\n",
|
|
|
|
["\r"] = "\\r", ["\t"] = "\\t", ["\v"] = "\\v", ["\127"] = "\\127",
|
2011-04-23 19:33:03 +00:00
|
|
|
}
|
2022-02-08 21:56:03 +00:00
|
|
|
local longControlCharEscapes = { ["\127"] = "\127" }
|
|
|
|
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 = 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
|
2016-03-31 19:22:23 +00:00
|
|
|
end
|
|
|
|
|
2014-01-07 14:00:54 +00:00
|
|
|
local function escape(str)
|
(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))
|
2011-04-23 19:33:03 +00:00
|
|
|
end
|
|
|
|
|
2011-04-23 21:29:52 +00:00
|
|
|
local function isIdentifier(str)
|
2022-02-08 21:56:03 +00:00
|
|
|
return type(str) == "string" and not not str:match("^[_%a][_%a%d]*$")
|
2011-04-23 21:29:52 +00:00
|
|
|
end
|
|
|
|
|
2022-02-08 21:56:03 +00:00
|
|
|
local flr = math.floor
|
2016-03-06 16:06:14 +00:00
|
|
|
local function isSequenceKey(k, sequenceLength)
|
2022-02-08 21:56:03 +00:00
|
|
|
return type(k) == "number" and
|
|
|
|
flr(k) == k and
|
|
|
|
1 <= (k) and
|
|
|
|
k <= sequenceLength
|
2011-04-23 21:29:52 +00:00
|
|
|
end
|
|
|
|
|
2013-09-14 14:45:31 +00:00
|
|
|
local defaultTypeOrders = {
|
2022-02-08 21:56:03 +00:00
|
|
|
['number'] = 1, ['boolean'] = 2, ['string'] = 3, ['table'] = 4,
|
|
|
|
['function'] = 5, ['userdata'] = 6, ['thread'] = 7,
|
2013-09-14 14:45:31 +00:00
|
|
|
}
|
2011-04-23 22:04:45 +00:00
|
|
|
|
2013-06-19 11:33:16 +00:00
|
|
|
local function sortKeys(a, b)
|
2022-02-08 21:56:03 +00:00
|
|
|
local ta, tb = type(a), type(b)
|
|
|
|
|
2013-09-14 14:45:31 +00:00
|
|
|
|
2022-02-08 21:56:03 +00:00
|
|
|
if ta == tb and (ta == 'string' or ta == 'number') then
|
|
|
|
return (a) < (b)
|
|
|
|
end
|
2013-09-14 14:45:31 +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 dta = defaultTypeOrders[ta] or 100
|
|
|
|
local dtb = defaultTypeOrders[tb] or 100
|
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
|
|
|
return dta == dtb and ta < tb or dta < dtb
|
2011-04-23 22:04:45 +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)
|
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 seqLen = 1
|
|
|
|
while rawget(t, seqLen) ~= nil do
|
|
|
|
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
|
2016-03-06 16:06:14 +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 = {}, 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
|
2011-04-23 21:29:52 +00:00
|
|
|
end
|
2011-04-23 19:00:41 +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 function countCycles(x, cycles)
|
|
|
|
if type(x) == "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)
|
2012-10-29 22:26:49 +00:00
|
|
|
end
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
2011-04-23 21:29:52 +00:00
|
|
|
end
|
|
|
|
|
2022-05-20 23:24:44 +00:00
|
|
|
local function getId(ids, v)
|
|
|
|
local id = ids[v]
|
|
|
|
if not id then
|
|
|
|
local tv = type(v)
|
|
|
|
id = (ids[tv] or 0) + 1
|
|
|
|
ids[v], ids[tv] = id, id
|
|
|
|
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
|
|
|
local function puts(buf, str)
|
|
|
|
buf.n = buf.n + 1
|
|
|
|
buf[buf.n] = str
|
|
|
|
end
|
2016-03-29 20:14:10 +00:00
|
|
|
|
2022-05-20 23:24:44 +00:00
|
|
|
local function tabify(buf, level, options)
|
|
|
|
local newline = options and options.newline or "\n"
|
|
|
|
local indent = options and options.indent or " "
|
|
|
|
puts(buf, newline .. rep(indent, level))
|
2014-08-21 18:15:25 +00:00
|
|
|
end
|
2011-04-23 23:39:05 +00:00
|
|
|
|
2022-05-20 23:24:44 +00:00
|
|
|
local function putValue(v, buf, cycles, ids, level,
|
|
|
|
options)
|
|
|
|
|
|
|
|
if options and options.override then
|
|
|
|
local s = options.override(v)
|
|
|
|
if s ~= nil then
|
|
|
|
puts(buf, s)
|
|
|
|
return
|
|
|
|
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 tv = type(v)
|
|
|
|
if tv == 'string' then
|
|
|
|
puts(buf, smartQuote(escape(v)))
|
|
|
|
elseif tv == 'number' or tv == 'boolean' or tv == 'nil' or
|
|
|
|
tv == 'cdata' or tv == 'ctype' then
|
|
|
|
puts(buf, tostring(v))
|
2022-05-20 23:24:44 +00:00
|
|
|
elseif tv == 'table' and not ids[v] 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
|
|
|
local t = v
|
|
|
|
|
2022-05-20 23:24:44 +00:00
|
|
|
local depth = options and options.depth
|
|
|
|
if depth and level >= depth 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
|
|
|
puts(buf, '{...}')
|
|
|
|
else
|
2022-05-20 23:24:44 +00:00
|
|
|
if cycles[t] > 1 then puts(buf, fmt('<%d>', getId(ids, t))) 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 keys, keysLen, seqLen = getKeys(t)
|
|
|
|
|
2022-05-20 23:24:44 +00:00
|
|
|
local nextLevel = level + 1
|
(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, '{')
|
|
|
|
for i = 1, seqLen + keysLen do
|
|
|
|
if i > 1 then puts(buf, ',') end
|
|
|
|
if i <= seqLen then
|
|
|
|
puts(buf, ' ')
|
2022-05-20 23:24:44 +00:00
|
|
|
putValue(t[i], buf, cycles, ids, nextLevel, options)
|
(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
|
|
|
else
|
|
|
|
local k = keys[i - seqLen]
|
2022-05-20 23:24:44 +00:00
|
|
|
tabify(buf, level + 1, options)
|
(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 isIdentifier(k) then
|
|
|
|
puts(buf, k)
|
|
|
|
else
|
|
|
|
puts(buf, "[")
|
2022-05-20 23:24:44 +00:00
|
|
|
putValue(k, buf, cycles, ids, nextLevel, options)
|
(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, "]")
|
|
|
|
end
|
|
|
|
puts(buf, ' = ')
|
2022-05-20 23:24:44 +00:00
|
|
|
putValue(t[k], buf, cycles, ids, nextLevel, options)
|
(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
|
|
|
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
|
2022-05-20 23:24:44 +00:00
|
|
|
tabify(buf, level + 1, options)
|
(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, '<metatable> = ')
|
2022-05-20 23:24:44 +00:00
|
|
|
putValue(mt, buf, cycles, ids, nextLevel, options)
|
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
|
|
|
if keysLen > 0 or type(mt) == 'table' then
|
2022-05-20 23:24:44 +00:00
|
|
|
tabify(buf, level, options)
|
(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
|
|
|
elseif seqLen > 0 then
|
|
|
|
puts(buf, ' ')
|
|
|
|
end
|
|
|
|
|
|
|
|
puts(buf, '}')
|
|
|
|
end
|
2011-05-09 22:31:56 +00:00
|
|
|
|
2022-02-08 21:56:03 +00:00
|
|
|
else
|
2022-05-20 23:24:44 +00:00
|
|
|
puts(buf, fmt('<%s %d>', tv, getId(ids, v)))
|
2022-02-08 21:56:03 +00:00
|
|
|
end
|
2014-08-21 18:15:25 +00:00
|
|
|
end
|
2014-07-06 15:24:37 +00:00
|
|
|
|
2022-02-08 21:56:03 +00:00
|
|
|
|
|
|
|
|
2014-08-21 18:15:25 +00:00
|
|
|
|
|
|
|
function inspect.inspect(root, options)
|
(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-05-20 23:24:44 +00:00
|
|
|
local buf = { n = 0 }
|
|
|
|
putValue(root, buf, cycles, {}, 0, options)
|
2022-02-08 21:56:03 +00:00
|
|
|
|
2022-05-20 23:24:44 +00:00
|
|
|
return concat(buf)
|
2011-04-23 17:48:43 +00:00
|
|
|
end
|
|
|
|
|
2022-02-08 21:56:03 +00:00
|
|
|
setmetatable(inspect, {
|
|
|
|
__call = function(_, root, options)
|
|
|
|
return inspect.inspect(root, options)
|
|
|
|
end,
|
|
|
|
})
|
2012-11-03 14:17:14 +00:00
|
|
|
|
2011-04-23 17:50:11 +00:00
|
|
|
return inspect
|