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

Improved code generation for "when" statements using elseif, and

Browse Source 
improved code generation for loops by omitting goto labels when not used.
This commit is contained in:
Bruce Hill 2017-10-13 18:09:04 -07:00
parent d13bcde2b9
commit e476bfea52
6 changed files with 140 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/how_do_i.nom
View File

@ -136,7 +136,7 @@ repeat:
say "repeat loop #\(%x)" say "repeat loop #\(%x)"
%x += 1 %x += 1
if (%x > 3): if (%x > 3):
break stop repeat-loop
# GOTOs: # GOTOs:
do: do:

179
lib/control_flow.nom
View File

@ -5,19 +5,19 @@ require "lib/utils.nom"
# Conditionals # Conditionals
compile [if %condition %if_body] to code: ".." compile [if %condition %if_body] to code: ".."
|if \(%condition as lua) then; |if \(%condition as lua) then;
| \(%if_body as lua statements) |\(%if_body as lua statements)
|end; |end;--end if
compile [unless %condition %body] to code: ".." compile [unless %condition %body] to code: ".."
|if not (\(%condition as lua)) then; |if not (\(%condition as lua)) then;
| \(%body as lua statements) |\(%body as lua statements)
|end; |end;--end if
compile [if %condition %if_body else %else_body, unless %condition %else_body else %if_body] to code: ".." compile [if %condition %if_body else %else_body, unless %condition %else_body else %if_body] to code: ".."
|if \(%condition as lua) then; |if \(%condition as lua) then;
| \(%if_body as lua statements) |\(%if_body as lua statements)
|else; |else;
| \(%else_body as lua statements) |\(%else_body as lua statements)
|end; |end;--end if
# Return # Return
compile [return] to code: "do; return; end;" compile [return] to code: "do; return; end;"
@ -29,47 +29,71 @@ compile [-> %label] to code: ".."
compile [go to %label] to code: ".." compile [go to %label] to code: ".."
|goto label_\(nomsu "var_to_lua_identifier" [%label]); |goto label_\(nomsu "var_to_lua_identifier" [%label]);
# Loop control flow rule [tree %tree has function call %call] =:
compile [stop, stop loop, break] to code: "break" lua code ".."
compile [stop for, stop for-loop, break for] to code: "goto break_for" |local target = (\(%call)).value;
compile [stop repeat, stop repeat-loop, break repeat] to code: "goto break_repeat" |for subtree,_ in coroutine.wrap(function() nomsu:walk_tree(\(%tree)); end) do;
compile [stop %var, break %var] to code: ".." | if type(subtree) == 'table' and subtree.type == "FunctionCall"
|goto break_\(nomsu "var_to_lua_identifier" [%var]); | and nomsu.utils.equivalent(subtree.value, target, 2) then;
| return true;
compile [continue, continue loop] to code: "continue" | end;
compile [continue for, continue for-loop] to code: "goto continue_for" |end;
compile [continue repeat, continue repeat-loop] to code: "goto continue_repeat" |do; return false; end;
compile [continue %var, go to next %var, on to the next %var] to code: ".."
|goto continue_\(nomsu "var_to_lua_identifier" [%var]);
# While loops # While loops
compile [repeat while %condition %body] to code: ".." compile [do next repeat-loop] to code: "goto continue_repeat;"
|do; compile [stop repeat-loop] to code: "goto stop_repeat;"
| while \(%condition as lua) do; compile [repeat while %condition %body] to code:
| \(%body as lua statements) %continue-labels = (..)
| ::continue_repeat::; "\n::continue_repeat::;" if (tree %body has function call \(do next repeat-loop)) else ""
| end; %code = ".."
| ::break_repeat::; |while \(%condition as lua) do;
|end; |\(%body as lua statements)\(%continue-labels)
|end;--while-loop
if (tree %body has function call \(stop repeat-loop)):
return ".."
|do;--while-loop label scope
|\(%code)
|::stop_repeat::;
|end;--while-loop label scope
return %code
parse [repeat %body] as: repeat while (true) %body parse [repeat %body] as: repeat while (true) %body
parse [repeat until %condition %body] as: repeat while (not %condition) %body parse [repeat until %condition %body] as: repeat while (not %condition) %body
# For loop control flow:
compile [stop for-loop] to code: "goto stop_for;"
compile [stop %var] to code: ".."
|goto stop_\(nomsu "var_to_lua_identifier" [%var]);
compile [do next for-loop] to code: "goto continue_for;"
compile [do next %var] to code: ".."
|goto continue_\(nomsu "var_to_lua_identifier" [%var]);
# Numeric range for loops # Numeric range for loops
compile [..] compile [..]
for %var from %start to %stop by %step %body for %var from %start to %stop by %step %body
for %var from %start to %stop via %step %body for %var from %start to %stop via %step %body
..to code: ".." ..to code:
|do; %continue-labels = ""
| for i=\(%start as lua),\(%stop as lua),\(%step as lua) do; if (tree %body has function call \(do next for-loop)):
# This trashes the loop variables, just like in Python. %continue-labels join= "\n::continue_for::;"
| \(%var as lua) = i; if (tree %body has function call (nomsu "replaced_vars" [\(do next %), lua expr "{['']=\(%var)}"])):
| \(%body as lua statements) %continue-labels join= "\n::continue_\(nomsu "var_to_lua_identifier" [%var])::;"
| ::continue_for::; %code = ".."
| ::continue_\(nomsu "var_to_lua_identifier" [%var])::; |for i=\(%start as lua),\(%stop as lua),\(%step as lua) do;
| end; # This trashes the loop variables, just like in Python.
| ::break_for::; |\(%var as lua) = i;
| ::break_\(nomsu "var_to_lua_identifier" [%var])::; |\(%body as lua statements)\(%continue-labels)
|end; |end;--numeric for-loop
%stop-labels = ""
if (tree %body has function call \(stop for-loop)):
%stop-labels join= "\n::stop_for::;"
if (tree %body has function call (nomsu "replaced_vars" [\(stop %), lua expr "{['']=\(%var)}"])):
%stop-labels join= "\n::stop_\(nomsu "var_to_lua_identifier" [%var])::;"
if (%stop-labels != ""): ".."
|do;--for-loop label scope
|\(%code)\(%stop-labels)
|end;--for-loop label scope
..else: %code
parse [for %var from %start to %stop %body] as: for %var from %start to %stop via 1 %body parse [for %var from %start to %stop %body] as: for %var from %start to %stop via 1 %body
parse [..] parse [..]
for all %start to %stop by %step %body for all %start to %stop by %step %body
@ -78,25 +102,35 @@ parse [..]
parse [for all %start to %stop %body] as: for all %start to %stop via 1 %body parse [for all %start to %stop %body] as: for all %start to %stop via 1 %body
compile [for %var in %iterable %body] to code: compile [for %var in %iterable %body] to code:
".." %continue-labels = ""
|do; if (tree %body has function call \(do next for-loop)):
| for i,value in ipairs(\(%iterable as lua)) do; %continue-labels join= "\n::continue_for::;"
if (tree %body has function call (nomsu "replaced_vars" [\(do next %), lua expr "{['']=\(%var)}"])):
%continue-labels join= "\n::continue_\(nomsu "var_to_lua_identifier" [%var])::;"
%code = ".."
|for i,value in ipairs(\(%iterable as lua)) do;
# This trashes the loop variables, just like in Python. # This trashes the loop variables, just like in Python.
| \(%var as lua) = value; |\(%var as lua) = value;
| \(%body as lua statements) |\(%body as lua statements)\(%continue-labels)
| ::continue_for::; |end;--foreach-loop
| ::continue_\(nomsu "var_to_lua_identifier" [%var])::; %stop-labels = ""
| end; if (tree %body has function call \(stop for-loop)):
| ::break_for::; %stop-labels join= "\n::stop_for::;"
| ::break_\(nomsu "var_to_lua_identifier" [%var])::; if (tree %body has function call (nomsu "replaced_vars" [\(stop %), lua expr "{['']=\(%var)}"])):
|end; %stop-labels join= "\n::stop_\(nomsu "var_to_lua_identifier" [%var])::;"
if (%stop-labels != ""): ".."
|do;--for-loop label scope
|\(%code)\(%stop-labels)
|end;--for-loop label scope
..else: %code
parse [for all %iterable %body] as: for % in %iterable %body parse [for all %iterable %body] as: for % in %iterable %body
# Switch statement/multi-branch if # Switch statement/multi-branch if
compile [when %body] to code: compile [when %body] to code:
%result = "do;\n" %result = ""
%fallthroughs = [] %fallthroughs = []
%first = (yes)
for %func-call in (%body's "value"): for %func-call in (%body's "value"):
assert ((%func-call's "type") == "FunctionCall") ".." assert ((%func-call's "type") == "FunctionCall") ".."
|Invalid format for 'when' statement. Only '*' blocks are allowed. |Invalid format for 'when' statement. Only '*' blocks are allowed.
@ -112,34 +146,35 @@ compile [when %body] to code:
%action = (%tokens -> 3) %action = (%tokens -> 3)
if (%action == (nil)): if (%action == (nil)):
lua block "table.insert(vars.fallthroughs, vars.condition)" lua block "table.insert(vars.fallthroughs, vars.condition)"
go to next %func-call do next %func-call
if (lua expr "vars.condition.type == 'Word' and vars.condition.value == 'else'"): if (lua expr "vars.condition.type == 'Word' and vars.condition.value == 'else'"):
%result join= ".." %result join= ".."
| |
|do; |else;
|\(%action as lua statements)
stop for-loop
..else: ..else:
%condition = (%condition as lua) %condition = (%condition as lua)
for all %fallthroughs: for all %fallthroughs:
%condition join= " or \(% as lua)" %condition join= " or \(% as lua)"
%result join= ".." %result join= ".."
| |
|if \(%condition) then; |\("if" if %first else "elseif") \(%condition) then;
%result join= ".." |\(%action as lua statements)
|
| \(%action as lua statements)
| goto finished_when;
|end;
%fallthroughs = [] %fallthroughs = []
%first = (no)
%result join= "\n::finished_when::;\nend;" if (%result != ""):
%result join= "\nend;"
%result %result
# Switch statement # Switch statement
compile [when %branch-value == ? %body] to code: compile [when %branch-value == ? %body] to code:
%result = "do;\nlocal branch_value = \(%branch-value as lua)" %result = ""
%fallthroughs = [] %fallthroughs = []
%first = (yes)
for %func-call in (%body's "value"): for %func-call in (%body's "value"):
assert ((%func-call's "type") == "FunctionCall") ".." assert ((%func-call's "type") == "FunctionCall") ".."
|Invalid format for 'when' statement. Only '*' blocks are allowed. |Invalid format for 'when' statement. Only '*' blocks are allowed.
@ -155,28 +190,32 @@ compile [when %branch-value == ? %body] to code:
%action = (%tokens -> 3) %action = (%tokens -> 3)
if (%action == (nil)): if (%action == (nil)):
lua block "table.insert(vars.fallthroughs, vars.condition)" lua block "table.insert(vars.fallthroughs, vars.condition)"
go to next %func-call do next %func-call
if (lua expr "vars.condition.type == 'Word' and vars.condition.value == 'else'"): if (lua expr "vars.condition.type == 'Word' and vars.condition.value == 'else'"):
%result join= ".." %result join= ".."
| |
|do; |else;
|\(%action as lua statements)
stop for-loop
..else: ..else:
%condition = "branch_value == (\(%condition as lua))" %condition = "branch_value == (\(%condition as lua))"
for all %fallthroughs: for all %fallthroughs:
%condition join= " or (branch_value == \(% as lua))" %condition join= " or (branch_value == \(% as lua))"
%result join= ".." %result join= ".."
| |
|if \(%condition) then; |\("if" if %first else "elseif") \(%condition) then;
%result join= ".." |\(%action as lua statements)
|
| \(%action as lua statements)
| goto finished_when;
|end;
%fallthroughs = [] %fallthroughs = []
%first = (no)
%result join= "\n::finished_when::;\nend;" if (%result != ""):
%result = ".."
|do;--when == ?
|local branch_value = \(%branch-value as lua);\(%result)
|end;
|end;--when == ?
%result %result
# With statement # With statement

