Updating to v6.15, which includes "external (...)" instead of separate

'externally' versions of stuff, and some auto-formatting.

1 files changed, 6 insertions, 12 deletions

diff --git a/nomsu_environment.lua b/nomsu_environment.lua
index 9952a65..5a055c3 100644
--- a/nomsu_environment.lua
+++ b/nomsu_environment.lua
@@ -99,7 +99,6 @@ nomsu_environment = Importer({
   tostring = tostring,
   string = string,
   xpcall = xpcall,
-  module = module,
   say = print,
   loadfile = loadfile,
   rawset = rawset,
@@ -215,7 +214,7 @@ nomsu_environment = Importer({
     end
     return tree
   end,
-  load_module = function(self, package_name)
+  Module = function(self, package_name)
     local path
     if package_name:match("%.nom$") or package_name:match("%.lua") then
       path = package_name
@@ -228,7 +227,7 @@ nomsu_environment = Importer({
     end
     path = path:gsub("^%./", "")
     do
-      local ret = package.loaded[package_name] or package.loaded[path]
+      local ret = package.nomsuloaded[package_name] or package.nomsuloaded[path]
       if ret then
         return ret
       end
@@ -250,12 +249,12 @@ nomsu_environment = Importer({
     _currently_running_files:add(path)
     mod:run(code)
     _currently_running_files:pop()
-    package.loaded[package_name] = mod
-    package.loaded[path] = mod
+    package.nomsuloaded[package_name] = mod
+    package.nomsuloaded[path] = mod
     return mod
   end,
   use = function(self, package_name)
-    local mod = self:load_module(package_name)
+    local mod = self:Module(package_name)
     local imports = assert(_module_imports[self])
     for k, v in pairs(mod) do
       imports[k] = v
@@ -267,7 +266,7 @@ nomsu_environment = Importer({
     return mod
   end,
   export = function(self, package_name)
-    local mod = self:load_module(package_name)
+    local mod = self:Module(package_name)
     local imports = assert(_module_imports[self])
     for k, v in pairs(_module_imports[mod]) do
       if rawget(imports, k) == nil then
@@ -290,11 +289,6 @@ nomsu_environment = Importer({
         self.COMPILE_RULES[k] = v
       end
     end
-    for k, v in pairs(mod.TESTS) do
-      if rawget(self.TESTS, k) == nil then
-        self.TESTS[k] = v
-      end
-    end
     return mod
   end,
   run = function(self, to_run)