Scripting|libcore: Accessing native/imported modules

A more convenient API.
skyjake · Nov 18, 2018 · adff2f6 · adff2f6
1 parent 0976a77
commit adff2f6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/doomsday/sdk/libcore/include/de/scriptsys/scriptsystem.h b/doomsday/sdk/libcore/include/de/scriptsys/scriptsystem.h
@@ -72,6 +72,15 @@ class DENG2_PUBLIC ScriptSystem : public System
 
     Record &nativeModule(String const &name);
 
+    /**
+     * Returns a native or an imported module.
+     *
+     * @param name  Name of the module.
+     *
+     * @return Module namespace.
+     */
+    Record &operator[](const String &nativeModuleName);
+
     /**
      * Returns a list of the names of all the existing native modules.
      *

diff --git a/doomsday/sdk/libcore/src/scriptsys/scriptsystem.cpp b/doomsday/sdk/libcore/src/scriptsys/scriptsystem.cpp
@@ -91,7 +91,7 @@ DENG2_PIMPL(ScriptSystem)
 
     ~Impl()
     {
-        qDeleteAll(modules.values());
+        qDeleteAll(modules);
     }
 
     static Value *Function_ImportPath(Context &, Function::ArgumentValues const &)
@@ -216,6 +216,24 @@ Record &ScriptSystem::nativeModule(String const &name)
     return *foundNative.value();
 }
 
+Record &ScriptSystem::operator[](const String &name)
+{
+    if (nativeModuleExists(name))
+    {
+        return nativeModule(name);
+    }
+    // Imported modules.
+    {
+        const auto &mods = d->modules;
+        auto found = mods.find(name);
+        if (found != mods.end())
+        {
+            return found.value()->names();
+        }
+    }
+    throw NotFoundError("ScriptSystem::operator[]", "Module not found: " + name);
+}
+
 bool ScriptSystem::nativeModuleExists(const String &name) const
 {
     DENG2_GUARD_FOR(d->nativeModules, G);