From 35c0807799717cd720ab28b35851c1a01a67445d Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 7 Sep 2021 22:50:21 -0400
Subject: De-taggification | part 4

---
 lux-jvm/source/luxc/lang/host/jvm/def.lux  | 30 +++++++++++++-------------
 lux-jvm/source/luxc/lang/host/jvm/inst.lux | 34 +++++++++++++++---------------
 2 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'lux-jvm/source/luxc/lang/host/jvm')

diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux
index 3260e954c..36aed2d61 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/def.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux
@@ -1,28 +1,28 @@
 (.module:
   [library
    [lux {"-" [Type]}
-    ["." ffi {"+" [import: do_to]}]
+    ["[0]" ffi {"+" [import: do_to]}]
     [control
-     ["." function]]
+     ["[0]" function]]
     [data
-     ["." product]
-     ["." text
+     ["[0]" product]
+     ["[0]" text
       ["%" format {"+" [format]}]]
      [collection
-      ["." array {"+" [Array]}]
-      ["." list ("#@." functor)]]]
+      ["[0]" array {"+" [Array]}]
+      ["[0]" list ("[1]@[0]" functor)]]]
     [math
      [number
       ["i" int]]]
     [target
      [jvm
       [encoding
-       ["." name]]
-      ["." type {"+" [Type Constraint]}
+       ["[0]" name]]
+      ["[0]" type {"+" [Type Constraint]}
        [category {"+" [Class Value Method]}]
-       ["." signature]
-       ["." descriptor]]]]]]
-  ["." //])
+       ["[0]" signature]
+       ["[0]" descriptor]]]]]]
+  ["[0]" //])
 
 (def: signature (|>> type.signature signature.signature))
 (def: descriptor (|>> type.descriptor descriptor.descriptor))
@@ -32,7 +32,7 @@
 (import: java/lang/String)
 
 (import: org/objectweb/asm/Opcodes
-  ["#::."
+  ["[1]::[0]"
    ("static" ACC_PUBLIC int)
    ("static" ACC_PROTECTED int)
    ("static" ACC_PRIVATE int)
@@ -59,17 +59,17 @@
    ("static" V1_8 int)])
 
 (import: org/objectweb/asm/FieldVisitor
-  ["#::."
+  ["[1]::[0]"
    (visitEnd [] void)])
 
 (import: org/objectweb/asm/MethodVisitor
-  ["#::."
+  ["[1]::[0]"
    (visitCode [] void)
    (visitMaxs [int int] void)
    (visitEnd [] void)])
 
 (import: org/objectweb/asm/ClassWriter
-  ["#::."
+  ["[1]::[0]"
    ("static" COMPUTE_MAXS int)
    ("static" COMPUTE_FRAMES int)
    (new [int])
diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index 9a622da03..2255774f8 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -1,23 +1,23 @@
 (.module:
   [library
    [lux {"-" [Type int char try]}
-    ["." ffi {"+" [import: do_to]}]
+    ["[0]" ffi {"+" [import: do_to]}]
     [abstract
      [monad {"+" [do]}]]
     [control
-     ["." function]
-     ["." maybe]
-     ["." try]
+     ["[0]" function]
+     ["[0]" maybe]
+     ["[0]" try]
      ["p" parser
       ["s" code]]]
     [data
-     ["." product]
+     ["[0]" product]
      [collection
-      ["." list ("#@." functor)]]]
+      ["[0]" list ("[1]@[0]" functor)]]]
     [macro
      [syntax {"+" [syntax:]}]
-     ["." code]
-     ["." template]]
+     ["[0]" code]
+     ["[0]" template]]
     [math
      [number
       ["n" nat]
@@ -25,16 +25,16 @@
     [target
      [jvm
       [encoding
-       ["." name {"+" [External]}]]
-      ["." type {"+" [Type]} ("#@." equivalence)
+       ["[0]" name {"+" [External]}]]
+      ["[0]" type {"+" [Type]} ("[1]@[0]" equivalence)
        [category {"+" [Void Value Return Method Primitive Object Class Array Var Parameter]}]
-       ["." box]
-       ["." descriptor]
-       ["." reflection]]]]
+       ["[0]" box]
+       ["[0]" descriptor]
+       ["[0]" reflection]]]]
     [tool
      [compiler
       [phase {"+" [Operation]}]]]]]
-  ["." // {"+" [Inst]}])
+  ["[0]" // {"+" [Inst]}])
 
 (def: class_name (|>> type.descriptor descriptor.class_name name.read))
 (def: descriptor (|>> type.descriptor descriptor.descriptor))
@@ -50,7 +50,7 @@
       in))
 
 (`` (import: org/objectweb/asm/Opcodes
-      ["#::."
+      ["[1]::[0]"
        ("static" NOP int)
 
        ... Conversion
@@ -126,11 +126,11 @@
       ))
 
 (import: org/objectweb/asm/Label
-  ["#::."
+  ["[1]::[0]"
    (new [])])
 
 (import: org/objectweb/asm/MethodVisitor
-  ["#::."
+  ["[1]::[0]"
    (visitCode [] void)
    (visitMaxs [int int] void)
    (visitEnd [] void)
-- 
cgit v1.2.3