codinget
/
moonbuild
mirror of https://github.com/natnat-mc/moonbuild
1
0
Fork 0
Code Releases Activity

added fs cache, closes #9

Browse Source
alfons-task
Nathan DECHER 5 years ago
parent d2db470347
commit a26a1500df
4 changed files with 252 additions and 57 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      bin/moonbuild.moon
  2. 149
      moonbuild.lua
  3. 33
      moonbuild/fscache.moon
  4. 44
      moonbuild/fsutil.moon

5
bin/moonbuild.moon
Unescape View File

@ -8,6 +8,7 @@ import truncate_traceback, rewrite_traceback from require 'moonscript.errors'
import trim from require 'moonscript.util'
util = require 'moonbuild.util'
import freezecache, invalidatecache from require 'moonbuild.fsutil'
import exists, mtime, run, min, max, first, flatten, match, patsubst, sortedpairs from util
import insert, concat from table
@ -30,7 +31,7 @@ pcall= (fn, ...) ->
rewrite = (err) ->
trace = debug.traceback '', 2
trunc = truncate_traceback trim trace
rewrite_traceback trunc, err
(rewrite_traceback trunc, err) or trace
xpcall fn, rewrite, ...
-- command object
@ -92,6 +93,7 @@ class BuildObject
print "Building #{@name} as #{name}"
else
print "Building #{name}"
freezecache file for file in *outs
ok, err = pcall ->
@.fn
ins: ins
@ -99,6 +101,7 @@ class BuildObject
infile: ins[1]
outfile: outs[1]
name: name
invalidatecache file for file in *outs
error "Can't build #{@name}: lua error\n#{err}" unless ok
for f in *outs
error "Can't build #{@name}: output file #{f} not created" unless exists f

149
moonbuild.lua
Unescape View File

@ -1,11 +1,70 @@
do
do
local _ENV = _ENV
package.preload[ "moonbuild.fscache" ] = function( ... ) local arg = _G.arg;
local attributes, dir
do
local _obj_0 = require('lfs')
attributes, dir = _obj_0.attributes, _obj_0.dir
end
local unpack = unpack or table.unpack
local FROZEN
FROZEN = function() end
local makecached
makecached = function(fn)
local cache = { }
local invalidate
invalidate = function(val)
cache[val] = nil
end
local freeze
freeze = function(val)
cache[val] = FROZEN
end
local reset
reset = function()
cache = { }
end
local get
get = function(val)
local cached = cache[val]
if cached ~= FROZEN and cached ~= nil then
return unpack(cached)
end
local ret = {
fn(val)
}
if cached ~= FROZEN then
cache[val] = ret
end
return unpack(ret)
end
return setmetatable({
get = get,
invalidate = invalidate,
freeze = freeze,
reset = reset
}, {
__call = function(self, val)
return get(val)
end
})
end
return {
attributes = makecached(attributes),
dir = makecached(dir)
}
end
end
do
local _ENV = _ENV
package.preload[ "moonbuild.fsutil" ] = function( ... ) local arg = _G.arg;
local dir, attributes
do
local _obj_0 = require('lfs')
local _obj_0 = require('moonbuild.fscache')
dir, attributes = _obj_0.dir, _obj_0.attributes
end
local gmatch, match, gsub, sub
@ -13,16 +72,53 @@ do
local _obj_0 = string
gmatch, match, gsub, sub = _obj_0.gmatch, _obj_0.match, _obj_0.gsub, _obj_0.sub
end
local insert, concat
local insert, remove, concat
do
local _obj_0 = table
insert, concat = _obj_0.insert, _obj_0.concat
insert, remove, concat = _obj_0.insert, _obj_0.remove, _obj_0.concat
end
local normalizepath
normalizepath = function(file)
local parts
do
local _accum_0 = { }
local _len_0 = 1
for part in gmatch(file, '[^/]+') do
_accum_0[_len_0] = part
_len_0 = _len_0 + 1
end
parts = _accum_0
end
local absolute = (sub(file, 1, 1)) == '/'
for i = 1, #parts do
local _continue_0 = false
repeat
if parts[i] == '.' then
remove(parts, i)
i = i - 1
_continue_0 = true
break
end
if parts[i] == '..' and i ~= 1 then
remove(parts, i)
remove(parts, i - 1)
i = i - 2
_continue_0 = true
break
end
_continue_0 = true
until true
if not _continue_0 then
break
end
end
return (absolute and '/' or '') .. concat(parts, '/')
end
local ls
ls = function(d)
local _accum_0 = { }
local _len_0 = 1
for f in dir(d) do
for f in dir(normalizepath(d)) do
if f ~= '.' and f ~= '..' then
_accum_0[_len_0] = f
_len_0 = _len_0 + 1
@ -37,7 +133,7 @@ lswithpath = function(d)
end
local _accum_0 = { }
local _len_0 = 1
for f in dir(d) do
for f in dir(normalizepath(d)) do
if f ~= '.' and f ~= '..' then
_accum_0[_len_0] = d .. '/' .. f
_len_0 = _len_0 + 1
@ -47,16 +143,16 @@ lswithpath = function(d)
end
local exists
exists = function(f)
return (attributes(f)) ~= nil
return (attributes(normalizepath(f))) ~= nil
end
local isdir
isdir = function(f)
local a = attributes(f)
local a = attributes(normalizepath(f))
return a and a.mode == 'directory' or false
end
local mtime
mtime = function(f)
local a = attributes(f)
local a = attributes(normalizepath(f))
return a and a.modification
end
local matchglob
@ -152,11 +248,31 @@ wildcard = function(glob)
return { }
end
end
local parentdir
parentdir = function(file)
return normalizepath(file .. '/..')
end
local freezecache
freezecache = function(file)
dir.freeze(file)
dir.freeze(parentdir(file))
return attributes.invalidate(file)
end
local invalidatecache
invalidatecache = function(file)
dir.invalidate(file)
dir.invalidate(parentdir(file))
return attributes.invalidate(file)
end
return {
wildcard = wildcard,
exists = exists,
isdir = isdir,
mtime = mtime
mtime = mtime,
normalizepath = normalizepath,
parentdir = parentdir,
freezecache = freezecache,
invalidatecache = invalidatecache
}
end
@ -570,6 +686,11 @@ end
local trim
trim = require('moonscript.util').trim
local util = require('moonbuild.util')
local freezecache, invalidatecache
do
local _obj_0 = require('moonbuild.fsutil')
freezecache, invalidatecache = _obj_0.freezecache, _obj_0.invalidatecache
end
local exists, mtime, run, min, max, first, flatten, match, patsubst, sortedpairs
exists, mtime, run, min, max, first, flatten, match, patsubst, sortedpairs = util.exists, util.mtime, util.run, util.min, util.max, util.first, util.flatten, util.match, util.patsubst, util.sortedpairs
local insert, concat
@ -602,7 +723,7 @@ pcall = function(fn, ...)
rewrite = function(err)
local trace = debug.traceback('', 2)
local trunc = truncate_traceback(trim(trace))
return rewrite_traceback(trunc, err)
return (rewrite_traceback(trunc, err)) or trace
end
return xpcall(fn, rewrite, ...)
end
@ -721,6 +842,10 @@ do
else
print("Building " .. tostring(name))
end
for _index_0 = 1, #outs do
local file = outs[_index_0]
freezecache(file)
end
local ok, err = pcall(function()
return self.fn({
ins = ins,
@ -730,6 +855,10 @@ do
name = name
})
end)
for _index_0 = 1, #outs do
local file = outs[_index_0]
invalidatecache(file)
end
if not (ok) then
error("Can't build " .. tostring(self.name) .. ": lua error\n" .. tostring(err))
end

