De-taggification | part 2

3 files changed, 23 insertions, 23 deletions

diff --git a/lux-jvm/source/luxc/lang/host/jvm.lux b/lux-jvm/source/luxc/lang/host/jvm.lux
index 44cc680eb..206408ce0 100644
--- a/lux-jvm/source/luxc/lang/host/jvm.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm.lux
@@ -1,32 +1,32 @@
 (.module:
   [library
-   [lux (#- Definition Type Label)
-    [ffi (#+ import:)]
+   [lux {"-" [Definition Type Label]}
+    [ffi {"+" [import:]}]
     [abstract
      monad]
     [control
      ["<>" parser
       ["<.>" code]]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      [collection
       ["." list ("#\." monad)]]]
     [macro
      ["." code]
-     [syntax (#+ syntax:)]]
+     [syntax {"+" [syntax:]}]]
     [target
      [jvm
-      ["." type (#+ Type)
-       [category (#+ Class)]]]]
+      ["." type {"+" [Type]}
+       [category {"+" [Class]}]]]]
     [tool
      [compiler
       [reference
-       [variable (#+ Register)]]
+       [variable {"+" [Register]}]]
       [language
        [lux
         ["." generation]]]
       [meta
-       [archive (#+ Archive)]]]]]])
+       [archive {"+" [Archive]}]]]]]])
 
 (import: org/objectweb/asm/MethodVisitor)
 
diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux
index 6b31137ac..3260e954c 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/def.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux (#- Type)
-    ["." ffi (#+ import: do_to)]
+   [lux {"-" [Type]}
+    ["." ffi {"+" [import: do_to]}]
     [control
      ["." function]]
     [data
      ["." product]
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
-      ["." array (#+ Array)]
+      ["." array {"+" [Array]}]
       ["." list ("#@." functor)]]]
     [math
      [number
@@ -18,8 +18,8 @@
      [jvm
       [encoding
        ["." name]]
-      ["." type (#+ Type Constraint)
-       [category (#+ Class Value Method)]
+      ["." type {"+" [Type Constraint]}
+       [category {"+" [Class Value Method]}]
        ["." signature]
        ["." descriptor]]]]]]
   ["." //])
diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index ba381d5d2..9a622da03 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux (#- Type int char try)
-    ["." ffi (#+ import: do_to)]
+   [lux {"-" [Type int char try]}
+    ["." ffi {"+" [import: do_to]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." function]
      ["." maybe]
@@ -15,7 +15,7 @@
      [collection
       ["." list ("#@." functor)]]]
     [macro
-     [syntax (#+ syntax:)]
+     [syntax {"+" [syntax:]}]
      ["." code]
      ["." template]]
     [math
@@ -25,16 +25,16 @@
     [target
      [jvm
       [encoding
-       ["." name (#+ External)]]
-      ["." type (#+ Type) ("#@." equivalence)
-       [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
+       ["." name {"+" [External]}]]
+      ["." type {"+" [Type]} ("#@." equivalence)
+       [category {"+" [Void Value Return Method Primitive Object Class Array Var Parameter]}]
        ["." box]
        ["." descriptor]
        ["." reflection]]]]
     [tool
      [compiler
-      [phase (#+ Operation)]]]]]
-  ["." // (#+ Inst)])
+      [phase {"+" [Operation]}]]]]]
+  ["." // {"+" [Inst]}])
 
 (def: class_name (|>> type.descriptor descriptor.class_name name.read))
 (def: descriptor (|>> type.descriptor descriptor.descriptor))