This commit is contained in:
Lars Mueller 2021-04-21 21:29:22 +02:00
parent 1ed07d6015
commit 7e00e3a237
2 changed files with 97 additions and 97 deletions

@ -78,7 +78,7 @@ end
local load_module, get_resource, loadfile_exports
modlib = setmetatable({
-- TODO bump on release
version = 64,
version = 65,
modname = minetest and minetest.get_current_modname(),
dir_delim = rawget(_G, "DIR_DELIM") or "/",
_RG = setmetatable({}, {

@ -3,140 +3,140 @@ local files = {}
local metatable = {__index = lua_log_file}
function lua_log_file.new(file_path, root)
local self = setmetatable({file_path = assert(file_path), root = root}, metatable)
if minetest then
files[self] = true
end
return self
local self = setmetatable({file_path = assert(file_path), root = root}, metatable)
if minetest then
files[self] = true
end
return self
end
function lua_log_file:load()
-- Bytecode is blocked by the engine
local read = assert(loadfile(self.file_path))
local env = {}
setfenv(read, env)
read()
env.R = env.R or {{}}
self.reference_count = #env.R
self.root = env.R[1]
self.references = modlib.table.flip(env.R)
-- Bytecode is blocked by the engine
local read = assert(loadfile(self.file_path))
local env = {}
setfenv(read, env)
read()
env.R = env.R or {{}}
self.reference_count = #env.R
self.root = env.R[1]
self.references = modlib.table.flip(env.R)
end
function lua_log_file:open()
self.file = io.open(self.file_path, "a+")
self.file = io.open(self.file_path, "a+")
end
function lua_log_file:init()
if modlib.file.exists(self.file_path) then
self:load()
self:_rewrite()
self:open()
return
end
self:open()
self.root = {}
self:_write()
if modlib.file.exists(self.file_path) then
self:load()
self:_rewrite()
self:open()
return
end
self:open()
self.root = {}
self:_write()
end
function lua_log_file:log(statement)
self.file:write(statement)
self.file:write"\n"
self.file:write(statement)
self.file:write"\n"
end
function lua_log_file:flush()
self.file:flush()
self.file:flush()
end
function lua_log_file:close()
self.file:close()
self.file = nil
files[self] = nil
self.file:close()
self.file = nil
files[self] = nil
end
if minetest then
minetest.register_on_shutdown(function()
for self in pairs(files) do
self.file:close()
end
end)
minetest.register_on_shutdown(function()
for self in pairs(files) do
self.file:close()
end
end)
end
-- TODO use shorthand notations
function lua_log_file:dump(value)
if value == nil then
return "nil"
end
if value == true then
return "true"
end
if value == false then
return "false"
end
if value ~= value then
-- nan
return "0/0"
end
local _type = type(value)
if _type == "number" then
return ("%.17g"):format(value)
end
if self.references[value] then
return "R[" .. self.references[value] .. "]"
end
self.reference_count = self.reference_count + 1
local reference = self.reference_count
self.references[value] = reference
local formatted
if _type == "string" then
formatted = ("%q"):format(value)
elseif _type == "table" then
local entries = {}
for _, value in ipairs(value) do
table.insert(entries, self:dump(value))
end
for key, value in pairs(value) do
if type(key) ~= "number" or key % 1 ~= 0 or key < 1 or key > #value then
table.insert(entries, "[" .. self:dump(key) .. "]=" .. self:dump(value))
end
end
formatted = "{" .. table.concat(entries, ";") .. "}"
else
error("unsupported type: " .. _type)
end
local key = "R[" .. reference .."]"
self:log(key .. "=" .. formatted)
return key
if value == nil then
return "nil"
end
if value == true then
return "true"
end
if value == false then
return "false"
end
if value ~= value then
-- nan
return "0/0"
end
local _type = type(value)
if _type == "number" then
return ("%.17g"):format(value)
end
if self.references[value] then
return "R[" .. self.references[value] .. "]"
end
self.reference_count = self.reference_count + 1
local reference = self.reference_count
self.references[value] = reference
local formatted
if _type == "string" then
formatted = ("%q"):format(value)
elseif _type == "table" then
local entries = {}
for _, value in ipairs(value) do
table.insert(entries, self:dump(value))
end
for key, value in pairs(value) do
if type(key) ~= "number" or key % 1 ~= 0 or key < 1 or key > #value then
table.insert(entries, "[" .. self:dump(key) .. "]=" .. self:dump(value))
end
end
formatted = "{" .. table.concat(entries, ";") .. "}"
else
error("unsupported type: " .. _type)
end
local key = "R[" .. reference .."]"
self:log(key .. "=" .. formatted)
return key
end
function lua_log_file:set(table, key, value)
table[key] = value
if not self.references[table] then
error"orphan table"
end
self:log(self:dump(table) .. "[" .. self:dump(key) .. "]=" .. self:dump(value))
table[key] = value
if not self.references[table] then
error"orphan table"
end
self:log(self:dump(table) .. "[" .. self:dump(key) .. "]=" .. self:dump(value))
end
function lua_log_file:set_root(key, value)
return self:set(self.root, key, value)
return self:set(self.root, key, value)
end
function lua_log_file:_write()
self.references = {}
self.reference_count = 0
self:log"R={}"
self:dump(self.root)
self.references = {}
self.reference_count = 0
self:log"R={}"
self:dump(self.root)
end
function lua_log_file:_rewrite()
self.file = io.open(self.file_path, "w+")
self:_write()
self.file:close()
self.file = io.open(self.file_path, "w+")
self:_write()
self.file:close()
end
function lua_log_file:rewrite()
if self.file then
self.file:close()
end
self:_rewrite()
self.file = io.open(self.file_path, "a+")
if self.file then
self.file:close()
end
self:_rewrite()
self.file = io.open(self.file_path, "a+")
end