- Added a special constructor for variants to ensure they don't take null values.

2 files changed, 38 insertions, 18 deletions

diff --git a/src/lux/compiler/host.clj b/src/lux/compiler/host.clj
index e7982a8ca..2e584c7c6 100644
--- a/src/lux/compiler/host.clj
+++ b/src/lux/compiler/host.clj
@@ -777,6 +777,7 @@
                                     $not-right (new Label)]
                                 (doto (.visitMethod =class (+ Opcodes/ACC_PUBLIC Opcodes/ACC_STATIC) "sum_get" "([Ljava/lang/Object;I)Ljava/lang/Object;" nil nil)
                                   (.visitCode)
+                                  (.visitFrame Opcodes/F_NEW (int 2) (to-array ["[Ljava/lang/Object;" Opcodes/INTEGER]) (int 0) (to-array []))
                                   (.visitLabel $begin)
                                   (.visitVarInsn Opcodes/ILOAD 1) ;; tag
                                   (.visitVarInsn Opcodes/ALOAD 0) ;; tag, sum
@@ -818,7 +819,41 @@
                                   (.visitInsn Opcodes/ACONST_NULL)
                                   (.visitInsn Opcodes/ARETURN)
                                   (.visitMaxs 0 0)
-                                  (.visitEnd)))]]
+                                  (.visitEnd)))
+              =sum-make-method (let [$is-null (new Label)]
+                                 (doto (.visitMethod =class (+ Opcodes/ACC_PUBLIC Opcodes/ACC_STATIC) "sum_make" "(ILjava/lang/Boolean;Ljava/lang/Object;)[Ljava/lang/Object;" nil nil)
+                                   (.visitCode)
+                                   (.visitVarInsn Opcodes/ALOAD 2)
+                                   (.visitJumpInsn Opcodes/IFNULL $is-null)
+                                   (.visitLdcInsn (int 4))
+                                   (.visitTypeInsn Opcodes/ANEWARRAY "java/lang/Object")
+                                   (.visitInsn Opcodes/DUP)
+                                   (.visitLdcInsn (int 0))
+                                   (.visitLdcInsn &/sum-tag)
+                                   (.visitInsn Opcodes/AASTORE)
+                                   (.visitInsn Opcodes/DUP)
+                                   (.visitLdcInsn (int 1))
+                                   (.visitVarInsn Opcodes/ILOAD 0)
+                                   (&&/wrap-int)
+                                   (.visitInsn Opcodes/AASTORE)
+                                   (.visitInsn Opcodes/DUP)
+                                   (.visitLdcInsn (int 2))
+                                   (.visitVarInsn Opcodes/ALOAD 1)
+                                   (.visitInsn Opcodes/AASTORE)
+                                   (.visitInsn Opcodes/DUP)
+                                   (.visitLdcInsn (int 3))
+                                   (.visitVarInsn Opcodes/ALOAD 2)
+                                   (.visitInsn Opcodes/AASTORE)
+                                   (.visitInsn Opcodes/ARETURN)
+                                   (.visitFrame Opcodes/F_NEW (int 3) (to-array [Opcodes/INTEGER "java/lang/Boolean" "java/lang/Object"]) (int 0) (to-array []))
+                                   (.visitLabel $is-null)
+                                   (.visitTypeInsn Opcodes/NEW "java/lang/IllegalStateException")
+                                   (.visitInsn Opcodes/DUP)
+                                   (.visitLdcInsn "Can't create variant for null pointer")
+                                   (.visitMethodInsn Opcodes/INVOKESPECIAL "java/lang/IllegalStateException" "<init>" "(Ljava/lang/String;)V")
+                                   (.visitInsn Opcodes/ATHROW)
+                                   (.visitMaxs 0 0)
+                                   (.visitEnd)))]]
     (&&/save-class! (second (string/split &&/lux-utils-class #"/"))
                     (.toByteArray (doto =class .visitEnd)))))
 
diff --git a/src/lux/compiler/lux.clj b/src/lux/compiler/lux.clj
index 3c09f6362..dba42eb21 100644
--- a/src/lux/compiler/lux.clj
+++ b/src/lux/compiler/lux.clj
@@ -86,25 +86,10 @@
 (defn compile-variant [compile ?tag tail? ?value]
   (|do [^MethodVisitor *writer* &/get-writer
         :let [_ (doto *writer*
-                  (.visitLdcInsn (int 4))
-                  (.visitTypeInsn Opcodes/ANEWARRAY "java/lang/Object")
-                  (.visitInsn Opcodes/DUP)
-                  (.visitLdcInsn (int 0))
-                  (.visitLdcInsn &/sum-tag)
-                  (.visitInsn Opcodes/AASTORE)
-                  (.visitInsn Opcodes/DUP)
-                  (.visitLdcInsn (int 1))
                   (.visitLdcInsn (int ?tag))
-                  (&&/wrap-int)
-                  (.visitInsn Opcodes/AASTORE)
-                  (.visitInsn Opcodes/DUP)
-                  (.visitLdcInsn (int 2))
-                  (.visitFieldInsn Opcodes/GETSTATIC "java/lang/Boolean" (if tail? "TRUE" "FALSE") "Ljava/lang/Boolean;")
-                  (.visitInsn Opcodes/AASTORE)
-                  (.visitInsn Opcodes/DUP)
-                  (.visitLdcInsn (int 3)))]
+                  (.visitFieldInsn Opcodes/GETSTATIC "java/lang/Boolean" (if tail? "TRUE" "FALSE") "Ljava/lang/Boolean;"))]
         _ (compile ?value)
-        :let [_ (.visitInsn *writer* Opcodes/AASTORE)]]
+        :let [_ (.visitMethodInsn *writer* Opcodes/INVOKESTATIC "lux/LuxUtils" "sum_make" "(ILjava/lang/Boolean;Ljava/lang/Object;)[Ljava/lang/Object;")]]
     (return nil)))
 
 (defn compile-local [compile ?idx]