From 3106afc2473ce12787e1fcae2e2c3a101214045d Mon Sep 17 00:00:00 2001 From: Li Jin Date: Tue, 5 Jul 2022 11:25:59 +0800 Subject: disable exporting macro from a normal module. --- spec/inputs/macro-export.yue | 25 +++++++++++++++++-------- spec/inputs/macro.yue | 2 +- spec/outputs/macro-export.lua | 2 -- spec/outputs/macro-teal.tl | 2 -- spec/outputs/macro-todo.lua | 2 -- 5 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 spec/outputs/macro-export.lua delete mode 100644 spec/outputs/macro-teal.tl delete mode 100644 spec/outputs/macro-todo.lua (limited to 'spec') diff --git a/spec/inputs/macro-export.yue b/spec/inputs/macro-export.yue index d669975..22ef424 100644 --- a/spec/inputs/macro-export.yue +++ b/spec/inputs/macro-export.yue @@ -1,15 +1,22 @@ +$ -> package.path = "?.lua;./spec/inputs/?.lua" + +import "macro-todo" as $ + +import "macro-todo" as {$, :$todo} + export macro config = (debugging = true)-> global debugMode = debugging == "true" global debugMacro = true "" -export macro showMacro = (name,res)-> - if debugMacro - "do - txt = #{res} - print '[macro '..#{name}..']' - print txt - txt" +export macro showMacro = (name, res)-> + if debugMacro then " +do + txt = #{res} + print '[macro ' .. #{name} .. ']' + print txt + txt +" else res @@ -25,5 +32,7 @@ export macro assert = (cond)-> else "#{cond}" -$config! +$ -> + global debugMode = true + global debugMacro = true diff --git a/spec/inputs/macro.yue b/spec/inputs/macro.yue index 37702d1..e391b9e 100644 --- a/spec/inputs/macro.yue +++ b/spec/inputs/macro.yue @@ -3,7 +3,7 @@ $ -> import "macro-export" as { $, -- import all macros - $config:$myconfig, -- rename macro $config to $myconfig + $config: $myconfig, -- rename macro $config to $myconfig } import "macro-todo" as $ diff --git a/spec/outputs/macro-export.lua b/spec/outputs/macro-export.lua deleted file mode 100644 index b5a63f8..0000000 --- a/spec/outputs/macro-export.lua +++ /dev/null @@ -1,2 +0,0 @@ -local _module_0 = { } -return _module_0 diff --git a/spec/outputs/macro-teal.tl b/spec/outputs/macro-teal.tl deleted file mode 100644 index b5a63f8..0000000 --- a/spec/outputs/macro-teal.tl +++ /dev/null @@ -1,2 +0,0 @@ -local _module_0 = { } -return _module_0 diff --git a/spec/outputs/macro-todo.lua b/spec/outputs/macro-todo.lua deleted file mode 100644 index b5a63f8..0000000 --- a/spec/outputs/macro-todo.lua +++ /dev/null @@ -1,2 +0,0 @@ -local _module_0 = { } -return _module_0 -- cgit v1.2.3-55-g6feb