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

Simplifying the filesystem code (no longer entangled with nomsupath) and

Browse Source 
using that to simplify the tools. Now the tools directly take lists of
file paths rather than things that might go through nomsupath or
directories or get processed by filetype. Use your shell for globbing stuff like
`nomsu tools/test.nom core/*.nom`
This commit is contained in:
Bruce Hill 2018-11-20 14:52:59 -08:00
parent f304138530
commit 2bbc035f5d
17 changed files with 172 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compatibility/3.5.5.6.nom
View File

@ -7,7 +7,5 @@ use "compatibility/compatibility.nom"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
upgrade action "traceback" to "3.5.5.6" via (..)
-> (barf "'traceback' has been deprecated")
upgrade action "traceback 1" to "3.5.5.6" via (..)
-> (barf "'traceback 1' has been deprecated")
for %tree:
compile error at %tree "'traceback' has been deprecated."

4
compatibility/3.nom
View File

@ -10,4 +10,6 @@ upgrade action (method %spec %body) to "3" as (my action %spec %body)
upgrade action (me) to "3" as %me
upgrade action (@) to "3" as %me
upgrade action "as" to "3" via (..)
-> (barf "Object API has changed. Use (%obj::action ...) instead of (as %obj: action ...)")
for %tree:
compile error at %tree "Object API has changed and 'as' is no longer supported." "\
..Use (%obj::action ...) instead of (as %obj: action ...)"

5
compatibility/4.11.nom
View File

@ -27,6 +27,11 @@ upgrade action "set" to "4.11" via (..)
%rhs.%i = %entry.2
return (SyntaxTree {type: "Action", source: %tree.source, 1: %lhs, 2: "=", 3: %rhs})
upgrade action "1 with 2 ~>" to "4.11" via (..)
for %tree:
compile error at %tree "This method has been deprecated." "\
..Perhaps this could be use %tree::map instead."
# Changing filesystem API:
upgrade action (for file %f in %path %body) to "4.11" as (..)
for %f in (files for %path) %body

4
compatibility/compatibility.nom
View File

@ -92,6 +92,10 @@ externally [..]
add %k = (%v upgraded from %start_version to %end_version)
set %with_upgraded_args's metatable to (%tree's metatable)
%tree = (%UPGRADES.%ver %with_upgraded_args %end_version)
if (%tree.version != %end_version):
%tree = (SyntaxTree {: for %k = %v in %tree: add %k = %v})
%tree.version = %end_version
if %tree.shebang:
%tree.shebang = "#!/usr/bin/env nomsu -V\%end_version\n"
return %tree

15
core/metaprogramming.nom
View File

@ -338,21 +338,6 @@ externally (match %tree with %patt) means:
end
return matches"
externally (%tree with %patt ~> %replacement) means:
lua> "\
..return \%tree:map(function(\%t)
local \%vars = \(match %t with %patt)
if not \%vars then return nil end
for \%k,\%v in pairs(\%vars) do
\%vars[\%k] = \(%v with %patt ~> %replacement)
end
return \%replacement:map(function(\%t)
if \%t.type == "Var" then
return \%vars[\%t[1]]
end
end)
end)"
test:
assume ((quote "one\n\"two\"") == "\"one\\n\\\"two\\\"\"")

15
files.lua
View File

@ -37,12 +37,13 @@ Files.read = function(filename)
do
local file_contents = _FILE_CACHE[filename]
if file_contents then
return file_contents
return file_contents or nil
end
end
if filename == 'stdin' then
if filename == 'stdin' or filename == '-' then
local contents = io.read('*a')
Files.spoof('stdin', contents)
Files.spoof('-', contents)
return contents
end
local file = io.open(filename)
@ -52,7 +53,7 @@ Files.read = function(filename)
local contents = file:read("*a")
file:close()
_FILE_CACHE[filename] = contents
return contents
return contents or nil
end
local match, gsub
do
@ -71,7 +72,7 @@ Files.exists = function(path)
if _SPOOFED_FILES[path] then
return true
end
if path == 'stdin' then
if path == 'stdin' or path == '-' then
return true
end
if run_cmd("ls " .. tostring(sanitize(path))) then
@ -82,7 +83,7 @@ end
Files.list = function(path)
if not (_BROWSE_CACHE[path]) then
local files
if _SPOOFED_FILES[path] or path == 'stdin' then
if _SPOOFED_FILES[path] or path == 'stdin' or path == '-' then
_BROWSE_CACHE[path] = {
path
}
@ -107,14 +108,14 @@ if ok then
if _SPOOFED_FILES[path] then
return true
end
if path == 'stdin' or raw_file_exists(path) then
if path == 'stdin' or path == '-' or raw_file_exists(path) then
return true
end
return false
end
Files.list = function(path)
if not (_BROWSE_CACHE[path]) then
if _SPOOFED_FILES[path] or path == 'stdin' then
if _SPOOFED_FILES[path] or path == 'stdin' or path == '-' then
_BROWSE_CACHE[path] = {
path
}

