Ported JVM reference generation to the new JVM bytecode machinery.

2 files changed, 5 insertions, 5 deletions

diff --git a/new-luxc/source/luxc/lang/translation/jvm/function.lux b/new-luxc/source/luxc/lang/translation/jvm/function.lux
index d0764796f..cc618ca0d 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/function.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/function.lux
@@ -17,7 +17,7 @@
     [compiler
      [analysis (#+ Arity Environment)]
      [synthesis (#+ Synthesis Abstraction Apply)]
-     ["_." reference (#+ Register Variable)]
+     [reference (#+ Register)]
      ["." phase
       ["." generation]]]]]
   [luxc
diff --git a/new-luxc/source/luxc/lang/translation/jvm/reference.lux b/new-luxc/source/luxc/lang/translation/jvm/reference.lux
index 63fd0685a..886f461ce 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/reference.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/reference.lux
@@ -37,14 +37,14 @@
                            //.$Object)))))
 
 (def: local
-  (-> Register (Operation Inst))
-  (|>> _.ALOAD operation@wrap))
+  (-> Register Inst)
+  (|>> _.ALOAD))
 
 (def: #export (variable variable)
   (-> Variable (Operation Inst))
   (case variable
     (#reference.Local variable)
-    (local variable)
+    (operation@wrap (local variable))
     
     (#reference.Foreign variable)
     (foreign variable)))
@@ -53,4 +53,4 @@
   (-> Name (Operation Inst))
   (do phase.monad
     [bytecode-name (generation.remember name)]
-    (operation@wrap (_.GETSTATIC bytecode-name //.value-field //.$Object))))
+    (wrap (_.GETSTATIC bytecode-name //.value-field //.$Object))))