Fixed|Scripting: Functions' global namespaces

Each function remembers the global namespace it was defined in, in case the function accesses those globals when it's run.
skyjake · Nov 24, 2019 · a6e1c03 · a6e1c03
1 parent 748f9dd
commit a6e1c03
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/doomsday/sdk/libcore/src/scriptsys/function.cpp b/doomsday/sdk/libcore/src/scriptsys/function.cpp
@@ -331,7 +331,7 @@ void Function::recordBeingDeleted(Record &DENG2_DEBUG_ONLY(record))
     // The namespace of the record is being deleted.
     DENG2_ASSERT(d->globals == &record);
 
-    d->globals = 0;
+    d->globals = nullptr;
 }
 
 void Function::registerNativeEntryPoint(String const &name, Function::NativeEntryPoint entryPoint)

diff --git a/doomsday/sdk/libcore/src/scriptsys/functionstatement.cpp b/doomsday/sdk/libcore/src/scriptsys/functionstatement.cpp
@@ -63,7 +63,8 @@ void FunctionStatement::execute(Context &context) const
     Evaluator &eval = context.evaluator();
 
     // Set the function's namespace.
-    _function->setGlobals(&context.process().globals());
+    Record &globals = context.process().globals();
+    _function->setGlobals(&globals);
 
     // Variable that will store the function.
     eval.evaluateTo<RefValue>(_identifier);

diff --git a/doomsday/sdk/libcore/src/scriptsys/process.cpp b/doomsday/sdk/libcore/src/scriptsys/process.cpp
@@ -106,23 +106,21 @@ DENG2_PIMPL(Process)
 
     /// Fast forward to a suitable catch statement for @a err.
     /// @return  @c true, if suitable catch statement found.
-    bool jumpIntoCatch(Error const &err)
+    bool jumpIntoCatch(const Error &err)
     {
         dint level = 0;
 
         // Proceed along default flow.
         for (context().proceed(); context().current(); context().proceed())
         {
-            Statement const *statement = context().current();
-            TryStatement const *tryStatement = dynamic_cast<TryStatement const *>(statement);
-            if (tryStatement)
+            const Statement *statement = context().current();
+            if (const auto *tryStatement = dynamic_cast<const TryStatement *>(statement))
             {
                 // Encountered a nested try statement.
                 ++level;
                 continue;
             }
-            CatchStatement const *catchStatement = dynamic_cast<CatchStatement const *>(statement);
-            if (catchStatement)
+            if (const auto *catchStatement = dynamic_cast<const CatchStatement *>(statement))
             {
                 if (!level)
                 {
@@ -437,6 +435,15 @@ void Process::namespaces(Namespaces &spaces) const
 
 Record &Process::globals()
 {
+    // Find the global namespace currently in effect.
+    DENG2_FOR_EACH_CONST_REVERSE(Impl::ContextStack, i, d->stack)
+    {
+        Context &context = **i;
+        if (context.type() == Context::GlobalNamespace || context.type() == Context::BaseProcess)
+        {
+            return context.names();
+        }
+    }
     return d->stack[0]->names();
 }