De-taggification | part 4

3 files changed, 55 insertions, 55 deletions

diff --git a/lux-r/source/luxc/lang/synthesis/variable.lux b/lux-r/source/luxc/lang/synthesis/variable.lux
index ecbca7062..82478a2d6 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]}])))
+              ["[0]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 78afc9e3e..474d88d8a 100644
--- a/lux-r/source/program.lux
+++ b/lux-r/source/program.lux
@@ -1,38 +1,38 @@
 (.module:
   [lux "*"
    [program {"+" [program:]}]
-   ["." ffi]
-   ["." debug]
+   ["[0]" ffi]
+   ["[0]" debug]
    [abstract
-    ["." monad {"+" [do]}]]
+    ["[0]" monad {"+" [do]}]]
    [control
     [pipe {"+" [exec> case> new>]}]
-    ["." maybe]
-    ["." try {"+" [Try]}]
-    ["." exception {"+" [exception:]}]
-    ["." io {"+" [IO io]}]
+    ["[0]" maybe]
+    ["[0]" try {"+" [Try]}]
+    ["[0]" exception {"+" [exception:]}]
+    ["[0]" io {"+" [IO io]}]
     [concurrency
-     ["." promise {"+" [Promise]}]]
+     ["[0]" promise {"+" [Promise]}]]
     [parser
-     ["<.>" code]]]
+     ["<[0]>" code]]]
    [data
-    ["." text ("#\." hash)
+    ["[0]" text ("[1]\[0]" hash)
      ["%" format {"+" [format]}]
      [encoding
-      ["." utf8]]]
+      ["[0]" utf8]]]
     [collection
-     ["." array {"+" [Array]}]]]
-   ["." macro
+     ["[0]" array {"+" [Array]}]]]
+   ["[0]" macro
     [syntax {"+" [syntax:]}]
-    ["." template]
-    ["." code]]
+    ["[0]" template]
+    ["[0]" code]]
    [math
     [number {"+" [hex]}
      ["n" nat]
-     ["." i64]]]
-   ["." world "_"
-    ["." file]
-    ["#/." program]]
+     ["[0]" i64]]]
+   ["[0]" world "_"
+    ["[0]" file]
+    ["[1]/[0]" program]]
    ["@" target
     ["_" r]]
    [tool
@@ -44,61 +44,61 @@
       [lux
        [program {"+" [Program]}]
        [generation {"+" [Context Host]}]
-       ["." synthesis]
+       ["[0]" synthesis]
        [analysis
         [macro {"+" [Expander]}]]
        [phase
-        ["." extension {"+" [Extender Handler]}
-         ["#/." bundle]
-         ["." analysis "_"
-          ["#" r]]
-         ["." generation "_"
-          ["#" r]]]
+        ["[0]" extension {"+" [Extender Handler]}
+         ["[1]/[0]" bundle]
+         ["[0]" analysis "_"
+          ["[1]" r]]
+         ["[0]" generation "_"
+          ["[1]" r]]]
         [generation
-         ["." reference]
-         ["." r
-          ["." runtime]]]]]]
+         ["[0]" reference]
+         ["[0]" r
+          ["[0]" runtime]]]]]]
      [default
-      ["." platform {"+" [Platform]}]]
+      ["[0]" platform {"+" [Platform]}]]
      [meta
-      ["." packager "_"
-       ["#" script]]]]]]
+      ["[0]" packager "_"
+       ["[1]" script]]]]]]
   [program
    ["/" compositor
-    ["#." cli]
-    ["#." static]]])
+    ["[1][0]" cli]
+    ["[1][0]" static]]])
 
 (ffi.import: java/lang/String)
 
 (ffi.import: (java/lang/Class a)
-  ["#::."
+  ["[1]::[0]"
    ("static" forName [java/lang/String] "try" (java/lang/Class java/lang/Object))])
 
 (ffi.import: java/lang/Object
-  ["#::."
+  ["[1]::[0]"
    (toString [] java/lang/String)
    (getClass [] (java/lang/Class java/lang/Object))])
 
 (ffi.import: java/lang/Long
-  ["#::."
+  ["[1]::[0]"
    (intValue [] java/lang/Integer)])
 
 (ffi.import: java/lang/Integer
-  ["#::."
+  ["[1]::[0]"
    (longValue [] long)])
 
 (ffi.import: java/lang/Number
-  ["#::."
+  ["[1]::[0]"
    (intValue [] java/lang/Integer)
    (longValue [] long)
    (doubleValue [] double)])
 
 (ffi.import: org/renjin/sexp/SEXP
-  ["#::."
+  ["[1]::[0]"
    (asInt [] int)])
 
 (ffi.import: org/renjin/sexp/AttributeMap
-  ["#::."
+  ["[1]::[0]"
    ("static" EMPTY org/renjin/sexp/AttributeMap)])
 
 (ffi.import: org/renjin/sexp/AbstractSEXP)
@@ -106,17 +106,17 @@
 (ffi.import: org/renjin/sexp/IntArrayVector)
 
 (ffi.import: org/renjin/sexp/Logical
-  ["#::."
+  ["[1]::[0]"
    (toBooleanStrict [] boolean)])
 
 (ffi.import: org/renjin/sexp/LogicalVector
-  ["#::."
+  ["[1]::[0]"
    (asLogical [] org/renjin/sexp/Logical)])
 
 (ffi.import: org/renjin/sexp/LogicalArrayVector)
 
 (ffi.import: org/renjin/sexp/StringVector
-  ["#::."
+  ["[1]::[0]"
    (asString [] java/lang/String)])
 
 (ffi.import: org/renjin/sexp/StringArrayVector)
@@ -124,7 +124,7 @@
 (ffi.import: org/renjin/sexp/Null)
 
 (ffi.import: org/renjin/sexp/ListVector
-  ["#::."
+  ["[1]::[0]"
    (get "as" get_index [int] org/renjin/sexp/SEXP)
    (get "as" get_field [java/lang/String] org/renjin/sexp/SEXP)
    (length [] int)])
@@ -132,7 +132,7 @@
 (ffi.import: org/renjin/sexp/PairList)
 
 (ffi.import: org/renjin/sexp/PairList$Builder
-  ["#::."
+  ["[1]::[0]"
    (new [])
    (add [org/renjin/sexp/SEXP] org/renjin/sexp/PairList$Builder)
    (build [] org/renjin/sexp/PairList)])
@@ -142,24 +142,24 @@
 (ffi.import: org/renjin/sexp/Environment)
 
 (ffi.import: org/renjin/sexp/FunctionCall
-  ["#::."
+  ["[1]::[0]"
    (new [org/renjin/sexp/SEXP org/renjin/sexp/PairList])
    (eval [org/renjin/eval/Context org/renjin/sexp/Environment] "try" org/renjin/sexp/SEXP)])
 
 (ffi.import: org/renjin/sexp/Closure
-  ["#::."
+  ["[1]::[0]"
    (getEnclosingEnvironment [] org/renjin/sexp/Environment)])
 
 (ffi.import: javax/script/ScriptEngine
-  ["#::."
+  ["[1]::[0]"
    (eval [java/lang/String] "try" java/lang/Object)])
 
 (ffi.import: org/renjin/script/RenjinScriptEngine
-  ["#::."
+  ["[1]::[0]"
    (getRuntimeContext [] org/renjin/eval/Context)])
 
 (ffi.import: org/renjin/script/RenjinScriptEngineFactory
-  ["#::."
+  ["[1]::[0]"
    (new [])
    (getScriptEngine [] org/renjin/script/RenjinScriptEngine)])
 
diff --git a/lux-r/source/test/program.lux b/lux-r/source/test/program.lux
index e8cf0df53..53463255a 100644
--- a/lux-r/source/test/program.lux
+++ b/lux-r/source/test/program.lux
@@ -2,13 +2,13 @@
   [lux "*"
    ["_" test {"+" [Test]}]
    [control
-    ["." io]
+    ["[0]" io]
     [parser
      [cli {"+" [program:]}]]]]
   [spec
-   ["." compositor]]
+   ["[0]" compositor]]
   {1
-   ["." /]})
+   ["[0]" /]})
 
 (program: args
   (<| io.io