From 77301f3a456c015daa9d8f9aa3d80fd4e45f8e7e Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 8 Sep 2021 21:44:06 -0400
Subject: De-bracing part 0

---
 lux-ruby/source/program.lux | 98 +++++++++++++++++++++------------------------
 1 file changed, 45 insertions(+), 53 deletions(-)

(limited to 'lux-ruby')

diff --git a/lux-ruby/source/program.lux b/lux-ruby/source/program.lux
index 4c1f8a32c..c28e1ae9c 100644
--- a/lux-ruby/source/program.lux
+++ b/lux-ruby/source/program.lux
@@ -366,16 +366,15 @@
   (-> (-> (Array java/lang/Object) org/jruby/runtime/builtin/IRubyObject)
       (-> (Array java/lang/Object) org/jruby/internal/runtime/methods/DynamicMethod))
   (ffi.object [] org/jruby/internal/runtime/methods/DynamicMethod []
-    [{java/lang/String "[]"}]
+    [java/lang/String "[]"]
 
     (org/jruby/internal/runtime/methods/DynamicMethod
-     [] (call self
-              {thread_context org/jruby/runtime/ThreadContext}
-              {self org/jruby/runtime/builtin/IRubyObject}
-              {module org/jruby/RubyModule}
-              {method java/lang/String}
-              {args [org/jruby/runtime/builtin/IRubyObject]}
-              {block org/jruby/runtime/Block})
+     [] (call self [thread_context org/jruby/runtime/ThreadContext
+                    self org/jruby/runtime/builtin/IRubyObject
+                    module org/jruby/RubyModule
+                    method java/lang/String
+                    args [org/jruby/runtime/builtin/IRubyObject]
+                    block org/jruby/runtime/Block])
      org/jruby/runtime/builtin/IRubyObject
      (let [member (ffi.read! 0 args)]
        (<| (case (ffi.check org/jruby/RubyFixnum member)
@@ -437,16 +436,15 @@
 (def: (lux_wrapper_equality value)
   (-> (Array java/lang/Object) org/jruby/internal/runtime/methods/DynamicMethod)
   (ffi.object [] org/jruby/internal/runtime/methods/DynamicMethod []
-    [{java/lang/String "=="}]
+    [java/lang/String "=="]
 
     (org/jruby/internal/runtime/methods/DynamicMethod
-     [] (call self
-              {thread_context org/jruby/runtime/ThreadContext}
-              {self org/jruby/runtime/builtin/IRubyObject}
-              {module org/jruby/RubyModule}
-              {method java/lang/String}
-              {args [org/jruby/runtime/builtin/IRubyObject]}
-              {block org/jruby/runtime/Block})
+     [] (call self [thread_context org/jruby/runtime/ThreadContext
+                    self org/jruby/runtime/builtin/IRubyObject
+                    module org/jruby/RubyModule
+                    method java/lang/String
+                    args [org/jruby/runtime/builtin/IRubyObject]
+                    block org/jruby/runtime/Block])
      org/jruby/runtime/builtin/IRubyObject
      (let [reference (ffi.read! 0 args)]
        (case (..read (:as java/lang/Object reference))
@@ -459,16 +457,15 @@
 (def: (lux_wrapper_length value)
   (-> (Array java/lang/Object) org/jruby/internal/runtime/methods/DynamicMethod)
   (ffi.object [] org/jruby/internal/runtime/methods/DynamicMethod []
-    [{java/lang/String "length"}]
+    [java/lang/String "length"]
 
     (org/jruby/internal/runtime/methods/DynamicMethod
-     [] (call self
-              {thread_context org/jruby/runtime/ThreadContext}
-              {self org/jruby/runtime/builtin/IRubyObject}
-              {module org/jruby/RubyModule}
-              {method java/lang/String}
-              {args [org/jruby/runtime/builtin/IRubyObject]}
-              {block org/jruby/runtime/Block})
+     [] (call self [thread_context org/jruby/runtime/ThreadContext
+                    self org/jruby/runtime/builtin/IRubyObject
+                    module org/jruby/RubyModule
+                    method java/lang/String
+                    args [org/jruby/runtime/builtin/IRubyObject]
+                    block org/jruby/runtime/Block])
      org/jruby/runtime/builtin/IRubyObject
      (|> value
          array.size
@@ -477,16 +474,15 @@
 (def: (lux_wrapper_to_s value)
   (-> (Array java/lang/Object) org/jruby/internal/runtime/methods/DynamicMethod)
   (ffi.object [] org/jruby/internal/runtime/methods/DynamicMethod []
-    [{java/lang/String "to_s"}]
+    [java/lang/String "to_s"]
 
     (org/jruby/internal/runtime/methods/DynamicMethod
-     [] (call self
-              {thread_context org/jruby/runtime/ThreadContext}
-              {self org/jruby/runtime/builtin/IRubyObject}
-              {module org/jruby/RubyModule}
-              {method java/lang/String}
-              {args [org/jruby/runtime/builtin/IRubyObject]}
-              {block org/jruby/runtime/Block})
+     [] (call self [thread_context org/jruby/runtime/ThreadContext
+                    self org/jruby/runtime/builtin/IRubyObject
+                    module org/jruby/RubyModule
+                    method java/lang/String
+                    args [org/jruby/runtime/builtin/IRubyObject]
+                    block org/jruby/runtime/Block])
      org/jruby/runtime/builtin/IRubyObject
      (|> value
          debug.inspection
@@ -499,16 +495,15 @@
 (def: (lux_wrapper_respond_to? value)
   (-> (Array java/lang/Object) org/jruby/internal/runtime/methods/DynamicMethod)
   (ffi.object [] org/jruby/internal/runtime/methods/DynamicMethod []
-    [{java/lang/String "respond_to?"}]
+    [java/lang/String "respond_to?"]
 
     (org/jruby/internal/runtime/methods/DynamicMethod
-     [] (call self
-              {thread_context org/jruby/runtime/ThreadContext}
-              {self org/jruby/runtime/builtin/IRubyObject}
-              {module org/jruby/RubyModule}
-              {method java/lang/String}
-              {args [org/jruby/runtime/builtin/IRubyObject]}
-              {block org/jruby/runtime/Block})
+     [] (call self [thread_context org/jruby/runtime/ThreadContext
+                    self org/jruby/runtime/builtin/IRubyObject
+                    module org/jruby/RubyModule
+                    method java/lang/String
+                    args [org/jruby/runtime/builtin/IRubyObject]
+                    block org/jruby/runtime/Block])
      org/jruby/runtime/builtin/IRubyObject
      (case (|> args
                (ffi.read! 0)
@@ -538,12 +533,10 @@
 (def: (lux_structure value)
   (-> (Array java/lang/Object) org/jruby/runtime/builtin/IRubyObject)
   (let [meta_class (ffi.object [] org/jruby/RubyClass []
-                     [{org/jruby/Ruby
-                       ..initial_ruby_runtime}]
+                     [org/jruby/Ruby ..initial_ruby_runtime]
 
                      (org/jruby/RubyClass
-                      [] (searchWithCache self
-                                          {method java/lang/String})
+                      [] (searchWithCache self [method java/lang/String])
                       org/jruby/runtime/callsite/CacheEntry
                       (case (:as Text method)
                         "[]"
@@ -668,18 +661,18 @@
              (def: phase_block_body
                org/jruby/runtime/BlockBody
                (ffi.object [] org/jruby/runtime/BlockBody []
-                 [{org/jruby/runtime/Signature ..phase_block_signature}]
+                 [org/jruby/runtime/Signature ..phase_block_signature]
                  ... Methods
                  (org/jruby/runtime/BlockBody
-                  [] (getFile self)
+                  [] (getFile self [])
                   java/lang/String
                   "YOLO")
                  (org/jruby/runtime/BlockBody
-                  [] (getLine self)
+                  [] (getLine self [])
                   int
                   (ffi.long_to_int (hex "+ABC,123")))
                  (org/jruby/runtime/BlockBody
-                  [] (getStaticScope self)
+                  [] (getStaticScope self [])
                   org/jruby/parser/StaticScope
                   ..dummy_static_scope)))
 
@@ -688,13 +681,12 @@
                  (-> (List Any) (Phase [extension.Bundle s] i o)
                      org/jruby/RubyProc))
                (let [block (ffi.object [] org/jruby/runtime/Block []
-                             [{org/jruby/runtime/BlockBody ..phase_block_body}]
+                             [org/jruby/runtime/BlockBody ..phase_block_body]
                              ... Methods
                              (org/jruby/runtime/Block
-                              [] (call self
-                                       {_ org/jruby/runtime/ThreadContext}
-                                       {inputs [org/jruby/runtime/builtin/IRubyObject]}
-                                       {_ org/jruby/runtime/Block})
+                              [] (call self [_ org/jruby/runtime/ThreadContext
+                                             inputs [org/jruby/runtime/builtin/IRubyObject]
+                                             _ org/jruby/runtime/Block])
                               org/jruby/runtime/builtin/IRubyObject
                               (<| try.trusted
                                   (let [inputs (array.list #.None inputs)])
-- 
cgit v1.2.3