diff options
| -rw-r--r-- | lux-cl/source/program.lux | 6 | ||||
| -rw-r--r-- | lux-js/source/program.lux | 25 | ||||
| -rw-r--r-- | lux-lua/source/program.lux | 32 | ||||
| -rw-r--r-- | lux-php/source/program.lux | 21 | ||||
| -rw-r--r-- | lux-python/source/program.lux | 5 | ||||
| -rw-r--r-- | lux-r/source/program.lux | 163 | ||||
| -rw-r--r-- | lux-ruby/source/program.lux | 98 | ||||
| -rw-r--r-- | lux-scheme/source/program.lux | 22 | ||||
| -rw-r--r-- | stdlib/source/library/lux/control/concurrency/actor.lux | 2 | ||||
| -rw-r--r-- | stdlib/source/library/lux/control/concurrency/thread.lux | 2 | ||||
| -rw-r--r-- | stdlib/source/library/lux/ffi.jvm.lux | 10 | ||||
| -rw-r--r-- | stdlib/source/library/lux/ffi.old.lux | 10 | ||||
| -rw-r--r-- | stdlib/source/library/lux/target/jvm/loader.lux | 2 | ||||
| -rw-r--r-- | stdlib/source/test/lux/control/concurrency/actor.lux | 6 | ||||
| -rw-r--r-- | stdlib/source/test/lux/ffi.jvm.lux | 59 | ||||
| -rw-r--r-- | stdlib/source/test/lux/ffi.old.lux | 12 |
16 files changed, 235 insertions, 240 deletions
diff --git a/lux-cl/source/program.lux b/lux-cl/source/program.lux index 56fded738..744474bc9 100644 --- a/lux-cl/source/program.lux +++ b/lux-cl/source/program.lux @@ -186,11 +186,11 @@ [] ... Methods (program/LuxADT - [] (getValue self) java/lang/Object + [] (getValue self []) java/lang/Object (:as java/lang/Object value)) (org/armedbear/lisp/LispObject - [] (length self) + [] (length self []) int (|> value (:as (Array java/lang/Object)) @@ -200,7 +200,7 @@ (~~ (template [<name>] [(org/armedbear/lisp/LispObject - [] (<name> self {idx int}) + [] (<name> self [idx int]) org/armedbear/lisp/LispObject (case (array.read! (|> idx java/lang/Integer::longValue (:as Nat)) (:as (Array java/lang/Object) value)) diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux index fde4d1e96..2cdc6fc66 100644 --- a/lux-js/source/program.lux +++ b/lux-js/source/program.lux @@ -162,10 +162,10 @@ [] ... Methods (program/IntValue - [] (getValue self) java/lang/Object + [] (getValue self []) java/lang/Object (:as java/lang/Object value)) (org/openjdk/nashorn/api/scripting/AbstractJSObject - [] (getMember self {member java/lang/String}) java/lang/Object + [] (getMember self [member java/lang/String]) java/lang/Object (case member (^ (static runtime.i64_high_field)) (|> value .nat runtime.high jvm_int) @@ -182,10 +182,12 @@ (ffi.object [] org/openjdk/nashorn/api/scripting/AbstractJSObject [] [] (org/openjdk/nashorn/api/scripting/AbstractJSObject - [] (isFunction self) boolean + [] (isFunction self []) boolean #1) (org/openjdk/nashorn/api/scripting/AbstractJSObject - [] (call self {this java/lang/Object} {args [java/lang/Object]}) java/lang/Object + [] (call self [this java/lang/Object + args [java/lang/Object]]) + java/lang/Object (debug.inspection js_object)) )) @@ -194,10 +196,12 @@ (ffi.object [] org/openjdk/nashorn/api/scripting/AbstractJSObject [] [] (org/openjdk/nashorn/api/scripting/AbstractJSObject - [] (isFunction self) boolean + [] (isFunction self []) boolean #1) (org/openjdk/nashorn/api/scripting/AbstractJSObject - [] (call self {this java/lang/Object} {args [java/lang/Object]}) java/lang/Object + [] (call self [this java/lang/Object + args [java/lang/Object]]) + java/lang/Object (|> (java/util/Arrays::copyOfRange value (|> args (array.read! 0) maybe.trusted (:as Int)) (.int (array.size value))) @@ -223,13 +227,14 @@ [] ... Methods (program/StructureValue - [] (getValue self) java/lang/Object + [] (getValue self []) java/lang/Object (:as (Array java/lang/Object) value)) (org/openjdk/nashorn/api/scripting/AbstractJSObject - [] (isArray self) boolean + [] (isArray self []) boolean #1) (org/openjdk/nashorn/api/scripting/AbstractJSObject - [] (getMember self {member java/lang/String}) java/lang/Object + [] (getMember self [member java/lang/String]) + java/lang/Object (case member (^or "toJSON" "toString") (:as java/lang/Object @@ -260,7 +265,7 @@ (panic! (exception.error ..unknown_member [(:as Text member) (:as java/lang/Object value)]))) ) (org/openjdk/nashorn/api/scripting/AbstractJSObject - [] (getSlot self {idx int}) java/lang/Object + [] (getSlot self [idx int]) java/lang/Object (|> value (array.read! (|> idx java/lang/Integer::longValue (:as Nat))) maybe.trusted diff --git a/lux-lua/source/program.lux b/lux-lua/source/program.lux index a16198b06..e21b86260 100644 --- a/lux-lua/source/program.lux +++ b/lux-lua/source/program.lux @@ -180,19 +180,19 @@ [] ... Methods (program/StructureValue - [] (getValue self) java/lang/Object + [] (getValue self []) java/lang/Object (:as java/lang/Object value)) (net/sandius/rembulan/impl/DefaultTable - [] (rawlen self) long + [] (rawlen self []) long (|> value array.size (:as java/lang/Long))) (net/sandius/rembulan/impl/DefaultTable - [] (rawget self {idx long}) java/lang/Object + [] (rawget self [idx long]) java/lang/Object (|> value (array.read! (|> idx (:as Nat) --)) maybe.trusted re_wrap)) (net/sandius/rembulan/impl/DefaultTable - [] (rawget self {field java/lang/Object}) java/lang/Object + [] (rawget self [field java/lang/Object]) java/lang/Object (case (ffi.check net/sandius/rembulan/ByteString field) (#.Some field) (case (net/sandius/rembulan/ByteString::decode field) @@ -651,16 +651,14 @@ [] ... Methods (net/sandius/rembulan/runtime/LuaFunction - [] (invoke self - {% net/sandius/rembulan/runtime/ExecutionContext}) + [] (invoke self [% net/sandius/rembulan/runtime/ExecutionContext]) void (<| (..return %) (host_phase partial_application phase))) (net/sandius/rembulan/runtime/LuaFunction - [] (invoke self - {% net/sandius/rembulan/runtime/ExecutionContext} - {input/0 java/lang/Object}) + [] (invoke self [% net/sandius/rembulan/runtime/ExecutionContext + input/0 java/lang/Object]) void (<| (..return %) try.trusted @@ -683,10 +681,9 @@ (exception.except ..invaid_phase_application [partial_application 2]))))) (net/sandius/rembulan/runtime/LuaFunction - [] (invoke self - {% net/sandius/rembulan/runtime/ExecutionContext} - {input/0 java/lang/Object} - {input/1 java/lang/Object}) + [] (invoke self [% net/sandius/rembulan/runtime/ExecutionContext + input/0 java/lang/Object + input/1 java/lang/Object]) void (<| (..return %) try.trusted @@ -707,11 +704,10 @@ (exception.except ..invaid_phase_application [partial_application 2]))))) (net/sandius/rembulan/runtime/LuaFunction - [] (invoke self - {% net/sandius/rembulan/runtime/ExecutionContext} - {input/0 java/lang/Object} - {input/1 java/lang/Object} - {input/2 java/lang/Object}) + [] (invoke self [% net/sandius/rembulan/runtime/ExecutionContext + input/0 java/lang/Object + input/1 java/lang/Object + input/2 java/lang/Object]) void (<| (..return %) try.trusted diff --git a/lux-php/source/program.lux b/lux-php/source/program.lux index abdfde3a5..1696206c6 100644 --- a/lux-php/source/program.lux +++ b/lux-php/source/program.lux @@ -226,21 +226,20 @@ (-> (Array java/lang/Object) php/runtime/Memory) (`` (ffi.object [] php/runtime/Memory [program/StructureValue] - [{php/runtime/Memory$Type php/runtime/Memory$Type::ARRAY}] + [php/runtime/Memory$Type php/runtime/Memory$Type::ARRAY] ... Methods (program/StructureValue - [] (getValue self) java/lang/Object + [] (getValue self []) java/lang/Object (:expected value)) (php/runtime/Memory - [] (toString self) + [] (toString self []) java/lang/String (debug.inspect value)) (php/runtime/Memory - [] (valueOfIndex self - {trace php/runtime/env/TraceInfo} - {index php/runtime/Memory}) + [] (valueOfIndex self [trace php/runtime/env/TraceInfo + index php/runtime/Memory]) php/runtime/Memory (`` (<| (~~ (template [<class> <method> <extractor>] [(case (ffi.check <class> index) @@ -262,9 +261,8 @@ (undefined)))) (php/runtime/Memory - [] (valueOfIndex self - {trace php/runtime/env/TraceInfo} - {index long}) + [] (valueOfIndex self [trace php/runtime/env/TraceInfo + index long]) php/runtime/Memory (|> value (array.read! index) @@ -272,9 +270,8 @@ (..value_wrapper lux_structure))) (php/runtime/Memory - [] (valueOfIndex self - {trace php/runtime/env/TraceInfo} - {index java/lang/String}) + [] (valueOfIndex self [trace php/runtime/env/TraceInfo + index java/lang/String]) php/runtime/Memory (case (:as Text index) (^ (static runtime.variant_tag_field)) diff --git a/lux-python/source/program.lux b/lux-python/source/program.lux index 649a77b95..5ab4e9aaf 100644 --- a/lux-python/source/program.lux +++ b/lux-python/source/program.lux @@ -372,9 +372,8 @@ [] ... Methods (org/python/core/PyObject - [] (__call__ self - {inputs [org/python/core/PyObject]} - {keywords [java/lang/String]}) + [] (__call__ self [inputs [org/python/core/PyObject] + keywords [java/lang/String]]) org/python/core/PyObject (try.trusted (case (array.list #.None inputs) 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)]) diff --git a/lux-scheme/source/program.lux b/lux-scheme/source/program.lux index 82b66ec9d..51ed54a32 100644 --- a/lux-scheme/source/program.lux +++ b/lux-scheme/source/program.lux @@ -171,10 +171,10 @@ [] ... Methods (program/VariantValue - [] (getValue self) java/lang/Object + [] (getValue self []) java/lang/Object (:as java/lang/Object value)) (gnu/lists/Pair - [] (getCar self) java/lang/Object + [] (getCar self []) java/lang/Object (if cdr? (case (array.read! 1 value) (#.Some flag_is_set) @@ -188,7 +188,7 @@ (:as java/lang/Integer) gnu/math/IntNum::new))) (gnu/lists/Pair - [] (getCdr self) java/lang/Object + [] (getCdr self []) java/lang/Object (if cdr? (|> value (array.read! 2) @@ -202,31 +202,31 @@ [] ... Methods (program/TupleValue - [] (getValue self) java/lang/Object + [] (getValue self []) java/lang/Object (:as java/lang/Object value)) (gnu/lists/SimpleVector - [] (getBufferLength self) int + [] (getBufferLength self []) int (ffi.long_to_int (array.size value))) (gnu/lists/SimpleVector - [] (getRaw self {idx int}) java/lang/Object + [] (getRaw self [idx int]) java/lang/Object (|> value (array.read! (|> idx java/lang/Integer::longValue (:as Nat))) maybe.trusted lux_value)) (gnu/lists/SimpleVector - [] (getBuffer self) java/lang/Object + [] (getBuffer self []) java/lang/Object (undefined)) (gnu/lists/SimpleVector - [] (setBuffer self {_ java/lang/Object}) void + [] (setBuffer self [_ java/lang/Object]) void (undefined)) (gnu/lists/SimpleVector - [] (clearBuffer self {_ int} {_ int}) void + [] (clearBuffer self [_ int _ int]) void (undefined)) (gnu/lists/SimpleVector - [] (copyBuffer self {_ int}) void + [] (copyBuffer self [_ int]) void (undefined)) (gnu/lists/SimpleVector - [] (newInstance self {_ int}) gnu/lists/SimpleVector + [] (newInstance self [_ int]) gnu/lists/SimpleVector (undefined)) )) diff --git a/stdlib/source/library/lux/control/concurrency/actor.lux b/stdlib/source/library/lux/control/concurrency/actor.lux index 617068a4c..5ce45f632 100644 --- a/stdlib/source/library/lux/control/concurrency/actor.lux +++ b/stdlib/source/library/lux/control/concurrency/actor.lux @@ -276,7 +276,7 @@ (~+ messages)]))))))) -(syntax: .public (actor [[state_type init] (<code>.record (<>.and <code>.any <code>.any)) +(syntax: .public (actor [[state_type init] (<code>.tuple (<>.and <code>.any <code>.any)) ?on_mail on_mail^]) (with_identifiers [g!_] (in (list (` (: ((~! io.IO) (..Actor (~ state_type))) diff --git a/stdlib/source/library/lux/control/concurrency/thread.lux b/stdlib/source/library/lux/control/concurrency/thread.lux index b0571cc64..4e82d76a6 100644 --- a/stdlib/source/library/lux/control/concurrency/thread.lux +++ b/stdlib/source/library/lux/control/concurrency/thread.lux @@ -105,7 +105,7 @@ (-> Nat (IO Any) (IO Any)) (with_expansions [<jvm> (as_is (let [runnable (ffi.object [] [java/lang/Runnable] [] - (java/lang/Runnable [] (run self) void + (java/lang/Runnable [] (run self []) void (..execute! action)))] (case milli_seconds 0 (java/util/concurrent/Executor::execute runnable runner) diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux index b71944646..8b7ba8911 100644 --- a/stdlib/source/library/lux/ffi.jvm.lux +++ b/stdlib/source/library/lux/ffi.jvm.lux @@ -706,7 +706,7 @@ (def: annotation_parameters^ (Parser (List Annotation_Parameter)) - (<code>.record (<>.some (<>.and <code>.local_tag <code>.any)))) + (<code>.tuple (<>.some (<>.and <code>.local_tag <code>.any)))) (def: annotation^ (Parser Annotation) @@ -771,16 +771,16 @@ (def: (argument^ type_vars) (-> (List (Type Var)) (Parser Argument)) - (<code>.record (<>.and <code>.local_identifier - (..type^ type_vars)))) + (<>.and <code>.local_identifier + (..type^ type_vars))) (def: (arguments^ type_vars) (-> (List (Type Var)) (Parser (List Argument))) - (<>.some (..argument^ type_vars))) + (<code>.tuple (<>.some (..argument^ type_vars)))) (def: (constructor_arg^ type_vars) (-> (List (Type Var)) (Parser (Typed Code))) - (<code>.record (<>.and (..type^ type_vars) <code>.any))) + (<>.and (..type^ type_vars) <code>.any)) (def: (constructor_args^ type_vars) (-> (List (Type Var)) (Parser (List (Typed Code)))) diff --git a/stdlib/source/library/lux/ffi.old.lux b/stdlib/source/library/lux/ffi.old.lux index c24e49deb..f62581e68 100644 --- a/stdlib/source/library/lux/ffi.old.lux +++ b/stdlib/source/library/lux/ffi.old.lux @@ -643,7 +643,7 @@ (def: annotation_params^ (Parser (List AnnotationParam)) - (<code>.record (<>.some (<>.and <code>.local_tag <code>.any)))) + (<code>.tuple (<>.some (<>.and <code>.local_tag <code>.any)))) (def: annotation^ (Parser Annotation) @@ -717,16 +717,16 @@ (def: (arg_decl^ type_vars) (-> (List Type_Parameter) (Parser ArgDecl)) - (<code>.record (<>.and <code>.local_identifier - (..generic_type^ type_vars)))) + (<>.and <code>.local_identifier + (..generic_type^ type_vars))) (def: (arg_decls^ type_vars) (-> (List Type_Parameter) (Parser (List ArgDecl))) - (<>.some (arg_decl^ type_vars))) + (<code>.tuple (<>.some (arg_decl^ type_vars)))) (def: (constructor_arg^ type_vars) (-> (List Type_Parameter) (Parser ConstructorArg)) - (<code>.record (<>.and (..generic_type^ type_vars) <code>.any))) + (<>.and (..generic_type^ type_vars) <code>.any)) (def: (constructor_args^ type_vars) (-> (List Type_Parameter) (Parser (List ConstructorArg))) diff --git a/stdlib/source/library/lux/target/jvm/loader.lux b/stdlib/source/library/lux/target/jvm/loader.lux index 596e57dab..fe2bba2e6 100644 --- a/stdlib/source/library/lux/target/jvm/loader.lux +++ b/stdlib/source/library/lux/target/jvm/loader.lux @@ -110,7 +110,7 @@ (<| <cast> (object [] java/lang/ClassLoader [] [] - (java/lang/ClassLoader (findClass self {class_name java/lang/String}) + (java/lang/ClassLoader (findClass self [class_name java/lang/String]) (java/lang/Class [? < java/lang/Object]) "throws" [java/lang/ClassNotFoundException] (let [class_name (:as Text class_name) diff --git a/stdlib/source/test/lux/control/concurrency/actor.lux b/stdlib/source/test/lux/control/concurrency/actor.lux index 012a9f796..27b13bba4 100644 --- a/stdlib/source/test/lux/control/concurrency/actor.lux +++ b/stdlib/source/test/lux/control/concurrency/actor.lux @@ -175,8 +175,8 @@ (in (do async.monad [verdict (async.future (do io.monad - [anonymous (/.actor {Nat - initial_state} + [anonymous (/.actor [Nat + initial_state] ((on_mail message state self) (message (++ state) self))) sent/++? (/.mail! ++! anonymous) @@ -207,7 +207,7 @@ (in (do async.monad [agent (async.future (do [! io.monad] - [agent (/.actor {Nat 0}) + [agent (/.actor [Nat 0]) _ (/.observe! (function (_ event stop) (function (_ events_seen self) (async.future diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux index 606bd8a23..431e72641 100644 --- a/stdlib/source/test/lux/ffi.jvm.lux +++ b/stdlib/source/test/lux/ffi.jvm.lux @@ -267,7 +267,7 @@ .let [object/0 (/.object [] [test/TestInterface0] [] (test/TestInterface0 - [] (actual0 self) + [] (actual0 self []) java/lang/Long (:as java/lang/Long expected))) @@ -278,7 +278,7 @@ object/1 (/.object [] [test/TestInterface1] [] (test/TestInterface1 - [] (actual1 self {throw? java/lang/Boolean}) + [] (actual1 self [throw? java/lang/Boolean]) java/lang/Long "throws" [java/lang/Throwable] (if (:as Bit throw?) @@ -303,7 +303,7 @@ object/2 (/.object [] [test/TestInterface2] [] (test/TestInterface2 - [a] (actual2 self {input a}) + [a] (actual2 self [input a]) a input)) example/2! @@ -313,7 +313,7 @@ object/3 (/.object [] [(test/TestInterface3 java/lang/Long)] [] ((test/TestInterface3 a) - [] (actual3 self) + [] (actual3 self []) a (:as java/lang/Long expected))) @@ -326,7 +326,9 @@ object/4 (/.object [] [test/TestInterface4] [] (test/TestInterface4 - [] (actual4 self {actual_left long} {actual_right long} {_ long}) + [] (actual4 self [actual_left long + actual_right long + _ long]) long (:as java/lang/Long (i.+ (:as Int actual_left) @@ -344,10 +346,11 @@ ... Fields ("private" value java/lang/Long) ... Constructors - ("public" [] (new self {value java/lang/Long}) [] + ("public" [] (new self [value java/lang/Long]) [] (:= ::value value)) ... Methods - (test/TestInterface0 [] (actual0 self) java/lang/Long + (test/TestInterface0 [] (actual0 self []) + java/lang/Long ::value)) (/.import: test/TestClass0 @@ -358,10 +361,12 @@ ... Fields ("private" value java/lang/Long) ... Constructors - ("public" [] (new self {value java/lang/Long}) [] + ("public" [] (new self [value java/lang/Long]) [] (:= ::value value)) ... Methods - (test/TestInterface1 [] (actual1 self {throw? java/lang/Boolean}) java/lang/Long "throws" [java/lang/Throwable] + (test/TestInterface1 [] (actual1 self [throw? java/lang/Boolean]) + java/lang/Long + "throws" [java/lang/Throwable] (if (:as Bit throw?) (panic! "YOLO") ::value))) @@ -372,11 +377,11 @@ (/.class: "final" test/TestClass2 [test/TestInterface2] ... Constructors - ("public" [] (new self) [] + ("public" [] (new self []) [] []) ... Methods (test/TestInterface2 - [a] (actual2 self {input a}) + [a] (actual2 self [input a]) a input)) @@ -388,11 +393,11 @@ ... Fields ("private" value a) ... Constructors - ("public" [] (new self {value a}) [] + ("public" [] (new self [value a]) [] (:= ::value value)) ... Methods ((test/TestInterface3 a) - [] (actual3 self) + [] (actual3 self []) a ::value)) @@ -402,10 +407,10 @@ (/.class: "final" test/TestClass4 [] ... Constructors - ("public" [] (new self) [] + ("public" [] (new self []) [] []) ... Methods - ("public" (actual4 self {value java/lang/Long}) java/lang/Long + ("public" (actual4 self [value java/lang/Long]) java/lang/Long value)) (/.import: test/TestClass4 @@ -415,10 +420,10 @@ (/.class: "final" test/TestClass5 [] ... Constructors - ("public" [] (new self) [] + ("public" [] (new self []) [] []) ... Methods - ("public" "static" (actual5 {value java/lang/Long}) + ("public" "static" (actual5 [value java/lang/Long]) java/lang/Long value)) @@ -428,10 +433,10 @@ (/.class: "abstract" test/TestClass6 [] ... Constructors - ("public" [] (new self) [] + ("public" [] (new self []) [] []) ... Methods - ("public" "abstract" (actual6 {value java/lang/Long}) + ("public" "abstract" (actual6 [value java/lang/Long]) java/lang/Long)) (/.import: test/TestClass6 @@ -440,11 +445,11 @@ (/.class: "final" test/TestClass7 test/TestClass6 [] ... Constructors - ("public" [] (new self) [] + ("public" [] (new self []) [] []) ... Methods (test/TestClass6 - [] (actual6 self {input java/lang/Long}) + [] (actual6 self [input java/lang/Long]) java/lang/Long input)) @@ -454,11 +459,13 @@ (/.class: "final" test/TestClass8 [test/TestInterface4] ... Constructors - ("public" [] (new self) [] + ("public" [] (new self []) [] []) ... Methods (test/TestInterface4 - [] (actual4 self {actual_left long} {actual_right long} {_ long}) + [] (actual4 self [actual_left long + actual_right long + _ long]) long (:as java/lang/Long (i.+ (:as Int actual_left) @@ -472,12 +479,12 @@ ... Fields ("private" value9 a) ... Constructors - ("public" [] (new self {value a}) [] + ("public" [] (new self [value a]) [] (:= ::value9 value)) ... Methods - ("public" (set_actual9 self {value a}) void + ("public" (set_actual9 self [value a]) void (:= ::value9 value)) - ("public" (get_actual9 self) a + ("public" (get_actual9 self []) a ::value9)) (/.import: (test/TestClass9 a) diff --git a/stdlib/source/test/lux/ffi.old.lux b/stdlib/source/test/lux/ffi.old.lux index 56f97a962..27d18d002 100644 --- a/stdlib/source/test/lux/ffi.old.lux +++ b/stdlib/source/test/lux/ffi.old.lux @@ -43,11 +43,11 @@ (:= ::increase increase) (:= ::counter counter) [])) - ("public" (currentC self) java/lang/Long + ("public" (currentC self []) java/lang/Long ::counter) - ("public" (upC self) void + ("public" (upC self []) void (:= ::counter (i.+ ::increase ::counter))) - ("public" (downC self) void + ("public" (downC self []) void (:= ::counter (i.- ::increase ::counter)))) (/.import: (test/lux/ffi/TestClass a) @@ -73,15 +73,15 @@ (/.object [] [test/lux/ffi/TestInterface] [] (test/lux/ffi/TestInterface - [] (current self) + [] (current self []) java/lang/Long counter) (test/lux/ffi/TestInterface - [] (up self) + [] (up self []) test/lux/ffi/TestInterface (test_object increase (i.+ increase counter))) (test/lux/ffi/TestInterface - [] (down self) + [] (down self []) test/lux/ffi/TestInterface (test_object increase (i.- increase counter))))) |