diff options
Diffstat (limited to '')
-rw-r--r-- | lux-r/source/program.lux | 163 | ||||
-rw-r--r-- | lux-ruby/source/program.lux | 98 |
2 files changed, 126 insertions, 135 deletions
diff --git a/lux-r/source/program.lux b/lux-r/source/program.lux index fec77c843..15323662a 100644 --- a/lux-r/source/program.lux +++ b/lux-r/source/program.lux @@ -210,19 +210,18 @@ [ ... program/LuxADT ... org/renjin/sexp/SEXP ] - [{[org/renjin/sexp/SEXP] - (ffi.array org/renjin/sexp/SEXP 0) - - ... (java/util/List java/lang/Object) - ... (:expected (..fake_list [])) - }] + [[org/renjin/sexp/SEXP] (ffi.array org/renjin/sexp/SEXP 0) + + ... (java/util/List java/lang/Object) + ... (:expected (..fake_list [])) + ] ... Methods ... (program/LuxADT - ... [] (getValue self) java/lang/Object + ... [] (getValue self []) java/lang/Object ... (:as java/lang/Object value)) ... (org/renjin/sexp/AbstractSEXP - ... [] (eval self {context org/renjin/eval/Context} {environment org/renjin/sexp/Environment}) + ... [] (eval self [context org/renjin/eval/Context environment org/renjin/sexp/Environment]) ... org/renjin/sexp/SEXP ... (exec ... ("lux io log" (exception.report @@ -232,24 +231,24 @@ ... self)) ... (org/renjin/sexp/AbstractSEXP - ... [] (getAttributes self) + ... [] (getAttributes self []) ... org/renjin/sexp/AttributeMap ... (org/renjin/sexp/AttributeMap::EMPTY)) ... (org/renjin/sexp/AbstractSEXP - ... [] (getTypeName self) + ... [] (getTypeName self []) ... java/lang/String ... "LUX") (org/renjin/sexp/ListVector - [] (get self {_ int}) + [] (get self [_ int]) org/renjin/sexp/SEXP (exec ... ("lux io log" (..%%code <call>)) _jvm_this)) (org/renjin/sexp/ListVector - [] (get self {_ java/lang/String}) + [] (get self [_ java/lang/String]) org/renjin/sexp/SEXP (exec ... ("lux io log" (..%%code <call>)) @@ -267,81 +266,81 @@ (panic! (..%%code <call>)))] ... org/renjin/sexp/ListVector - [(accept self {_ org/renjin/sexp/SexpVisitor}) void] - [(anyNA self) boolean] - [(contains self {_ org/renjin/sexp/Vector} {_ int}) boolean] - ... [(copyTo self {_ [double]} {_ int} {_ int}) void] - [(equals self {_ java/lang/Object}) boolean] + [(accept self [_ org/renjin/sexp/SexpVisitor]) void] + [(anyNA self []) boolean] + [(contains self [_ org/renjin/sexp/Vector _ int]) boolean] + ... [(copyTo self [_ [double] _ int _ int]) void] + [(equals self [_ java/lang/Object]) boolean] - [(getComputationDepth self) int] - [(getElementAsByte self {_ int}) byte] - [(getElementAsComplex self {_ int}) org/apache/commons/math/complex/Complex] - [(getElementAsComplexIm self {_ int}) double] - [(getElementAsDouble self {_ int}) double] - - [(getElementAsDouble self {_ java/lang/String}) double] - [(getElementAsInt self {_ int}) int] - [(getElementAsInt self {_ java/lang/String}) int] - [(getElementAsList self {_ java/lang/String}) org/renjin/sexp/ListVector] - [(getElementAsLogical self {_ int}) org/renjin/sexp/Logical] - [(getElementAsObject self {_ int}) java/lang/Object] - [(getElementAsRawLogical self {_ int}) int] - [(getElementAsSEXP self {_ int}) org/renjin/sexp/SEXP] - [(getElementAsSEXP self {_ java/lang/String}) org/renjin/sexp/SEXP] - [(getElementAsString self {_ int}) java/lang/String] - [(getElementAsString self {_ java/lang/String}) java/lang/String] - [(getElementAsVector self {_ java/lang/String}) org/renjin/sexp/Vector] + [(getComputationDepth self []) int] + [(getElementAsByte self [_ int]) byte] + [(getElementAsComplex self [_ int]) org/apache/commons/math/complex/Complex] + [(getElementAsComplexIm self [_ int]) double] + [(getElementAsDouble self [_ int]) double] + + [(getElementAsDouble self [_ java/lang/String]) double] + [(getElementAsInt self [_ int]) int] + [(getElementAsInt self [_ java/lang/String]) int] + [(getElementAsList self [_ java/lang/String]) org/renjin/sexp/ListVector] + [(getElementAsLogical self [_ int]) org/renjin/sexp/Logical] + [(getElementAsObject self [_ int]) java/lang/Object] + [(getElementAsRawLogical self [_ int]) int] + [(getElementAsSEXP self [_ int]) org/renjin/sexp/SEXP] + [(getElementAsSEXP self [_ java/lang/String]) org/renjin/sexp/SEXP] + [(getElementAsString self [_ int]) java/lang/String] + [(getElementAsString self [_ java/lang/String]) java/lang/String] + [(getElementAsVector self [_ java/lang/String]) org/renjin/sexp/Vector] - [(getTypeName self) java/lang/String] - [(getVectorType self) org/renjin/sexp/Vector$Type] - [(indexOf self {_ org/renjin/sexp/Vector} {_ int} {_ int}) int] - [(indexOfName self {_ java/lang/String}) int] - [(isConstantAccessTime self) boolean] - [(isDeferred self) boolean] - [(isElementNA self {_ int}) boolean] - [(isElementNaN self {_ int}) boolean] - [(isElementTrue self {_ int}) boolean] - [(iterator self) (java/util/Iterator org/renjin/sexp/SEXP)] - [(length self) int] - [(maxElementLength self) int] - [(minElementLength self) int] - [(namedValues self) (java/lang/Iterable org/renjin/sexp/NamedValue)] - [(newBuilderWithInitialCapacity self {_ int}) org/renjin/sexp/ListVector$Builder] - [(newBuilderWithInitialSize self {_ int}) org/renjin/sexp/Vector$Builder] - [(newCopyBuilder self) org/renjin/sexp/ListVector$Builder] - [(newCopyBuilder self {_ org/renjin/sexp/Vector$Type}) org/renjin/sexp/Vector$Builder] - [(newCopyNamedBuilder self) org/renjin/sexp/ListVector$NamedBuilder] - [(promise self {_ org/renjin/sexp/Environment}) org/renjin/sexp/SEXP] - [(repromise self) org/renjin/sexp/SEXP] - [(repromise self {_ org/renjin/sexp/SEXP}) org/renjin/sexp/SEXP] - [(toArrayUnsafe self) [org/renjin/sexp/SEXP]] - [(toString self) java/lang/String] + [(getTypeName self []) java/lang/String] + [(getVectorType self []) org/renjin/sexp/Vector$Type] + [(indexOf self [_ org/renjin/sexp/Vector _ int _ int]) int] + [(indexOfName self [_ java/lang/String]) int] + [(isConstantAccessTime self []) boolean] + [(isDeferred self []) boolean] + [(isElementNA self [_ int]) boolean] + [(isElementNaN self [_ int]) boolean] + [(isElementTrue self [_ int]) boolean] + [(iterator self []) (java/util/Iterator org/renjin/sexp/SEXP)] + [(length self []) int] + [(maxElementLength self []) int] + [(minElementLength self []) int] + [(namedValues self []) (java/lang/Iterable org/renjin/sexp/NamedValue)] + [(newBuilderWithInitialCapacity self [_ int]) org/renjin/sexp/ListVector$Builder] + [(newBuilderWithInitialSize self [_ int]) org/renjin/sexp/Vector$Builder] + [(newCopyBuilder self []) org/renjin/sexp/ListVector$Builder] + [(newCopyBuilder self [_ org/renjin/sexp/Vector$Type]) org/renjin/sexp/Vector$Builder] + [(newCopyNamedBuilder self []) org/renjin/sexp/ListVector$NamedBuilder] + [(promise self [_ org/renjin/sexp/Environment]) org/renjin/sexp/SEXP] + [(repromise self []) org/renjin/sexp/SEXP] + [(repromise self [_ org/renjin/sexp/SEXP]) org/renjin/sexp/SEXP] + [(toArrayUnsafe self []) [org/renjin/sexp/SEXP]] + [(toString self []) java/lang/String] ... org/renjin/sexp/AbstractSEXP ... org/renjin/sexp/SEXP - ... [(accept self {_ org/renjin/sexp/SexpVisitor}) void] - ... [(asInt self) int] - ... [(asLogical self) org/renjin/sexp/Logical] - ... [(asReal self) double] - ... [(asString self) java/lang/String] - ... [(force self {_ org/renjin/eval/Context}) org/renjin/sexp/SEXP] - ... [(getAttribute self {_ org/renjin/sexp/Symbol}) org/renjin/sexp/SEXP] - ... [(getElementAsSEXP self {_ int}) org/renjin/sexp/SEXP] - ... [(getImplicitClass self) java/lang/String] - ... ... [(getIndexByName self {_ java/lang/String}) int] - ... [(getName self {_ int}) java/lang/String] - ... [(getNames self) org/renjin/sexp/AtomicVector] - ... [(getS3Class self) org/renjin/sexp/StringVector] - ... ... [(hasAttributes self) boolean] - ... [(hasNames self) boolean] - ... [(inherits self {_ java/lang/String}) boolean] - ... [(isNumeric self) boolean] - ... ... [(isObject self) boolean] - ... [(length self) int] - ... ... [(setAttribute self {_ java/lang/String} {_ org/renjin/sexp/SEXP}) org/renjin/sexp/SEXP] - ... [(setAttribute self {_ org/renjin/sexp/Symbol} {_ org/renjin/sexp/SEXP}) org/renjin/sexp/SEXP] - ... [(setAttributes self {_ org/renjin/sexp/AttributeMap$Builder}) org/renjin/sexp/SEXP] - ... [(setAttributes self {_ org/renjin/sexp/AttributeMap}) org/renjin/sexp/SEXP] + ... [(accept self [_ org/renjin/sexp/SexpVisitor]) void] + ... [(asInt self []) int] + ... [(asLogical self []) org/renjin/sexp/Logical] + ... [(asReal self []) double] + ... [(asString self []) java/lang/String] + ... [(force self [_ org/renjin/eval/Context]) org/renjin/sexp/SEXP] + ... [(getAttribute self [_ org/renjin/sexp/Symbol]) org/renjin/sexp/SEXP] + ... [(getElementAsSEXP self [_ int]) org/renjin/sexp/SEXP] + ... [(getImplicitClass self []) java/lang/String] + ... ... [(getIndexByName self [_ java/lang/String]) int] + ... [(getName self [_ int]) java/lang/String] + ... [(getNames self []) org/renjin/sexp/AtomicVector] + ... [(getS3Class self []) org/renjin/sexp/StringVector] + ... ... [(hasAttributes self []) boolean] + ... [(hasNames self []) boolean] + ... [(inherits self [_ java/lang/String]) boolean] + ... [(isNumeric self []) boolean] + ... ... [(isObject self []) boolean] + ... [(length self []) int] + ... ... [(setAttribute self [_ java/lang/String _ org/renjin/sexp/SEXP]) org/renjin/sexp/SEXP] + ... [(setAttribute self [_ org/renjin/sexp/Symbol _ org/renjin/sexp/SEXP]) org/renjin/sexp/SEXP] + ... [(setAttributes self [_ org/renjin/sexp/AttributeMap$Builder]) org/renjin/sexp/SEXP] + ... [(setAttributes self [_ org/renjin/sexp/AttributeMap]) org/renjin/sexp/SEXP] )) ))))) 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)]) |