From 69aaea030e08e083151aa25b8080eddd0d4c1683 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Fri, 9 Nov 2018 16:40:36 -0800 Subject: No longer passing `tree` to every compile action. Now, you can just return a LuaCode object, and it will automatically get a source from `tree` if it didn't already have a source. Plus some fixes/cleanup. --- lib/consolecolor.nom | 2 +- lib/object.nom | 2 +- lib/things.nom | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/consolecolor.nom b/lib/consolecolor.nom index d8b078f..1016c0b 100644 --- a/lib/consolecolor.nom +++ b/lib/consolecolor.nom @@ -17,7 +17,7 @@ for %name = %colornum in %colors: #(=lua "COMPILE_ACTIONS").%name = (..) [%nomsu, %tree] -> (Lua "'\\027[\(%colornum)m'") %compile.action.%name = (..) - [%nomsu, %tree, %text] ->: + [%nomsu, %text] ->: if %text: return (Lua "('\\027[\(%colornum)m'..\(%text as lua expr)..'\\027[0m')") ..else: return (Lua "'\\027[\(%colornum)m'") diff --git a/lib/object.nom b/lib/object.nom index 2af5412..bb2de3a 100644 --- a/lib/object.nom +++ b/lib/object.nom @@ -56,7 +56,7 @@ test: ..local fn_name = \%actions[1].stub:as_lua_id() local \%args = List(\%actions[1]:get_args()) table.insert(\%args, 1, \(\%me)) - local lua = LuaCode(tree.source, "class.", fn_name, " = ", \(..) + local lua = LuaCode("class.", fn_name, " = ", \(..) what (%args -> %body) compiles to ..) for i=2,#\%actions do diff --git a/lib/things.nom b/lib/things.nom index 4f15e68..50c7aaa 100644 --- a/lib/things.nom +++ b/lib/things.nom @@ -60,7 +60,7 @@ test: lua> "\ ..local fn_name = \%actions[1].stub:as_lua_id() local \%args = List{\(\%its), unpack(\%actions[1]:get_args())} - local lua = LuaCode(tree.source, "class.", fn_name, " = ", \(..) + local lua = LuaCode("class.", fn_name, " = ", \(..) what (%args -> %body) compiles to ..) for i=2,#\%actions do -- cgit v1.2.3