aboutsummaryrefslogtreecommitdiff
path: root/lux-jvm
diff options
context:
space:
mode:
authorEduardo Julian2021-08-29 21:59:48 -0400
committerEduardo Julian2021-08-29 21:59:48 -0400
commitef437d6584d8fd863c0dab276e5a3d4dc094767b (patch)
treee9167f045de84e7865815178e967ee85584df088 /lux-jvm
parentff537895fe9c24f37a0ce11b640af5d4882571a5 (diff)
De-taggification | part 0
Diffstat (limited to '')
-rw-r--r--lux-jvm/source/luxc/lang/host/jvm/def.lux52
-rw-r--r--lux-jvm/source/luxc/lang/host/jvm/inst.lux8
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm.lux4
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux4
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/primitive.lux10
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/structure.lux8
-rw-r--r--lux-jvm/source/program.lux4
-rw-r--r--lux-jvm/test/test/luxc/lang/translation/jvm.lux2
8 files changed, 46 insertions, 46 deletions
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))
diff --git a/lux-jvm/source/luxc/lang/translation/jvm.lux b/lux-jvm/source/luxc/lang/translation/jvm.lux
index 18c05fecc..41a10f32a 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm.lux
@@ -45,11 +45,11 @@
(import: java/lang/reflect/Field
["#::."
- (get [#? java/lang/Object] #try #? java/lang/Object)])
+ (get ["?" java/lang/Object] "try" "?" java/lang/Object)])
(import: (java/lang/Class a)
["#::."
- (getField [java/lang/String] #try java/lang/reflect/Field)])
+ (getField [java/lang/String] "try" java/lang/reflect/Field)])
(import: java/lang/Object
["#::."
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 7db88c007..99c702b81 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
@@ -56,8 +56,8 @@
(import: java/lang/Double
["#::."
- (#static MIN_VALUE java/lang/Double)
- (#static MAX_VALUE java/lang/Double)])
+ ("static" MIN_VALUE java/lang/Double)
+ ("static" MAX_VALUE java/lang/Double)])
(def: $String (type.class "java.lang.String" (list)))
(def: $CharSequence (type.class "java.lang.CharSequence" (list)))
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
index 359406e7e..95d6c95bf 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
@@ -25,13 +25,13 @@
(import: java/lang/Byte
["#::."
- (#static MAX_VALUE byte)
- (#static MIN_VALUE byte)])
+ ("static" MAX_VALUE byte)
+ ("static" MIN_VALUE byte)])
(import: java/lang/Short
["#::."
- (#static MAX_VALUE short)
- (#static MIN_VALUE short)])
+ ("static" MAX_VALUE short)
+ ("static" MIN_VALUE short)])
(def: .public (i64 value)
(-> (I64 Any) (Operation Inst))
@@ -68,7 +68,7 @@
(import: java/lang/Double
["#::."
- (#static doubleToRawLongBits #manual [double] int)])
+ ("static" doubleToRawLongBits "manual" [double] int)])
(def: d0-bits
Int
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
index 5676fa5f9..76948ca72 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
@@ -64,13 +64,13 @@
(import: java/lang/Byte
["#::."
- (#static MAX_VALUE byte)
- (#static MIN_VALUE byte)])
+ ("static" MAX_VALUE byte)
+ ("static" MIN_VALUE byte)])
(import: java/lang/Short
["#::."
- (#static MAX_VALUE short)
- (#static MIN_VALUE short)])
+ ("static" MAX_VALUE short)
+ ("static" MIN_VALUE short)])
(def: .public (tagI lefts right?)
(-> Nat Bit Inst)
diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux
index ac4da1255..3a2e3a55b 100644
--- a/lux-jvm/source/program.lux
+++ b/lux-jvm/source/program.lux
@@ -76,13 +76,13 @@
(import: java/lang/reflect/Method
["#::."
- (invoke [java/lang/Object [java/lang/Object]] #try java/lang/Object)])
+ (invoke [java/lang/Object [java/lang/Object]] "try" java/lang/Object)])
(import: java/lang/ClassLoader)
(import: (java/lang/Class c)
["#::."
- (getMethod [java/lang/String [(java/lang/Class java/lang/Object)]] #try java/lang/reflect/Method)])
+ (getMethod [java/lang/String [(java/lang/Class java/lang/Object)]] "try" java/lang/reflect/Method)])
(import: java/lang/Object
["#::."
diff --git a/lux-jvm/test/test/luxc/lang/translation/jvm.lux b/lux-jvm/test/test/luxc/lang/translation/jvm.lux
index 5aee41ce5..82d5470c4 100644
--- a/lux-jvm/test/test/luxc/lang/translation/jvm.lux
+++ b/lux-jvm/test/test/luxc/lang/translation/jvm.lux
@@ -507,7 +507,7 @@
))))
(host.import: java/util/GregorianCalendar
- (#static AD int))
+ ("static" AD int))
(context: "Member [Field]"
(<| (times +100)