Ported JVM pattern-matching & loop generation to the new JVM bytecode machinery.

1 files changed, 9 insertions, 3 deletions

diff --git a/new-luxc/source/luxc/lang/translation/jvm/case.lux b/new-luxc/source/luxc/lang/translation/jvm/case.lux
index 484604323..7ea571450 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/case.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/case.lux
@@ -39,17 +39,23 @@
 (def: peekI
   Inst
   (|>> _.DUP
-       runtime.peekI))
+       (_.int +0)
+       _.AALOAD))
 
 (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: popI
+  (|>> (_.int +1)
+       _.AALOAD
+       (_.CHECKCAST runtime.$Stack)))
 
 (def: (path' phase stack-depth @else @end path)
   (-> Phase Nat Label Label Path (Operation Inst))
   (.case path
     #synthesis.Pop
-    (operation@wrap runtime.popI)
+    (operation@wrap ..popI)
     
     (#synthesis.Bind register)
     (operation@wrap (|>> peekI