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

Removed the Word tree type and replaced it with raw strings, since

Browse Source 
they're only used as part of Actions
This commit is contained in:
Bruce Hill 2018-05-24 21:16:51 -07:00
parent d9b795ee45
commit 64294f5cd6
7 changed files with 40 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compile_lib.sh
View File

@ -1,21 +1,7 @@
#!/bin/sh #!/bin/sh
# This file is a script that converts the .nom files in lib/ into slightly more optimized # This file is a script that converts the .nom files in lib/ into slightly more optimized
# precompiled versions that are only lua> ".." and =lua ".." bits which are faster to load. # precompiled versions that are only lua> ".." and =lua ".." bits which are faster to load.
FLUSH=false moonc *.moon
while getopts ":f" opt; do
case $opt in
f)
FLUSH=true
echo "flushing..."
;;
esac
done
if [ "$FLUSH" = true ] ; then
rm core/*.lua
rm lib/*.lua
#rm tests/*.lua
fi
for file in core/*.nom; do for file in core/*.nom; do
printf "Compiling $file ..." printf "Compiling $file ..."
./nomsu.moon -o "core/$(basename $file .nom).lua" $file ./nomsu.moon -o "core/$(basename $file .nom).lua" $file
@ -26,8 +12,3 @@ for file in lib/*.nom; do
./nomsu.moon -o "lib/$(basename $file .nom).lua" $file ./nomsu.moon -o "lib/$(basename $file .nom).lua" $file
echo "done." echo "done."
done done
#for file in tests/*.nom; do
# printf "Compiling $file ..."
# ./nomsu.moon -c $file
# echo "done."
#done

8
core/control_flow.nom
View File

@ -271,7 +271,7 @@ immediately
%condition: %func_call.2 %condition: %func_call.2
%action: %func_call.3 %action: %func_call.3
.. ..
assume ((%star and (%star.type is "Word")) and (%star.value is "*")) or barf ".." assume (%star = "*") or barf ".."
Invalid format for 'when' statement. Lines must begin with '*' Invalid format for 'when' statement. Lines must begin with '*'
assume %condition or barf ".." assume %condition or barf ".."
Invalid format for 'when' statement. Lines must begin with '*' and have a condition or the word "else" Invalid format for 'when' statement. Lines must begin with '*' and have a condition or the word "else"
@ -279,7 +279,7 @@ immediately
lua> "table.insert(\%fallthroughs, \(%condition as lua expr));" lua> "table.insert(\%fallthroughs, \(%condition as lua expr));"
do next %func_call do next %func_call
if: (%condition.type is "Word") and (%condition.value is "else") if: %condition = "else"
assume (not %is_first) or barf "'else' clause cannot be first in 'when % = ?' block" assume (not %is_first) or barf "'else' clause cannot be first in 'when % = ?' block"
to %code write "\nelse\n " to %code write "\nelse\n "
to %code write: %action as lua statements to %code write: %action as lua statements
@ -315,7 +315,7 @@ immediately
assume (%func_call.type is "Action") or barf ".." assume (%func_call.type is "Action") or barf ".."
Invalid format for 'when' statement. Only '*' blocks are allowed. Invalid format for 'when' statement. Only '*' blocks are allowed.
with {%star:%func_call.1, %condition:%func_call.2, %action:%func_call.3} with {%star:%func_call.1, %condition:%func_call.2, %action:%func_call.3}
assume ((%star and (%star.type is "Word")) and (%star.value is "*")) or barf ".." assume (%star = "*") or barf ".."
Invalid format for 'when' statement. Lines must begin with '*' Invalid format for 'when' statement. Lines must begin with '*'
assume %condition or barf ".." assume %condition or barf ".."
Invalid format for 'when' statement. Lines must begin with '*' and have a condition or the word "else" Invalid format for 'when' statement. Lines must begin with '*' and have a condition or the word "else"
@ -323,7 +323,7 @@ immediately
lua> "table.insert(\%fallthroughs, \(%condition as lua expr))" lua> "table.insert(\%fallthroughs, \(%condition as lua expr))"
do next %func_call do next %func_call
if: (%condition.type is "Word") and (%condition.value is "else") if: %condition = "else"
assume (not %is_first) or barf "'else' clause cannot be first in 'when % = ?' block" assume (not %is_first) or barf "'else' clause cannot be first in 'when % = ?' block"
to %code write "\nelse\n " to %code write "\nelse\n "
to %code write: %action as lua statements to %code write: %action as lua statements

24
nomsu.lua
View File

@ -480,7 +480,7 @@ do
local _len_0 = 1 local _len_0 = 1
for _index_0 = 1, #tree do for _index_0 = 1, #tree do
local arg = tree[_index_0] local arg = tree[_index_0]
if arg.type ~= "Word" then if type(arg) ~= "string" then
_accum_0[_len_0] = arg _accum_0[_len_0] = arg
_len_0 = _len_0 + 1 _len_0 = _len_0 + 1
end end
@ -508,8 +508,8 @@ do
local lua = Lua.Value() local lua = Lua.Value()
if not action and math_expression:match(stub) then if not action and math_expression:match(stub) then
for i, tok in ipairs(tree) do for i, tok in ipairs(tree) do
if tok.type == "Word" then if type(tok) == 'string' then
lua:append(tok.value) lua:append(tok)
else else
local tok_lua = self:tree_to_lua(tok, Tuple(i, path)) local tok_lua = self:tree_to_lua(tok, Tuple(i, path))
if not (tok_lua.is_value) then if not (tok_lua.is_value) then
@ -530,7 +530,7 @@ do
for i, tok in ipairs(tree) do for i, tok in ipairs(tree) do
local _continue_0 = false local _continue_0 = false
repeat repeat
if tok.type == "Word" then if type(tok) == "string" then
_continue_0 = true _continue_0 = true
break break
end end
@ -749,8 +749,6 @@ do
return Lua.Value(nil, tostring(tree.value)) return Lua.Value(nil, tostring(tree.value))
elseif "Var" == _exp_0 then elseif "Var" == _exp_0 then
return Lua.Value(nil, tree:as_lua_id()) return Lua.Value(nil, tree:as_lua_id())
elseif "Word" == _exp_0 then
return error("Cannot convert a Word to lua")
elseif "Comment" == _exp_0 then elseif "Comment" == _exp_0 then
return Lua(nil, "--" .. tree.value:gsub("\n", "\n--") .. "\n") return Lua(nil, "--" .. tree.value:gsub("\n", "\n--") .. "\n")
else else
@ -769,11 +767,11 @@ do
if inline then if inline then
local nomsu = Nomsu() local nomsu = Nomsu()
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
if bit.type == "Word" then if type(bit) == "string" then
if i > 1 then if i > 1 then
nomsu:append(" ") nomsu:append(" ")
end end
nomsu:append(bit.value) nomsu:append(bit)
else else
local arg_nomsu = self:tree_to_nomsu(bit, true) local arg_nomsu = self:tree_to_nomsu(bit, true)
if not (arg_nomsu) then if not (arg_nomsu) then
@ -794,8 +792,8 @@ do
local next_space = "" local next_space = ""
local last_colon = nil local last_colon = nil
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
if bit.type == "Word" then if type(bit) == "string" then
nomsu:append(next_space, bit.value) nomsu:append(next_space, bit)
next_space = " " next_space = " "
else else
local arg_nomsu local arg_nomsu
@ -889,7 +887,7 @@ do
else else
local interp_nomsu = self:tree_to_nomsu(bit, true) local interp_nomsu = self:tree_to_nomsu(bit, true)
if interp_nomsu then if interp_nomsu then
if bit.type ~= "Word" and bit.type ~= "List" and bit.type ~= "Dict" and bit.type ~= "Text" then if bit.type ~= "List" and bit.type ~= "Dict" and bit.type ~= "Text" then
interp_nomsu:parenthesize() interp_nomsu:parenthesize()
end end
nomsu:append("\\", interp_nomsu) nomsu:append("\\", interp_nomsu)
@ -912,7 +910,7 @@ do
else else
local interp_nomsu = self:tree_to_nomsu(bit, true) local interp_nomsu = self:tree_to_nomsu(bit, true)
if interp_nomsu then if interp_nomsu then
if bit.type ~= "Word" and bit.type ~= "List" and bit.type ~= "Dict" and bit.type ~= "Text" then if bit.type ~= "List" and bit.type ~= "Dict" and bit.type ~= "Text" then
interp_nomsu:parenthesize() interp_nomsu:parenthesize()
end end
nomsu:append("\\", interp_nomsu) nomsu:append("\\", interp_nomsu)
@ -1073,8 +1071,6 @@ do
return Nomsu(nil, tostring(tree.value)) return Nomsu(nil, tostring(tree.value))
elseif "Var" == _exp_0 then elseif "Var" == _exp_0 then
return Nomsu(nil, "%", tree.value) return Nomsu(nil, "%", tree.value)
elseif "Word" == _exp_0 then
return Nomsu(nil, tree.value)
elseif "Comment" == _exp_0 then elseif "Comment" == _exp_0 then
if inline then if inline then
return nil return nil

26
nomsu.moon
View File

@ -433,7 +433,7 @@ class NomsuCompiler
stub = tree\get_stub! stub = tree\get_stub!
compile_action = @environment.COMPILE_ACTIONS[stub] compile_action = @environment.COMPILE_ACTIONS[stub]
if compile_action if compile_action
args = [arg for arg in *tree when arg.type != "Word"] args = [arg for arg in *tree when type(arg) != "string"]
-- Force all compile-time actions to take a tree location -- Force all compile-time actions to take a tree location
args = [args[p-1] for p in *@environment.ARG_ORDERS[compile_action][stub]] args = [args[p-1] for p in *@environment.ARG_ORDERS[compile_action][stub]]
-- Force Lua to avoid tail call optimization for debugging purposes -- Force Lua to avoid tail call optimization for debugging purposes
@ -448,8 +448,8 @@ class NomsuCompiler
-- math expressions like 2*x + 3^2 without having to define a single -- math expressions like 2*x + 3^2 without having to define a single
-- action for every possibility. -- action for every possibility.
for i,tok in ipairs tree for i,tok in ipairs tree
if tok.type == "Word" if type(tok) == 'string'
lua\append tok.value lua\append tok
else else
tok_lua = @tree_to_lua(tok, Tuple(i, path)) tok_lua = @tree_to_lua(tok, Tuple(i, path))
unless tok_lua.is_value unless tok_lua.is_value
@ -463,7 +463,7 @@ class NomsuCompiler
args = {} args = {}
for i, tok in ipairs tree for i, tok in ipairs tree
if tok.type == "Word" then continue if type(tok) == "string" then continue
arg_lua = @tree_to_lua(tok, Tuple(i, path)) arg_lua = @tree_to_lua(tok, Tuple(i, path))
unless arg_lua.is_value unless arg_lua.is_value
error "Cannot use:\n#{colored.yellow repr(tok)}\nas an argument to #{stub}, since it's not an expression, it produces: #{repr arg_lua}", 0 error "Cannot use:\n#{colored.yellow repr(tok)}\nas an argument to #{stub}, since it's not an expression, it produces: #{repr arg_lua}", 0
@ -625,9 +625,6 @@ class NomsuCompiler
when "Var" when "Var"
Lua.Value(nil, tree\as_lua_id!) Lua.Value(nil, tree\as_lua_id!)
when "Word"
error("Cannot convert a Word to lua")
when "Comment" when "Comment"
Lua(nil, "--"..tree.value\gsub("\n","\n--").."\n") Lua(nil, "--"..tree.value\gsub("\n","\n--").."\n")
@ -641,10 +638,10 @@ class NomsuCompiler
if inline if inline
nomsu = Nomsu! nomsu = Nomsu!
for i,bit in ipairs tree for i,bit in ipairs tree
if bit.type == "Word" if type(bit) == "string"
if i > 1 if i > 1
nomsu\append " " nomsu\append " "
nomsu\append bit.value nomsu\append bit
else else
arg_nomsu = @tree_to_nomsu(bit,true) arg_nomsu = @tree_to_nomsu(bit,true)
return nil unless arg_nomsu return nil unless arg_nomsu
@ -660,8 +657,8 @@ class NomsuCompiler
-- TODO: track line length as we go and use 80-that instead of 80 for wrapping -- TODO: track line length as we go and use 80-that instead of 80 for wrapping
last_colon = nil last_colon = nil
for i,bit in ipairs tree for i,bit in ipairs tree
if bit.type == "Word" if type(bit) == "string"
nomsu\append next_space, bit.value nomsu\append next_space, bit
next_space = " " next_space = " "
else else
arg_nomsu = if last_colon == i-1 and bit.type == "Action" then nil arg_nomsu = if last_colon == i-1 and bit.type == "Action" then nil
@ -736,7 +733,7 @@ class NomsuCompiler
else else
interp_nomsu = @tree_to_nomsu(bit, true) interp_nomsu = @tree_to_nomsu(bit, true)
if interp_nomsu if interp_nomsu
if bit.type != "Word" and bit.type != "List" and bit.type != "Dict" and bit.type != "Text" if bit.type != "List" and bit.type != "Dict" and bit.type != "Text"
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
nomsu\append "\\", interp_nomsu nomsu\append "\\", interp_nomsu
else return nil else return nil
@ -753,7 +750,7 @@ class NomsuCompiler
else else
interp_nomsu = @tree_to_nomsu(bit, true) interp_nomsu = @tree_to_nomsu(bit, true)
if interp_nomsu if interp_nomsu
if bit.type != "Word" and bit.type != "List" and bit.type != "Dict" and bit.type != "Text" if bit.type != "List" and bit.type != "Dict" and bit.type != "Text"
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
nomsu\append "\\", interp_nomsu nomsu\append "\\", interp_nomsu
else else
@ -865,9 +862,6 @@ class NomsuCompiler
when "Var" when "Var"
return Nomsu(nil, "%", tree.value) return Nomsu(nil, "%", tree.value)
when "Word"
return Nomsu(nil, tree.value)
when "Comment" when "Comment"
return nil if inline return nil if inline
return Nomsu(nil, "#", tree.value\gsub("\n", "\n ")) return Nomsu(nil, "#", tree.value\gsub("\n", "\n "))

2
nomsu.peg
View File

@ -50,7 +50,7 @@ inline_action (Action):
action (Action): action (Action):
(expression (dotdot? %ws*))* word ((dotdot? %ws*) (expression / word))* (expression (dotdot? %ws*))* word ((dotdot? %ws*) (expression / word))*
word (Word): { %operator / (!number plain_word) } word: { %operator / (!number plain_word) }
text_word (Text): {%operator / (!number plain_word)} text_word (Text): {%operator / (!number plain_word)}

23
nomsu_tree.lua
View File

@ -103,7 +103,6 @@ Tree("Dict", 'multi')
Tree("DictEntry", 'multi') Tree("DictEntry", 'multi')
Tree("IndexChain", 'multi') Tree("IndexChain", 'multi')
Tree("Number", 'single') Tree("Number", 'single')
Tree("Word", 'single')
Tree("Comment", 'single') Tree("Comment", 'single')
Tree("Var", 'single', { Tree("Var", 'single', {
as_lua_id = function(self) as_lua_id = function(self)
@ -121,31 +120,29 @@ Tree("Action", 'multi', {
if include_names == nil then if include_names == nil then
include_names = false include_names = false
end end
local bits
if include_names then if include_names then
do return concat((function()
local _accum_0 = { } local _accum_0 = { }
local _len_0 = 1 local _len_0 = 1
for _index_0 = 1, #self do for _index_0 = 1, #self do
local t = self[_index_0] local a = self[_index_0]
_accum_0[_len_0] = (t.type == "Word" and t.value or "%" .. tostring(t.value)) _accum_0[_len_0] = type(a) == "string" and a or "%" .. tostring(a.value)
_len_0 = _len_0 + 1 _len_0 = _len_0 + 1
end end
bits = _accum_0 return _accum_0
end end)(), " ")
else else
do return concat((function()
local _accum_0 = { } local _accum_0 = { }
local _len_0 = 1 local _len_0 = 1
for _index_0 = 1, #self do for _index_0 = 1, #self do
local t = self[_index_0] local a = self[_index_0]
_accum_0[_len_0] = (t.type == "Word" and t.value or "%") _accum_0[_len_0] = type(a) == "string" and a or "%"
_len_0 = _len_0 + 1 _len_0 = _len_0 + 1
end end
bits = _accum_0 return _accum_0
end end)(), " ")
end end
return concat(bits, " ")
end end
}) })
return Types return Types

9
nomsu_tree.moon
View File

@ -56,7 +56,6 @@ Tree "Dict", 'multi'
Tree "DictEntry", 'multi' Tree "DictEntry", 'multi'
Tree "IndexChain", 'multi' Tree "IndexChain", 'multi'
Tree "Number", 'single' Tree "Number", 'single'
Tree "Word", 'single'
Tree "Comment", 'single' Tree "Comment", 'single'
Tree "Var", 'single', Tree "Var", 'single',
@ -65,9 +64,9 @@ Tree "Var", 'single',
Tree "Action", 'multi', Tree "Action", 'multi',
get_stub: (include_names=false)=> get_stub: (include_names=false)=>
bits = if include_names if include_names
[(t.type == "Word" and t.value or "%#{t.value}") for t in *@] concat [type(a) == "string" and a or "%#{a.value}" for a in *@], " "
else [(t.type == "Word" and t.value or "%") for t in *@] else
return concat(bits, " ") concat [type(a) == "string" and a or "%" for a in *@], " "
return Types return Types