- Upgrade the tuple left-access mechanism to the new style.

- Updated JS compiler.
- Updated Python compiler.

3 files changed, 33 insertions, 26 deletions

diff --git a/luxc/src/lux/compiler/jvm/case.clj b/luxc/src/lux/compiler/jvm/case.clj
index 32ca72ae3..cceed14e4 100644
--- a/luxc/src/lux/compiler/jvm/case.clj
+++ b/luxc/src/lux/compiler/jvm/case.clj
@@ -126,7 +126,7 @@
           stack-peek
           (.visitTypeInsn Opcodes/CHECKCAST "[Ljava/lang/Object;")
           (.visitLdcInsn (int _idx))
-          (.visitMethodInsn Opcodes/INVOKESTATIC "lux/LuxRT" (if is-tail? "product_getRight" "product_getLeft") "([Ljava/lang/Object;I)Ljava/lang/Object;")
+          (.visitMethodInsn Opcodes/INVOKESTATIC "lux/LuxRT" (if is-tail? "product_getRight" "tuple_left") "([Ljava/lang/Object;I)Ljava/lang/Object;")
           (.visitMethodInsn Opcodes/INVOKESTATIC "lux/LuxRT" "pm_stack_push" "([Ljava/lang/Object;Ljava/lang/Object;)[Ljava/lang/Object;")
           )))
 
diff --git a/luxc/src/lux/compiler/jvm/lux.clj b/luxc/src/lux/compiler/jvm/lux.clj
index 06a6650d9..b57b94894 100644
--- a/luxc/src/lux/compiler/jvm/lux.clj
+++ b/luxc/src/lux/compiler/jvm/lux.clj
@@ -208,7 +208,7 @@
                               (.visitTypeInsn Opcodes/CHECKCAST "[Ljava/lang/Object;")
                               (.visitLdcInsn (int idx))
                               (.visitMethodInsn Opcodes/INVOKESTATIC "lux/LuxRT"
-                                                (if tail? "product_getRight" "product_getLeft")
+                                                (if tail? "product_getRight" "tuple_left")
                                                 "([Ljava/lang/Object;I)Ljava/lang/Object;"))))
                         _path)]]
     (return nil)))
diff --git a/luxc/src/lux/compiler/jvm/rt.clj b/luxc/src/lux/compiler/jvm/rt.clj
index 948f08805..d28011b41 100644
--- a/luxc/src/lux/compiler/jvm/rt.clj
+++ b/luxc/src/lux/compiler/jvm/rt.clj
@@ -69,34 +69,41 @@
 ;; Runtime infrastructure
 (defn ^:private compile-LuxRT-adt-methods [^ClassWriter =class]
   (|let [_ (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)
+                 $not-rec (new Label)
+                 index-right #(doto %
+                                (.visitVarInsn Opcodes/ALOAD 0)
+                                (.visitInsn Opcodes/ARRAYLENGTH)
+                                (.visitLdcInsn (int 1))
+                                (.visitInsn Opcodes/ISUB))
+                 lefts #(doto %
+                          (.visitVarInsn Opcodes/ILOAD 1))
+                 left-index lefts
+                 access #(doto %
+                           (.visitVarInsn Opcodes/ALOAD 0)
+                           left-index
+                           (.visitInsn Opcodes/AALOAD))
+                 sub-lefts #(doto %
+                              ;; index-right, lefts
+                              (.visitInsn Opcodes/SWAP)
+                              (.visitInsn Opcodes/ISUB))
+                 sub-tuple #(doto %
+                              (.visitVarInsn Opcodes/ALOAD 0)
+                              index-right
+                              (.visitInsn Opcodes/AALOAD)
+                              (.visitTypeInsn Opcodes/CHECKCAST "[Ljava/lang/Object;"))]
+             (doto (.visitMethod =class (+ Opcodes/ACC_PUBLIC Opcodes/ACC_STATIC) "tuple_left" "([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 1)) ;; 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/SWAP) ;; index-last-elem, tuple-size
-               (.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 1)) ;; 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) ;;
+               index-right
+               lefts
+               (.visitInsn Opcodes/DUP2) (.visitJumpInsn Opcodes/IF_ICMPGT $not-rec)
+               sub-lefts (.visitVarInsn Opcodes/ISTORE 1)
+               sub-tuple (.visitVarInsn Opcodes/ASTORE 0)
                (.visitJumpInsn Opcodes/GOTO $begin)
-               (.visitLabel $not-rec) ;; tuple-size, index-last-elem
+               (.visitLabel $not-rec)
+               ;; index-right, lefts
                ;; (.visitInsn Opcodes/POP2) ;;
-               (.visitVarInsn Opcodes/ALOAD 0) ;; tuple
-               (.visitVarInsn Opcodes/ILOAD 1) ;; tuple, index
-               (.visitInsn Opcodes/AALOAD) ;; elem
+               access
                (.visitInsn Opcodes/ARETURN)
                (.visitMaxs 0 0)
                (.visitEnd)))