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

Cleaned up code output to be just a series of declarations, instead of a

Browse Source 
table literal and a loop.
This commit is contained in:
Bruce Hill 2018-01-18 16:45:05 -08:00
parent 6021f04490
commit 7759b778f6
1 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/class.nom
View File

@ -26,7 +26,10 @@ compile [set @%var = %val] to code:
return "_me["..key_lua.."] = "..val_lua..";"; return "_me["..key_lua.."] = "..val_lua..";";
compile [object %classname %class_body] to: compile [object %classname %class_body] to:
local [%methods] local [%methods, %class_identifier]
set %class_identifier = (=lua "nomsu:var_to_lua_identifier(\(%classname as value)):sub(2,-1)")
if (%class_identifier == ""):
set %class_identifier = "class"
set %methods = [] set %methods = []
for %line in (%class_body's "value"): for %line in (%class_body's "value"):
if ((%line's "type") == "Comment"): do next %line if ((%line's "type") == "Comment"): do next %line
@ -39,24 +42,23 @@ compile [object %classname %class_body] to:
local stub = nomsu:get_stub(names[1]); local stub = nomsu:get_stub(names[1]);
local body_lua = nomsu:tree_to_lua(\%line.value[3]); local body_lua = nomsu:tree_to_lua(\%line.value[3]);
body_lua = body_lua.statements or ("return "..body_lua.expr..";"); body_lua = body_lua.statements or ("return "..body_lua.expr..";");
table.insert(\%methods, ([[ local arg_nomsus = {};
{ aliases=%s, for i, arg in ipairs(args) do arg_nomsus[i] = "nomsu:tree_to_lua("..arg..").expr"; end
line=%s, table.insert(\%methods, ([==[
source=%s, %s[ %s] = function(%s)
action=function(%s) %s
%s end
end, nomsu:define_compile_action(%s, %s, function(%s)
compile_to=function(%s) return {expr="("..nomsu:tree_to_lua(_me).expr..")[ "..%s.."]("..%s..")"};
return {expr="("..nomsu:tree_to_lua(_me).expr..")[ "..%s.."]("..nomsu:tree_to_lua(%s).expr..")"}; end, %s);
end, ACTION_METADATA[%s[ %s]] = ACTION_METADATA[ACTIONS[ %s]];
}]]):format(repr(names), repr(\%line:get_line_no()), repr(nomsu:dedent(\%line.src)), ]==]):format(
table.concat(args, ", "), body_lua, \%class_identifier, repr(stub), table.concat(args, ", "),
table.concat(args, ", "), repr(repr(stub)), table.concat(args, ").expr..nomsu:tree_to_lua("))); body_lua,
repr(names), repr(\%line:get_line_no()), table.concat(args, ", "),
local %class_identifier repr(repr(stub)), table.concat(arg_nomsus, ".."),
set %class_identifier = (=lua "nomsu:var_to_lua_identifier(\(%classname as value)):sub(2,-1)") repr(nomsu:dedent(\%line.src)),
if (%class_identifier == ""): \%class_identifier, repr(stub), repr(stub)));
set %class_identifier = "class"
return ".." return ".."
do -- \%class_identifier do -- \%class_identifier
@ -79,21 +81,7 @@ compile [object %classname %class_body] to:
\%class_identifier.class = \%class_identifier; \%class_identifier.class = \%class_identifier;
-- Define the methods: -- Define the methods:
\%class_identifier.methods = { \(join %methods with "\n")
\(join %methods with ",\n ")
}
-- Define nomsu compile time actions that rewrite "%foo baz %x" to %foo['% baz %'](%foo, %x)
-- so classes can have overlapping method names:
for i,method in ipairs(\%class_identifier.methods) do
for a_i, alias in ipairs(method.aliases) do
\%class_identifier[nomsu:get_stub(alias)] = method.action;
end
ACTION_METADATA[method.action] = {
fn=method.action, src=method.source, line_no=method.line, aliases=method.aliases,
};
nomsu:define_compile_action(method.aliases, method.line, method.compile_to, method.source);
end
-- Define class methods for instantiating and accessing instances: -- Define class methods for instantiating and accessing instances:
\%class_identifier.instance_metatable = { \%class_identifier.instance_metatable = {