De-taggification | part 4

2 files changed, 45 insertions, 45 deletions

diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
index 706c69c00..e3ac4141b 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
@@ -3,43 +3,43 @@
    [lux {"-" [Type Label]}
     [ffi {"+" [import:]}]
     [abstract
-     ["." monad {"+" [do]}]]
+     ["[0]" monad {"+" [do]}]]
     [control
-     ["." try]
+     ["[0]" try]
      ["<>" parser
       ["<s>" synthesis {"+" [Parser]}]]]
     [data
-     ["." product]
+     ["[0]" product]
      [collection
-      ["." list ("#@." monad)]
-      ["." dictionary]]]
+      ["[0]" list ("[1]@[0]" monad)]
+      ["[0]" dictionary]]]
     [math
      [number
       ["f" frac]]]
     [target
      [jvm
-      ["." type]]]
+      ["[0]" type]]]
     [tool
      [compiler
-      ["." phase]
+      ["[0]" phase]
       [meta
        [archive {"+" [Archive]}]]
       [language
        [lux
-        ["." synthesis {"+" [Synthesis %synthesis]}]
+        ["[0]" synthesis {"+" [Synthesis %synthesis]}]
         [phase
          [generation
           [extension {"+" [Nullary Unary Binary Trinary Variadic
                            nullary unary binary trinary variadic]}]]
-         ["." extension
-          ["." bundle]]]]]]]]]
+         ["[0]" extension
+          ["[0]" bundle]]]]]]]]]
   [luxc
    [lang
     [host
      ["$" jvm {"+" [Label Inst Def Handler Bundle Operation Phase]}
       ["_" inst]]]]]
-  ["." ///
-   ["." runtime]])
+  ["[0]" ///
+   ["[0]" runtime]])
 
 (def: .public (custom [parser handler])
   (All (_ s)
@@ -55,7 +55,7 @@
       (phase.except extension.invalid_syntax [extension_name %synthesis input]))))
 
 (import: java/lang/Double
-  ["#::."
+  ["[1]::[0]"
    ("static" MIN_VALUE java/lang/Double)
    ("static" MAX_VALUE java/lang/Double)])
 
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
index 802d13d3f..4539ea17e 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
@@ -3,56 +3,56 @@
    [lux {"-" [Type Label primitive int char type]}
     [ffi {"+" [import:]}]
     [abstract
-     ["." monad {"+" [do]}]]
+     ["[0]" monad {"+" [do]}]]
     [control
-     ["." maybe ("#\." functor)]
-     ["." exception {"+" [exception:]}]
-     ["." function]
-     ["<>" parser ("#\." monad)
-      ["<.>" text]
-      ["<.>" synthesis {"+" [Parser]}]]]
+     ["[0]" maybe ("[1]\[0]" functor)]
+     ["[0]" exception {"+" [exception:]}]
+     ["[0]" function]
+     ["<>" parser ("[1]\[0]" monad)
+      ["<[0]>" text]
+      ["<[0]>" synthesis {"+" [Parser]}]]]
     [data
-     ["." product]
-     ["." text ("#\." equivalence)
+     ["[0]" product]
+     ["[0]" text ("[1]\[0]" equivalence)
       ["%" format {"+" [format]}]]
      [collection
-      ["." list ("#\." monad mix)]
-      ["." dictionary {"+" [Dictionary]}]
-      ["." set]]]
+      ["[0]" list ("[1]\[0]" monad mix)]
+      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" set]]]
     [macro
-     ["." template]]
+     ["[0]" template]]
     [math
      [number
       ["n" nat]]]
     [target
      [jvm
-      ["." type {"+" [Type Typed Argument]}
-       ["." category {"+" [Void Value Return Primitive Object Class Array Var Parameter Method]}]
-       ["." box]
-       ["." reflection]
-       ["." signature]
-       ["." descriptor]
-       ["." parser]]]]
+      ["[0]" type {"+" [Type Typed Argument]}
+       ["[0]" category {"+" [Void Value Return Primitive Object Class Array Var Parameter Method]}]
+       ["[0]" box]
+       ["[0]" reflection]
+       ["[0]" signature]
+       ["[0]" descriptor]
+       ["[0]" parser]]]]
     [tool
      [compiler
-      ["." phase ("#\." monad)]
+      ["[0]" phase ("[1]\[0]" monad)]
       [reference {"+" []}
-       ["." variable {"+" [Variable Register]}]]
+       ["[0]" variable {"+" [Variable Register]}]]
       [meta
        [archive {"+" [Archive]}]]
       [language
        [lux
         [analysis {"+" [Environment]}]
-        ["." synthesis {"+" [Synthesis Path %synthesis]}]
-        ["." generation]
+        ["[0]" synthesis {"+" [Synthesis Path %synthesis]}]
+        ["[0]" generation]
         [phase
          [generation
           [extension {"+" [Nullary Unary Binary
                            nullary unary binary]}]]
          [analysis
-          [".A" reference]]
-         ["." extension
-          ["." bundle]
+          ["[0]A" reference]]
+         ["[0]" extension
+          ["[0]" bundle]
           [analysis
            ["/" jvm]]]]]]]]]]
   [luxc
@@ -60,12 +60,12 @@
     [host
      ["$" jvm {"+" [Label Inst Def Handler Bundle Operation Phase]}
       ["_" inst]
-      ["_." def]]]]]
-  ["." // "_"
+      ["_[0]" def]]]]]
+  ["[0]" // "_"
    [common {"+" [custom]}]
-   ["/#" //
-    ["#." reference]
-    ["#." function]]])
+   ["/[1]" //
+    ["[1][0]" reference]
+    ["[1][0]" function]]])
 
 (template [<name> <category> <parser>]
   [(def: .public <name>