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 --- stdlib/source/library/lux/control/concurrency/actor.lux | 2 +- stdlib/source/library/lux/control/concurrency/thread.lux | 2 +- stdlib/source/library/lux/ffi.jvm.lux | 10 +++++----- stdlib/source/library/lux/ffi.old.lux | 10 +++++----- stdlib/source/library/lux/target/jvm/loader.lux | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'stdlib/source/library') 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] (.record (<>.and .any .any)) +(syntax: .public (actor [[state_type init] (.tuple (<>.and .any .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 [ (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)) - (.record (<>.some (<>.and .local_tag .any)))) + (.tuple (<>.some (<>.and .local_tag .any)))) (def: annotation^ (Parser Annotation) @@ -771,16 +771,16 @@ (def: (argument^ type_vars) (-> (List (Type Var)) (Parser Argument)) - (.record (<>.and .local_identifier - (..type^ type_vars)))) + (<>.and .local_identifier + (..type^ type_vars))) (def: (arguments^ type_vars) (-> (List (Type Var)) (Parser (List Argument))) - (<>.some (..argument^ type_vars))) + (.tuple (<>.some (..argument^ type_vars)))) (def: (constructor_arg^ type_vars) (-> (List (Type Var)) (Parser (Typed Code))) - (.record (<>.and (..type^ type_vars) .any))) + (<>.and (..type^ type_vars) .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)) - (.record (<>.some (<>.and .local_tag .any)))) + (.tuple (<>.some (<>.and .local_tag .any)))) (def: annotation^ (Parser Annotation) @@ -717,16 +717,16 @@ (def: (arg_decl^ type_vars) (-> (List Type_Parameter) (Parser ArgDecl)) - (.record (<>.and .local_identifier - (..generic_type^ type_vars)))) + (<>.and .local_identifier + (..generic_type^ type_vars))) (def: (arg_decls^ type_vars) (-> (List Type_Parameter) (Parser (List ArgDecl))) - (<>.some (arg_decl^ type_vars))) + (.tuple (<>.some (arg_decl^ type_vars)))) (def: (constructor_arg^ type_vars) (-> (List Type_Parameter) (Parser ConstructorArg)) - (.record (<>.and (..generic_type^ type_vars) .any))) + (<>.and (..generic_type^ type_vars) .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 @@ (<| (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) -- cgit v1.2.3