1
lib/metaprogramming.nom
View File

@ -110,4 +110,3 @@ parse [parse tree %code] as: nomsu "tree_to_str" [\%code]
parse [enable debugging] as: lua code "nomsu.debug = true" parse [enable debugging] as: lua code "nomsu.debug = true"
parse [disable debugging] as: lua code "nomsu.debug = false" parse [disable debugging] as: lua code "nomsu.debug = false"

34
nomsu.moon
View File

@ -329,10 +329,10 @@ class NomsuCompiler
@errorln "#{colored.red "Error occurred in statement:"}\n#{colored.bright colored.yellow statement.src}" @errorln "#{colored.red "Error occurred in statement:"}\n#{colored.bright colored.yellow statement.src}"
@error(expr) @error(expr)
code_for_statement = ([[ code_for_statement = ([[
return (function(nomsu, vars) return (function(nomsu, vars)
%s %s
return %s; return %s;
end);]])\format(statements or "", expr or "ret") end);]])\format(statements or "", expr or "ret")
if @debug if @debug
@writeln "#{colored.bright "RUNNING LUA:"}\n#{colored.blue colored.bright(code_for_statement)}" @writeln "#{colored.bright "RUNNING LUA:"}\n#{colored.blue colored.bright(code_for_statement)}"
lua_thunk, err = load(code_for_statement) lua_thunk, err = load(code_for_statement)
@ -342,7 +342,7 @@ class NomsuCompiler
n = n + 1 n = n + 1
("\n%-3d|")\format(n) ("\n%-3d|")\format(n)
code = "1 |"..code_for_statement\gsub("\n", fn) code = "1 |"..code_for_statement\gsub("\n", fn)
error("Failed to compile generated code:\n#{colored.bright colored.blue code}\n\n#{err}\n\nProduced by statement:\n#{colored.bright colored.yellow statement.src}") error("Failed to compile generated code:\n#{colored.bright colored.blue colored.onblack code}\n\n#{err}\n\nProduced by statement:\n#{colored.bright colored.yellow statement.src}")
run_statement = lua_thunk! run_statement = lua_thunk!
ok,ret = pcall(run_statement, self, vars) ok,ret = pcall(run_statement, self, vars)
if expr then return_value = ret if expr then return_value = ret
@ -350,16 +350,16 @@ class NomsuCompiler
@errorln "#{colored.red "Error occurred in statement:"}\n#{colored.yellow statement.src}" @errorln "#{colored.red "Error occurred in statement:"}\n#{colored.yellow statement.src}"
@errorln debug.traceback! @errorln debug.traceback!
@error(ret) @error(ret)
insert buffer, "#{statements or ''}\n#{expr and "ret = #{expr}" or ''}" insert buffer, "#{statements or ''}\n#{expr and "ret = #{expr};" or ''}"
if max_operations if max_operations
debug.sethook! debug.sethook!
lua_code = ([[ lua_code = ([[
return (function(nomsu, vars) return (function(nomsu, vars)
local ret; local ret;
%s %s
return ret; return ret;
end);]])\format(concat(buffer, "\n")) end);]])\format(concat(buffer, "\n"))
return return_value, lua_code, vars return return_value, lua_code, vars
tree_to_value: (tree, vars)=> tree_to_value: (tree, vars)=>
@ -368,7 +368,7 @@ class NomsuCompiler
@writeln "#{colored.bright "RUNNING LUA TO GET VALUE:"}\n#{colored.blue colored.bright(code)}" @writeln "#{colored.bright "RUNNING LUA TO GET VALUE:"}\n#{colored.blue colored.bright(code)}"
lua_thunk, err = load(code) lua_thunk, err = load(code)
if not lua_thunk if not lua_thunk
@error("Failed to compile generated code:\n#{colored.bright colored.blue code}\n\n#{colored.red err}") @error("Failed to compile generated code:\n#{colored.bright colored.blue colored.onblack code}\n\n#{colored.red err}")
return (lua_thunk!)(self, vars or {}) return (lua_thunk!)(self, vars or {})
tree_to_lua: (tree)=> tree_to_lua: (tree)=>
@ -391,11 +391,11 @@ class NomsuCompiler
if statement then insert lua_bits, statement if statement then insert lua_bits, statement
if expr then insert lua_bits, "ret = #{expr};" if expr then insert lua_bits, "ret = #{expr};"
return ([[ return ([[
(function(nomsu, vars) (function(nomsu, vars)
local ret; local ret;
%s %s
return ret; return ret;
end)]])\format(concat(lua_bits, "\n")) end)]])\format(concat(lua_bits, "\n"))
when "FunctionCall" when "FunctionCall"
stub = @get_stub(tree) stub = @get_stub(tree)

