Better syntax for parallel-hierarchy imports.

12 files changed, 40 insertions, 48 deletions

diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux
index 5d2491d28..9ae382975 100644
--- a/stdlib/source/test/aedifex/artifact/extension.lux
+++ b/stdlib/source/test/aedifex/artifact/extension.lux
@@ -12,10 +12,10 @@
     ["." random (#+ Random)]
     [number
      ["n" nat]]]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
-     ["#" type]]]})
+     ["#" type]]]])
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/aedifex/artifact/snapshot.lux b/stdlib/source/test/aedifex/artifact/snapshot.lux
index d48c8f34e..4e968904d 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
@@ -17,8 +16,8 @@
    ["#." stamp]
    ["#." time]
    ["#." version]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Snapshot)
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/build.lux b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
index e3fdcab62..156be7af4 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
@@ -3,17 +3,16 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
      ["<.>" xml]]]
    [math
     ["." random (#+ Random)]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Build)
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
index f2051d037..aa3dbcff1 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
@@ -14,8 +13,8 @@
     ["." random (#+ Random)]]
    [time
     ["." instant]]]
-  {#program
-   ["." /]}
+  [\\program
+   ["." /]]
   ["$." // #_
    ["#." time]
    ["#." build]])
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/time.lux b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
index 3acb37232..f6861bf9c 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
@@ -3,17 +3,16 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
      ["<.>" text]]]
    [math
     ["." random (#+ Random)]]]
-  {#program
-   ["." /]}
+  [\\program
+   ["." /]]
   ["$." /// #_
    ["#." time]])
 
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version.lux b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
index 59ed7189f..06adc7239 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
@@ -3,17 +3,16 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
      ["<.>" xml]]]
    [math
     ["." random (#+ Random)]]]
-  {#program
-   ["." /]}
+  [\\program
+   ["." /]]
   ["." / #_
    ["#." value]]
   ["$." /// #_
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
index dc3f754a2..3ed0b32ce 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
@@ -22,11 +21,11 @@
     ["." instant]]]
   ["$." /// #_
    ["#." stamp]]
-  {#program
+  [\\program
    ["." /
     ["//#" ///
      ["#." stamp]
-     ["#." time]]]})
+     ["#." time]]]])
 
 (def: #export random
   (Random /.Value)
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index b9b0ab4e0..c2ab6a354 100644
--- a/stdlib/source/test/aedifex/artifact/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
@@ -14,8 +13,8 @@
     ["." random (#+ Random)]
     [number
      ["i" int]]]]
-  {#program
-   ["." /]}
+  [\\program
+   ["." /]]
   ["." / #_
    ["#." date]
    ["#." time]])
diff --git a/stdlib/source/test/aedifex/artifact/time/date.lux b/stdlib/source/test/aedifex/artifact/time/date.lux
index a68a60a56..494aa5e07 100644
--- a/stdlib/source/test/aedifex/artifact/time/date.lux
+++ b/stdlib/source/test/aedifex/artifact/time/date.lux
@@ -15,8 +15,8 @@
    [time
     ["." date]
     ["." year]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Date)
diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux
index cd70d1c83..a17f9c40c 100644
--- a/stdlib/source/test/aedifex/artifact/time/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time/time.lux
@@ -13,8 +13,8 @@
     [number
      ["n" nat]
      ["i" int]]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Time)
diff --git a/stdlib/source/test/aedifex/artifact/type.lux b/stdlib/source/test/aedifex/artifact/type.lux
index 01b581eb3..447b60bac 100644
--- a/stdlib/source/test/aedifex/artifact/type.lux
+++ b/stdlib/source/test/aedifex/artifact/type.lux
@@ -12,8 +12,8 @@
     ["." random (#+ Random) ("#\." monad)]
     [number
      ["n" nat]]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Type)
diff --git a/stdlib/source/test/aedifex/artifact/versioning.lux b/stdlib/source/test/aedifex/artifact/versioning.lux
index c438caca5..d1d4da7ef 100644
--- a/stdlib/source/test/aedifex/artifact/versioning.lux
+++ b/stdlib/source/test/aedifex/artifact/versioning.lux
@@ -3,17 +3,16 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
      ["<.>" xml]]]
    [math
     ["." random (#+ Random)]]]
-  {#program
-   ["." /]}
+  [\\program
+   ["." /]]
   ["$." // #_
    ["#." time]
    ["#." snapshot