From 17fc0a0e3870030dc5db5e14c0a798b65ef7e557 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Sat, 15 Dec 2018 15:14:26 -0800
Subject: [PATCH] Fix for files getting run twice by (use "")

---
 nomsu_environment.lua  | 34 +++++++++++++++++++++++-----------
 nomsu_environment.moon |  4 ++++
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/nomsu_environment.lua b/nomsu_environment.lua
index 93487aa..71d7d06 100644
--- a/nomsu_environment.lua
+++ b/nomsu_environment.lua
@@ -322,18 +322,30 @@ local nomsu_environment = Importer({
             break
           end
           for _index_0 = 1, #files do
-            local filename = files[_index_0]
-            local lua_filename = filename:gsub("%.nom$", ".lua")
-            local code
-            if optimization ~= 0 and Files.read(lua_filename) then
-              local file = Files.read(lua_filename)
-              code = LuaCode:from(Source(filename, 1, #file), file)
-            else
-              local file = Files.read(filename)
-              code = NomsuCode:from(Source(filename, 1, #file), file)
+            local _continue_1 = false
+            repeat
+              local filename = files[_index_0]
+              local lua_filename = filename:gsub("%.nom$", ".lua")
+              if environment.FILE_CACHE[filename] then
+                import_to_1_from(environment, environment.FILE_CACHE[filename], prefix)
+                _continue_1 = true
+                break
+              end
+              local code
+              if optimization ~= 0 and Files.read(lua_filename) then
+                local file = Files.read(lua_filename)
+                code = LuaCode:from(Source(filename, 1, #file), file)
+              else
+                local file = Files.read(filename)
+                code = NomsuCode:from(Source(filename, 1, #file), file)
+              end
+              environment.run_1_in(code, mod)
+              did_anything = true
+              _continue_1 = true
+            until true
+            if not _continue_1 then
+              break
             end
-            environment.run_1_in(code, mod)
-            did_anything = true
           end
           break
         end
diff --git a/nomsu_environment.moon b/nomsu_environment.moon
index cc059b5..6986b77 100644
--- a/nomsu_environment.moon
+++ b/nomsu_environment.moon
@@ -179,6 +179,10 @@ nomsu_environment = Importer{
             continue unless files
             for filename in *files
                 lua_filename = filename\gsub("%.nom$", ".lua")
+                -- Need to check here to prevent re-running files
+                if environment.FILE_CACHE[filename]
+                    import_to_1_from(environment, environment.FILE_CACHE[filename], prefix)
+                    continue
                 -- TODO: don't automatically use precompiled version?
                 code = if optimization != 0 and Files.read(lua_filename)
                     -- TODO: use a checksum?