Changeset 6774 for code/branches/gamestates3/data/lua

Timestamp:

Apr 23, 2010, 11:46:11 AM (14 years ago)

Author:

rgrieder

Message:

Activated Strict.lua
That means you can no longer assign to or access an undeclared global variable on function scope.
Declaring: either assign anything to the variable (including nil) on file scope
or use the function global("myVar", "myVar2", …, "myVarN") (mind the strings!)

File:

• code/branches/gamestates3/data/lua/Strict.lua (modified) (3 diffs)

code/branches/gamestates3/data/lua/Strict.lua

@@ -13 +13 @@
 end
 
-__STRICT = false
+__STRICT = true
 mt.__declared = {}
 
 mt.__newindex = function (t, n, v)
-  if __STRICT and not mt.__declared[n] then
-    local d = debug.getinfo(2, "S")
-    local w = d and d.what or "C"
-    if w ~= "main" and w ~= "C" then
-      error("assign to undeclared variable '"..n.."'", 2)
+  if not mt.__declared[n] then
+    if __STRICT then
+      local d = debug.getinfo(2, "S")
+      local w = d and d.what or "C"
+      if w ~= "main" and w ~= "C" then
+        error("Assigning to undeclared global variable '"..n.."'", 2)
+      end
     end
     mt.__declared[n] = true
@@ -29 +31 @@
   
 mt.__index = function (t, n)
-  if not mt.__declared[n] and debug.getinfo(2, "S").what ~= "C" then
-    error("variable '"..n.."' is not declared", 2)
+  if not mt.__declared[n] then
+    local d = debug.getinfo(2, "S")
+    local w = d and d.what or "C"
+    if w ~= "C" then
+      error("Global variable '"..n.."' was not declared", 2)
+    else
+      mt.__declared[n] = true
+    end
   end
   return rawget(t, n)
@@ -36 +44 @@
 
 function global(...)
-   for _, v in ipairs{...} do mt.__declared[v] = true end
+  for _, v in ipairs{...} do
+    mt.__declared[v] = true
+  end
 end