15
files.moon
View File

@ -25,17 +25,18 @@ Files.spoof = (filename, contents)->
-- Read a file's contents
Files.read = (filename)->
if file_contents = _FILE_CACHE[filename]
return file_contents
if filename == 'stdin'
return file_contents or nil
if filename == 'stdin' or filename == '-'
contents = io.read('*a')
Files.spoof('stdin', contents)
Files.spoof('-', contents)
return contents
file = io.open(filename)
return nil unless file
contents = file\read("*a")
file\close!
_FILE_CACHE[filename] = contents
return contents
return contents or nil
{:match, :gsub} = string
@ -49,14 +50,14 @@ sanitize = (path)->
Files.exists = (path)->
return true if _SPOOFED_FILES[path]
return true if path == 'stdin'
return true if path == 'stdin' or path == '-'
return true if run_cmd("ls #{sanitize(path)}")
return false
Files.list = (path)->
unless _BROWSE_CACHE[path]
local files
_BROWSE_CACHE[path] = if _SPOOFED_FILES[path] or path == 'stdin'
_BROWSE_CACHE[path] = if _SPOOFED_FILES[path] or path == 'stdin' or path == '-'
{path}
else run_cmd('find -L "'..path..'" -not -path "*/\\.*" -type f') or false
return _BROWSE_CACHE[path]
@ -68,12 +69,12 @@ if ok
return if mode == 'file' or mode == 'directory' or mode == 'link' then true else false
Files.exists = (path)->
return true if _SPOOFED_FILES[path]
return true if path == 'stdin' or raw_file_exists(path)
return true if path == 'stdin' or path == '-' or raw_file_exists(path)
return false
Files.list = (path)->
unless _BROWSE_CACHE[path]
_BROWSE_CACHE[path] = if _SPOOFED_FILES[path] or path == 'stdin'
_BROWSE_CACHE[path] = if _SPOOFED_FILES[path] or path == 'stdin' or path == '-'
{path}
else
file_type, err = lfs.attributes(path, 'mode')

30
nomsu.lua
View File

