From 93eb82e1bf6d2f2a6b3b0adb85f4ab93cbb766a9 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 14 Mar 2022 03:33:01 -0400
Subject: De-sigil-ification: @

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

(limited to 'lux-jvm/source')

diff --git a/lux-jvm/source/luxc/lang/host/jvm.lux b/lux-jvm/source/luxc/lang/host/jvm.lux
index 46771939d..017dd834a 100644
--- a/lux-jvm/source/luxc/lang/host/jvm.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm.lux
@@ -1,34 +1,34 @@
 (.using
-  [library
-   [lux {"-" Definition Type Label}
-    [ffi {"+" import:}]
-    [abstract
-     monad]
-    [control
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     [binary {"+" Binary}]
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list ("[1]#[0]" monad)]]]
-    [macro
-     ["[0]" code]
-     [syntax {"+" syntax:}]]
-    [target
-     [jvm
-      ["[0]" type {"+" Type}
-       [category {"+" Class}]]]]
-    [tool
-     [compiler
-      [reference
-       [variable {"+" Register}]]
-      [language
-       [lux
-        ["[0]" generation]]]
-      [meta
-       [archive {"+" Archive}]]]]]])
+ [library
+  [lux {"-" Definition Type Label}
+   [ffi {"+" import:}]
+   [abstract
+    monad]
+   [control
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    [binary {"+" Binary}]
+    [text
+     ["%" format {"+" format}]]
+    [collection
+     ["[0]" list ("[1]#[0]" monad)]]]
+   [macro
+    ["[0]" code]
+    [syntax {"+" syntax:}]]
+   [target
+    [jvm
+     ["[0]" type {"+" Type}
+      [category {"+" Class}]]]]
+   [tool
+    [compiler
+     [reference
+      [variable {"+" Register}]]
+     [language
+      [lux
+       ["[0]" generation]]]
+     [meta
+      [archive {"+" Archive}]]]]]])
 
 (import: org/objectweb/asm/MethodVisitor)
 
@@ -105,7 +105,7 @@
                                 (` (def: .public (~ (code.local_symbol option))
                                      (~ g!type)
                                      (|> (~ g!none)
-                                         (with@ (~ (code.local_symbol (format "#" option))) #1)))))
+                                         (has (~ (code.local_symbol (format "#" option))) #1)))))
                               options)]
     (in (list& (` (type: .public (~ g!type)
                     (.Record
@@ -127,8 +127,8 @@
                     (-> (~ g!type) (~ g!type) (~ g!type))
                     (~ (|> g!tags+
                            (list#each (function (_ tag)
-                                        (list tag (` (or (value@ (~ tag) (~ g!_left))
-                                                         (value@ (~ tag) (~ g!_right)))))))
+                                        (list tag (` (or (the (~ tag) (~ g!_left))
+                                                         (the (~ tag) (~ g!_right)))))))
                            list#conjoint
                            code.tuple))))
 
diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux
index 1fff1604a..e7174a61e 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 @@
 (.using
-  [library
-   [lux {"-" Type}
-    ["[0]" ffi {"+" import: do_to}]
-    [control
-     ["[0]" function]]
-    [data
-     ["[0]" product]
-     ["[0]" text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" array {"+" Array}]
-      ["[0]" list ("[1]@[0]" functor)]]]
-    [math
-     [number
-      ["i" int]]]
-    [target
-     [jvm
-      [encoding
-       ["[0]" name]]
-      ["[0]" type {"+" Type Constraint}
-       [category {"+" Class Value Method}]
-       ["[0]" signature]
-       ["[0]" descriptor]]]]]]
-  ["[0]" //])
+ [library
+  [lux {"-" Type}
+   ["[0]" ffi {"+" import: do_to}]
+   [control
+    ["[0]" function]]
+   [data
+    ["[0]" product]
+    ["[0]" text
+     ["%" format {"+" format}]]
+    [collection
+     ["[0]" array {"+" Array}]
+     ["[0]" list ("[1]@[0]" functor)]]]
+   [math
+    [number
+     ["i" int]]]
+   [target
+    [jvm
+     [encoding
+      ["[0]" name]]
+     ["[0]" type {"+" Type Constraint}
+      [category {"+" Class Value Method}]
+      ["[0]" signature]
+      ["[0]" descriptor]]]]]]
+ ["[0]" //])
 
 (def: signature (|>> type.signature signature.signature))
 (def: descriptor (|>> type.descriptor descriptor.descriptor))
@@ -110,23 +110,23 @@
 (def: (class_flags config)
   (-> //.Class_Config Int)
   ($_ i.+
-      (if (value@ //.#finalC config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0)))
+      (if (the //.#finalC config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0)))
 
 (def: (method_flags config)
   (-> //.Method_Config Int)
   ($_ i.+
-      (if (value@ //.#staticM config) (org/objectweb/asm/Opcodes::ACC_STATIC) +0)
-      (if (value@ //.#finalM config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0)
-      (if (value@ //.#synchronizedM config) (org/objectweb/asm/Opcodes::ACC_SYNCHRONIZED) +0)
-      (if (value@ //.#strictM config) (org/objectweb/asm/Opcodes::ACC_STRICT) +0)))
+      (if (the //.#staticM config) (org/objectweb/asm/Opcodes::ACC_STATIC) +0)
+      (if (the //.#finalM config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0)
+      (if (the //.#synchronizedM config) (org/objectweb/asm/Opcodes::ACC_SYNCHRONIZED) +0)
+      (if (the //.#strictM config) (org/objectweb/asm/Opcodes::ACC_STRICT) +0)))
 
 (def: (field_flags config)
   (-> //.Field_Config Int)
   ($_ i.+
-      (if (value@ //.#staticF config) (org/objectweb/asm/Opcodes::ACC_STATIC) +0)
-      (if (value@ //.#finalF config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0)
-      (if (value@ //.#transientF config) (org/objectweb/asm/Opcodes::ACC_TRANSIENT) +0)
-      (if (value@ //.#volatileF config) (org/objectweb/asm/Opcodes::ACC_VOLATILE) +0)))
+      (if (the //.#staticF config) (org/objectweb/asm/Opcodes::ACC_STATIC) +0)
+      (if (the //.#finalF config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0)
+      (if (the //.#transientF config) (org/objectweb/asm/Opcodes::ACC_TRANSIENT) +0)
+      (if (the //.#volatileF config) (org/objectweb/asm/Opcodes::ACC_VOLATILE) +0)))
 
 (def: param_signature
   (-> (Type Class) Text)
-- 
cgit v1.2.3