De-taggification | part 2

3 files changed, 27 insertions, 27 deletions

diff --git a/lux-r/source/luxc/lang/synthesis/variable.lux b/lux-r/source/luxc/lang/synthesis/variable.lux
index fe599dfc7..ecbca7062 100644
--- a/lux-r/source/luxc/lang/synthesis/variable.lux
+++ b/lux-r/source/luxc/lang/synthesis/variable.lux
@@ -5,7 +5,7 @@
                    ["s" set])))
   (luxc (lang ["la" analysis]
               ["ls" synthesis]
-              [".L" variable #+ Variable])))
+              [".L" variable {"+" [Variable]}])))
 
 (def: (bound-vars path)
   (-> ls.Path (List Variable))
diff --git a/lux-r/source/program.lux b/lux-r/source/program.lux
index 18f074100..78afc9e3e 100644
--- a/lux-r/source/program.lux
+++ b/lux-r/source/program.lux
@@ -1,67 +1,67 @@
 (.module:
-  [lux #*
-   [program (#+ program:)]
+  [lux "*"
+   [program {"+" [program:]}]
    ["." ffi]
    ["." debug]
    [abstract
-    ["." monad (#+ do)]]
+    ["." monad {"+" [do]}]]
    [control
-    [pipe (#+ exec> case> new>)]
+    [pipe {"+" [exec> case> new>]}]
     ["." maybe]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO io)]
+    ["." try {"+" [Try]}]
+    ["." exception {"+" [exception:]}]
+    ["." io {"+" [IO io]}]
     [concurrency
-     ["." promise (#+ Promise)]]
+     ["." promise {"+" [Promise]}]]
     [parser
      ["<.>" code]]]
    [data
     ["." text ("#\." hash)
-     ["%" format (#+ format)]
+     ["%" format {"+" [format]}]
      [encoding
       ["." utf8]]]
     [collection
-     ["." array (#+ Array)]]]
+     ["." array {"+" [Array]}]]]
    ["." macro
-    [syntax (#+ syntax:)]
+    [syntax {"+" [syntax:]}]
     ["." template]
     ["." code]]
    [math
-    [number (#+ hex)
+    [number {"+" [hex]}
      ["n" nat]
      ["." i64]]]
-   ["." world #_
+   ["." world "_"
     ["." file]
     ["#/." program]]
    ["@" target
     ["_" r]]
    [tool
     [compiler
-     [phase (#+ Operation Phase)]
+     [phase {"+" [Operation Phase]}]
      [reference
-      [variable (#+ Register)]]
+      [variable {"+" [Register]}]]
      [language
       [lux
-       [program (#+ Program)]
-       [generation (#+ Context Host)]
+       [program {"+" [Program]}]
+       [generation {"+" [Context Host]}]
        ["." synthesis]
        [analysis
-        [macro (#+ Expander)]]
+        [macro {"+" [Expander]}]]
        [phase
-        ["." extension (#+ Extender Handler)
+        ["." extension {"+" [Extender Handler]}
          ["#/." bundle]
-         ["." analysis #_
+         ["." analysis "_"
           ["#" r]]
-         ["." generation #_
+         ["." generation "_"
           ["#" r]]]
         [generation
          ["." reference]
          ["." r
           ["." runtime]]]]]]
      [default
-      ["." platform (#+ Platform)]]
+      ["." platform {"+" [Platform]}]]
      [meta
-      ["." packager #_
+      ["." packager "_"
        ["#" script]]]]]]
   [program
    ["/" compositor
diff --git a/lux-r/source/test/program.lux b/lux-r/source/test/program.lux
index 46e2a2b71..e8cf0df53 100644
--- a/lux-r/source/test/program.lux
+++ b/lux-r/source/test/program.lux
@@ -1,10 +1,10 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
+  [lux "*"
+   ["_" test {"+" [Test]}]
    [control
     ["." io]
     [parser
-     [cli (#+ program:)]]]]
+     [cli {"+" [program:]}]]]]
   [spec
    ["." compositor]]
   {1