GabrielTofvesson/cc-utilities
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix odd persistent global state bug

Browse Source
This commit is contained in:
Gabriel Tofvesson 2024-10-14 14:03:51 +02:00
parent 6bb6c0e822
commit f185e40f49
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
itemcontroller.lua
View File

@ -1,7 +1,9 @@
local Logging = require("logging")
Logging.resetAll()
local Chest = require("storage.chest") local Chest = require("storage.chest")
local ItemGroup = require("storage.itemgroup") local ItemGroup = require("storage.itemgroup")
local Storage = require("storage") local Storage = require("storage")
local Logging = require("logging")
local Text = require("gfx.text") local Text = require("gfx.text")
local List = require("gfx.list") local List = require("gfx.list")
local Event = require("gfx.event") local Event = require("gfx.event")

15
logging.lua
View File

@ -139,21 +139,19 @@ local function _simpleStringify(inValue, builder, ignoreGlobals, skipFunctions,
local isPlain = plain or LogPlain.is(inValue) local isPlain = plain or LogPlain.is(inValue)
local isDeep = plain or LogPlain.isDeep(inValue) local isDeep = plain or LogPlain.isDeep(inValue)
if type(value) == "table" then if type(value) == "table" then
if not isPlain then table.insert(builder, "<")
table.insert(builder, "<")
end
if ignoreGlobals and G_[value] ~= nil then if ignoreGlobals and G_[value] ~= nil then
table.insert(builder, "_G.") table.insert(builder, "_G.")
table.insert(builder, G_[value]) table.insert(builder, G_[value])
elseif RecursionSentinel.isSentinel(value) then elseif RecursionSentinel.isSentinel(value) then
if isPlain then if isPlain then
table.insert(builder, "<recurse_") table.insert(builder, "recurse_")
table.insert(builder, tostring(value.index)) table.insert(builder, tostring(value.index))
table.insert(builder, ">")
else else
table.insert(builder, "recurse ") table.insert(builder, "recurse ")
table.insert(builder, tostring(value.value)) table.insert(builder, tostring(value.value))
end end
table.insert(builder, ">")
else else
if not isPlain then if not isPlain then
table.insert(builder, tostring(value)) table.insert(builder, tostring(value))
@ -183,9 +181,6 @@ local function _simpleStringify(inValue, builder, ignoreGlobals, skipFunctions,
end end
table.insert(builder, "}") table.insert(builder, "}")
end end
if not isPlain then
table.insert(builder, ">")
end
elseif type(value) == "string" then elseif type(value) == "string" then
if not isPlain then if not isPlain then
table.insert(builder, "\"") table.insert(builder, "\"")
@ -276,4 +271,8 @@ function Logging.getGlobalLogger()
return _G._GLOBAL_LOGGER return _G._GLOBAL_LOGGER
end end
function Logging.resetAll()
_G._GLOBAL_LOGGER = nil
end
return Logging return Logging