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

Cleaned up metaprogramming to go "compile to" -> "rule =" -> "parse as".

Browse Source 
This speeds things up a bit, and is more intuitive.
This commit is contained in:
Bruce Hill 2018-01-09 14:59:06 -08:00
parent f97ab858ed
commit 421abe1a6f
4 changed files with 367 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/control_flow.nom
View File

@ -3,6 +3,7 @@ require "lib/operators.nom"
require "lib/utils.nom"
# Conditionals
immediately:
compile [if %condition %if_body] to code: ".."
if \(%condition as lua) then
\(%if_body as lua statements)
@ -25,15 +26,19 @@ parse [unless %x == %y %if_body else %else_body] as: if (%x != %y) %if_body else
parse [unless %x != %y %if_body else %else_body] as: if (%x == %y) %if_body else %else_body
# Return
immediately:
compile [return] to code: "do return; end"
compile [return %return_value] to code: "do return \(%return_value as lua); end"
# GOTOs
immediately:
compile [-> %label] to code: ".."
::label_\(nomsu "var_to_lua_identifier" [%label])::;
compile [go to %label] to code: ".."
goto label_\(nomsu "var_to_lua_identifier" [%label]);
# Helper function
immediately:
rule [tree %tree has function call %call] =:
lua> ".."
local target = (\%call).stub;
@ -46,6 +51,7 @@ rule [tree %tree has function call %call] =:
return false;
# While loops
immediately:
compile [do next repeat-loop] to code: "goto continue_repeat;"
compile [stop repeat-loop] to code: "goto stop_repeat;"
compile [repeat while %condition %body] to code:
@ -71,6 +77,7 @@ parse [repeat until %x == %y %body] as: repeat while (%x != %y) %body
parse [repeat until %x != %y %body] as: repeat while (%x == %y) %body
# For loop control flow:
immediately:
compile [stop for-loop] to code: "goto stop_for;"
compile [stop %var] to code: ".."
goto stop_\(nomsu "var_to_lua_identifier" [%var]);
@ -79,6 +86,7 @@ compile [do next %var] to code: ".."
goto continue_\(nomsu "var_to_lua_identifier" [%var]);
# Numeric range for loops
immediately:
compile [..]
for %var from %start to %stop by %step %body
for %var from %start to %stop via %step %body
@ -108,6 +116,7 @@ compile [..]
end --for-loop label scope
..if %stop_labels != "" else %code
immediately:
parse [for %var from %start to %stop %body] as: for %var from %start to %stop via 1 %body
parse [..]
for all %start to %stop by %step %body
@ -115,6 +124,7 @@ parse [..]
..as: for % from %start to %stop via %step %body
parse [for all %start to %stop %body] as: for all %start to %stop via 1 %body
immediately:
compile [for %var in %iterable %body] to code:
%continue_labels = ""
if (tree %body has function call \(do next for-loop)):
@ -142,6 +152,7 @@ compile [for %var in %iterable %body] to code:
parse [for all %iterable %body] as: for % in %iterable %body
# Dict iteration (lua's "pairs()")
immediately:
compile [for %key = %value in %iterable %body] to code:
%continue_labels = ""
if (tree %body has function call \(do next for-loop)):
@ -173,6 +184,7 @@ compile [for %key = %value in %iterable %body] to code:
..if %stop_labels != "" else %code
# Switch statement/multi-branch if
immediately:
compile [when %body] to code:
%result = ""
%fallthroughs = []
@ -217,6 +229,7 @@ compile [when %body] to code:
return %result
# Switch statement
immediately:
compile [when %branch_value == ? %body] to code:
%result = ""
%fallthroughs = []
@ -266,6 +279,7 @@ compile [when %branch_value == ? %body] to code:
return %result
# Try/except
immediately:
compile [..]
try %action and if it succeeds %success or if it fails %fallback
try %action and if it fails %fallback or if it succeeds %success
@ -295,6 +309,7 @@ parse [try %action and if it succeeds %success] as:
try %action and if it succeeds %success or if it fails: pass
# Do/finally:
immediately:
compile [do %action then always %final_action] to code: ".."
do
local fell_through = false;

108
lib/metaprogramming.nom
View File

