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

Optimization/simplification pass.

Browse Source
This commit is contained in:
Bruce Hill 2018-07-17 16:13:35 -07:00
parent 39a0121856
commit cbd1437752
9 changed files with 319 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
code_obj.lua
View File

@ -82,8 +82,8 @@ do
is_code = true, is_code = true,
append = function(self, ...) append = function(self, ...)
local n = select("#", ...) local n = select("#", ...)
local bits, indents = self.bits, self.indents
local match = string.match local match = string.match
local bits = self.bits
for i = 1, n do for i = 1, n do
local _continue_0 = false local _continue_0 = false
repeat repeat
@ -98,27 +98,6 @@ do
if type(b) ~= 'string' and not (type(b) == 'table' and b.is_code) then if type(b) ~= 'string' and not (type(b) == 'table' and b.is_code) then
b = repr(b) b = repr(b)
end end
if type(b) == 'string' then
local trailing_text, spaces = match(b, "\n(([ ]*)[^\n]*)$")
if trailing_text then
self.current_indent = #spaces
self.trailing_line_len = #trailing_text
else
self.trailing_line_len = self.trailing_line_len + #b
end
else
do
local trailing_text = match(tostring(b), "\n([^\n]*)$")
if trailing_text then
self.trailing_line_len = #trailing_text + self.current_indent
else
self.trailing_line_len = self.trailing_line_len + #tostring(b)
end
end
if self.current_indent ~= 0 then
indents[#bits] = self.current_indent
end
end
_continue_0 = true _continue_0 = true
until true until true
if not _continue_0 then if not _continue_0 then
@ -126,11 +105,35 @@ do
end end
end end
self.__str = nil self.__str = nil
self._trailing_line_len = nil
end,
trailing_line_len = function(self)
if self._trailing_line_len == nil then
local bits, match = self.bits, string.match
local len = 0
for i = #bits, 1, -1 do
local b = bits[i]
if type(b) == 'string' then
do
local line = match(b, "\n([^\n]*)$")
if line then
return len + #line
else
len = len + #b
end
end
else
len = len + b:trailing_line_len()
end
end
self._trailing_line_len = len
end
return self._trailing_line_len
end, end,
concat_append = function(self, values, joiner, wrapping_joiner) concat_append = function(self, values, joiner, wrapping_joiner)
wrapping_joiner = wrapping_joiner or joiner wrapping_joiner = wrapping_joiner or joiner
local bits, indents = self.bits, self.indents
local match = string.match local match = string.match
local bits = self.bits
local line_len = 0 local line_len = 0
for i = 1, #values do for i = 1, #values do
local b = values[i] local b = values[i]
@ -143,47 +146,28 @@ do
end end
end end
bits[#bits + 1] = b bits[#bits + 1] = b
if type(b) ~= 'string' and self.current_indent ~= 0 then
indents[#bits] = self.current_indent
end
local b_str = tostring(b) local b_str = tostring(b)
local line, spaces = match(b_str, "\n(([ ]*)[^\n]*)$") local line = match(b_str, "\n([^\n]*)$")
if spaces then if line then
if type(b) == 'string' then
self.current_indent = #spaces
end
line_len = #line line_len = #line
else else
line_len = line_len + #b line_len = line_len + #b
end end
end end
self.__str = nil self.__str = nil
self._trailing_line_len = nil
end, end,
prepend = function(self, ...) prepend = function(self, ...)
local n = select("#", ...) local n = select("#", ...)
local bits, indents = self.bits, self.indents local bits = self.bits
for i = #bits + n, n + 1, -1 do for i = #bits + n, n + 1, -1 do
bits[i] = bits[i - n] bits[i] = bits[i - n]
end end
for i = 1, n do for i = 1, n do
bits[i] = select(i, ...) bits[i] = select(i, ...)
end end
self.current_indent = 0
for i, b in ipairs(bits) do
if type(b) == 'string' then
do
local spaces = b:match("\n([ ]*)[^\n]*$")
if spaces then
self.current_indent = #spaces
end
end
elseif self.current_indent ~= 0 then
indents[i] = self.current_indent
else
indents[i] = nil
end
end
self.__str = nil self.__str = nil
self._trailing_line_len = nil
end end
} }
_base_0.__index = _base_0 _base_0.__index = _base_0
@ -191,8 +175,6 @@ do
__init = function(self, source, ...) __init = function(self, source, ...)
self.source = source self.source = source
self.bits = { } self.bits = { }
self.indents, self.current_indent = { }, 0
self.trailing_line_len = 0
if type(self.source) == 'string' then if type(self.source) == 'string' then
self.source = Source:from_string(self.source) self.source = Source:from_string(self.source)
end end
@ -242,6 +224,7 @@ do
end end
end end
self.__str = nil self.__str = nil
self._trailing_line_len = nil
end, end,
remove_free_vars = function(self, vars) remove_free_vars = function(self, vars)
if not (#vars > 0) then if not (#vars > 0) then
@ -274,6 +257,7 @@ do
end end
end end
self.__str = nil self.__str = nil
self._trailing_line_len = nil
end, end,
declare_locals = function(self, to_declare) declare_locals = function(self, to_declare)
if to_declare == nil then if to_declare == nil then
@ -336,11 +320,25 @@ do
end, end,
__tostring = function(self) __tostring = function(self)
if self.__str == nil then if self.__str == nil then
local buff, indents = { }, self.indents local buff, indent = { }, 0
local match, gsub, rep
do
local _obj_0 = string
match, gsub, rep = _obj_0.match, _obj_0.gsub, _obj_0.rep
end
for i, b in ipairs(self.bits) do for i, b in ipairs(self.bits) do
b = tostring(b) if type(b) == 'string' then
if indents[i] then do
b = b:gsub("\n", "\n" .. ((" "):rep(indents[i]))) local spaces = match(b, "\n([ ]*)[^\n]*$")
if spaces then
indent = #spaces
end
end
else
b = tostring(b)
if indent > 0 then
b = gsub(b, "\n", "\n" .. rep(" ", indent))
end
end end
buff[#buff + 1] = b buff[#buff + 1] = b
end end
@ -394,7 +392,6 @@ do
_class_0.__parent.__init(self, ...) _class_0.__parent.__init(self, ...)
self.free_vars = { } self.free_vars = { }
self.is_value = false self.is_value = false
self.__str = nil
end, end,
__base = _base_0, __base = _base_0,
__name = "LuaCode", __name = "LuaCode",
@ -424,11 +421,6 @@ do
lua.is_value = true lua.is_value = true
return lua return lua
end end
self.Comment = function(...)
local lua = LuaCode(...)
lua.is_comment = true
return lua
end
if _parent_0.__inherited then if _parent_0.__inherited then
_parent_0.__inherited(_parent_0, _class_0) _parent_0.__inherited(_parent_0, _class_0)
end end
@ -440,11 +432,25 @@ do
local _base_0 = { local _base_0 = {
__tostring = function(self) __tostring = function(self)
if self.__str == nil then if self.__str == nil then
local buff, indents = { }, self.indents local buff, indent = { }, 0
local match, gsub, rep
do
local _obj_0 = string
match, gsub, rep = _obj_0.match, _obj_0.gsub, _obj_0.rep
end
for i, b in ipairs(self.bits) do for i, b in ipairs(self.bits) do
b = tostring(b) if type(b) == 'string' then
if indents[i] then do
b = b:gsub("\n", "\n" .. ((" "):rep(indents[i]))) local spaces = match(b, "\n([ ]*)[^\n]*$")
if spaces then
indent = #spaces
end
end
else
b = tostring(b)
if indent > 0 then
b = gsub(b, "\n", "\n" .. rep(" ", indent))
end
end end
buff[#buff + 1] = b buff[#buff + 1] = b
end end

88
code_obj.moon
View File

@ -48,8 +48,6 @@ class Code
is_code: true is_code: true
new: (@source, ...)=> new: (@source, ...)=>
@bits = {} @bits = {}
@indents, @current_indent = {}, 0
@trailing_line_len = 0
if type(@source) == 'string' if type(@source) == 'string'
@source = Source\from_string(@source) @source = Source\from_string(@source)
assert(@source and Source\is_instance(@source), "Source has the wrong type") assert(@source and Source\is_instance(@source), "Source has the wrong type")
@ -57,8 +55,8 @@ class Code
append: (...)=> append: (...)=>
n = select("#",...) n = select("#",...)
bits, indents = @bits, @indents
match = string.match match = string.match
bits = @bits
for i=1,n for i=1,n
b = select(i, ...) b = select(i, ...)
assert(b, "code bit is nil") assert(b, "code bit is nil")
@ -67,24 +65,28 @@ class Code
bits[#bits+1] = b bits[#bits+1] = b
if type(b) != 'string' and not (type(b) == 'table' and b.is_code) if type(b) != 'string' and not (type(b) == 'table' and b.is_code)
b = repr(b) b = repr(b)
if type(b) == 'string'
trailing_text, spaces = match(b, "\n(([ ]*)[^\n]*)$")
if trailing_text
@current_indent = #spaces
@trailing_line_len = #trailing_text
else @trailing_line_len += #b
else
if trailing_text = match(tostring(b), "\n([^\n]*)$")
@trailing_line_len = #trailing_text + @current_indent
else @trailing_line_len += #tostring(b)
if @current_indent != 0
indents[#bits] = @current_indent
@__str = nil @__str = nil
@_trailing_line_len = nil
trailing_line_len: =>
if @_trailing_line_len == nil
bits, match = @bits, string.match
len = 0
for i=#bits,1,-1
b = bits[i]
if type(b) == 'string'
if line = match(b, "\n([^\n]*)$")
return len + #line
else len += #b
else
len += b\trailing_line_len!
@_trailing_line_len = len
return @_trailing_line_len
concat_append: (values, joiner, wrapping_joiner)=> concat_append: (values, joiner, wrapping_joiner)=>
wrapping_joiner or= joiner wrapping_joiner or= joiner
bits, indents = @bits, @indents
match = string.match match = string.match
bits = @bits
line_len = 0 line_len = 0
for i=1,#values for i=1,#values
b = values[i] b = values[i]
@ -95,51 +97,35 @@ class Code
else else
bits[#bits+1] = joiner bits[#bits+1] = joiner
bits[#bits+1] = b bits[#bits+1] = b
if type(b) != 'string' and @current_indent != 0
indents[#bits] = @current_indent
b_str = tostring(b) b_str = tostring(b)
line, spaces = match(b_str, "\n(([ ]*)[^\n]*)$") line = match(b_str, "\n([^\n]*)$")
if spaces if line
if type(b) == 'string'
@current_indent = #spaces
line_len = #line line_len = #line
else else
line_len += #b line_len += #b
@__str = nil @__str = nil
@_trailing_line_len = nil
prepend: (...)=> prepend: (...)=>
n = select("#",...) n = select("#",...)
bits, indents = @bits, @indents bits = @bits
for i=#bits+n,n+1,-1 for i=#bits+n,n+1,-1
bits[i] = bits[i-n] bits[i] = bits[i-n]
for i=1,n for i=1,n
bits[i] = select(i, ...) bits[i] = select(i, ...)
@current_indent = 0
for i,b in ipairs(bits)
if type(b) == 'string'
if spaces = b\match("\n([ ]*)[^\n]*$")
@current_indent = #spaces
elseif @current_indent != 0
indents[i] = @current_indent
else indents[i] = nil
@__str = nil @__str = nil
@_trailing_line_len = nil
class LuaCode extends Code class LuaCode extends Code
new: (...)=> new: (...)=>
super ... super ...
@free_vars = {} @free_vars = {}
@is_value = false @is_value = false
@__str = nil
@Value = (...)-> @Value = (...)->
lua = LuaCode(...) lua = LuaCode(...)
lua.is_value = true lua.is_value = true
return lua return lua
@Comment = (...)->
lua = LuaCode(...)
lua.is_comment = true
return lua
add_free_vars: (vars)=> add_free_vars: (vars)=>
return unless #vars > 0 return unless #vars > 0
@ -150,6 +136,7 @@ class LuaCode extends Code
@free_vars[#@free_vars+1] = var @free_vars[#@free_vars+1] = var
seen[var] = true seen[var] = true
@__str = nil @__str = nil
@_trailing_line_len = nil
remove_free_vars: (vars)=> remove_free_vars: (vars)=>
return unless #vars > 0 return unless #vars > 0
@ -169,6 +156,7 @@ class LuaCode extends Code
if type(b) != 'string' if type(b) != 'string'
stack[#stack+1] = b stack[#stack+1] = b
@__str = nil @__str = nil
@_trailing_line_len = nil
declare_locals: (to_declare=nil)=> declare_locals: (to_declare=nil)=>
if to_declare == nil if to_declare == nil
@ -205,11 +193,16 @@ class LuaCode extends Code
__tostring: => __tostring: =>
if @__str == nil if @__str == nil
buff, indents = {}, @indents buff, indent = {}, 0
{:match, :gsub, :rep} = string
for i,b in ipairs @bits for i,b in ipairs @bits
b = tostring(b) if type(b) == 'string'
if indents[i] if spaces = match(b, "\n([ ]*)[^\n]*$")
b = b\gsub("\n", "\n"..((" ")\rep(indents[i]))) indent = #spaces
else
b = tostring(b)
if indent > 0
b = gsub(b, "\n", "\n"..rep(" ", indent))
buff[#buff+1] = b buff[#buff+1] = b
@__str = concat(buff, "") @__str = concat(buff, "")
return @__str return @__str
@ -246,11 +239,16 @@ class LuaCode extends Code
class NomsuCode extends Code class NomsuCode extends Code
__tostring: => __tostring: =>
if @__str == nil if @__str == nil
buff, indents = {}, @indents buff, indent = {}, 0
{:match, :gsub, :rep} = string
for i,b in ipairs @bits for i,b in ipairs @bits
b = tostring(b) if type(b) == 'string'
if indents[i] if spaces = match(b, "\n([ ]*)[^\n]*$")
b = b\gsub("\n", "\n"..((" ")\rep(indents[i]))) indent = #spaces
else
b = tostring(b)
if indent > 0
b = gsub(b, "\n", "\n"..rep(" ", indent))
buff[#buff+1] = b buff[#buff+1] = b
@__str = concat(buff, "") @__str = concat(buff, "")
return @__str return @__str

186
files.lua
View File

@ -34,25 +34,52 @@ files.read = function(filename)
_FILE_CACHE[filename] = contents _FILE_CACHE[filename] = contents
return contents return contents
end end
local iterate_single
iterate_single = function(item, prev)
if item == prev then
return nil
else
return item
end
end
local match, gsub local match, gsub
do do
local _obj_0 = string local _obj_0 = string
match, gsub = _obj_0.match, _obj_0.gsub match, gsub = _obj_0.match, _obj_0.gsub
end end
iterate_single = function(item, prev) local sanitize
if item == prev then sanitize = function(path)
return nil path = gsub(path, "\\", "\\\\")
else path = gsub(path, "`", "")
return item path = gsub(path, '"', '\\"')
path = gsub(path, "$", "")
return path
end
files.exists = function(path)
if not (io.popen("ls " .. tostring(sanitize(path))):close()) then
return true
end end
if package.nomsupath then
for nomsupath in package.nomsupath:gmatch("[^;]+") do
if not (io.popen("ls " .. tostring(nomsupath) .. "/" .. tostring(sanitize(path))):close()) then
return true
end
end
end
return false
end
local _browse_cache = { }
local browse
browse = function(path)
if not (_browse_cache[path]) then
local f = io.popen('find -L "' .. package.nomsupath .. '/' .. path .. '" -not -path "*/\\.*" -type f -name "*.nom"')
local _files
do
local _tbl_0 = { }
for line in f:lines() do
local _key_0, _val_0 = line
_tbl_0[_key_0] = _val_0
end
_files = _tbl_0
end
if not (f:close()) then
_files = false
end
_browse_cache[path] = _files
end
return _browse_cache[path]
end end
local ok, lfs = pcall(require, "lfs") local ok, lfs = pcall(require, "lfs")
if ok then if ok then
@ -78,109 +105,76 @@ if ok then
end end
return false return false
end end
local browse
browse = function(filename) browse = function(filename)
local file_type, err = lfs.attributes(filename, 'mode') if not (_browse_cache[filename]) then
if file_type == 'file' then _browse_cache[filename] = false
if match(filename, "%.nom$") or match(filename, "%.lua$") then local file_type, err = lfs.attributes(filename, 'mode')
coroutine.yield(filename) if file_type == 'file' then
return true if match(filename, "%.nom$") or match(filename, "%.lua$") then
end _browse_cache[filename] = {
elseif file_type == 'directory' or file_type == 'link' then filename
for subfile in lfs.dir(filename) do }
if not (subfile == "." or subfile == "..") then
browse(filename .. "/" .. subfile)
end end
end elseif file_type == 'char device' then
return true _browse_cache[filename] = {
elseif file_type == 'char device' then filename
coroutine.yield(filename) }
return true elseif file_type == 'directory' or file_type == 'link' then
end local _files = { }
return false for subfile in lfs.dir(filename) do
end if not (subfile == "." or subfile == "..") then
files.walk = function(path) local _list_0 = (browse(filename .. "/" .. subfile) or { })
if match(path, "%.nom$") or match(path, "%.lua$") or path == 'stdin' then for _index_0 = 1, #_list_0 do
return iterate_single, path local f = _list_0[_index_0]
end _files[#_files + 1] = f
return coroutine.wrap(function() end
if not browse(path) and package.nomsupath then
for nomsupath in package.nomsupath:gmatch("[^;]+") do
if browse(nomsupath .. "/" .. path) then
break
end end
end end
_browse_cache[filename] = _files
end end
return nil end
end) return _browse_cache[filename]
end end
else else
if io.popen('find . -maxdepth 0'):close() then if io.popen('find . -maxdepth 0'):close() then
error("Could not find 'luafilesystem' module and couldn't run system command `find` (this might happen on Windows). Please install `luafilesystem` (which can be found at: http://keplerproject.github.io/luafilesystem/ or `luarocks install luafilesystem`)", 0) error("Could not find 'luafilesystem' module and couldn't run system command `find` (this might happen on Windows). Please install `luafilesystem` (which can be found at: http://keplerproject.github.io/luafilesystem/ or `luarocks install luafilesystem`)", 0)
end end
local sanitize end
sanitize = function(path) files.walk = function(path, flush_cache)
path = gsub(path, "\\", "\\\\") if flush_cache == nil then
path = gsub(path, "`", "") flush_cache = false
path = gsub(path, '"', '\\"')
path = gsub(path, "$", "")
return path
end end
files.exists = function(path) if flush_cache then
if not (io.popen("ls " .. tostring(sanitize(path))):close()) then _browse_cache = { }
return true end
end local _files = browse(path)
if package.nomsupath then if package.nomsupath and not _files then
for nomsupath in package.nomsupath:gmatch("[^;]+") do for nomsupath in package.nomsupath:gmatch("[^;]+") do
if not (io.popen("ls " .. tostring(nomsupath) .. "/" .. tostring(sanitize(path))):close()) then do
return true _files = browse(nomsupath .. "/" .. path)
if _files then
break
end end
end end
end end
return false
end end
files.walk = function(path) local iter
if match(path, "%.nom$") or match(path, "%.lua$") or path == 'stdin' then iter = function(_files, i)
return iterate_single, path i = i + 1
do
local f = _files[i]
if f then
return i, f
end
end end
path = sanitize(path)
return coroutine.wrap(function()
local f = io.popen('find -L "' .. path .. '" -not -path "*/\\.*" -type f -name "*.nom"')
local found = false
for line in f:lines() do
found = true
coroutine.yield(line)
end
if not found and package.nomsupath then
f:close()
for nomsupath in package.nomsupath:gmatch("[^;]+") do
f = io.popen('find -L "' .. package.nomsupath .. '/' .. path .. '" -not -path "*/\\.*" -type f -name "*.nom"')
for line in f:lines() do
found = true
coroutine.yield(line)
end
f:close()
if found then
break
end
end
end
if not (found) then
return error("Invalid file path: " .. tostring(path))
end
end)
end end
return iter, _files, 0
end end
local line_counter = re.compile([[ lines <- {| line (%nl line)* |} local line_counter = re.compile([[ lines <- {| line (%nl line)* |}
line <- {} (!%nl .)* line <- {} (!%nl .)*
]], { ]], {
nl = lpeg.P("\r") ^ -1 * lpeg.P("\n") nl = lpeg.P("\r") ^ -1 * lpeg.P("\n")
}) })
local get_lines = re.compile([[ lines <- {| line (%nl line)* |}
line <- {[^%nl]*}
]], {
nl = lpeg.P("\r") ^ -1 * lpeg.P("\n")
})
local _LINE_STARTS = { } local _LINE_STARTS = { }
files.get_line_starts = function(str) files.get_line_starts = function(str)
if type(str) ~= 'string' then if type(str) ~= 'string' then
@ -196,6 +190,7 @@ files.get_line_starts = function(str)
_LINE_STARTS[str] = line_starts _LINE_STARTS[str] = line_starts
return line_starts return line_starts
end end
local log = { }
files.get_line_number = function(str, pos) files.get_line_number = function(str, pos)
local line_starts = files.get_line_starts(str) local line_starts = files.get_line_starts(str)
local lo, hi = 1, #line_starts local lo, hi = 1, #line_starts
@ -213,6 +208,11 @@ files.get_line = function(str, line_no)
local line_starts = files.get_line_starts(str) local line_starts = files.get_line_starts(str)
return str:sub(line_starts[line_no] or 1, (line_starts[line_no + 1] or 1) - 2) return str:sub(line_starts[line_no] or 1, (line_starts[line_no + 1] or 1) - 2)
end end
local get_lines = re.compile([[ lines <- {| line (%nl line)* |}
line <- {[^%nl]*}
]], {
nl = lpeg.P("\r") ^ -1 * lpeg.P("\n")
})
files.get_lines = function(str) files.get_lines = function(str)
return get_lines:match(str) return get_lines:match(str)
end end

130
files.moon
View File

@ -28,11 +28,33 @@ files.read = (filename)->
_FILE_CACHE[filename] = contents _FILE_CACHE[filename] = contents
return contents return contents
iterate_single = (item, prev) -> if item == prev then nil else item
-- `walk` returns an iterator over all files matching a path. -- `walk` returns an iterator over all files matching a path.
{:match, :gsub} = string {:match, :gsub} = string
iterate_single = (item, prev) -> if item == prev then nil else item
-- TODO: improve sanitization
sanitize = (path)->
path = gsub(path,"\\","\\\\")
path = gsub(path,"`","")
path = gsub(path,'"','\\"')
path = gsub(path,"$","")
return path
files.exists = (path)->
return true unless io.popen("ls #{sanitize(path)}")\close!
if package.nomsupath
for nomsupath in package.nomsupath\gmatch("[^;]+")
return true unless io.popen("ls #{nomsupath}/#{sanitize(path)}")\close!
return false
_browse_cache = {}
browse = (path)->
unless _browse_cache[path]
f = io.popen('find -L "'..package.nomsupath..'/'..path..'" -not -path "*/\\.*" -type f -name "*.nom"')
_files = {line for line in f\lines!}
_files = false unless f\close!
_browse_cache[path] = _files
return _browse_cache[path]
ok, lfs = pcall(require, "lfs") ok, lfs = pcall(require, "lfs")
if ok if ok
raw_file_exists = (filename)-> raw_file_exists = (filename)->
@ -44,82 +66,48 @@ if ok
for nomsupath in package.nomsupath\gmatch("[^;]+") for nomsupath in package.nomsupath\gmatch("[^;]+")
return true if raw_file_exists(nomsupath.."/"..path) return true if raw_file_exists(nomsupath.."/"..path)
return false return false
-- Return 'true' if any files or directories are found, otherwise 'false', and yield every filename
browse = (filename)->
file_type, err = lfs.attributes(filename, 'mode')
if file_type == 'file'
if match(filename, "%.nom$") or match(filename, "%.lua$")
coroutine.yield filename
return true
elseif file_type == 'directory' or file_type == 'link'
for subfile in lfs.dir(filename)
unless subfile == "." or subfile == ".."
browse(filename.."/"..subfile)
return true
elseif file_type == 'char device'
coroutine.yield(filename)
return true
return false export browse
files.walk = (path)-> browse = (filename)->
if match(path, "%.nom$") or match(path, "%.lua$") or path == 'stdin' unless _browse_cache[filename]
return iterate_single, path _browse_cache[filename] = false
return coroutine.wrap -> file_type, err = lfs.attributes(filename, 'mode')
if not browse(path) and package.nomsupath if file_type == 'file'
for nomsupath in package.nomsupath\gmatch("[^;]+") if match(filename, "%.nom$") or match(filename, "%.lua$")
break if browse(nomsupath.."/"..path) _browse_cache[filename] = {filename}
return nil elseif file_type == 'char device'
_browse_cache[filename] = {filename}
elseif file_type == 'directory' or file_type == 'link'
_files = {}
for subfile in lfs.dir(filename)
unless subfile == "." or subfile == ".."
for f in *(browse(filename.."/"..subfile) or {})
_files[#_files+1] = f
_browse_cache[filename] = _files
return _browse_cache[filename]
else else
if io.popen('find . -maxdepth 0')\close! if io.popen('find . -maxdepth 0')\close!
error "Could not find 'luafilesystem' module and couldn't run system command `find` (this might happen on Windows). Please install `luafilesystem` (which can be found at: http://keplerproject.github.io/luafilesystem/ or `luarocks install luafilesystem`)", 0 error "Could not find 'luafilesystem' module and couldn't run system command `find` (this might happen on Windows). Please install `luafilesystem` (which can be found at: http://keplerproject.github.io/luafilesystem/ or `luarocks install luafilesystem`)", 0
-- TODO: improve sanitization
sanitize = (path)->
path = gsub(path,"\\","\\\\")
path = gsub(path,"`","")
path = gsub(path,'"','\\"')
path = gsub(path,"$","")
return path
files.exists = (path)-> files.walk = (path, flush_cache=false)->
return true unless io.popen("ls #{sanitize(path)}")\close! if flush_cache
if package.nomsupath export _browse_cache
for nomsupath in package.nomsupath\gmatch("[^;]+") _browse_cache = {}
return true unless io.popen("ls #{nomsupath}/#{sanitize(path)}")\close! _files = browse(path)
return false if package.nomsupath and not _files
for nomsupath in package.nomsupath\gmatch("[^;]+")
files.walk = (path)-> if _files = browse(nomsupath.."/"..path) then break
if match(path, "%.nom$") or match(path, "%.lua$") or path == 'stdin' iter = (_files, i)->
return iterate_single, path i += 1
path = sanitize(path) if f = _files[i]
return coroutine.wrap -> return i, f
f = io.popen('find -L "'..path..'" -not -path "*/\\.*" -type f -name "*.nom"') return iter, _files, 0
found = false
for line in f\lines!
found = true
coroutine.yield(line)
if not found and package.nomsupath
f\close!
for nomsupath in package.nomsupath\gmatch("[^;]+")
f = io.popen('find -L "'..package.nomsupath..'/'..path..'" -not -path "*/\\.*" -type f -name "*.nom"')
for line in f\lines!
found = true
coroutine.yield(line)
f\close!
break if found
unless found
error("Invalid file path: "..tostring(path))
line_counter = re.compile([[ line_counter = re.compile([[
lines <- {| line (%nl line)* |} lines <- {| line (%nl line)* |}
line <- {} (!%nl .)* line <- {} (!%nl .)*
]], nl:lpeg.P("\r")^-1 * lpeg.P("\n")) ]], nl:lpeg.P("\r")^-1 * lpeg.P("\n"))
get_lines = re.compile([[
lines <- {| line (%nl line)* |}
line <- {[^%nl]*}
]], nl:lpeg.P("\r")^-1 * lpeg.P("\n"))
-- LINE_STARTS is a mapping from strings to a table that maps line number to character positions -- LINE_STARTS is a mapping from strings to a table that maps line number to character positions
_LINE_STARTS = {} _LINE_STARTS = {}
files.get_line_starts = (str)-> files.get_line_starts = (str)->
@ -131,6 +119,7 @@ files.get_line_starts = (str)->
_LINE_STARTS[str] = line_starts _LINE_STARTS[str] = line_starts
return line_starts return line_starts
log = {}
files.get_line_number = (str, pos)-> files.get_line_number = (str, pos)->
line_starts = files.get_line_starts(str) line_starts = files.get_line_starts(str)
-- Binary search for line number of position -- Binary search for line number of position
@ -146,6 +135,11 @@ files.get_line = (str, line_no)->
line_starts = files.get_line_starts(str) line_starts = files.get_line_starts(str)
return str\sub(line_starts[line_no] or 1, (line_starts[line_no+1] or 1) - 2) return str\sub(line_starts[line_no] or 1, (line_starts[line_no+1] or 1) - 2)
get_lines = re.compile([[
lines <- {| line (%nl line)* |}
line <- {[^%nl]*}
]], nl:lpeg.P("\r")^-1 * lpeg.P("\n"))
files.get_lines = (str)-> get_lines\match(str) files.get_lines = (str)-> get_lines\match(str)
return files return files

6
lib/os.nom
View File

@ -6,7 +6,7 @@ use "core"
action [path of Nomsu file %filename] action [path of Nomsu file %filename]
lua> ".." lua> ".."
for f in files.walk(\%filename) do return f end for i,f in files.walk(\%filename) do return f end
barf "Could not find file: \%filename" barf "Could not find file: \%filename"
action [sh> %cmd] action [sh> %cmd]
@ -21,7 +21,7 @@ action [read file %filename]
compile [for file %f in %path %body] to compile [for file %f in %path %body] to
Lua ".." Lua ".."
for \(%f as lua expr) in files.walk(\(%path as lua expr)) do for i,\(%f as lua expr) in files.walk(\(%path as lua expr)) do
\(%body as lua statements) \(%body as lua statements)
\(compile as: === next %f ===) \(compile as: === next %f ===)
end end
@ -31,7 +31,7 @@ compile [%expr for file %f in %path] to
Lua value ".." Lua value ".."
(function() (function()
local ret = list{} local ret = list{}
for \(%f as lua expr) in files.walk(\(%path as lua expr)) do for i,\(%f as lua expr) in files.walk(\(%path as lua expr)) do
ret[#ret+1] = \(%expr as lua statements) ret[#ret+1] = \(%expr as lua statements)
end end
return ret return ret

34
nomsu.lua
View File

@ -144,7 +144,7 @@ run = function()
if not (files.exists(f)) then if not (files.exists(f)) then
error("Could not find: " .. tostring(f)) error("Could not find: " .. tostring(f))
end end
for filename in files.walk(f) do for _, filename in files.walk(f) do
input_files[filename] = true input_files[filename] = true
end end
end end
@ -228,7 +228,7 @@ run = function()
local parse_errs = { } local parse_errs = { }
for _index_0 = 1, #file_queue do for _index_0 = 1, #file_queue do
local f = file_queue[_index_0] local f = file_queue[_index_0]
for filename in files.walk(f) do for _, filename in files.walk(f) do
local _continue_0 = false local _continue_0 = false
repeat repeat
if not (filename == "stdin" or filename:match("%.nom$")) then if not (filename == "stdin" or filename:match("%.nom$")) then
@ -323,18 +323,20 @@ say ".."
end end
end end
end end
local debugger do
if args.debugger == "nil" then local debugger
debugger = { } if args.debugger == "nil" then
else debugger = { }
debugger = require(args.debugger or 'error_handling') else
debugger = require(args.debugger or 'error_handling')
end
local guard
if type(debugger) == 'function' then
guard = debugger
else
guard = debugger.guard or debugger.call or debugger.wrap or debugger.run or (function(fn)
return fn()
end)
end
return guard(run)
end end
local guard
if type(debugger) == 'function' then
guard = debugger
else
guard = debugger.guard or debugger.call or debugger.wrap or debugger.run or (function(fn)
return fn()
end)
end
return guard(run)

16
nomsu.moon
View File

@ -95,7 +95,7 @@ run = ->
for f in *file_queue for f in *file_queue
unless files.exists(f) unless files.exists(f)
error("Could not find: #{f}") error("Could not find: #{f}")
for filename in files.walk(f) for _,filename in files.walk(f)
input_files[filename] = true input_files[filename] = true
nomsu.can_optimize = (f)-> nomsu.can_optimize = (f)->
@ -149,7 +149,7 @@ run = ->
parse_errs = {} parse_errs = {}
for f in *file_queue for f in *file_queue
for filename in files.walk(f) for _,filename in files.walk(f)
continue unless filename == "stdin" or filename\match("%.nom$") continue unless filename == "stdin" or filename\match("%.nom$")
if args.check_syntax if args.check_syntax
-- Check syntax -- Check syntax
@ -218,8 +218,10 @@ say ".."
elseif not ok elseif not ok
Errhand.print_error ret Errhand.print_error ret
debugger = if args.debugger == "nil" then {}
else require(args.debugger or 'error_handling') do
guard = if type(debugger) == 'function' then debugger debugger = if args.debugger == "nil" then {}
else debugger.guard or debugger.call or debugger.wrap or debugger.run or ((fn)->fn()) else require(args.debugger or 'error_handling')
guard(run) guard = if type(debugger) == 'function' then debugger
else debugger.guard or debugger.call or debugger.wrap or debugger.run or ((fn)->fn())
guard(run)

22
nomsu_compiler.lua
View File

@ -266,7 +266,7 @@ do
local add_bit_lua local add_bit_lua
add_bit_lua = function(lua, bit_lua) add_bit_lua = function(lua, bit_lua)
local bit_leading_len = #(tostring(bit_lua):match("^[^\n]*")) local bit_leading_len = #(tostring(bit_lua):match("^[^\n]*"))
lua:append(lua.trailing_line_len + bit_leading_len > MAX_LINE and ",\n " or ", ") lua:append(lua:trailing_line_len() + bit_leading_len > MAX_LINE and ",\n " or ", ")
return lua:append(bit_lua) return lua:append(bit_lua)
end end
local operate_on_text local operate_on_text
@ -334,11 +334,11 @@ do
["use %"] = function(self, tree, _path) ["use %"] = function(self, tree, _path)
if _path.type == 'Text' and #_path == 1 and type(_path[1]) == 'string' then if _path.type == 'Text' and #_path == 1 and type(_path[1]) == 'string' then
local path = _path[1] local path = _path[1]
for f in files.walk(path) do for _, f in files.walk(path) do
self:run_file(f) self:run_file(f)
end end
end end
return LuaCode(tree.source, "for f in files.walk(", self:compile(_path), ") do nomsu:run_file(f) end") return LuaCode(tree.source, "for i,f in files.walk(", self:compile(_path), ") do nomsu:run_file(f) end")
end, end,
["test %"] = function(self, tree, _body) ["test %"] = function(self, tree, _body)
return LuaCode("") return LuaCode("")
@ -845,7 +845,7 @@ do
next_space = match(next_space, "[^ ]*") next_space = match(next_space, "[^ ]*")
end end
nomsu:append(next_space) nomsu:append(next_space)
if arg_nomsu and nomsu.trailing_line_len + #tostring(arg_nomsu) < MAX_LINE then if arg_nomsu and nomsu:trailing_line_len() + #tostring(arg_nomsu) < MAX_LINE then
if bit.type == "Block" then if bit.type == "Block" then
nomsu:append(arg_nomsu) nomsu:append(arg_nomsu)
next_space = "\n.." next_space = "\n.."
@ -867,7 +867,7 @@ do
end end
pos = bit.source.stop pos = bit.source.stop
end end
if next_space == " " and nomsu.trailing_line_len > MAX_LINE then if next_space == " " and nomsu:trailing_line_len() > MAX_LINE then
next_space = "\n.." next_space = "\n.."
end end
end end
@ -1035,8 +1035,8 @@ do
if item.type == "Block" then if item.type == "Block" then
item_nomsu:parenthesize() item_nomsu:parenthesize()
end end
if nomsu.trailing_line_len + #tostring(item_nomsu) <= MAX_LINE then if nomsu:trailing_line_len() + #tostring(item_nomsu) <= MAX_LINE then
if nomsu.trailing_line_len > 0 then if nomsu:trailing_line_len() > 0 then
nomsu:append(", ") nomsu:append(", ")
end end
nomsu:append(item_nomsu) nomsu:append(item_nomsu)
@ -1053,7 +1053,7 @@ do
nomsu:append("\n") nomsu:append("\n")
end end
else else
if nomsu.trailing_line_len > 0 then if nomsu:trailing_line_len() > 0 then
nomsu:append('\n') nomsu:append('\n')
end end
nomsu:append(pop_comments(item.source.start), item_nomsu) nomsu:append(pop_comments(item.source.start), item_nomsu)
@ -1092,8 +1092,8 @@ do
if item.type == "Block" then if item.type == "Block" then
item_nomsu:parenthesize() item_nomsu:parenthesize()
end end
if nomsu.trailing_line_len + #tostring(item_nomsu) <= MAX_LINE then if nomsu:trailing_line_len() + #tostring(item_nomsu) <= MAX_LINE then
if nomsu.trailing_line_len > 0 then if nomsu:trailing_line_len() > 0 then
nomsu:append(", ") nomsu:append(", ")
end end
nomsu:append(item_nomsu) nomsu:append(item_nomsu)
@ -1110,7 +1110,7 @@ do
nomsu:append("\n") nomsu:append("\n")
end end
else else
if nomsu.trailing_line_len > 0 then if nomsu:trailing_line_len() > 0 then
nomsu:append('\n') nomsu:append('\n')
end end
nomsu:append(pop_comments(item.source.start), item_nomsu) nomsu:append(pop_comments(item.source.start), item_nomsu)

22
nomsu_compiler.moon
View File

@ -162,7 +162,7 @@ with NomsuCompiler
return LuaCode.Value(code.source, cls_str, repr(tostring(code.source)), ", ", @compile(code), ")") return LuaCode.Value(code.source, cls_str, repr(tostring(code.source)), ", ", @compile(code), ")")
add_bit_lua = (lua, bit_lua)-> add_bit_lua = (lua, bit_lua)->
bit_leading_len = #(tostring(bit_lua)\match("^[^\n]*")) bit_leading_len = #(tostring(bit_lua)\match("^[^\n]*"))
lua\append(lua.trailing_line_len + bit_leading_len > MAX_LINE and ",\n " or ", ") lua\append(lua\trailing_line_len! + bit_leading_len > MAX_LINE and ",\n " or ", ")
lua\append(bit_lua) lua\append(bit_lua)
operate_on_text = (text)-> operate_on_text = (text)->
lua = LuaCode.Value(text.source, cls_str, repr(tostring(text.source))) lua = LuaCode.Value(text.source, cls_str, repr(tostring(text.source)))
@ -217,9 +217,9 @@ with NomsuCompiler
["use %"]: (tree, _path)=> ["use %"]: (tree, _path)=>
if _path.type == 'Text' and #_path == 1 and type(_path[1]) == 'string' if _path.type == 'Text' and #_path == 1 and type(_path[1]) == 'string'
path = _path[1] path = _path[1]
for f in files.walk(path) for _,f in files.walk(path)
@run_file(f) @run_file(f)
return LuaCode(tree.source, "for f in files.walk(", @compile(_path), ") do nomsu:run_file(f) end") return LuaCode(tree.source, "for i,f in files.walk(", @compile(_path), ") do nomsu:run_file(f) end")
["test %"]: (tree, _body)=> ["test %"]: (tree, _body)=>
return LuaCode "" return LuaCode ""
@ -549,7 +549,7 @@ with NomsuCompiler
else assert recurse(bit,inline:true) else assert recurse(bit,inline:true)
next_space = match(next_space, "[^ ]*") if bit.type == "Block" next_space = match(next_space, "[^ ]*") if bit.type == "Block"
nomsu\append next_space nomsu\append next_space
if arg_nomsu and nomsu.trailing_line_len + #tostring(arg_nomsu) < MAX_LINE if arg_nomsu and nomsu\trailing_line_len! + #tostring(arg_nomsu) < MAX_LINE
if bit.type == "Block" if bit.type == "Block"
nomsu\append arg_nomsu nomsu\append arg_nomsu
next_space = "\n.." next_space = "\n.."
@ -567,7 +567,7 @@ with NomsuCompiler
next_space = "\n.." next_space = "\n.."
pos = bit.source.stop pos = bit.source.stop
if next_space == " " and nomsu.trailing_line_len > MAX_LINE if next_space == " " and nomsu\trailing_line_len! > MAX_LINE
next_space = "\n.." next_space = "\n.."
nomsu\append pop_comments(pos, '\n') nomsu\append pop_comments(pos, '\n')
return nomsu return nomsu
@ -681,8 +681,8 @@ with NomsuCompiler
for i, item in ipairs tree for i, item in ipairs tree
item_nomsu = assert recurse(item, inline:true) item_nomsu = assert recurse(item, inline:true)
item_nomsu\parenthesize! if item.type == "Block" item_nomsu\parenthesize! if item.type == "Block"
if nomsu.trailing_line_len + #tostring(item_nomsu) <= MAX_LINE if nomsu\trailing_line_len! + #tostring(item_nomsu) <= MAX_LINE
nomsu\append ", " if nomsu.trailing_line_len > 0 nomsu\append ", " if nomsu\trailing_line_len! > 0
nomsu\append item_nomsu nomsu\append item_nomsu
else else
if #tostring(item_nomsu) > MAX_LINE if #tostring(item_nomsu) > MAX_LINE
@ -694,7 +694,7 @@ with NomsuCompiler
nomsu\append "(..)\n ", item_nomsu nomsu\append "(..)\n ", item_nomsu
nomsu\append "\n" if i < #tree nomsu\append "\n" if i < #tree
else else
nomsu\append '\n' if nomsu.trailing_line_len > 0 nomsu\append '\n' if nomsu\trailing_line_len! > 0
nomsu\append pop_comments(item.source.start), item_nomsu nomsu\append pop_comments(item.source.start), item_nomsu
nomsu\append pop_comments(tree.source.stop, '\n') nomsu\append pop_comments(tree.source.stop, '\n')
return NomsuCode(tree.source, "[..]\n ", nomsu) return NomsuCode(tree.source, "[..]\n ", nomsu)
@ -716,8 +716,8 @@ with NomsuCompiler
for i, item in ipairs tree for i, item in ipairs tree
item_nomsu = assert recurse(item, inline:true) item_nomsu = assert recurse(item, inline:true)
item_nomsu\parenthesize! if item.type == "Block" item_nomsu\parenthesize! if item.type == "Block"
if nomsu.trailing_line_len + #tostring(item_nomsu) <= MAX_LINE if nomsu\trailing_line_len! + #tostring(item_nomsu) <= MAX_LINE
nomsu\append ", " if nomsu.trailing_line_len > 0 nomsu\append ", " if nomsu\trailing_line_len! > 0
nomsu\append item_nomsu nomsu\append item_nomsu
else else
if #tostring(item_nomsu) > MAX_LINE if #tostring(item_nomsu) > MAX_LINE
@ -729,7 +729,7 @@ with NomsuCompiler
nomsu\append "(..)\n ", item_nomsu nomsu\append "(..)\n ", item_nomsu
nomsu\append "\n" if i < #tree nomsu\append "\n" if i < #tree
else else
nomsu\append '\n' if nomsu.trailing_line_len > 0 nomsu\append '\n' if nomsu\trailing_line_len! > 0
nomsu\append pop_comments(item.source.start), item_nomsu nomsu\append pop_comments(item.source.start), item_nomsu
nomsu\append pop_comments(tree.source.stop, '\n') nomsu\append pop_comments(tree.source.stop, '\n')
return NomsuCode(tree.source, "{..}\n ", nomsu) return NomsuCode(tree.source, "{..}\n ", nomsu)