Changeset 6774 for code/branches/gamestates3/src/libraries/core

Timestamp:

Apr 23, 2010, 11:46:11 AM (15 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!)

Location:

code/branches/gamestates3/src/libraries/core

Files:

• LuaState.cc (modified) (2 diffs)
• LuaState.h (modified) (1 diff)

code/branches/gamestates3/src/libraries/core/LuaState.cc

@@ -53 +53 @@
     DeclareToluaInterface(Core);
 
-    LuaState::LuaState()
+    LuaState::LuaState(bool bStrict)
         : bIsRunning_(false)
         , includeParseFunction_(NULL)
@@ -82 +82 @@
         tolua_pushusertype(luaState_, static_cast<void*>(this), "orxonox::LuaState");
         lua_setglobal(luaState_, "luaState");
+
+        // Strict.lua ensures that global variables are not declared inside a function scope
+        if (bStrict)
+        {
+            if (!this->doFile("Strict.lua"))
+                ThrowException(InitialisationFailed, "Running Strict.lua failed");
+        }
+        else
+        {
+            // Add dummy function for declaring global variables
+            this->doString("global = function(...) end");
+        }
 
         // Parse init script

code/branches/gamestates3/src/libraries/core/LuaState.h

@@ -68 +68 @@
     { // tolua_export
     public:
-        LuaState();
+        LuaState(bool bStrict = true);
         ~LuaState();