Merge pull request #42 from LuxLang/context_sensitive_macro_expansion

Context sensitive macro expansion

4 files changed, 9 insertions, 8 deletions

diff --git a/stdlib/test/test/lux.lux b/stdlib/test/test/lux.lux
index 8bd3a1ee5..f5c5fd2f1 100644
--- a/stdlib/test/test/lux.lux
+++ b/stdlib/test/test/lux.lux
@@ -2,7 +2,6 @@
   lux
   lux/test
   (lux (control ["M" monad #+ do Monad])
-       [io]
        [math]
        ["r" math/random]
        (data [maybe]
diff --git a/stdlib/test/test/lux/concurrency/promise.lux b/stdlib/test/test/lux/concurrency/promise.lux
index 3be2f03b5..37ba6f2e1 100644
--- a/stdlib/test/test/lux/concurrency/promise.lux
+++ b/stdlib/test/test/lux/concurrency/promise.lux
@@ -56,7 +56,7 @@
 
       (test "Cannot re-resolve a resolved promise."
             (and (not (io.run (&.resolve false (&/wrap true))))
-                 (io.run (&.resolve true (&.promise Bool)))))
+                 (io.run (&.resolve true (: (&.Promise Bool) (&.promise #.None))))))
 
       (wrap (do &.Monad<Promise>
               [?none (&.time-out +100 (&.delay +200 true))
diff --git a/stdlib/test/test/lux/data/number/ratio.lux b/stdlib/test/test/lux/data/number/ratio.lux
index 93081cd14..73e43e6c5 100644
--- a/stdlib/test/test/lux/data/number/ratio.lux
+++ b/stdlib/test/test/lux/data/number/ratio.lux
@@ -32,7 +32,10 @@
                          (&.ratio +0 denom2)))
 
             (test "All ratios are built normalized."
-                  (|> sample &.normalize (&.r/= sample)))
+                  (|> sample
+                      &.normalize
+                      ("lux in-module" "lux/data/number/ratio")
+                      (&.r/= sample)))
             ))))
 
 (context: "Arithmetic"
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index 2efff3c71..9a0fedbb8 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -1,9 +1,6 @@
 (.module:
   lux
-  (lux (control monad)
-       [io]
-       (concurrency [promise])
-       [cli #+ program:]
+  (lux [cli #+ program:]
        [test])
   (test ["_." lux]
         (lux ["_." cli]
@@ -74,7 +71,8 @@
              (world ["_." blob]
                     ["_." file]
                     (net ["_." tcp]
-                         ["_." udp]))))
+                         ["_." udp]))
+             ))
   (lux (control [contract]
                 [concatenative])
        (concurrency [space])
@@ -88,6 +86,7 @@
              (coll (tree ["tree_." parser])))
        (math [random])
        [macro]
+       (macro (poly [json]))
        (type [unit])
        [world/env]
        [world/console])