diff options
Diffstat (limited to 'stdlib/source/library/lux/target')
14 files changed, 39 insertions, 37 deletions
diff --git a/stdlib/source/library/lux/target/jvm/bytecode.lux b/stdlib/source/library/lux/target/jvm/bytecode.lux index 2891e83fa..13363a06f 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode.lux @@ -9,11 +9,11 @@ ["." writer (#+ Writer)] ["." state (#+ +State)] ["." function] + ["." maybe] ["." try (#+ Try)] ["." exception (#+ exception:)]] [data ["." product] - ["." maybe] [text ["%" format (#+ format)]] [collection @@ -876,10 +876,10 @@ (def: .public (lookupswitch default cases) (-> Label (List [S4 Label]) (Bytecode Any)) - (let [cases (list.sort (function (_ [left _] [right _]) - (i.< (//signed.value left) - (//signed.value right))) - cases) + (let [cases (list.sorted (function (_ [left _] [right _]) + (i.< (//signed.value left) + (//signed.value right))) + cases) [estimator bytecode] _.lookupswitch] (function (_ [pool environment tracker]) (do try.monad diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux index a825e6699..5499207cf 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux @@ -4,9 +4,9 @@ [abstract ["." equivalence (#+ Equivalence)]] [control + ["." maybe] ["." try (#+ Try)]] [data - ["." maybe] [text ["%" format (#+ Format)]] [format diff --git a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux index 7d76f4c78..22777c083 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux @@ -52,7 +52,7 @@ Instruction function.identity) -(def: .public run +(def: .public result (-> Instruction Specification) (function.apply format.no_op)) diff --git a/stdlib/source/library/lux/target/jvm/class.lux b/stdlib/source/library/lux/target/jvm/class.lux index 17561fa0d..b4cb88ec4 100644 --- a/stdlib/source/library/lux/target/jvm/class.lux +++ b/stdlib/source/library/lux/target/jvm/class.lux @@ -92,7 +92,7 @@ (Try Class)) (do try.monad [[pool [@this @super @interfaces] =fields =methods] - (<| (state.run' //constant/pool.empty) + (<| (state.result' //constant/pool.empty) (do //constant/pool.monad [classes (install_classes this super interfaces) =fields (monad.seq //constant/pool.monad fields) diff --git a/stdlib/source/library/lux/target/jvm/loader.lux b/stdlib/source/library/lux/target/jvm/loader.lux index 5676f1f4a..892d1e1ee 100644 --- a/stdlib/source/library/lux/target/jvm/loader.lux +++ b/stdlib/source/library/lux/target/jvm/loader.lux @@ -113,7 +113,7 @@ (java/lang/Class [? < java/lang/Object]) #throws [java/lang/ClassNotFoundException] (let [class_name (:as Text class_name) - classes (|> library atom.read! io.run)] + classes (|> library atom.read! io.run!)] (case (dictionary.get class_name classes) (#.Some bytecode) (case (..define class_name bytecode (<| <cast> self)) @@ -121,10 +121,10 @@ (:assume class) (#try.Failure error) - (error! (exception.error ..cannot_define [class_name error]))) + (panic! (exception.error ..cannot_define [class_name error]))) #.None - (error! (exception.error ..unknown [class_name]))))))))) + (panic! (exception.error ..unknown [class_name]))))))))) (def: .public (store name bytecode library) (-> Text Binary Library (IO (Try Any))) diff --git a/stdlib/source/library/lux/target/jvm/method.lux b/stdlib/source/library/lux/target/jvm/method.lux index 54aee2e60..8c42130d1 100644 --- a/stdlib/source/library/lux/target/jvm/method.lux +++ b/stdlib/source/library/lux/target/jvm/method.lux @@ -68,7 +68,7 @@ (#try.Failure error) (function (_ _) (#try.Failure error))) [environment exceptions instruction output] (//bytecode.resolve environment code) - .let [bytecode (|> instruction //bytecode/instruction.run format.instance)] + .let [bytecode (|> instruction //bytecode/instruction.result format.instance)] @code (//attribute.code {#//attribute/code.limit (get@ #//bytecode/environment.limit environment) #//attribute/code.code bytecode #//attribute/code.exception_table exceptions diff --git a/stdlib/source/library/lux/target/jvm/modifier.lux b/stdlib/source/library/lux/target/jvm/modifier.lux index 92aeafec2..8689834c4 100644 --- a/stdlib/source/library/lux/target/jvm/modifier.lux +++ b/stdlib/source/library/lux/target/jvm/modifier.lux @@ -11,7 +11,7 @@ [data [format [".F" binary (#+ Writer)]]] - [macro (#+ with_gensyms) + [macro (#+ with_identifiers) [syntax (#+ syntax:)] ["." code]] [math @@ -81,7 +81,7 @@ ) (syntax: .public (modifiers: ofT {options (<>.many <c>.any)}) - (with_gensyms [g!modifier g!code] + (with_identifiers [g!modifier g!code] (in (list (` (template [(~ g!code) (~ g!modifier)] [(def: (~' .public) (~ g!modifier) (..Modifier (~ ofT)) diff --git a/stdlib/source/library/lux/target/jvm/reflection.lux b/stdlib/source/library/lux/target/jvm/reflection.lux index 256fc2863..eb219a297 100644 --- a/stdlib/source/library/lux/target/jvm/reflection.lux +++ b/stdlib/source/library/lux/target/jvm/reflection.lux @@ -243,7 +243,7 @@ [/reflection.double /.double] [/reflection.char /.char])) (if (text.starts_with? /descriptor.array_prefix class_name) - (<t>.run /parser.value (|> class_name //name.internal //name.read)) + (<t>.result /parser.value (|> class_name //name.internal //name.read)) (#try.Success (/.class class_name (list))))))) _) (case (ffi.check java/lang/reflect/GenericArrayType reflection) diff --git a/stdlib/source/library/lux/target/jvm/type.lux b/stdlib/source/library/lux/target/jvm/type.lux index c4a5abd0b..e6beb53d2 100644 --- a/stdlib/source/library/lux/target/jvm/type.lux +++ b/stdlib/source/library/lux/target/jvm/type.lux @@ -4,8 +4,9 @@ [abstract [equivalence (#+ Equivalence)] [hash (#+ Hash)]] + [control + ["." maybe]] [data - ["." maybe] ["." text ["%" format (#+ Format)]] [collection diff --git a/stdlib/source/library/lux/target/jvm/type/alias.lux b/stdlib/source/library/lux/target/jvm/type/alias.lux index 05ecd1f29..9c01faea3 100644 --- a/stdlib/source/library/lux/target/jvm/type/alias.lux +++ b/stdlib/source/library/lux/target/jvm/type/alias.lux @@ -4,12 +4,12 @@ [abstract ["." monad (#+ do)]] [control + ["." maybe] ["." try] ["." exception (#+ exception:)] ["<>" parser ["<.>" text (#+ Parser)]]] [data - ["." maybe] ["." text ["%" format (#+ format)]] [collection @@ -119,13 +119,13 @@ (-> Aliasing (-> (Type Method) (Type Method))) (|>> //.signature //signature.signature - (<text>.run (do <>.monad - [type_variables (|> (<>.some (..bound_type_var aliasing)) - (<>.after (<text>.this //signature.parameters_start)) - (<>.before (<text>.this //signature.parameters_end)) - (<>.else (list))) - inputs (..inputs aliasing) - return (..return aliasing) - exceptions (<>.some (..exception aliasing))] - (in (//.method [type_variables inputs return exceptions])))) + (<text>.result (do <>.monad + [type_variables (|> (<>.some (..bound_type_var aliasing)) + (<>.after (<text>.this //signature.parameters_start)) + (<>.before (<text>.this //signature.parameters_end)) + (<>.else (list))) + inputs (..inputs aliasing) + return (..return aliasing) + exceptions (<>.some (..exception aliasing))] + (in (//.method [type_variables inputs return exceptions])))) try.assumed)) diff --git a/stdlib/source/library/lux/target/jvm/type/descriptor.lux b/stdlib/source/library/lux/target/jvm/type/descriptor.lux index df751407b..60e8eead3 100644 --- a/stdlib/source/library/lux/target/jvm/type/descriptor.lux +++ b/stdlib/source/library/lux/target/jvm/type/descriptor.lux @@ -3,8 +3,9 @@ [lux (#- int char) [abstract [equivalence (#+ Equivalence)]] + [control + ["." maybe]] [data - ["." maybe] ["." text ("#\." equivalence) ["%" format (#+ format)]] [collection diff --git a/stdlib/source/library/lux/target/jvm/type/lux.lux b/stdlib/source/library/lux/target/jvm/type/lux.lux index dc10d216a..c6721ab41 100644 --- a/stdlib/source/library/lux/target/jvm/type/lux.lux +++ b/stdlib/source/library/lux/target/jvm/type/lux.lux @@ -228,7 +228,7 @@ (def: .public (check operation input) (All [a] (-> (Parser (Check a)) Text (Check a))) - (case (<text>.run operation input) + (case (<text>.result operation input) (#try.Success check) check diff --git a/stdlib/source/library/lux/target/jvm/type/parser.lux b/stdlib/source/library/lux/target/jvm/type/parser.lux index f54b961cc..6712f7ee0 100644 --- a/stdlib/source/library/lux/target/jvm/type/parser.lux +++ b/stdlib/source/library/lux/target/jvm/type/parser.lux @@ -90,14 +90,14 @@ (-> (Type Value) (Maybe Text)) (|>> //.signature //signature.signature - (<text>.run ..var') + (<text>.result ..var') try.maybe)) (def: .public name (-> (Type Var) Text) (|>> //.signature //signature.signature - (<text>.run ..var') + (<text>.result ..var') try.assumed)) (template [<name> <prefix> <constructor>] @@ -125,7 +125,7 @@ (def: class' (-> (Parser (Type Parameter)) (Parser (Type Class))) (|>> ..class'' - (\ <>.monad map (product.uncurry //.class)))) + (\ <>.monad map (product.uncurried //.class)))) (def: .public parameter (Parser (Type Parameter)) @@ -154,7 +154,7 @@ (-> (Type Value) (Maybe (Type Class))) (|>> //.signature //signature.signature - (<text>.run (<>.after (<text>.this <prefix>) ..class)) + (<text>.result (<>.after (<text>.this <prefix>) ..class)) try.maybe))] [lower? //signature.lower_prefix //.lower] @@ -165,7 +165,7 @@ (-> (Type Class) [External (List (Type Parameter))]) (|>> //.signature //signature.signature - (<text>.run (..class'' ..parameter)) + (<text>.result (..class'' ..parameter)) try.assumed)) (def: .public value @@ -223,7 +223,7 @@ (<>.some ..exception)))] (|>> //.signature //signature.signature - (<text>.run parser) + (<text>.result parser) try.assumed))) (template [<name> <category> <parser>] @@ -231,7 +231,7 @@ (-> (Type Value) (Maybe <category>)) (|>> //.signature //signature.signature - (<text>.run <parser>) + (<text>.result <parser>) try.maybe))] [array? (Type Value) @@ -261,5 +261,5 @@ (-> (Type Declaration) [External (List (Type Var))]) (|>> //.signature //signature.signature - (<text>.run ..declaration') + (<text>.result ..declaration') try.assumed)) diff --git a/stdlib/source/library/lux/target/r.lux b/stdlib/source/library/lux/target/r.lux index e446c0cb1..d0a5f7b58 100644 --- a/stdlib/source/library/lux/target/r.lux +++ b/stdlib/source/library/lux/target/r.lux @@ -4,10 +4,10 @@ [control [pipe (#+ case> cond> new>)] ["." function] + ["." maybe ("#\." functor)] [parser ["<.>" code]]] [data - ["." maybe ("#\." functor)] ["." text ["%" format (#+ format)]] [collection |