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

Removed automatic file caching.

Browse Source
This commit is contained in:
Bruce Hill 2019-01-08 16:38:34 -08:00
parent 1d2bd858fd
commit 1f47f1aa28
3 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
files.lua
View File

@ -20,9 +20,6 @@ run_cmd = function(cmd)
return lines return lines
end end
local _SPOOFED_FILES = { } local _SPOOFED_FILES = { }
local _FILE_CACHE = setmetatable({ }, {
__index = _SPOOFED_FILES
})
local _BROWSE_CACHE = { } local _BROWSE_CACHE = { }
local _anon_number = 0 local _anon_number = 0
Files.spoof = function(filename, contents) Files.spoof = function(filename, contents)
@ -33,16 +30,11 @@ Files.spoof = function(filename, contents)
_SPOOFED_FILES[filename] = contents _SPOOFED_FILES[filename] = contents
return filename return filename
end end
Files.read = function(filename, skip_cache) Files.read = function(filename)
if skip_cache == nil then do
skip_cache = nil local contents = _SPOOFED_FILES[filename]
end if contents then
if not (skip_cache) then return contents
do
local file_contents = _FILE_CACHE[filename]
if file_contents then
return file_contents or nil
end
end end
end end
if filename == 'stdin' or filename == '-' then if filename == 'stdin' or filename == '-' then
@ -57,9 +49,6 @@ Files.read = function(filename, skip_cache)
end end
local contents = file:read("*a") local contents = file:read("*a")
file:close() file:close()
if not (skip_cache) then
_FILE_CACHE[filename] = contents
end
return contents or nil return contents or nil
end end
local match, gsub local match, gsub

10
files.moon
View File

@ -10,7 +10,6 @@ run_cmd = (cmd)->
return lines return lines
_SPOOFED_FILES = {} _SPOOFED_FILES = {}
_FILE_CACHE = setmetatable {}, __index:_SPOOFED_FILES
_BROWSE_CACHE = {} _BROWSE_CACHE = {}
-- Create a fake file and put it in the cache -- Create a fake file and put it in the cache
@ -23,10 +22,9 @@ Files.spoof = (filename, contents)->
return filename return filename
-- Read a file's contents -- Read a file's contents
Files.read = (filename, skip_cache=nil)-> Files.read = (filename)->
unless skip_cache if contents = _SPOOFED_FILES[filename]
if file_contents = _FILE_CACHE[filename] return contents
return file_contents or nil
if filename == 'stdin' or filename == '-' if filename == 'stdin' or filename == '-'
contents = io.read('*a') contents = io.read('*a')
Files.spoof('stdin', contents) Files.spoof('stdin', contents)
@ -36,8 +34,6 @@ Files.read = (filename, skip_cache=nil)->
return nil unless file return nil unless file
contents = file\read("*a") contents = file\read("*a")
file\close! file\close!
unless skip_cache
_FILE_CACHE[filename] = contents
return contents or nil return contents or nil
{:match, :gsub} = string {:match, :gsub} = string

6
lib/os.nom
View File

@ -30,7 +30,7 @@ external $(sh> $) = $os.execute
test: test:
read file "lib/os.nom" read file "lib/os.nom"
externally (read file $filename) means (=lua "Files.read(\$filename, true)") external $(read file $filename) = $Files.read
externally [ externally [
write to file $filename $text, to file $filename write $text write to file $filename $text, to file $filename write $text
write $text to file $filename write $text to file $filename
@ -54,5 +54,5 @@ externally (source lines of $tree) means:
..: add ($file, line $) ..: add ($file, line $)
], joined with "\n" ], joined with "\n"
externally (spoof file $text) means ($Files.spoof $text) external $(spoof file $text) = $Files.spoof
externally (spoof file $filename = $text) means ($Files.spoof $filename $text) external $(spoof file $filename = $text) = $Files.spoof