Skip to content

Commit

Permalink
Optimize strict.lua (minetest#12495)
Browse files Browse the repository at this point in the history
Co-authored-by: sfan5 <[email protected]>
  • Loading branch information
appgurueu and sfan5 committed Jul 2, 2022
1 parent 9ac3b52 commit 3e30858
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions builtin/common/strict.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local getinfo = debug.getinfo
local getinfo, rawget, rawset = debug.getinfo, rawget, rawset

function core.global_exists(name)
if type(name) ~= "string" then
Expand All @@ -14,33 +14,33 @@ local declared = {}
local warned = {}

function meta:__newindex(name, value)
if declared[name] then
return
end
local info = getinfo(2, "Sl")
local desc = ("%s:%d"):format(info.short_src, info.currentline)
if not declared[name] then
local warn_key = ("%s\0%d\0%s"):format(info.source,
info.currentline, name)
if not warned[warn_key] and info.what ~= "main" and
info.what ~= "C" then
core.log("warning", ("Assignment to undeclared "..
"global %q inside a function at %s.")
local warn_key = ("%s\0%d\0%s"):format(info.source, info.currentline, name)
if not warned[warn_key] and info.what ~= "main" and info.what ~= "C" then
core.log("warning", ("Assignment to undeclared global %q inside a function at %s.")
:format(name, desc))
warned[warn_key] = true
end
declared[name] = true
warned[warn_key] = true
end
rawset(self, name, value)
declared[name] = true
end


function meta:__index(name)
if declared[name] then
return
end
local info = getinfo(2, "Sl")
local warn_key = ("%s\0%d\0%s"):format(info.source, info.currentline, name)
if not declared[name] and not warned[warn_key] and info.what ~= "C" then
if not warned[warn_key] and info.what ~= "C" then
core.log("warning", ("Undeclared global variable %q accessed at %s:%s")
:format(name, info.short_src, info.currentline))
warned[warn_key] = true
end
return rawget(self, name)
end

setmetatable(_G, meta)

0 comments on commit 3e30858

Please sign in to comment.