diff options
Diffstat (limited to 'builtin/common/strict.lua')
| -rw-r--r-- | builtin/common/strict.lua | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/builtin/common/strict.lua b/builtin/common/strict.lua index ccde9676b..936ebb37b 100644 --- a/builtin/common/strict.lua +++ b/builtin/common/strict.lua @@ -1,9 +1,4 @@ - --- Always warn when creating a global variable, even outside of a function. --- This ignores mod namespaces (variables with the same name as the current mod). -local WARN_INIT = false - -local getinfo = debug.getinfo +local getinfo, rawget, rawset = debug.getinfo, rawget, rawset function core.global_exists(name) if type(name) ~= "string" then @@ -19,39 +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 - end - -- Ignore mod namespaces - if WARN_INIT and name ~= core.get_current_modname() then - core.log("warning", ("Global variable %q created at %s.") - :format(name, desc)) + 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) - |