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/function.lux | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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

diff --git a/new-luxc/source/luxc/lang/translation/jvm/function.lux b/new-luxc/source/luxc/lang/translation/jvm/function.lux
index 56ef21b46..d95c2c6c0 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/function.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/function.lux
@@ -258,15 +258,16 @@
                                               (_.INVOKESPECIAL class "<init>" (init-method env function-arity))
                                               _.ARETURN))
                                        ))))
-                   _.fuse)]
+                   _.fuse)
+        failureI (|>> (_.INVOKESTATIC //.$Runtime "apply_fail" (type.method [(list) type.void (list)]))
+                      _.NULL
+                      _.ARETURN)]
     (def.method #$.Public $.noneM runtime.apply-method (runtime.apply-signature apply-arity)
                 (|>> get-amount-of-partialsI
                      (_.TABLESWITCH +0 (|> num-partials dec .int)
                                     @default @labels)
                      casesI
-                     (_.INVOKESTATIC runtime.$Runtime "apply_fail" (type.method [(list) type.void (list)]))
-                     _.NULL
-                     _.ARETURN
+                     failureI
                      ))))
 
 (def: #export (with-function @begin class env arity bodyI)
@@ -309,7 +310,7 @@
                          [function-class
                           (def.class #$.V1_6 #$.Public $.finalC
                                      function-class (list)
-                                     ($.simple-class //.function-class) (list)
+                                     //.$Function (list)
                                      functionD)])]
     (wrap instanceI)))
 
-- 
cgit v1.2.3