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-ruby/source/program.lux | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'lux-ruby')

diff --git a/lux-ruby/source/program.lux b/lux-ruby/source/program.lux
index b54acaaa9..374009830 100644
--- a/lux-ruby/source/program.lux
+++ b/lux-ruby/source/program.lux
@@ -243,7 +243,7 @@
       (if (n.< size idx)
         (case (org/jruby/RubyArray::get (.int idx) host_object)
           #.None
-          (recur (inc idx) output)
+          (recur (++ idx) output)
           
           (#.Some value)
           (case (read value)
@@ -251,7 +251,7 @@
             (#try.Failure error)
 
             (#try.Success lux_value)
-            (recur (inc idx) (array.write! idx lux_value output))))
+            (recur (++ idx) (array.write! idx lux_value output))))
         (#try.Success output)))))
 
 (exception: (unknown_kind_of_object {object java/lang/Object})
@@ -380,7 +380,7 @@
               {args [org/jruby/runtime/builtin/IRubyObject]}
               {block org/jruby/runtime/Block})
      org/jruby/runtime/builtin/IRubyObject
-     (let [member (ffi.array_read 0 args)]
+     (let [member (ffi.read! 0 args)]
        (<| (case (ffi.check org/jruby/RubyFixnum member)
              (#.Some member)
              (case (array.read! (org/jruby/RubyFixnum::getLongValue member) value)
@@ -451,7 +451,7 @@
               {args [org/jruby/runtime/builtin/IRubyObject]}
               {block org/jruby/runtime/Block})
      org/jruby/runtime/builtin/IRubyObject
-     (let [reference (ffi.array_read 0 args)]
+     (let [reference (ffi.read! 0 args)]
        (case (..read (:as java/lang/Object reference))
          (#try.Success reference)
          (org/jruby/RubyBoolean::newBoolean ..initial_ruby_runtime (same? (: Any reference) (: Any value)))
@@ -514,7 +514,7 @@
               {block org/jruby/runtime/Block})
      org/jruby/runtime/builtin/IRubyObject
      (case (|> args
-               (ffi.array_read 0)
+               (ffi.read! 0)
                (ffi.check org/jruby/RubySymbol))
        (#.Some method)
        (|> (case (|> method
@@ -587,8 +587,8 @@
    (do try.monad
      [expansion (org/jruby/RubyProc::call (!ruby_thread_context)
                                           (|> (ffi.array org/jruby/runtime/builtin/IRubyObject 2)
-                                              (ffi.array_write 0 (..to_host inputs))
-                                              (ffi.array_write 1 (..to_host lux)))
+                                              (ffi.write! 0 (..to_host inputs))
+                                              (ffi.write! 1 (..to_host lux)))
                                           macro)]
      (..read (:as java/lang/Object expansion)))))
 
@@ -778,11 +778,11 @@
                      [handler (try.of_maybe (..ensure_macro handler))
                       output (org/jruby/RubyProc::call (!ruby_thread_context)
                                                        (|> (ffi.array org/jruby/runtime/builtin/IRubyObject 5)
-                                                           (ffi.array_write 0 (org/jruby/RubyString::newInternalFromJavaExternal (!ruby_runtime) name))
-                                                           (ffi.array_write 1 (:as org/jruby/runtime/builtin/IRubyObject (phase_wrapper phase)))
-                                                           (ffi.array_write 2 (..to_host archive))
-                                                           (ffi.array_write 3 (..to_host parameters))
-                                                           (ffi.array_write 4 (..to_host state)))
+                                                           (ffi.write! 0 (org/jruby/RubyString::newInternalFromJavaExternal (!ruby_runtime) name))
+                                                           (ffi.write! 1 (:as org/jruby/runtime/builtin/IRubyObject (phase_wrapper phase)))
+                                                           (ffi.write! 2 (..to_host archive))
+                                                           (ffi.write! 3 (..to_host parameters))
+                                                           (ffi.write! 4 (..to_host state)))
                                                        handler)]
                      (..read (:as java/lang/Object output))))))
 
-- 
cgit v1.2.3