From e00ba096c8837abe85d366e0c1293c09dbe84d81 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Wed, 18 Aug 2021 03:29:15 -0400 Subject: Some bug fixes. --- lux-jvm/source/program.lux | 58 +++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'lux-jvm/source/program.lux') diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux index 767101102..deef09f36 100644 --- a/lux-jvm/source/program.lux +++ b/lux-jvm/source/program.lux @@ -95,22 +95,22 @@ (def: _apply1_args (Array (java/lang/Class java/lang/Object)) (|> (ffi.array (java/lang/Class java/lang/Object) 1) - (ffi.array_write 0 _object_class))) + (ffi.write! 0 _object_class))) (def: _apply2_args (Array (java/lang/Class java/lang/Object)) (|> (ffi.array (java/lang/Class java/lang/Object) 2) - (ffi.array_write 0 _object_class) - (ffi.array_write 1 _object_class))) + (ffi.write! 0 _object_class) + (ffi.write! 1 _object_class))) (def: _apply5_args (Array (java/lang/Class java/lang/Object)) (|> (ffi.array (java/lang/Class java/lang/Object) 5) - (ffi.array_write 0 _object_class) - (ffi.array_write 1 _object_class) - (ffi.array_write 2 _object_class) - (ffi.array_write 3 _object_class) - (ffi.array_write 4 _object_class))) + (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))) (def: .public (expander macro inputs lux) Expander @@ -123,8 +123,8 @@ (java/lang/reflect/Method::invoke (:as java/lang/Object macro) (|> (ffi.array java/lang/Object 2) - (ffi.array_write 0 (:as java/lang/Object inputs)) - (ffi.array_write 1 (:as java/lang/Object lux))) + (ffi.write! 0 (:as java/lang/Object inputs)) + (ffi.write! 1 (:as java/lang/Object lux))) apply_method)))) (def: how_to_wrap_a_phase @@ -150,13 +150,13 @@ (#$.Extension "jvm conversion long-to-int"))) literal_nat (: (-> Nat Synthesis) (|>> .i64 $.i64 unwrap_long long_to_int)) - array_write (: (-> Text Nat Synthesis Synthesis Synthesis) - (function (_ element_class index value array) - ((#$.Extension "jvm array write object" - (list (jvm_type (jvm/type.array (jvm/type.class element_class (list)))) - (literal_nat index) - value - array))))) + write! (: (-> Text Nat Synthesis Synthesis Synthesis) + (function (_ element_class index value array) + ((#$.Extension "jvm array write object" + (list (jvm_type (jvm/type.array (jvm/type.class element_class (list)))) + (literal_nat index) + value + array))))) object_array (: (-> Text Nat Synthesis) (function (_ class_name size) (#$.Extension "jvm array new object" @@ -191,9 +191,9 @@ ($.text runtime.apply_method)) (input (|> (object_array "java.lang.Class" phase_arity) - (array_write "java.lang.Class" 0 (class_of example_object)) - (array_write "java.lang.Class" 1 (class_of example_object)) - (array_write "java.lang.Class" 2 (class_of example_object)))))))] + (write! "java.lang.Class" 0 (class_of example_object)) + (write! "java.lang.Class" 1 (class_of example_object)) + (write! "java.lang.Class" 2 (class_of example_object)))))))] (#$.Extension "jvm member invoke virtual" (list& (class_type "java.lang.reflect.Method") ($.text "invoke") @@ -203,9 +203,9 @@ $phase) (input (|> (object_array "java.lang.Object" phase_arity) - (array_write "java.lang.Object" 0 $archive) - (array_write "java.lang.Object" 1 $input) - (array_write "java.lang.Object" 2 $state)))))))) + (write! "java.lang.Object" 0 $archive) + (write! "java.lang.Object" 1 $input) + (write! "java.lang.Object" 2 $state)))))))) (def: (phase_wrapper archive) (-> Archive (generation.Operation _.Anchor _.Inst _.Definition platform.Phase_Wrapper)) @@ -223,7 +223,7 @@ (java/lang/reflect/Method::invoke (:as java/lang/Object phase_wrapper) (|> (ffi.array java/lang/Object 1) - (ffi.array_write 0 (:as java/lang/Object phase))) + (ffi.write! 0 (:as java/lang/Object phase))) apply_method))))))) (def: .public platform @@ -265,11 +265,11 @@ (java/lang/reflect/Method::invoke (:as java/lang/Object handler) (|> (ffi.array java/lang/Object 5) - (ffi.array_write 0 (:as java/lang/Object name)) - (ffi.array_write 1 (:as java/lang/Object (phase_wrapper phase))) - (ffi.array_write 2 (:as java/lang/Object archive)) - (ffi.array_write 3 (:as java/lang/Object parameters)) - (ffi.array_write 4 (:as java/lang/Object state))) + (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))) method)))) (def: (declare_success! _) -- cgit v1.2.3