From 74e8954ee269aa5dea39f1e4e3c55e8d387384a8 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Fri, 21 Oct 2022 14:37:09 -0400
Subject: Clean-up after format change for extensions [part 2]

---
 lux-jvm/source/program.lux | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'lux-jvm')

diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux
index 96b9d749b..82d1fb6e3 100644
--- a/lux-jvm/source/program.lux
+++ b/lux-jvm/source/program.lux
@@ -82,14 +82,13 @@
       (ffi.write! 0 _object_class)
       (ffi.write! 1 _object_class)))
 
-(def _apply5_args
+(def _apply4_args
   (Array (java/lang/Class java/lang/Object))
-  (|> (ffi.array (java/lang/Class java/lang/Object) 5)
+  (|> (ffi.array (java/lang/Class java/lang/Object) 4)
       (ffi.write! 0 _object_class)
       (ffi.write! 1 _object_class)
       (ffi.write! 2 _object_class)
-      (ffi.write! 3 _object_class)
-      (ffi.write! 4 _object_class)))
+      (ffi.write! 3 _object_class)))
 
 (def .public (expander macro inputs lux)
   Expander
@@ -133,10 +132,10 @@
   (<| (as extension.Extender)
       (function (@self handler))
       (as extension.Handler)
-      (function (@self name phase))
-      (as extension.Phase)
+      (function (@self phase))
+      (as phase.Phase)
       (function (@self archive parameters))
-      (as extension.Operation)
+      (as phase.Operation)
       (function (@self state))
       (as Try)
       try.trusted
@@ -145,15 +144,14 @@
         [method (|> handler
                     (as java/lang/Object)
                     (java/lang/Object::getClass)
-                    (java/lang/Class::getMethod "apply" _apply5_args))]
+                    (java/lang/Class::getMethod "apply" _apply4_args))]
         (java/lang/reflect/Method::invoke
          (as java/lang/Object handler)
-         (|> (ffi.array java/lang/Object 5)
-             (ffi.write! 0 (as java/lang/Object name))
-             (ffi.write! 1 (as java/lang/Object (phase_wrapper phase)))
-             (ffi.write! 2 (as java/lang/Object archive))
-             (ffi.write! 3 (as java/lang/Object parameters))
-             (ffi.write! 4 (as java/lang/Object state)))
+         (|> (ffi.array java/lang/Object 4)
+             (ffi.write! 0 (as java/lang/Object (phase_wrapper phase)))
+             (ffi.write! 1 (as java/lang/Object archive))
+             (ffi.write! 2 (as java/lang/Object parameters))
+             (ffi.write! 3 (as java/lang/Object state)))
          method))))
 
 (def (declare_success! _)
-- 
cgit v1.2.3