aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBruce Hill <bruce@bruce-hill.com>2018-11-09 16:40:36 -0800
committerBruce Hill <bruce@bruce-hill.com>2018-11-09 16:41:19 -0800
commit69aaea030e08e083151aa25b8080eddd0d4c1683 (patch)
tree6cd90a65e6828f60cc052c4a1b33a4a4c0d65570 /lib
parenta2f07415c5284bf94c146cea6eed4a15f171b9ab (diff)
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/consolecolor.nom2
-rw-r--r--lib/object.nom2
-rw-r--r--lib/things.nom2
3 files changed, 3 insertions, 3 deletions
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