@ -2,10 +2,60 @@
This File contains rules for making rules and macros and some helper functions to make
that easier.
# Rule to make rules:
# Rule to make macros:
immediately:
lua> ".."
nomsu:defmacro("rule %signature = %body", (function(nomsu, vars)
nomsu:defmacro("compile %macro_def to %body", function(nomsu, vars)
nomsu:assert(\%macro_def.type == "List",
"Invalid type for compile definition signature. Expected List, but got: "..tostring(\%macro_def.type));
nomsu:assert(\%body.type == "Block",
"Invalid type for compile definition body. Expected Block, but got: "..tostring(\%body.type));
local signature = {};
for i, alias in ipairs(\%macro_def.value) do
signature[i] = alias.src;
end
local body_lua = nomsu:tree_to_lua(\%body);
body_lua = body_lua.statements or ("return "..body_lua.expr..";");
local lua = ([[
do
local function macro(nomsu, vars)
%s
end
local function macro_wrapper(...) return {expr=macro(...)}; end
nomsu:defmacro(%s, macro_wrapper, %s);
end]]):format(body_lua, nomsu:repr(signature), nomsu:repr(("compile %s\\n..to code %s"):format(\%macro_def.src, \%body.src)));
return {statements=lua};
end, \(__src__ 1));
lua> ".."
nomsu:defmacro("compile %macro_def to code %body", function(nomsu, vars)
nomsu:assert(\%macro_def.type == "List",
"Invalid type for compile definition signature. Expected List, but got: "..tostring(\%macro_def.type));
nomsu:assert(\%body.type == "Block",
"Invalid type for compile definition body. Expected Block, but got: "..tostring(\%body.type));
local signature = {};
for i, alias in ipairs(\%macro_def.value) do
signature[i] = alias.src;
end
local body_lua = nomsu:tree_to_lua(\%body);
body_lua = body_lua.statements or ("return "..body_lua.expr..";");
local lua = ([[
do
local function macro(nomsu, vars)
%s
end
local function macro_wrapper(...) return {statements=macro(...)}; end
nomsu:defmacro(%s, macro_wrapper, %s);
end]]):format(body_lua, nomsu:repr(signature), nomsu:repr(("compile %s\\n..to code %s"):format(\%macro_def.src, \%body.src)));
return {statements=lua};
end, \(__src__ 1));
compile [rand] to: "math.random()"
# Rule to make rules:
immediately:
compile [rule %signature = %body] to code:
lua> ".."
nomsu:assert(\%signature.type == "List",
"Invalid type for rule definition signature. Expected List, but got: "..tostring(\%signature.type));
nomsu:assert(\%body.type == "Block",
@ -14,56 +64,14 @@ immediately:
for i, alias in ipairs(\%signature.value) do
signature[i] = alias.src;
end
local src = nomsu:source_code(0);
local body_lua = nomsu:tree_to_lua(\%body);
local fn_src = ([[
function(nomsu, vars)
body_lua = body_lua.statements or ("return "..body_lua.expr..";");
local src = nomsu:dedent(nomsu:source_code(0));
local def_lua = ([[
nomsu:def(%s, function(nomsu, vars)
%s
end]]):format(body_lua.statements or ("return "..body_lua.expr..";"));
return {statements=([[
nomsu:def(%s, %s, %s)
]]):format(nomsu:repr(signature), fn_src, nomsu:repr(nomsu:dedent(src)))};
end), \(__src__ 1));
# Rules to make lua macros:
immediately:
rule [compile \%macro_def to \%body] =:
lua> ".."
nomsu:assert(\%macro_def.type == "List",
"Invalid type for compile definition signature. Expected List, but got: "..tostring(\%macro_def.type));
nomsu:assert(\%body.type == "Block",
"Invalid type for compile definition body. Expected Block, but got: "..tostring(\%body.type));
local signature = {};
for i, alias in ipairs(\%macro_def.value) do
signature[i] = alias.src;
end
local body_lua = nomsu:tree_to_lua(\%body);
local fn_src = ([[
function(nomsu, vars)
%s
end]]):format(body_lua.statements or ("return "..body_lua.expr..";"));
local fn = nomsu:run_lua("return "..fn_src..";");
local fn_wrapper = function(...) return {expr=fn(...)}; end;
nomsu:defmacro(signature, fn_wrapper, ("compile %s\\n..to %s"):format(\%macro_def.src, \%body.src));
rule [compile \%macro_def to code \%body] =:
lua> ".."
nomsu:assert(\%macro_def.type == "List",
"Invalid type for compile definition signature. Expected List, but got: "..tostring(\%macro_def.type));
nomsu:assert(\%body.type == "Block",
"Invalid type for compile definition body. Expected Block, but got: "..tostring(\%body.type));
local signature = {};
for i, alias in ipairs(\%macro_def.value) do
signature[i] = alias.src;
end
local body_lua = nomsu:tree_to_lua(\%body);
local fn_src = ([[
function(nomsu, vars)
%s
end]]):format(body_lua.statements or ("return "..body_lua.expr..";"));
local fn = nomsu:run_lua("return "..fn_src..";");
local fn_wrapper = function(...) return {statements=fn(...)}; end;
nomsu:defmacro(signature, fn_wrapper, ("compile %s\\n..to code %s"):format(\%macro_def.src, \%body.src));
end, %s);]]):format(nomsu:repr(signature), body_lua, nomsu:repr(src));
return def_lua;
# Rule to make nomsu macros:
immediately:

15
nomsu.lua
View File

@ -142,8 +142,8 @@ do
}
setmetatable(defs, {
__index = function(self, key)
local fn
fn = function(start, value, stop)
local make_node
make_node = function(start, value, stop)
return {
start = start,
stop = stop,
@ -152,8 +152,8 @@ do
type = key
}
end
self[key] = fn
return fn
self[key] = make_node
return make_node
end
})
local peg_tidier = re.compile([[ file <- {~ %nl* (def/comment) (%nl+ (def/comment))* %nl* ~}
@ -535,6 +535,7 @@ do
self:assert(tree.type == "File", "Attempt to run non-file: " .. tostring(tree.type))
local lua = self:tree_to_lua(tree)
local lua_code = lua.statements or (lua.expr .. ";")
lua_code = "-- File: " .. tostring(filename) .. "\n" .. lua_code
local ret = self:run_lua(lua_code, vars)
if max_operations then
debug.sethook()
@ -571,6 +572,7 @@ end]]):format(lua_code))
end,
tree_to_value = function(self, tree, vars, filename)
local code = "return (function(nomsu, vars)\nreturn " .. tostring(self:tree_to_lua(tree, filename).expr) .. ";\nend);"
code = "-- Tree to value: " .. tostring(filename) .. "\n" .. code
if self.debug then
self:writeln(tostring(colored.bright("RUNNING LUA TO GET VALUE:")) .. "\n" .. tostring(colored.blue(colored.bright(code))))
end
@ -889,7 +891,7 @@ end]]):format(lua_code))
else
local lua = self:tree_to_lua(arg, filename)
if lua.statements then
self:error("Cannot use [[" .. tostring(arg.src) .. "]] as a function argument, since it's not an expression.")
self:error("Cannot use [[" .. tostring(arg.src) .. "]] as a function argument to " .. tostring(tree.stub) .. ", since it's not an expression.")
end
insert(args, lua.expr)
end
@ -1319,9 +1321,10 @@ end]]):format(lua_code))
self:defmacro("immediately %block", function(self, vars)
local lua = self:tree_to_lua(vars.block)
local lua_code = lua.statements or (lua.expr .. ";")
lua_code = "-- Immediately:\n" .. lua_code
self:run_lua(lua_code, vars)
return {
statements = lua_code
statements = ""
}
end)
self:defmacro("lua> %code", function(self, vars)

13
nomsu.moon
View File

@ -106,10 +106,10 @@ do
return {type: "FunctionCall", :src, line_no: "#{ctx.filename}:#{line_no}", :value, :stub}
setmetatable(defs, {__index:(key)=>
fn = (start, value, stop)->
make_node = (start, value, stop)->
{:start, :stop, :value, src:ctx.source_code\sub(start,stop-1), type: key}
self[key] = fn
return fn
self[key] = make_node
return make_node
})
-- Just for cleanliness, I put the language spec in its own file using a slightly modified
@ -346,6 +346,7 @@ class NomsuCompiler
lua = @tree_to_lua(tree)
lua_code = lua.statements or (lua.expr..";")
lua_code = "-- File: #{filename}\n"..lua_code
ret = @run_lua(lua_code, vars)
if max_operations
debug.sethook!
@ -375,6 +376,7 @@ end]]\format(lua_code))
tree_to_value: (tree, vars, filename)=>
code = "return (function(nomsu, vars)\nreturn #{@tree_to_lua(tree, filename).expr};\nend);"
code = "-- Tree to value: #{filename}\n"..code
if @debug
@writeln "#{colored.bright "RUNNING LUA TO GET VALUE:"}\n#{colored.blue colored.bright(code)}"
lua_thunk, err = load(code)
@ -583,7 +585,7 @@ end]]\format(lua_code))
else
lua = @tree_to_lua arg, filename
if lua.statements
@error "Cannot use [[#{arg.src}]] as a function argument, since it's not an expression."
@error "Cannot use [[#{arg.src}]] as a function argument to #{tree.stub}, since it's not an expression."
insert args, lua.expr
arg_num += 1
@ -835,8 +837,9 @@ end]]\format(lua_code))
@defmacro "immediately %block", (vars)=>
lua = @tree_to_lua(vars.block)
lua_code = lua.statements or (lua.expr..";")
lua_code = "-- Immediately:\n"..lua_code
@run_lua(lua_code, vars)
return statements:lua_code
return statements:""
@defmacro "lua> %code", (vars)=>
lua = nomsu_string_as_lua(@, vars.code)