- Now using the new utility methods in LuxUtils for working with tuples/products.

2 files changed, 78 insertions, 17 deletions

diff --git a/src/lux/compiler/case.clj b/src/lux/compiler/case.clj
index 5e9aacc0f..314e7a6d3 100644
--- a/src/lux/compiler/case.clj
+++ b/src/lux/compiler/case.clj
@@ -95,22 +95,24 @@
       (compile-match ?member $target $else)
 
       _
-      (doto writer
-        (.visitTypeInsn Opcodes/CHECKCAST "[Ljava/lang/Object;")
-        (-> (doto (.visitInsn Opcodes/DUP)
-              (.visitLdcInsn (int idx))
-              (.visitInsn Opcodes/AALOAD)
-              (compile-match test $next $sub-else)
-              (.visitLabel $sub-else)
-              (.visitInsn Opcodes/POP)
-              (.visitJumpInsn Opcodes/GOTO $else)
-              (.visitLabel $next))
-            (->> (|let [[idx test] idx+member
-                        $next (new Label)
-                        $sub-else (new Label)])
-                 (doseq [idx+member (->> ?members &/enumerate &/->seq)])))
-        (.visitInsn Opcodes/POP)
-        (.visitJumpInsn Opcodes/GOTO $target)))
+      (let [num-members (&/|length ?members)]
+        (doto writer
+          (.visitTypeInsn Opcodes/CHECKCAST "[Ljava/lang/Object;")
+          (-> (doto (.visitInsn Opcodes/DUP)
+                (.visitLdcInsn (int idx))
+                (.visitMethodInsn Opcodes/INVOKESTATIC "lux/LuxUtils" (if is-tail? "product_getRight" "product_getLeft") "([Ljava/lang/Object;I)Ljava/lang/Object;")
+                (compile-match test $next $sub-else)
+                (.visitLabel $sub-else)
+                (.visitInsn Opcodes/POP)
+                (.visitJumpInsn Opcodes/GOTO $else)
+                (.visitLabel $next))
+              (->> (|let [[idx test] idx+member
+                          $next (new Label)
+                          $sub-else (new Label)
+                          is-tail? (= (dec num-members) idx)])
+                   (doseq [idx+member (->> ?members &/enumerate &/->seq)])))
+          (.visitInsn Opcodes/POP)
+          (.visitJumpInsn Opcodes/GOTO $target))))
 
     (&a-case/$VariantTestAC ?tag ?count ?test)
     (doto writer
diff --git a/src/lux/compiler/host.clj b/src/lux/compiler/host.clj
index a6f413595..f4e7ab740 100644
--- a/src/lux/compiler/host.clj
+++ b/src/lux/compiler/host.clj
@@ -709,7 +709,66 @@
                              (.visitMethodInsn Opcodes/INVOKESPECIAL super-class init-method "()V")
                              (.visitInsn Opcodes/RETURN)
                              (.visitMaxs 0 0)
-                             (.visitEnd))]]
+                             (.visitEnd))
+              =product_getLeft-method (let [$begin (new Label)
+                                            $not-rec (new Label)]
+                                        (doto (.visitMethod =class (+ Opcodes/ACC_PUBLIC Opcodes/ACC_STATIC) "product_getLeft" "([Ljava/lang/Object;I)Ljava/lang/Object;" nil nil)
+                                          (.visitCode)
+                                          (.visitLabel $begin)
+                                          (.visitVarInsn Opcodes/ALOAD 0) ;; tuple
+                                          (.visitInsn Opcodes/ARRAYLENGTH) ;; tuple-size
+                                          (.visitVarInsn Opcodes/ILOAD 1) ;; tuple-size, index
+                                          (.visitLdcInsn (int 2)) ;; tuple-size, index, offset-last-elem
+                                          (.visitInsn Opcodes/IADD) ;; tuple-size, index-last-elem
+                                          (.visitInsn Opcodes/DUP2) ;; tuple-size, index-last-elem, tuple-size, index-last-elem
+                                          (.visitJumpInsn Opcodes/IF_ICMPGT $not-rec)
+                                          ;; tuple-size, index-last-elem
+                                          (.visitInsn Opcodes/ISUB) ;; sub-index
+                                          (.visitVarInsn Opcodes/ALOAD 0) ;; sub-index, tuple
+                                          (.visitInsn Opcodes/DUP) ;; sub-index, tuple, tuple
+                                          (.visitInsn Opcodes/ARRAYLENGTH) ;; sub-index, tuple, tuple-size
+                                          (.visitLdcInsn (int 2)) ;; sub-index, tuple, tuple-size, offset-last-elem
+                                          (.visitInsn Opcodes/ISUB) ;; sub-index, tuple, index-last-elem
+                                          (.visitInsn Opcodes/AALOAD) ;; sub-index, sub-tuple
+                                          (.visitTypeInsn Opcodes/CHECKCAST "[Ljava/lang/Object;")
+                                          (.visitVarInsn Opcodes/ASTORE 0) ;; sub-index
+                                          (.visitVarInsn Opcodes/ISTORE 1) ;;
+                                          (.visitJumpInsn Opcodes/GOTO $begin)
+                                          (.visitLabel $not-rec) ;; tuple-size, index-last-elem
+                                          (.visitFrame Opcodes/F_NEW (int 2) (to-array ["[Ljava/lang/Object;" Opcodes/INTEGER]) (int 2) (to-array [Opcodes/INTEGER Opcodes/INTEGER]))
+                                          (.visitInsn Opcodes/POP2) ;;
+                                          (.visitVarInsn Opcodes/ALOAD 0) ;; tuple
+                                          (.visitVarInsn Opcodes/ILOAD 1) ;; tuple, index
+                                          (.visitInsn Opcodes/AALOAD) ;; elem
+                                          (.visitInsn Opcodes/ARETURN)
+                                          (.visitMaxs 0 0)
+                                          (.visitEnd)))
+              =product_getRight-method (let [$is-last (new Label)]
+                                         (doto (.visitMethod =class (+ Opcodes/ACC_PUBLIC Opcodes/ACC_STATIC) "product_getRight" "([Ljava/lang/Object;I)Ljava/lang/Object;" nil nil)
+                                           (.visitCode)
+                                           (.visitVarInsn Opcodes/ALOAD 0) ;; tuple
+                                           (.visitInsn Opcodes/ARRAYLENGTH) ;; tuple-size
+                                           (.visitVarInsn Opcodes/ILOAD 1) ;; tuple-size, index
+                                           (.visitLdcInsn (int 2)) ;; tuple-size, index, offset-last-elem
+                                           (.visitInsn Opcodes/IADD) ;; tuple-size, index-last-elem
+                                           (.visitInsn Opcodes/DUP2) ;; tuple-size, index-last-elem, tuple-size, index-last-elem
+                                           (.visitJumpInsn Opcodes/IF_ICMPEQ $is-last) ;; tuple-size, index-last-elem
+                                           (.visitInsn Opcodes/POP2) ;;
+                                           (.visitVarInsn Opcodes/ALOAD 0)
+                                           (.visitVarInsn Opcodes/ILOAD 1)
+                                           (.visitVarInsn Opcodes/ALOAD 0)
+                                           (.visitInsn Opcodes/ARRAYLENGTH)
+                                           (.visitMethodInsn Opcodes/INVOKESTATIC "java/util/Arrays" "copyOfRange" "([Ljava/lang/Object;II)Ljava/lang/Object;")
+                                           (.visitInsn Opcodes/ARETURN)
+                                           (.visitLabel $is-last) ;; tuple-size, index-last-elem
+                                           (.visitFrame Opcodes/F_NEW (int 2) (to-array ["[Ljava/lang/Object;" Opcodes/INTEGER]) (int 2) (to-array [Opcodes/INTEGER Opcodes/INTEGER]))
+                                           (.visitInsn Opcodes/POP2) ;;
+                                           (.visitVarInsn Opcodes/ALOAD 0) ;; tuple
+                                           (.visitVarInsn Opcodes/ILOAD 1) ;; tuple, index
+                                           (.visitInsn Opcodes/AALOAD) ;; elem
+                                           (.visitInsn Opcodes/ARETURN)
+                                           (.visitMaxs 0 0)
+                                           (.visitEnd)))]]
     (&&/save-class! (second (string/split &&/lux-utils-class #"/"))
                     (.toByteArray (doto =class .visitEnd)))))