Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug where cached files would incorrectly appear to not have been

Browse Source 
found.
This commit is contained in:
Bruce Hill 2018-12-31 00:27:49 -08:00
parent faaf5311c8
commit dff2c1c915
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nomsu_environment.lua
View File

@ -328,6 +328,7 @@ local nomsu_environment = Importer({
local lua_filename = filename:gsub("%.nom$", ".lua") local lua_filename = filename:gsub("%.nom$", ".lua")
if environment.FILE_CACHE[filename] then if environment.FILE_CACHE[filename] then
import_to_1_from(environment, environment.FILE_CACHE[filename], prefix) import_to_1_from(environment, environment.FILE_CACHE[filename], prefix)
did_anything = true
_continue_1 = true _continue_1 = true
break break
end end
@ -356,7 +357,7 @@ local nomsu_environment = Importer({
end end
end end
if not (did_anything) then if not (did_anything) then
error("File not found: " .. tostring(path), 0) error("File not found: " .. tostring(path) .. "\n(searched in " .. tostring(package.nomsupath) .. ")", 0)
end end
import_to_1_from(environment, mod, prefix) import_to_1_from(environment, mod, prefix)
environment.FILE_CACHE[path] = mod environment.FILE_CACHE[path] = mod

3
nomsu_environment.moon
View File

@ -182,6 +182,7 @@ nomsu_environment = Importer{
-- Need to check here to prevent re-running files -- Need to check here to prevent re-running files
if environment.FILE_CACHE[filename] if environment.FILE_CACHE[filename]
import_to_1_from(environment, environment.FILE_CACHE[filename], prefix) import_to_1_from(environment, environment.FILE_CACHE[filename], prefix)
did_anything = true
continue continue
-- TODO: don't automatically use precompiled version? -- TODO: don't automatically use precompiled version?
code = if optimization != 0 and Files.read(lua_filename) code = if optimization != 0 and Files.read(lua_filename)
@ -195,7 +196,7 @@ nomsu_environment = Importer{
did_anything = true did_anything = true
break break
unless did_anything unless did_anything
error("File not found: #{path}", 0) error("File not found: #{path}\n(searched in #{package.nomsupath})", 0)
import_to_1_from(environment, mod, prefix) import_to_1_from(environment, mod, prefix)
environment.FILE_CACHE[path] = mod environment.FILE_CACHE[path] = mod
_currently_running_files\remove! _currently_running_files\remove!