Better syntax for parallel-hierarchy imports.

15 files changed, 50 insertions, 60 deletions

diff --git a/stdlib/source/test/lux/macro/code.lux b/stdlib/source/test/lux/macro/code.lux
index 730671b5b..93ed2c19b 100644
--- a/stdlib/source/test/lux/macro/code.lux
+++ b/stdlib/source/test/lux/macro/code.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try (#+ Try)]]
    [data
@@ -24,8 +23,8 @@
      [language
       [lux
        ["." syntax]]]]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (def: random_text
   (Random Text)
diff --git a/stdlib/source/test/lux/macro/local.lux b/stdlib/source/test/lux/macro/local.lux
index b499beb68..d125a2af4 100644
--- a/stdlib/source/test/lux/macro/local.lux
+++ b/stdlib/source/test/lux/macro/local.lux
@@ -23,8 +23,8 @@
     ["." random (#+ Random)]
     [number
      ["n" nat]]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (syntax: (macro_error macro)
   (function (_ compiler)
diff --git a/stdlib/source/test/lux/macro/poly.lux b/stdlib/source/test/lux/macro/poly.lux
index 9a42c450a..d15e96d3d 100644
--- a/stdlib/source/test/lux/macro/poly.lux
+++ b/stdlib/source/test/lux/macro/poly.lux
@@ -1,8 +1,8 @@
 (.module:
   [lux #*
    ["_" test (#+ Test)]]
-  {1
-   ["." /]}
+  [\\
+   ["." /]]
   ["." / #_
    ["#." equivalence]
    ["#." functor]
diff --git a/stdlib/source/test/lux/macro/poly/equivalence.lux b/stdlib/source/test/lux/macro/poly/equivalence.lux
index 593dba8e1..a43da2d84 100644
--- a/stdlib/source/test/lux/macro/poly/equivalence.lux
+++ b/stdlib/source/test/lux/macro/poly/equivalence.lux
@@ -5,11 +5,10 @@
    [abstract
     [monad (#+ do)]
     [equivalence (#+ Equivalence)
-     {[0 #poly]
-      ["." /]}]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+     [\poly
+      ["." /]]]
+    [\spec
+     ["$." equivalence]]]
    [data
     ["." bit]
     ["." maybe]
diff --git a/stdlib/source/test/lux/macro/poly/functor.lux b/stdlib/source/test/lux/macro/poly/functor.lux
index 9463d7f11..8d94cf852 100644
--- a/stdlib/source/test/lux/macro/poly/functor.lux
+++ b/stdlib/source/test/lux/macro/poly/functor.lux
@@ -4,8 +4,8 @@
    [abstract
     [monad (#+ do)]
     [functor
-     {[0 #poly]
-      ["." /]}]]
+     [\poly
+      ["." /]]]]
    ["r" math/random (#+ Random)]
    ["_" test (#+ Test)]
    [control
diff --git a/stdlib/source/test/lux/macro/poly/json.lux b/stdlib/source/test/lux/macro/poly/json.lux
index 0931481da..91ad9b010 100644
--- a/stdlib/source/test/lux/macro/poly/json.lux
+++ b/stdlib/source/test/lux/macro/poly/json.lux
@@ -6,12 +6,10 @@
     codec
     [monad (#+ do)]
     ["." equivalence (#+ Equivalence)
-     {[0 #poly]
-      ["poly/#" /]}]
-    {[0 #spec]
-     [/
-      ["$." equivalence]
-      ["$." codec]]}]
+     ["poly/#" \poly]]
+    [\spec
+     ["$." equivalence]
+     ["$." codec]]]
    [control
     pipe
     ["." try]
@@ -25,8 +23,8 @@
      ["%" format (#+ format)]]
     [format
      [json (#+)
-      {[0 #poly]
-       ["." /]}]]
+      [\poly
+       ["." /]]]]
     [collection
      [row (#+ row)]
      ["d" dictionary]
diff --git a/stdlib/source/test/lux/macro/syntax.lux b/stdlib/source/test/lux/macro/syntax.lux
index f2fbe2010..057565f3d 100644
--- a/stdlib/source/test/lux/macro/syntax.lux
+++ b/stdlib/source/test/lux/macro/syntax.lux
@@ -7,8 +7,8 @@
     ["." random]
     [number
      ["n" nat]]]]
-  {1
-   ["." /]}
+  [\\
+   ["." /]]
   ["." / #_
    ["#." annotations]
    ["#." check]
diff --git a/stdlib/source/test/lux/macro/syntax/annotations.lux b/stdlib/source/test/lux/macro/syntax/annotations.lux
index dac3c1e16..fdee0ffa5 100644
--- a/stdlib/source/test/lux/macro/syntax/annotations.lux
+++ b/stdlib/source/test/lux/macro/syntax/annotations.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try]
     [parser
@@ -17,8 +16,8 @@
     ["." random (#+ Random)]
     [number
      ["n" nat]]]]
-  {1
-   ["." /]}
+  [\\
+   ["." /]]
   ["$." /// #_
    ["#." code]])
 
diff --git a/stdlib/source/test/lux/macro/syntax/check.lux b/stdlib/source/test/lux/macro/syntax/check.lux
index d5036d9b2..59f5c1a0b 100644
--- a/stdlib/source/test/lux/macro/syntax/check.lux
+++ b/stdlib/source/test/lux/macro/syntax/check.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try]
     ["<>" parser
@@ -14,8 +13,8 @@
     ["." random (#+ Random)]]
    [macro
     ["." code ("#\." equivalence)]]]
-  {1
-   ["." /]}
+  [\\
+   ["." /]]
   ["$." /// #_
    ["#." code]])
 
diff --git a/stdlib/source/test/lux/macro/syntax/declaration.lux b/stdlib/source/test/lux/macro/syntax/declaration.lux
index 2cb737caf..555c3138e 100644
--- a/stdlib/source/test/lux/macro/syntax/declaration.lux
+++ b/stdlib/source/test/lux/macro/syntax/declaration.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try]
     [parser
@@ -14,8 +13,8 @@
     ["." random (#+ Random)]
     [number
      ["n" nat]]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (def: #export random
   (Random /.Declaration)
diff --git a/stdlib/source/test/lux/macro/syntax/definition.lux b/stdlib/source/test/lux/macro/syntax/definition.lux
index be6f05449..48719ac17 100644
--- a/stdlib/source/test/lux/macro/syntax/definition.lux
+++ b/stdlib/source/test/lux/macro/syntax/definition.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try]
     ["." exception]
@@ -17,8 +16,8 @@
     ["." code ("#\." equivalence)]]
    [meta
     ["." location]]]
-  {1
-   ["." /]}
+  [\\
+   ["." /]]
   ["$."// #_
    ["#." check]
    ["#." annotations]
diff --git a/stdlib/source/test/lux/macro/syntax/export.lux b/stdlib/source/test/lux/macro/syntax/export.lux
index 34c19a11f..10e86fd20 100644
--- a/stdlib/source/test/lux/macro/syntax/export.lux
+++ b/stdlib/source/test/lux/macro/syntax/export.lux
@@ -11,8 +11,8 @@
     ["." bit ("#\." equivalence)]]
    [math
     ["." random]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/lux/macro/syntax/input.lux b/stdlib/source/test/lux/macro/syntax/input.lux
index b0b642645..bf22a9c17 100644
--- a/stdlib/source/test/lux/macro/syntax/input.lux
+++ b/stdlib/source/test/lux/macro/syntax/input.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try]
     [parser
@@ -14,8 +13,8 @@
     ["." random (#+ Random)]
     [number
      ["n" nat]]]]
-  {1
-   ["." /]}
+  [\\
+   ["." /]]
   ["$." /// #_
    ["#." code]])
 
diff --git a/stdlib/source/test/lux/macro/syntax/type/variable.lux b/stdlib/source/test/lux/macro/syntax/type/variable.lux
index 4701f5aef..d2ac5d86e 100644
--- a/stdlib/source/test/lux/macro/syntax/type/variable.lux
+++ b/stdlib/source/test/lux/macro/syntax/type/variable.lux
@@ -3,17 +3,16 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
      ["<.>" code]]]
    [math
     ["." random (#+ Random)]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (def: #export random
   (Random /.Variable)
diff --git a/stdlib/source/test/lux/macro/template.lux b/stdlib/source/test/lux/macro/template.lux
index 8f68ff501..12e503e33 100644
--- a/stdlib/source/test/lux/macro/template.lux
+++ b/stdlib/source/test/lux/macro/template.lux
@@ -16,8 +16,8 @@
     ["." random (#+ Random)]
     [number
      ["." nat]]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (/.let [(!pow/2 <scalar>)
         [(nat.* <scalar> <scalar>)]]