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

Fixes for indentation of generated lua code.

Browse Source
This commit is contained in:
Bruce Hill 2018-09-28 18:34:40 -07:00
parent 3f31b09e74
commit 84931a6f0e
1 changed files with 50 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
core/control_flow.nom
View File

@ -129,12 +129,13 @@ compile [repeat while %condition %body] to:
%lua::append "\n ::continue_repeat::" %lua::append "\n ::continue_repeat::"
%lua::append "\nend --while-loop" %lua::append "\nend --while-loop"
if (%body has subtree \(stop repeating)): if (%body has subtree \(stop repeating)):
%lua = (..) %inner_lua = %lua
Lua "\ %lua = (Lua "do -- scope of 'stop repeating' label\n ")
..do -- scope of "stop repeating" label %lua::append %inner_lua
\%lua %lua::append "\
..
::stop_repeat:: ::stop_repeat::
end -- end of "stop repeating" label scope" end -- end of 'stop repeating' label scope"
return %lua return %lua
@ -158,12 +159,13 @@ compile [repeat %n times %body] to:
%lua::append "\n ::continue_repeat::" %lua::append "\n ::continue_repeat::"
%lua::append "\nend --numeric for-loop" %lua::append "\nend --numeric for-loop"
if (%body has subtree \(stop repeating)): if (%body has subtree \(stop repeating)):
%lua = (..) %inner_lua = %lua
Lua "\ %lua = (Lua "do -- scope of 'stop repeating' label\n ")
..do -- scope of "stop repeating" label %lua::append %inner_lua
\%lua %lua::append "\
..
::stop_repeat:: ::stop_repeat::
end -- end of "stop repeating" label scope" end -- end of 'stop repeating' label scope"
return %lua return %lua
@ -220,12 +222,12 @@ compile [..]
%lua::append "\n \(compile as (===next %var ===))" %lua::append "\n \(compile as (===next %var ===))"
%lua::append "\nend --numeric for-loop" %lua::append "\nend --numeric for-loop"
if (%body has subtree \(stop %var)): if (%body has subtree \(stop %var)):
%lua = (..) %inner_lua = %lua
Lua "\ %lua = (Lua "do -- scope for stopping for-loop\n ")
..do -- scope for stopping for-loop %lua::append %inner_lua
\%lua %lua::append "\n "
\(compile as (===stop %var ===)) %lua::append (compile as (===stop %var ===))
end -- end of scope for stopping for-loop" %lua::append "\nend -- end of scope for stopping for-loop"
return %lua return %lua
@ -262,12 +264,12 @@ compile [for %var in %iterable %body] to:
%lua::append (Lua "\n\(compile as (===next %var ===))") %lua::append (Lua "\n\(compile as (===next %var ===))")
%lua::append "\nend --foreach-loop" %lua::append "\nend --foreach-loop"
if (%body has subtree \(stop %var)): if (%body has subtree \(stop %var)):
%lua = (..) %inner_lua = %lua
Lua "\ %lua = (Lua "do -- scope for stopping for-loop\n ")
..do -- scope for stopping for-loop %lua::append %inner_lua
\%lua %lua::append "\n "
\(compile as (===stop %var ===)) %lua::append (compile as (===stop %var ===))
end -- end of scope for stopping for-loop" %lua::append "\nend -- end of scope for stopping for-loop"
return %lua return %lua
@ -285,12 +287,12 @@ compile [for %var in %iterable at %i %body] to:
%lua::append (Lua "\n\(compile as (===next %var ===))") %lua::append (Lua "\n\(compile as (===next %var ===))")
%lua::append "\nend --foreach-loop" %lua::append "\nend --foreach-loop"
if (%body has subtree \(stop %var)): if (%body has subtree \(stop %var)):
%lua = (..) %inner_lua = %lua
Lua "\ %lua = (Lua "do -- scope for stopping for-loop\n ")
..do -- scope for stopping for-loop %lua::append %inner_lua
\%lua %lua::append "\n "
\(compile as (===stop %var ===)) %lua::append (compile as (===stop %var ===))
end -- end of scope for stopping for-loop" %lua::append "\nend -- end of scope for stopping for-loop"
return %lua return %lua
@ -333,11 +335,11 @@ compile [..]
if (%body has subtree \(stop %value)): if (%body has subtree \(stop %value)):
%stop_labels::append "\n\(compile as (===stop %value ===))" %stop_labels::append "\n\(compile as (===stop %value ===))"
if ((size of "\%stop_labels") > 0): if ((size of "\%stop_labels") > 0):
%lua = (..) %inner_lua = %lua
Lua "\ %lua = (Lua "do -- scope for stopping for % = % loop\n ")
..do -- scope for stopping for % = % loop %lua::append %inner_lua
\%lua\%stop_labels %lua::append %stop_labels
end" %lua::append "\nend"
return %lua return %lua
@ -384,11 +386,8 @@ compile [if %body, when %body] to:
..need a conditional block around it. Otherwise, make sure the 'else' \ ..need a conditional block around it. Otherwise, make sure the 'else' \
..block comes last." ..block comes last."
%code::append "\ %code::append "\nelse\n "
.. %code::append (%action as lua statements)
else
\(%action as lua statements)"
%else_allowed = (no) %else_allowed = (no)
..else: ..else:
%code::append "\%clause " %code::append "\%clause "
@ -397,10 +396,8 @@ compile [if %body, when %body] to:
%code::append " or " %code::append " or "
%code::append (%line.%i as lua expr) %code::append (%line.%i as lua expr)
%code::append "\ %code::append " then\n "
.. then %code::append (%action as lua statements)
\(%action as lua statements)"
%clause = "\nelseif" %clause = "\nelseif"
if ((size of "\%code") == 0): if ((size of "\%code") == 0):
@ -449,11 +446,8 @@ compile [if %branch_value is %body, when %branch_value is %body] to:
..need a conditional block around it. Otherwise, make sure the 'else' \ ..need a conditional block around it. Otherwise, make sure the 'else' \
..block comes last." ..block comes last."
%code::append "\ %code::append "\nelse\n "
.. %code::append (%action as lua statements)
else
\(%action as lua statements)"
%else_allowed = (no) %else_allowed = (no)
..else: ..else:
%code::append "\%clause " %code::append "\%clause "
@ -462,22 +456,22 @@ compile [if %branch_value is %body, when %branch_value is %body] to:
%code::append " or " %code::append " or "
%code::append "\(mangle "branch value") == \(%line.%i as lua expr)" %code::append "\(mangle "branch value") == \(%line.%i as lua expr)"
%code::append "\ %code::append " then\n "
.. then %code::append (%action as lua statements)
\(%action as lua statements)"
%clause = "\nelseif" %clause = "\nelseif"
if ((size of "\%code") == 0): if ((size of "\%code") == 0):
compile error at %body "'if' block has an empty body." compile error at %body "'if' block has an empty body."
..hint "This means nothing would happen, so the 'if' block should be deleted." ..hint "This means nothing would happen, so the 'if' block should be deleted."
%code::append "\nend --when" %code::append "\nend --when"
return (..) %lua = (..)
Lua "\ Lua "\
..do --if % is ..do --if % is...
local \(mangle "branch value") = \(%branch_value as lua expr) local \(mangle "branch value") = \(%branch_value as lua expr)"
\%code %lua::append "\n "
end --if % is" %lua::append %code
%lua::append "\nend --if % is..."
return %lua
# Do/finally # Do/finally
compile [do %action] to (..) compile [do %action] to (..)