De-taggification | part 2

1 files changed, 12 insertions, 12 deletions

diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index bdc83f437..25e19caa8 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -4,38 +4,38 @@
                    <target> <target>']
   (.module:
     [library
-     ["/" lux #*
-      [program (#+ program:)]
-      ["_" test (#+ Test)]
+     ["/" lux "*"
+      [program {"+" [program:]}]
+      ["_" test {"+" [Test]}]
       ["@" target]
       [abstract
-       [monad (#+ do)]]
+       [monad {"+" [do]}]]
       [control
        ["." io]
        ["." maybe ("#\." functor)]
        [concurrency
-        ["." atom (#+ Atom)]]
+        ["." atom {"+" [Atom]}]]
        [parser
         ["<.>" code]]]
       [data
        ["." product]
        ["." bit ("#\." equivalence)]
        ["." text ("#\." equivalence)
-        ["%" format (#+ format)]]
+        ["%" format {"+" [format]}]]
        [collection
         ["." list ("#\." functor)]
-        ["." set (#+ Set) ("#\." equivalence)]
+        ["." set {"+" [Set]} ("#\." equivalence)]
         [dictionary
          ["." plist]]]]
       ["." macro
-       [syntax (#+ syntax:)]
+       [syntax {"+" [syntax:]}]
        ["." code ("#\." equivalence)]
        ["." template]]
       ["." math
        ["." random ("#\." functor)]
        [number
-        [i8 (#+)]
-        [i16 (#+)]
+        [i8 {"+" []}]
+        [i16 {"+" []}]
         ["n" nat]
         ["i" int]
         ["r" rev]
@@ -44,7 +44,7 @@
       ["." meta
        ["." location ("#\." equivalence)]]]]
     ... TODO: Must have 100% coverage on tests.
-    ["." / #_
+    ["." / "_"
      ["#." abstract]
      ["#." control]
      ["#." data]
@@ -65,7 +65,7 @@
      ["#." world]
      ["#." ffi]
      ["#." extension]
-     ["#." target #_
+     ["#." target "_"
       <target>]]))
 
 ... TODO: Get rid of this ASAP