core.formspec_escape: Restore backwards compat

[dragonfireclient.git] / builtin / common / strict.lua

diff --git a/builtin/common/strict.lua b/builtin/common/strict.lua
index 91d1f5b19f9bb17683a21197bd2e4f5af100f09a..f46234dc6b9006a302f2ed7d516b7ceaf15bebd4 100644 (file)
--- a/builtin/common/strict.lua
+++ b/builtin/common/strict.lua
@@ -1,11 +1,10 @@
+local getinfo = debug.getinfo
 
--- 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 function warn(message)
-       print(os.date("%H:%M:%S: WARNING: ")..message)
+function core.global_exists(name)
+       if type(name) ~= "string" then
+               error("core.global_exists: " .. tostring(name) .. " is not a string")
+       end
+       return rawget(_G, name) ~= nil
 end
 
 
@@ -15,35 +14,29 @@ local declared = {}
 local warned = {}
 
 function meta:__newindex(name, value)
-       local info = debug.getinfo(2, "Sl")
+       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
-                       minetest.log("error", ("Assignment to undeclared "..
+                       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 (not core.get_current_modname or
-                       name ~= core.get_current_modname()) then
-               warn(("Global variable %q created at %s.")
-                       :format(name, desc))
-       end
        rawset(self, name, value)
 end
 
 
 function meta:__index(name)
-       local info = debug.getinfo(2, "Sl")
+       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
-               warn(("Undeclared global variable %q accessed at %s:%s")
+               core.log("warning", ("Undeclared global variable %q accessed at %s:%s")
                                :format(name, info.short_src, info.currentline))
                warned[warn_key] = true
        end
@@ -51,4 +44,3 @@ function meta:__index(name)
 end
 
 setmetatable(_G, meta)
-