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

Prevented redeclaration of function arguments as locals.

Browse Source
This commit is contained in:
Bruce Hill 2018-01-23 19:28:53 -08:00
parent 6d11354b3f
commit 49f0e95571
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/metaprogramming.nom
View File

@ -34,11 +34,19 @@ immediately
lua> ".." lua> ".."
nomsu:define_compile_action("compile %names to %body", \(__line_no__), function(\%names, \%body) nomsu:define_compile_action("compile %names to %body", \(__line_no__), function(\%names, \%body)
local names, args = nomsu:parse_spec(\%names); local names, args = nomsu:parse_spec(\%names);
local declared_locals = {};
for i, arg in ipairs(args) do declared_locals[arg] = true; end
names, args = repr(names), table.concat(args, ", "); names, args = repr(names), table.concat(args, ", ");
local body_lua = nomsu:tree_to_lua(\%body); local body_lua = nomsu:tree_to_lua(\%body);
local body_code = body_lua.statements or ("return "..body_lua.expr..";"); local body_code = body_lua.statements or ("return "..body_lua.expr..";");
if body_lua.locals and #body_lua.locals > 0 then local undeclared_locals = {};
body_code = "local "..table.concat(body_lua.locals, ", ")..";\\n"..body_code; for i, body_local in ipairs(body_lua.locals or {}) do
if not declared_locals[body_local] then
table.insert(undeclared_locals, body_local);
end
end
if #undeclared_locals > 0 then
body_code = "local "..table.concat(undeclared_locals, ", ")..";\\n"..body_code;
end end
local lua = ([[ local lua = ([[
do do
@ -55,11 +63,20 @@ immediately
lua> ".." lua> ".."
nomsu:define_compile_action("compile %names to code %body", \(__line_no__), function(\%names, \%body) nomsu:define_compile_action("compile %names to code %body", \(__line_no__), function(\%names, \%body)
local names, args = nomsu:parse_spec(\%names); local names, args = nomsu:parse_spec(\%names);
local declared_locals = {};
for i, arg in ipairs(args) do declared_locals[arg] = true; end
names, args = repr(names), table.concat(args, ", "); names, args = repr(names), table.concat(args, ", ");
local body_lua = nomsu:tree_to_lua(\%body); local body_lua = nomsu:tree_to_lua(\%body);
local body_code = body_lua.statements or ("return "..body_lua.expr..";"); local body_code = body_lua.statements or ("return "..body_lua.expr..";");
if body_lua.locals and #body_lua.locals > 0 then local body_code = body_lua.statements or ("return "..body_lua.expr..";");
body_code = "local "..table.concat(body_lua.locals, ", ")..";\\n"..body_code; local undeclared_locals = {};
for i, body_local in ipairs(body_lua.locals or {}) do
if not declared_locals[body_local] then
table.insert(undeclared_locals, body_local);
end
end
if #undeclared_locals > 0 then
body_code = "local "..table.concat(undeclared_locals, ", ")..";\\n"..body_code;
end end
local lua = ([[ local lua = ([[
do do
@ -78,11 +95,19 @@ immediately
compile [action %names %body] to code compile [action %names %body] to code
lua> ".." lua> ".."
local names, args = nomsu:parse_spec(\%names); local names, args = nomsu:parse_spec(\%names);
local declared_locals = {};
for i, arg in ipairs(args) do declared_locals[arg] = true; end
names, args = repr(names), table.concat(args, ", "); names, args = repr(names), table.concat(args, ", ");
local body_lua = nomsu:tree_to_lua(\%body); local body_lua = nomsu:tree_to_lua(\%body);
local body_code = body_lua.statements or ("return "..body_lua.expr..";"); local body_code = body_lua.statements or ("return "..body_lua.expr..";");
if body_lua.locals and #body_lua.locals > 0 then local undeclared_locals = {};
body_code = "local "..table.concat(body_lua.locals, ", ")..";\\n"..body_code; for i, body_local in ipairs(body_lua.locals or {}) do
if not declared_locals[body_local] then
table.insert(undeclared_locals, body_local);
end
end
if #undeclared_locals > 0 then
body_code = "local "..table.concat(undeclared_locals, ", ")..";\\n"..body_code;
end end
local src = nomsu:dedent(nomsu:source_code(0)); local src = nomsu:dedent(nomsu:source_code(0));
local def_lua = ([[ local def_lua = ([[