2 files changed, 18 insertions, 9 deletions

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 $