From ef437d6584d8fd863c0dab276e5a3d4dc094767b Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 29 Aug 2021 21:59:48 -0400
Subject: De-taggification | part 0

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

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

diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux
index b772435cd..6b31137ac 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/def.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux
@@ -33,30 +33,30 @@
 
 (import: org/objectweb/asm/Opcodes
   ["#::."
-   (#static ACC_PUBLIC int)
-   (#static ACC_PROTECTED int)
-   (#static ACC_PRIVATE int)
-
-   (#static ACC_TRANSIENT int)
-   (#static ACC_VOLATILE int)
-
-   (#static ACC_ABSTRACT int)
-   (#static ACC_FINAL int)
-   (#static ACC_STATIC int)
-   (#static ACC_SYNCHRONIZED int)
-   (#static ACC_STRICT int)
-
-   (#static ACC_SUPER int)
-   (#static ACC_INTERFACE int)
-
-   (#static V1_1 int)
-   (#static V1_2 int)
-   (#static V1_3 int)
-   (#static V1_4 int)
-   (#static V1_5 int)
-   (#static V1_6 int)
-   (#static V1_7 int)
-   (#static V1_8 int)])
+   ("static" ACC_PUBLIC int)
+   ("static" ACC_PROTECTED int)
+   ("static" ACC_PRIVATE int)
+
+   ("static" ACC_TRANSIENT int)
+   ("static" ACC_VOLATILE int)
+
+   ("static" ACC_ABSTRACT int)
+   ("static" ACC_FINAL int)
+   ("static" ACC_STATIC int)
+   ("static" ACC_SYNCHRONIZED int)
+   ("static" ACC_STRICT int)
+
+   ("static" ACC_SUPER int)
+   ("static" ACC_INTERFACE int)
+
+   ("static" V1_1 int)
+   ("static" V1_2 int)
+   ("static" V1_3 int)
+   ("static" V1_4 int)
+   ("static" V1_5 int)
+   ("static" V1_6 int)
+   ("static" V1_7 int)
+   ("static" V1_8 int)])
 
 (import: org/objectweb/asm/FieldVisitor
   ["#::."
@@ -70,8 +70,8 @@
 
 (import: org/objectweb/asm/ClassWriter
   ["#::."
-   (#static COMPUTE_MAXS int)
-   (#static COMPUTE_FRAMES int)
+   ("static" COMPUTE_MAXS int)
+   ("static" COMPUTE_FRAMES int)
    (new [int])
    (visit [int int java/lang/String java/lang/String java/lang/String [java/lang/String]] void)
    (visitEnd [] void)
diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index 296baf8d4..ba381d5d2 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -46,12 +46,12 @@
 
 (syntax: (declare [codes (p.many s.local_identifier)])
   (|> codes
-      (list@each (function (_ code) (` ((~' #static) (~ (code.local_identifier code)) (~' int)))))
+      (list@each (function (_ code) (` ((~' "static") (~ (code.local_identifier code)) (~' int)))))
       in))
 
 (`` (import: org/objectweb/asm/Opcodes
       ["#::."
-       (#static NOP int)
+       ("static" NOP int)
 
        ... Conversion
        (~~ (declare D2F D2I D2L
@@ -84,7 +84,7 @@
                     LCONST_0 LCONST_1
                     FCONST_0 FCONST_1 FCONST_2
                     DCONST_0 DCONST_1))
-       (#static ACONST_NULL int)
+       ("static" ACONST_NULL int)
        
        ... Var
        (~~ (declare IINC
@@ -116,7 +116,7 @@
        (~~ (declare GETSTATIC PUTSTATIC GETFIELD PUTFIELD
                     INVOKESTATIC INVOKESPECIAL INVOKEVIRTUAL INVOKEINTERFACE))
 
-       (#static ATHROW int)
+       ("static" ATHROW int)
 
        ... Concurrency
        (~~ (declare MONITORENTER MONITOREXIT))
-- 
cgit v1.2.3