33
moonbuild/fscache.moon
Unescape View File

@ -0,0 +1,33 @@
import attributes, dir from require 'lfs'
unpack or= table.unpack
FROZEN = ->
makecached = (fn) ->
cache = {}
invalidate = (val) ->
cache[val] = nil
freeze = (val) ->
cache[val] = FROZEN
reset = ->
cache = {}
get = (val) ->
cached = cache[val]
if cached!=FROZEN and cached!=nil
return unpack cached
ret = {fn val}
if cached!=FROZEN
cache[val] = ret
unpack ret
setmetatable { :get, :invalidate, :freeze, :reset },
__call: (val) => get val
{
attributes: makecached attributes
dir: makecached dir
}

44
moonbuild/fsutil.moon
Unescape View File

@ -1,25 +1,40 @@
import dir, attributes from require 'lfs'
import dir, attributes from require 'moonbuild.fscache'
import gmatch, match, gsub, sub from string
import insert, concat from table
import insert, remove, concat from table
normalizepath = (file) ->
parts = [part for part in gmatch file, '[^/]+']
absolute = (sub file, 1, 1)=='/'
for i=1, #parts
if parts[i]=='.'
remove parts, i
i -= 1
continue
if parts[i]=='..' and i!=1
remove parts, i
remove parts, i-1
i -= 2
continue
(absolute and '/' or '') .. concat parts, '/'
ls = (d) ->
[f for f in dir d when f!='.' and f!='..']
[f for f in dir normalizepath d when f!='.' and f!='..']
lswithpath = (d) ->
if d==''
return ls '.'
[d..'/'..f for f in dir d when f!='.' and f!='..']
[d..'/'..f for f in dir normalizepath d when f!='.' and f!='..']
exists = (f) ->
(attributes f) != nil
(attributes normalizepath f) != nil
isdir = (f) ->
a = attributes f
a = attributes normalizepath f
a and a.mode == 'directory' or false
mtime = (f) ->
a = attributes f
a = attributes normalizepath f
a and a.modification
matchglob = (str, glob) ->
@ -81,8 +96,23 @@ wildcard = (glob) ->
else
return {}
parentdir = (file) ->
normalizepath file..'/..'
freezecache = (file) ->
dir.freeze file
dir.freeze parentdir file
attributes.invalidate file
invalidatecache = (file) ->
dir.invalidate file
dir.invalidate parentdir file
attributes.invalidate file
{
:wildcard
:exists, :isdir
:mtime
:normalizepath, :parentdir
:freezecache, :invalidatecache
}

Write Preview
Loading…
Cancel
Save