12
utils.lua
View File

@ -290,7 +290,10 @@ utils = {
end end
return table.sort(list, comparison) return table.sort(list, comparison)
end, end,
equivalent = function(x, y) equivalent = function(x, y, depth)
if depth == nil then
depth = 1
end
if x == y then if x == y then
return true return true
end end
@ -300,13 +303,16 @@ utils = {
if type(x) ~= 'table' then if type(x) ~= 'table' then
return false return false
end end
if depth == 0 then
return false
end
for k, v in pairs(x) do for k, v in pairs(x) do
if y[k] ~= v then if not (utils.equivalent(y[k], v, depth - 1)) then
return false return false
end end
end end
for k, v in pairs(y) do for k, v in pairs(y) do
if x[k] ~= v then if not (utils.equivalent(x[k], v, depth - 1)) then
return false return false
end end
end end

7
utils.moon
View File

@ -138,15 +138,16 @@ utils = {
comparison = if reverse then ((x,y)->(keyFn(x)>keyFn(y))) else ((x,y)->(keyFn(x)<keyFn(y))) comparison = if reverse then ((x,y)->(keyFn(x)>keyFn(y))) else ((x,y)->(keyFn(x)<keyFn(y)))
table.sort list, comparison table.sort list, comparison
equivalent: (x,y)-> equivalent: (x,y,depth=1)->
if x == y then return true if x == y then return true
if type(x) != type(y) then return false if type(x) != type(y) then return false
if type(x) != 'table' then return false if type(x) != 'table' then return false
if depth == 0 then return false
for k,v in pairs(x) for k,v in pairs(x)
if y[k] != v unless utils.equivalent(y[k], v, depth-1)
return false return false
for k,v in pairs(y) for k,v in pairs(y)
if x[k] != v unless utils.equivalent(x[k], v, depth-1)
return false return false
return true return true