@ -102,7 +102,7 @@ end
local file_queue = List({ })
local sep = "\3"
local parser = re.compile([[ args <- {| (flag %sep)* (({~ file ~} -> add_file) {:primary_file: %true :} %sep)?
{:nomsu_args: {| ({(!%sep .)*} %sep)* |} :} %sep? |} !.
{:nomsu_args: {| (nomsu_flag %sep)* {:extra_args: {| ({[^%sep]+} %sep)* |} :} |} :} |} !.
flag <-
{:optimization: "-O" (%sep? %number)? :}
/ ("-I" %sep? ({~ file ~} -> add_file))
@ -115,6 +115,7 @@ local parser = re.compile([[ args <- {| (flag %sep)* (({~ file ~} -> add_file
/ {:no_core: "--no-core" %true :}
/ {:debugger: ("-d" %sep? {(!%sep .)*}) :}
/ {:requested_version: "-V" (%sep? {([0-9.])+})? :}
nomsu_flag <- {| ({:key: ('-' [a-z]) :} {:value: %true :}) / ({:key: ('--' [^%sep=]+) :} {:value: ('=' {[^%sep]+}) / %true :}) |}
file <- ("-" -> "stdin") / {(!%sep .)+}
]], {
["true"] = lpeg.Cc(true),
@ -135,7 +136,14 @@ if not args or args.help then
print(usage)
os.exit(EXIT_FAILURE)
end
nomsu_environment.command_line_args = List(args.nomsu_args)
local nomsu_args = Dict({ })
local _list_0 = args.nomsu_args
for _index_0 = 1, #_list_0 do
local argpair = _list_0[_index_0]
nomsu_args[argpair.key] = argpair.value
end
nomsu_args.extra_args = List(args.nomsu_args.extra_args or { })
nomsu_environment.command_line_args = nomsu_args
nomsu_environment.OPTIMIZATION = tonumber(args.optimization or 1)
if args.version then
nomsu_environment.run_file_1_in('core', nomsu_environment, nomsu_environment.OPTIMIZATION)
@ -146,27 +154,15 @@ local run
run = function()
local input_files = { }
for _index_0 = 1, #file_queue do
local _continue_0 = false
repeat
local f = file_queue[_index_0]
if f == 'stdin' then
input_files[f] = true
_continue_0 = true
break
end
if not (Files.exists(f)) then
error("Could not find: '" .. tostring(f) .. "'")
end
local _list_0 = Files.list(f)
for _index_1 = 1, #_list_0 do
local filename = _list_0[_index_1]
local _list_1 = Files.list(f)
for _index_1 = 1, #_list_1 do
local filename = _list_1[_index_1]
input_files[filename] = true
end
_continue_0 = true
until true
if not _continue_0 then
break
end
end
if not (args.no_core) then
nomsu_environment.run_file_1_in('core', nomsu_environment, nomsu_environment.OPTIMIZATION)

12
nomsu.moon
View File

@ -61,7 +61,7 @@ file_queue = List{}
sep = "\3"
parser = re.compile([[
args <- {| (flag %sep)* (({~ file ~} -> add_file) {:primary_file: %true :} %sep)?
{:nomsu_args: {| ({(!%sep .)*} %sep)* |} :} %sep? |} !.
{:nomsu_args: {| (nomsu_flag %sep)* {:extra_args: {| ({[^%sep]+} %sep)* |} :} |} :} |} !.
flag <-
{:optimization: "-O" (%sep? %number)? :}
/ ("-I" %sep? ({~ file ~} -> add_file))
@ -74,6 +74,7 @@ parser = re.compile([[
/ {:no_core: "--no-core" %true :}
/ {:debugger: ("-d" %sep? {(!%sep .)*}) :}
/ {:requested_version: "-V" (%sep? {([0-9.])+})? :}
nomsu_flag <- {| ({:key: ('-' [a-z]) :} {:value: %true :}) / ({:key: ('--' [^%sep=]+) :} {:value: ('=' {[^%sep]+}) / %true :}) |}
file <- ("-" -> "stdin") / {(!%sep .)+}
]], {
true:lpeg.Cc(true), number:lpeg.R("09")^1/tonumber, sep:lpeg.P(sep)
@ -88,7 +89,11 @@ args = parser\match(arg_string)
if not args or args.help
print usage
os.exit(EXIT_FAILURE)
nomsu_environment.command_line_args = List(args.nomsu_args)
nomsu_args = Dict{}
for argpair in *args.nomsu_args
nomsu_args[argpair.key] = argpair.value
nomsu_args.extra_args = List(args.nomsu_args.extra_args or {})
nomsu_environment.command_line_args = nomsu_args
nomsu_environment.OPTIMIZATION = tonumber(args.optimization or 1)
if args.version
@ -99,9 +104,6 @@ if args.version
run = ->
input_files = {}
for f in *file_queue
if f == 'stdin'
input_files[f] = true
continue
unless Files.exists(f)
error("Could not find: '#{f}'")
for filename in *Files.list(f)

5
nomsu_environment.lua
View File

@ -296,6 +296,7 @@ local nomsu_environment = Importer({
end
_currently_running_files:add(path)
local mod = _1_forked(environment)
local did_anything = false
for nomsupath in package.nomsupath:gmatch("[^;]+") do
local _continue_0 = false
repeat
@ -323,6 +324,7 @@ local nomsu_environment = Importer({
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
@ -337,6 +339,9 @@ local nomsu_environment = Importer({
break
end
end
if not (did_anything) then
error("File not found: " .. tostring(path), 0)
end
import_to_1_from(environment, mod, prefix)
environment.FILE_CACHE[path] = mod
return _currently_running_files:remove()

4
nomsu_environment.moon
View File

@ -169,6 +169,7 @@ nomsu_environment = Importer{
_currently_running_files\add path
mod = _1_forked(environment)
did_anything = false
for nomsupath in package.nomsupath\gmatch("[^;]+")
files = Files.list(nomsupath.."/"..path)
continue unless files
@ -183,7 +184,10 @@ nomsu_environment = Importer{
file = Files.read(filename)
NomsuCode\from(Source(filename, 1, #file), file)
environment.run_1_in(code, mod)
did_anything = true
break
unless did_anything
error("File not found: #{path}", 0)
import_to_1_from(environment, mod, prefix)
environment.FILE_CACHE[path] = mod
_currently_running_files\remove!

26
tools/autoformat.nom
View File

@ -10,23 +10,17 @@ use "lib/os.nom"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
%args = (command line args)
%inplace = (no)
if (%args.1 is "-i"):
%inplace = (yes)
%args::remove index 1
for %path in %args:
if (%path == "-"):
%path = "stdin"
for %filename in (files for %path):
unless ((%filename::matches "%.nom$") or (%filename == "stdin")):
do next %filename
%contents = (read file %filename)
%code = (NomsuCode from (Source %filename 1 (size of %contents)) %contents)
for %filename in %args.extra_args:
%file = (read file %filename)
unless %file:
barf "File does not exist: \%filename"
%leading_indent = (%file::matching "[\n]*([ ]*)")
%code = (NomsuCode from (%Source %filename 1 (size of %file)) %file)
%tree = (%code parsed)
%formatted = ((%tree as nomsu)::text)
if %inplace:
%formatted = "\
..\%leading_indent\(((%tree as nomsu)::text)::with "\n" -> "\n\%leading_indent")"
if %args."-i":
write %formatted to file %filename
..else:
say %formatted inline

14
tools/find_action.nom
View File

@ -9,17 +9,13 @@ use "lib/consolecolor.nom"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
%stub = (command line args).1
%stub = (command line args).extra_args.1
say "Looking for stub: \%stub..."
for % in 2 to (size of (command line args)):
for %filename in (files for (command line args).%):
if (%filename == "-"):
%filename = "stdin"
unless ((%filename == "stdin") or (%filename::matches "%.nom$")):
do next %filename
for % in 2 to (size of (command line args).extra_args):
%filename = (command line args).extra_args.%
%file = (read file %filename)
unless %file:
barf "File does not exist: \%filename"
%code = (NomsuCode from (%Source %filename 1 (size of %file)) %file)
try:
%tree = (%code parsed)

15
tools/parse.nom
View File

@ -35,15 +35,10 @@ externally (print tree %t at indent %indent) means:
else:
say "\%indent \(quote %arg)"
for %path in (command line args):
for %filename in (files for %path):
if (%filename == "-"):
%filename = "stdin"
unless ((%filename == "stdin") or (%filename::matches "%.nom$")):
do next %filename
%text = (read file %filename)
%nomsu = (NomsuCode from (Source %filename 1 (size of %text)) %text)
for %filename in (command line args).extra_args:
%file = (read file %filename)
unless %file:
barf "File does not exist: \%filename"
%nomsu = (NomsuCode from (Source %filename 1 (size of %file)) %file)
%tree = (%nomsu parsed)
print tree %tree at indent ""

37
tools/replace.nom
View File

@ -9,34 +9,33 @@ use "lib/os.nom"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
%args = (command line args)
%inplace = (no)
if (%args.1 is "-i"):
%inplace = (yes)
%args::remove index 1
barf "Deprecated."
if ((size of %args) < 3):
if ((size of %args.extra_args) < 3):
say "Usage: nomsu tools/replace.nom [-i] tree_to_replace replacement files..."
lua> "os.exit(1)"
%pattern = (parse (%args::remove index 1))
%replacement = (parse (%args::remove index 1))
for %path in %args:
for %filename in (files for %path):
unless (any [%filename::matches "%.nom$", %filename == "-", %filename == "stdin"]):
do next %filename
%tree = (parse (read file %filename) from %filename)
%tree2 = (%tree with %pattern ~> %replacement)
%pattern = ((%args.extra_args.1) parsed)
%replacement = ((%args.extra_args.2) parsed)
for %filename in %args.extra_args at %i:
if (%i < 3): do next %i
%file = (read file %filename)
unless %file: barf "File does not exist: \%filename"
%nomsu = (NomsuCode from (Source %filename 1 (size of %file)) %file)
%tree = (%nomsu parsed)
# TODO: fix this to use variable substitution
%tree2 = (..)
%tree::map (..)
for %subtree:
if (%subtree == %pattern):
return %replacement
if (%tree2 == %tree):
say "No changes in \%filename"
do next %filename
%text = "\
..#!/usr/bin/env nomsu -V\(%tree.version or (Nomsu version))
\(%tree2 as nomsu)"
%text = ((%tree2 as nomsu)::text)
when:
%inplace:
%args."-i":
say "Replaced in \%filename"
write %text to file %filename

24
tools/test.nom
View File

@ -8,24 +8,10 @@ use "lib/consolecolor.nom"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
%args = (command line args)
if (%args.1 == "-v"):
%args::remove index 1
%verbose = (yes)
%to_run = [..]
:
for %path in (command line args):
for %filename in (files for %path):
if (%filename == "-"):
%filename = "stdin"
if ((%filename::matches "%.nom$") or (%filename == "stdin")): add %filename
# Make sure all the files get run
for %filename in %to_run:
use %filename
for %filename in (command line args).extra_args: use %filename
%tests = {: for %s = %t in (tests): add (=lua "Source:from_string(\%s)") = %t}
for %filename in %to_run:
for %filename in (command line args).extra_args:
%file_tests = []
for %src = %test in %tests:
if (%src.filename == %filename):
@ -34,13 +20,13 @@ for %filename in %to_run:
unless (%file_tests is empty):
sort %file_tests by % -> %.source
lua> "io.write('[ .. ] ', \%filename); io.flush()"
if %verbose: say ""
if (command line args)."-v": say ""
for % in %file_tests:
if %verbose:
if (command line args)."-v":
say " \(yellow (%.test::with "\n" -> "\n "))"
run %.test
if %verbose:
if (command line args)."-v":
say (green "PASS")
..else:
say "\r[\(green "PASS")"

44
tools/upgrade.nom
View File

@ -7,46 +7,26 @@
use "compatibility"
use "lib/os.nom"
use "lib/consolecolor.nom"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
%args = (command line args)
%inplace = (no)
%start_version = (nil)
%version = (Nomsu version)
repeat:
if %args.1 is:
"-i":
%inplace = (yes)
%args::remove index 1
"-t":
use "lib/consolecolor.nom"
%test = (yes)
%args::remove index 1
"-V":
%version = %args.2
%args::remove index 1
%args::remove index 1
"-S":
%start_version = %args.2
%args::remove index 1
%args::remove index 1
else: stop
for %path in %args:
for %filename in (files for %path):
unless (%filename::matches "%.nom$"): do next %filename
%inplace = (%args."-i" or %args."--inplace")
%start_version = %args."--upgrade-from"
%version = (%args."--upgrade-to" or (Nomsu version))
%test = (%args."-t" or %args."--test")
for %filename in %args.extra_args:
%file = (read file %filename)
%code = (NomsuCode from (%Source %filename 1 (size of %file)) %file)
unless %file:
barf "File does not exist: \%filename"
%leading_indent = (%file::matching "[\n]*([ ]*)")
%code = (NomsuCode from (Source %filename 1 (size of %file)) %file)
%tree = (%code parsed)
%uptree = (..)
%tree upgraded from (%start_version or (%tree.version or (Nomsu version))) to \
..%version
%text = ((%uptree as nomsu)::text)
%text = "\%leading_indent\(((%uptree as nomsu)::text)::with "\n" -> "\n\%leading_indent")"
when:
%inplace:
say "Upgraded \%filename"
@ -59,4 +39,4 @@ for %path in %args:
say (bright "\%filename will be changed")
else:
say %text
say %text inline