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

Fixed compile_lib and cleaned up control_flow

Browse Source
This commit is contained in:
Bruce Hill 2018-04-28 19:37:51 -07:00
parent 05528c50ec
commit 85c5511fa5
2 changed files with 61 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compile_lib.sh
View File

@ -18,12 +18,12 @@ fi
for file in core/*.nom; do for file in core/*.nom; do
printf "Compiling $file ..." printf "Compiling $file ..."
./nomsu.moon $file -o "$(basename $file .nom).lua" ./nomsu.moon -o "$(basename $file .nom).lua" $file
echo "done." echo "done."
done done
for file in lib/*.nom; do for file in lib/*.nom; do
printf "Compiling $file ..." printf "Compiling $file ..."
./nomsu.moon $file -o "$(basename $file .nom).lua" ./nomsu.moon -o "$(basename $file .nom).lua" $file
echo "done." echo "done."
done done
#for file in tests/*.nom; do #for file in tests/*.nom; do

109
core/control_flow.nom
View File

@ -71,16 +71,18 @@ immediately
# Helper function # Helper function
immediately immediately
compile [if %tree has subtree %subtree where %condition %body] to compile [%tree has subtree %subtree where %condition] to
Lua ".." Lua value ".."
for \(%subtree as lua expr) in coroutine.wrap(function() nomsu:walk_tree(\(%tree as lua expr)) end) do (function()
if Types.is_node(\(%subtree as lua expr)) then for \(%subtree as lua expr) in coroutine.wrap(function() nomsu:walk_tree(\(%tree as lua expr)) end) do
if \(%condition as lua expr) then if Types.is_node(\(%subtree as lua expr)) then
\(%body as lua statements) if \(%condition as lua expr) then
break; return true;
end
end end
end end
end return false;
end)()
# While loops # While loops
immediately immediately
@ -91,13 +93,12 @@ immediately
Lua ".." Lua ".."
while \(%condition as lua expr) do while \(%condition as lua expr) do
\(%body as lua statements) \(%body as lua statements)
if %body has subtree % where if
(%.type = "Action") and ((%'s stub) is "do next repeat") %body has subtree % where: (%.type = "Action") and ((%'s stub) is "do next repeat")
.. ..: to %lua write "\n ::continue_repeat::;"
to %lua write "\n ::continue_repeat::;"
to %lua write "\nend --while-loop" to %lua write "\nend --while-loop"
if %body has subtree % where if
(%.type = "Action") and ((%'s stub) is "stop repeating") %body has subtree % where: (%.type = "Action") and ((%'s stub) is "stop repeating")
.. ..
%lua <- %lua <-
Lua ".." Lua ".."
@ -116,12 +117,12 @@ immediately
Lua ".." Lua ".."
for i=1,\(%n as lua expr) do for i=1,\(%n as lua expr) do
\(%body as lua statements) \(%body as lua statements)
if %body has subtree % where if
(%.type = "Action") and ((%'s stub) is "do next repeat") %body has subtree % where: (%.type = "Action") and ((%'s stub) is "do next repeat")
..: to %lua write "\n ::continue_repeat::;" ..: to %lua write "\n ::continue_repeat::;"
to %lua write "\nend --numeric for-loop" to %lua write "\nend --numeric for-loop"
if %body has subtree % where if
(%.type = "Action") and ((%'s stub) is "stop repeating") %body has subtree % where: (%.type = "Action") and ((%'s stub) is "stop repeating")
.. ..
%lua <- %lua <-
Lua ".." Lua ".."
@ -150,17 +151,19 @@ immediately
Lua ".." Lua ".."
for \(%var as lua expr)=\(%start as lua expr),\(%stop as lua expr),\(%step as lua expr) do for \(%var as lua expr)=\(%start as lua expr),\(%stop as lua expr),\(%step as lua expr) do
\(%body as lua statements) \(%body as lua statements)
if %body has subtree % where if
(%.type = "Action") and %body has subtree % where
((%'s stub) is "do next %") and (%.type = "Action") and
%.value.3.value is %var.value ((%'s stub) is "do next %") and
%.value.3.value is %var.value
..: to %lua write "\n ::continue_\(%var as lua identifier)::;" ..: to %lua write "\n ::continue_\(%var as lua identifier)::;"
to %lua write "\nend --numeric for-loop" to %lua write "\nend --numeric for-loop"
if %body has subtree % where if
(%.type = "Action") and %body has subtree % where
((%'s stub) is "stop %") and (%.type = "Action") and
%.value.2.value is %var.value ((%'s stub) is "stop %") and
%.value.2.value is %var.value
.. ..
%lua <- %lua <-
Lua ".." Lua ".."
@ -188,16 +191,18 @@ immediately
Lua ".." Lua ".."
for i,\(%var as lua identifier) in ipairs(\(%iterable as lua expr)) do for i,\(%var as lua identifier) in ipairs(\(%iterable as lua expr)) do
\(%body as lua statements) \(%body as lua statements)
if %body has subtree % where if
(%.type = "Action") and %body has subtree % where
((%'s stub) is "do next %") and (%.type = "Action") and
%.value.3.value is %var.value ((%'s stub) is "do next %") and
%.value.3.value is %var.value
..: to %lua write (Lua "\n ::continue_\(%var as lua identifier)::;") ..: to %lua write (Lua "\n ::continue_\(%var as lua identifier)::;")
to %lua write "\nend --foreach-loop" to %lua write "\nend --foreach-loop"
if %body has subtree % where if
(%.type = "Action") and %body has subtree % where
((%'s stub) is "stop %") and (%.type = "Action") and
%.value.2.value is %var.value ((%'s stub) is "stop %") and
%.value.2.value is %var.value
.. ..
%lua <- %lua <-
Lua ".." Lua ".."
@ -219,30 +224,34 @@ immediately
Lua ".." Lua ".."
for \(%key as lua identifier),\(%value as lua identifier) in pairs(\(%iterable as lua expr)) do for \(%key as lua identifier),\(%value as lua identifier) in pairs(\(%iterable as lua expr)) do
\(%body as lua statements) \(%body as lua statements)
if %body has subtree % where if
(%.type = "Action") and %body has subtree % where
((%'s stub) is "do next %") and (%.type = "Action") and
%.value.3.value is %key.value ((%'s stub) is "do next %") and
%.value.3.value is %key.value
..: to %lua write (Lua "\n ::continue_\(%key as lua identifier)::;") ..: to %lua write (Lua "\n ::continue_\(%key as lua identifier)::;")
if %body has subtree % where if
(%.type = "Action") and %body has subtree % where
((%'s stub) is "do next %") and (%.type = "Action") and
%.value.3.value is %value.value ((%'s stub) is "do next %") and
%.value.3.value is %value.value
..: to %lua write (Lua "\n ::continue_\(%value as lua identifier)::;") ..: to %lua write (Lua "\n ::continue_\(%value as lua identifier)::;")
to %lua write "\nend --foreach-loop" to %lua write "\nend --foreach-loop"
%stop_labels <- (Lua "") %stop_labels <- (Lua "")
if %body has subtree % where if
(%.type = "Action") and %body has subtree % where
((%'s stub) is "stop %") and (%.type = "Action") and
%.value.2.value is %key.value ((%'s stub) is "stop %") and
%.value.2.value is %key.value
..: to %stop_labels write "\n::stop_\(%key as lua identifier)::;" ..: to %stop_labels write "\n::stop_\(%key as lua identifier)::;"
if %body has subtree % where if
(%.type = "Action") and %body has subtree % where
((%'s stub) is "stop %") and (%.type = "Action") and
%.value.2.value is %value.value ((%'s stub) is "stop %") and
%.value.2.value is %value.value
..: to %stop_labels write "\n::stop_\(%value as lua identifier)::;" ..: to %stop_labels write "\n::stop_\(%value as lua identifier)::;"
if: (length of %stop_labels) > 0 if: (length of %stop_labels) > 0