Better syntax for parallel-hierarchy imports.

12 files changed, 28 insertions, 29 deletions

diff --git a/stdlib/source/test/lux/control/parser.lux b/stdlib/source/test/lux/control/parser.lux
index 82ce4e6a4..81155f605 100644
--- a/stdlib/source/test/lux/control/parser.lux
+++ b/stdlib/source/test/lux/control/parser.lux
@@ -4,11 +4,10 @@
    [abstract
     [monad (#+ do)]
     [equivalence (#+ Equivalence)]
-    {[0 #spec]
-     [/
-      ["$." functor (#+ Injection Comparison)]
-      ["$." apply]
-      ["$." monad]]}]
+    [\spec
+     ["$." functor (#+ Injection Comparison)]
+     ["$." apply]
+     ["$." monad]]]
    [control
     ["." try (#+ Try)]
     [parser
@@ -25,8 +24,8 @@
    [macro
     [syntax (#+ syntax:)]
     ["." code]]]
-  {1
-   ["." / (#+ Parser)]}
+  [\\
+   ["." / (#+ Parser)]]
   ["." / #_
    ["#." analysis]
    ["#." binary]
diff --git a/stdlib/source/test/lux/control/parser/analysis.lux b/stdlib/source/test/lux/control/parser/analysis.lux
index 756ef3d21..49e7b0478 100644
--- a/stdlib/source/test/lux/control/parser/analysis.lux
+++ b/stdlib/source/test/lux/control/parser/analysis.lux
@@ -28,8 +28,8 @@
      [language
       [lux
        ["." analysis]]]]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (template: (!expect <expectation> <computation>)
   (case <computation>
diff --git a/stdlib/source/test/lux/control/parser/binary.lux b/stdlib/source/test/lux/control/parser/binary.lux
index 5311ccdb3..289a80ba9 100644
--- a/stdlib/source/test/lux/control/parser/binary.lux
+++ b/stdlib/source/test/lux/control/parser/binary.lux
@@ -37,8 +37,8 @@
      ["." int]
      ["." rev]
      ["." frac]]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (template: (!expect <expectation> <computation>)
   (case <computation>
diff --git a/stdlib/source/test/lux/control/parser/cli.lux b/stdlib/source/test/lux/control/parser/cli.lux
index 41ffb4e23..97ffd5e0e 100644
--- a/stdlib/source/test/lux/control/parser/cli.lux
+++ b/stdlib/source/test/lux/control/parser/cli.lux
@@ -14,8 +14,8 @@
     ["." random]
     [number
      ["n" nat ("#\." decimal)]]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (template: (!expect <pattern> <value>)
   (case <value>
diff --git a/stdlib/source/test/lux/control/parser/code.lux b/stdlib/source/test/lux/control/parser/code.lux
index 0a8311fb3..987f0ad9d 100644
--- a/stdlib/source/test/lux/control/parser/code.lux
+++ b/stdlib/source/test/lux/control/parser/code.lux
@@ -22,8 +22,8 @@
      ["." int]
      ["." rev]
      ["." frac]]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (template: (!expect <pattern> <value>)
   (case <value>
diff --git a/stdlib/source/test/lux/control/parser/environment.lux b/stdlib/source/test/lux/control/parser/environment.lux
index 6a210f2a0..48b7bca54 100644
--- a/stdlib/source/test/lux/control/parser/environment.lux
+++ b/stdlib/source/test/lux/control/parser/environment.lux
@@ -14,9 +14,9 @@
     ["." random]
     [number
      ["n" nat]]]]
-  {1
+  [\\
    ["." /
-    ["/#" // ("#\." monad)]]})
+    ["/#" // ("#\." monad)]]])
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/lux/control/parser/json.lux b/stdlib/source/test/lux/control/parser/json.lux
index 4d8dc0b8e..0a4adcc83 100644
--- a/stdlib/source/test/lux/control/parser/json.lux
+++ b/stdlib/source/test/lux/control/parser/json.lux
@@ -24,8 +24,8 @@
     [number
      ["n" nat]
      ["." frac]]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (template: (!expect <pattern> <value>)
   (case <value>
diff --git a/stdlib/source/test/lux/control/parser/synthesis.lux b/stdlib/source/test/lux/control/parser/synthesis.lux
index 7916f7217..064891f2c 100644
--- a/stdlib/source/test/lux/control/parser/synthesis.lux
+++ b/stdlib/source/test/lux/control/parser/synthesis.lux
@@ -28,8 +28,8 @@
       [lux
        [analysis (#+ Environment)]
        ["." synthesis (#+ Synthesis)]]]]]]
-  {1
-   ["." /]})
+  [\\
+   ["." /]])
 
 (template: (!expect <pattern> <value>)
   (case <value>
diff --git a/stdlib/source/test/lux/control/parser/text.lux b/stdlib/source/test/lux/control/parser/text.lux
index 6b2152320..0ccad4208 100644
--- a/stdlib/source/test/lux/control/parser/text.lux
+++ b/stdlib/source/test/lux/control/parser/text.lux
@@ -25,10 +25,10 @@
      ["n" nat]]]
    [macro
     ["." code]]]
-  {1
+  [\\
    ["." /
     ["<>" //
-     ["<c>" code]]]})
+     ["<c>" code]]]])
 
 (template: (!expect <pattern> <value>)
   (case <value>
diff --git a/stdlib/source/test/lux/control/parser/tree.lux b/stdlib/source/test/lux/control/parser/tree.lux
index 5dbe726ea..f4daaf751 100644
--- a/stdlib/source/test/lux/control/parser/tree.lux
+++ b/stdlib/source/test/lux/control/parser/tree.lux
@@ -14,9 +14,9 @@
     ["." random]
     [number
      ["n" nat]]]]
-  {1
+  [\\
    ["." /
-    ["/#" //]]})
+    ["/#" //]]])
 
 (template: (!expect <pattern> <value>)
   (case <value>
diff --git a/stdlib/source/test/lux/control/parser/type.lux b/stdlib/source/test/lux/control/parser/type.lux
index 5390498c7..d2a9bce32 100644
--- a/stdlib/source/test/lux/control/parser/type.lux
+++ b/stdlib/source/test/lux/control/parser/type.lux
@@ -15,9 +15,9 @@
     [number
      ["n" nat]]]
    ["." type ("#\." equivalence)]]
-  {1
+  [\\
    ["." /
-    ["/#" //]]})
+    ["/#" //]]])
 
 (template: (!expect <pattern> <value>)
   (case <value>
diff --git a/stdlib/source/test/lux/control/parser/xml.lux b/stdlib/source/test/lux/control/parser/xml.lux
index c2d0ac4e2..116f948da 100644
--- a/stdlib/source/test/lux/control/parser/xml.lux
+++ b/stdlib/source/test/lux/control/parser/xml.lux
@@ -21,9 +21,9 @@
     ["." random (#+ Random)]
     [number
      ["n" nat]]]]
-  {1
+  [\\
    ["." /
-    ["/#" // ("#\." monad)]]})
+    ["/#" // ("#\." monad)]]])
 
 (template: (!expect <pattern> <value>)
   (case <value>