De-taggification | part 2

8 files changed, 64 insertions, 64 deletions

diff --git a/stdlib/source/specification/compositor/analysis/type.lux b/stdlib/source/specification/compositor/analysis/type.lux
index 662748677..2ad411da0 100644
--- a/stdlib/source/specification/compositor/analysis/type.lux
+++ b/stdlib/source/specification/compositor/analysis/type.lux
@@ -1,21 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
+  [lux "*"
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    [pipe (#+ case>)]
+    [pipe {"+" [case>]}]
     ["." io]
     ["." try]]
    [math
-    ["r" random (#+ Random)]]
+    ["r" random {"+" [Random]}]]
    [macro
     ["." code]]
    [tool
     [compiler
-     [analysis (#+ State+)]
+     [analysis {"+" [State+]}]
      ["." phase
-      [macro (#+ Expander)]
+      [macro {"+" [Expander]}]
       ["." analysis
        ["#/." scope]
        ["#/." type]]]]]])
diff --git a/stdlib/source/specification/compositor/common.lux b/stdlib/source/specification/compositor/common.lux
index 72a27804d..bf1236b3f 100644
--- a/stdlib/source/specification/compositor/common.lux
+++ b/stdlib/source/specification/compositor/common.lux
@@ -1,23 +1,23 @@
 (.module:
-  [lux #*
+  [lux "*"
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    ["." io (#+ IO)]
-    ["." try (#+ Try)]]
+    ["." io {"+" [IO]}]
+    ["." try {"+" [Try]}]]
    [tool
     [compiler
      ["." reference]
      ["." analysis]
-     ["." synthesis (#+ Synthesis)]
+     ["." synthesis {"+" [Synthesis]}]
      ["." directive]
      ["." phase
-      ["." macro (#+ Expander)]
-      ["." generation (#+ Operation)]
-      [extension (#+ Extender)
+      ["." macro {"+" [Expander]}]
+      ["." generation {"+" [Operation]}]
+      [extension {"+" [Extender]}
        ["." bundle]]]
      [default
-      ["." platform (#+ Platform)]]]]])
+      ["." platform {"+" [Platform]}]]]]])
 
 (type: .public Runner
   (-> Text Synthesis (Try Any)))
diff --git a/stdlib/source/specification/compositor/generation/case.lux b/stdlib/source/specification/compositor/generation/case.lux
index d1d0074fd..c7c221eb7 100644
--- a/stdlib/source/specification/compositor/generation/case.lux
+++ b/stdlib/source/specification/compositor/generation/case.lux
@@ -1,32 +1,32 @@
 (.module:
-  [lux (#- case)
-   ["_" test (#+ Test)]
+  [lux {"-" [case]}
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    [pipe (#+ case>)]
-    ["." try (#+ Try)]]
+    [pipe {"+" [case>]}]
+    ["." try {"+" [Try]}]]
    [data
     ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
+     ["%" format {"+" [format]}]]
     [number
      ["n" nat]
      ["f" frac]]
     [collection
      ["." list ("#\." mix)]]]
    [math
-    ["r" random (#+ Random)]]
+    ["r" random {"+" [Random]}]]
    [tool
     [compiler
      ["." reference]
      ["." analysis]
-     ["." synthesis (#+ Path Synthesis)]
+     ["." synthesis {"+" [Path Synthesis]}]
      ["." phase
       ["#/." synthesis
        ["." case]]
       ["." extension/synthesis]]]]]
   [///
-   [common (#+ Runner)]])
+   [common {"+" [Runner]}]])
 
 (def: limit Nat 10)
 
diff --git a/stdlib/source/specification/compositor/generation/common.lux b/stdlib/source/specification/compositor/generation/common.lux
index e9d8eae55..18d739d8e 100644
--- a/stdlib/source/specification/compositor/generation/common.lux
+++ b/stdlib/source/specification/compositor/generation/common.lux
@@ -1,11 +1,11 @@
 (.module:
-  [lux (#- i64)
-   ["_" test (#+ Test)]
+  [lux {"-" [i64]}
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    [pipe (#+ case>)]
-    ["." try (#+ Try)]]
+    [pipe {"+" [case>]}]
+    ["." try {"+" [Try]}]]
    [data
     ["." bit ("#\." equivalence)]
     [number
@@ -14,19 +14,19 @@
      ["i" int]
      ["f" frac]]
     ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
+     ["%" format {"+" [format]}]]
     [collection
      ["." list]]]
    [math
-    ["r" random (#+ Random)]]
+    ["r" random {"+" [Random]}]]
    [tool
     [compiler
      ["." reference]
      ["." synthesis]]]]
-  ["." // #_
+  ["." // "_"
    ["#." case]
    [//
-    [common (#+ Runner)]]])
+    [common {"+" [Runner]}]]])
 
 (def: safe
   (-> Text Text)
diff --git a/stdlib/source/specification/compositor/generation/function.lux b/stdlib/source/specification/compositor/generation/function.lux
index d97b2c02c..dc92cc224 100644
--- a/stdlib/source/specification/compositor/generation/function.lux
+++ b/stdlib/source/specification/compositor/generation/function.lux
@@ -1,11 +1,11 @@
 (.module:
-  [lux (#- function)
-   ["_" test (#+ Test)]
+  [lux {"-" [function]}
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]
+    [monad {"+" [do]}]
     ["." enum]]
    [control
-    [pipe (#+ case>)]
+    [pipe {"+" [case>]}]
     ["." maybe]]
    [data
     [number
@@ -13,16 +13,16 @@
     [collection
      ["." list ("#\." functor)]]]
    [math
-    ["r" random (#+ Random) ("#\." monad)]]
+    ["r" random {"+" [Random]} ("#\." monad)]]
    [tool
     [compiler
-     [analysis (#+ Arity)]
-     ["." reference (#+ Register)]
-     ["." synthesis (#+ Synthesis)]]]]
-  ["." // #_
+     [analysis {"+" [Arity]}]
+     ["." reference {"+" [Register]}]
+     ["." synthesis {"+" [Synthesis]}]]]]
+  ["." // "_"
    ["#." case]
    [//
-    [common (#+ Runner)]]])
+    [common {"+" [Runner]}]]])
 
 (def: max_arity
   Arity
diff --git a/stdlib/source/specification/compositor/generation/primitive.lux b/stdlib/source/specification/compositor/generation/primitive.lux
index cd740649c..a73ba6f21 100644
--- a/stdlib/source/specification/compositor/generation/primitive.lux
+++ b/stdlib/source/specification/compositor/generation/primitive.lux
@@ -1,24 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
+  [lux "*"
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    [pipe (#+ case>)]
+    [pipe {"+" [case>]}]
     ["." try]]
    [data
     ["." bit ("#\." equivalence)]
     [number
      ["f" frac]]
     ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
+     ["%" format {"+" [format]}]]]
    [math
     ["r" random]]
    [tool
     [compiler
      ["." synthesis]]]]
   [///
-   [common (#+ Runner)]])
+   [common {"+" [Runner]}]])
 
 (def: (f/=' reference subject)
   (-> Frac Frac Bit)
diff --git a/stdlib/source/specification/compositor/generation/reference.lux b/stdlib/source/specification/compositor/generation/reference.lux
index ee9da7455..bcf2bb2d1 100644
--- a/stdlib/source/specification/compositor/generation/reference.lux
+++ b/stdlib/source/specification/compositor/generation/reference.lux
@@ -1,10 +1,10 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
+  [lux "*"
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    [pipe (#+ case>)]
+    [pipe {"+" [case>]}]
     ["." try]]
    [data
     [number
@@ -15,9 +15,9 @@
      ["." reference]
      ["." synthesis]]]
    [math
-    ["r" random (#+ Random)]]]
+    ["r" random {"+" [Random]}]]]
   [///
-   [common (#+ Runner Definer)]])
+   [common {"+" [Runner Definer]}]])
 
 (def: name
   (Random Name)
diff --git a/stdlib/source/specification/compositor/generation/structure.lux b/stdlib/source/specification/compositor/generation/structure.lux
index 33e38520f..4161c650a 100644
--- a/stdlib/source/specification/compositor/generation/structure.lux
+++ b/stdlib/source/specification/compositor/generation/structure.lux
@@ -1,10 +1,10 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
+  [lux "*"
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    [pipe (#+ case>)]
+    [pipe {"+" [case>]}]
     ["." maybe]
     ["." try]]
    [data
@@ -12,19 +12,19 @@
      ["n" nat]
      ["i" int]]
     ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
+     ["%" format {"+" [format]}]]
     [collection
-     ["." array (#+ Array)]
+     ["." array {"+" [Array]}]
      ["." list ("#\." functor)]]]
    [math
     ["r" random]]
-   ["." ffi (#+ import:)]
+   ["." ffi {"+" [import:]}]
    [tool
     [compiler
      ["." analysis]
      ["." synthesis]]]]
   [///
-   [common (#+ Runner)]])
+   [common {"+" [Runner]}]])
 
 (import: java/lang/Integer)