From 7027b09b68a5ad8f7a4eb2f9edd913d43d2f1730 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 14 Sep 2019 23:42:56 -0400
Subject: More fixes.

---
 new-luxc/source/luxc/lang/translation/jvm/case.lux | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'new-luxc/source/luxc/lang/translation/jvm/case.lux')

diff --git a/new-luxc/source/luxc/lang/translation/jvm/case.lux b/new-luxc/source/luxc/lang/translation/jvm/case.lux
index c157a5776..484604323 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/case.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/case.lux
@@ -26,8 +26,6 @@
   ["." //
    ["." runtime]])
 
-(def: $Runtime (type.class //.runtime-class (list)))
-
 (def: (pop-altI stack-depth)
   (-> Nat Inst)
   (.case stack-depth
@@ -45,7 +43,7 @@
 
 (def: pushI
   Inst
-  (|>> (_.INVOKESTATIC $Runtime "pm_push" (type.method [(list runtime.$Stack //.$Value) runtime.$Stack (list)]))))
+  (|>> (_.INVOKESTATIC //.$Runtime "pm_push" (type.method [(list runtime.$Stack //.$Value) runtime.$Stack (list)]))))
 
 (def: (path' phase stack-depth @else @end path)
   (-> Phase Nat Label Label Path (Operation Inst))
@@ -100,7 +98,7 @@
                                (_.CHECKCAST //.$Variant)
                                (_.int (.int (<prepare> idx)))
                                <flag>
-                               (_.INVOKESTATIC $Runtime "pm_variant" (type.method [(list //.$Variant runtime.$Tag runtime.$Flag) runtime.$Value (list)]))
+                               (_.INVOKESTATIC //.$Runtime "pm_variant" (type.method [(list //.$Variant runtime.$Tag runtime.$Flag) runtime.$Value (list)]))
                                _.DUP
                                (_.IFNULL @fail)
                                (_.GOTO @success)
@@ -118,7 +116,7 @@
                                      _.AALOAD
                                      
                                      lefts
-                                     (_.INVOKESTATIC $Runtime "tuple_left" (type.method [(list //.$Tuple runtime.$Index) //.$Value (list)])))]
+                                     (_.INVOKESTATIC //.$Runtime "tuple_left" (type.method [(list //.$Tuple runtime.$Index) //.$Value (list)])))]
                       (|>> peekI
                            (_.CHECKCAST //.$Tuple)
                            (_.int (.int lefts))
@@ -129,7 +127,7 @@
     (operation@wrap (|>> peekI
                          (_.CHECKCAST //.$Tuple)
                          (_.int (.int lefts))
-                         (_.INVOKESTATIC $Runtime "tuple_right" (type.method [(list //.$Tuple runtime.$Index) //.$Value (list)]))
+                         (_.INVOKESTATIC //.$Runtime "tuple_right" (type.method [(list //.$Tuple runtime.$Index) //.$Value (list)]))
                          pushI))
 
     ## Extra optimization
@@ -155,7 +153,7 @@
         (wrap (|>> peekI
                    (_.CHECKCAST //.$Tuple)
                    (_.int (.int lefts))
-                   (_.INVOKESTATIC $Runtime <getter> (type.method [(list //.$Tuple runtime.$Index) //.$Value (list)]))
+                   (_.INVOKESTATIC //.$Runtime <getter> (type.method [(list //.$Tuple runtime.$Index) //.$Value (list)]))
                    (_.ASTORE register)
                    then!))))
     ([synthesis.member/left  "tuple_left"]
@@ -188,7 +186,7 @@
     (wrap (|>> pathI
                (_.label @else)
                _.POP
-               (_.INVOKESTATIC $Runtime "pm_fail" (type.method [(list) type.void (list)]))
+               (_.INVOKESTATIC //.$Runtime "pm_fail" (type.method [(list) type.void (list)]))
                _.NULL
                (_.GOTO @end)))))
 
-- 
cgit v1.2.3