From b0093a3849baaeb5e12692b2cf6ac65ba74bbd54 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Tue, 15 Mar 2022 22:45:49 -0400 Subject: Leaner syntax for library/lux/control/exception.report --- stdlib/source/program/aedifex.lux | 8 ++-- .../source/program/aedifex/artifact/time/date.lux | 52 +++++++++++----------- stdlib/source/program/aedifex/command/deps.lux | 26 +++++------ .../program/aedifex/dependency/resolution.lux | 10 ++--- stdlib/source/program/aedifex/hash.lux | 12 ++--- stdlib/source/program/aedifex/project.lux | 6 +-- .../source/program/aedifex/repository/remote.lux | 4 +- stdlib/source/program/aedifex/runtime.lux | 2 +- 8 files changed, 60 insertions(+), 60 deletions(-) (limited to 'stdlib/source/program') diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux index 191a46ec5..a86e634a2 100644 --- a/stdlib/source/program/aedifex.lux +++ b/stdlib/source/program/aedifex.lux @@ -95,10 +95,10 @@ (exception: (cannot_find_repository [repository Text options (Dictionary Text Address)]) (exception.report - ["Repository" (%.text repository)] - ["Options" (exception.listing (function (_ [name repo]) - (format (%.text name) " := " (%.text repo))) - (dictionary.entries options))])) + "Repository" (%.text repository) + "Options" (exception.listing (function (_ [name repo]) + (format (%.text name) " := " (%.text repo))) + (dictionary.entries options)))) (def: succeed! (IO Any) diff --git a/stdlib/source/program/aedifex/artifact/time/date.lux b/stdlib/source/program/aedifex/artifact/time/date.lux index acb108a35..8189c6978 100644 --- a/stdlib/source/program/aedifex/artifact/time/date.lux +++ b/stdlib/source/program/aedifex/artifact/time/date.lux @@ -1,27 +1,27 @@ (.using - [library - [lux "*" - [abstract - [monad {"+" do}] - [equivalence {"+" Equivalence}]] - [control - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}] - ["<>" parser - ["<[0]>" text {"+" Parser}]]] - [data - [text - ["%" format]]] - [math - [number - ["n" nat] - ["i" int]]] - [time - ["[0]" date ("[1]#[0]" equivalence)] - ["[0]" year] - ["[0]" month]] - [type - abstract]]]) + [library + [lux "*" + [abstract + [monad {"+" do}] + [equivalence {"+" Equivalence}]] + [control + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}] + ["<>" parser + ["<[0]>" text {"+" Parser}]]] + [data + [text + ["%" format]]] + [math + [number + ["n" nat] + ["i" int]]] + [time + ["[0]" date ("[1]#[0]" equivalence)] + ["[0]" year] + ["[0]" month]] + [type + abstract]]]) (def: .public (pad value) (-> Nat Text) @@ -34,9 +34,9 @@ (exception: .public (year_is_out_of_range [year year.Year]) (exception.report - ["Minimum" (%.int ..min_year)] - ["Maximum" (%.int ..max_year)] - ["Year" (%.int (year.value year))])) + "Minimum" (%.int ..min_year) + "Maximum" (%.int ..max_year) + "Year" (%.int (year.value year)))) (abstract: .public Date date.Date diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux index 24e29882b..b6d07d986 100644 --- a/stdlib/source/program/aedifex/command/deps.lux +++ b/stdlib/source/program/aedifex/command/deps.lux @@ -58,20 +58,20 @@ (list#mix dictionary.lacks resolution) (///dependency/deployment.all local)) _ (console.write_line (exception.report - ["Local successes" (|> local_successes - (list.sorted (# ///dependency.order <)) - (exception.listing ..format))] - ["Local failures" (|> local_failures + "Local successes" (|> local_successes (list.sorted (# ///dependency.order <)) - (exception.listing ..format))] - ["Remote successes" (|> remote_successes - (set.of_list ///dependency.hash) - (set.difference (set.of_list ///dependency.hash local_successes)) - set.list - (list.sorted (# ///dependency.order <)) - (exception.listing ..format))] - ["Remote failures" (|> remote_failures + (exception.listing ..format)) + "Local failures" (|> local_failures + (list.sorted (# ///dependency.order <)) + (exception.listing ..format)) + "Remote successes" (|> remote_successes + (set.of_list ///dependency.hash) + (set.difference (set.of_list ///dependency.hash local_successes)) + set.list (list.sorted (# ///dependency.order <)) - (exception.listing ..format))]) + (exception.listing ..format)) + "Remote failures" (|> remote_failures + (list.sorted (# ///dependency.order <)) + (exception.listing ..format))) console)] (in resolution)))) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 2100c1ca1..67dbfc37c 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -63,9 +63,9 @@ extension Extension hash Text]) (exception.report - ["Artifact" (///artifact.format artifact)] - ["Extension" (%.text extension)] - ["Hash" (%.text hash)]))] + "Artifact" (///artifact.format artifact) + "Extension" (%.text extension) + "Hash" (%.text hash)))] [sha-1_does_not_match] [md5_does_not_match] @@ -157,8 +157,8 @@ (exception: .public (cannot_resolve [dependency Dependency]) (exception.report - ["Artifact" (%.text (///artifact.format (the //.#artifact dependency)))] - ["Type" (%.text (the //.#type dependency))])) + "Artifact" (%.text (///artifact.format (the //.#artifact dependency))) + "Type" (%.text (the //.#type dependency)))) (template [ ] [(def: ( console repository artifact) diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux index 6af53e362..d45c8bb6e 100644 --- a/stdlib/source/program/aedifex/hash.lux +++ b/stdlib/source/program/aedifex/hash.lux @@ -83,16 +83,16 @@ (exception: .public (not_a_hash [size Nat value Text]) (exception.report - ["Pseudo hash" (%.text value)] - ["Expected size" (%.nat size)] - ["Actual size" (%.nat (text.size value))])) + "Pseudo hash" (%.text value) + "Expected size" (%.nat size) + "Actual size" (%.nat (text.size value)))) (template [ ] [(exception: .public ( [data Binary]) (exception.report - ["Pseudo hash" (%.text (..encoded data))] - ["Expected size" (%.nat )] - ["Actual size" (%.nat (binary.size data))]))] + "Pseudo hash" (%.text (..encoded data)) + "Expected size" (%.nat ) + "Actual size" (%.nat (binary.size data))))] [not_a_sha-1 ..sha-1::size] [not_a_md5 ..md5::size] diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux index 9741cc731..7a8ed68e2 100644 --- a/stdlib/source/program/aedifex/project.lux +++ b/stdlib/source/program/aedifex/project.lux @@ -43,13 +43,13 @@ (exception: .public (unknown_profile [name Name]) (exception.report - ["Name" (%.text name)])) + "Name" (%.text name))) (exception: .public (circular_dependency [dependee Name dependent Name]) (exception.report - ["Dependent" (%.text dependent)] - ["Dependee" (%.text dependee)])) + "Dependent" (%.text dependent) + "Dependee" (%.text dependee))) (def: (profile' lineage project name) (-> (Set Name) Project Name (Try Profile)) diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux index 85fe69b3c..efe3263a4 100644 --- a/stdlib/source/program/aedifex/repository/remote.lux +++ b/stdlib/source/program/aedifex/repository/remote.lux @@ -36,8 +36,8 @@ [(exception: .public ( [url URL status Nat]) (exception.report - ["URL" (%.text url)] - ["Status Code" (%.nat status)]))] + "URL" (%.text url) + "Status Code" (%.nat status)))] [download_failure] [upload_failure] diff --git a/stdlib/source/program/aedifex/runtime.lux b/stdlib/source/program/aedifex/runtime.lux index 78b17c8ea..9179dc2e8 100644 --- a/stdlib/source/program/aedifex/runtime.lux +++ b/stdlib/source/program/aedifex/runtime.lux @@ -31,7 +31,7 @@ [#program #parameters (`` (list (~~ (template.spliced ))))])] - [default_java "java" ["-jar"]] + [default_java "java" ["-jar" "--add-opens" "java.base/java.lang=ALL-UNNAMED"]] [default_js "node" ["--stack_size=8192"]] [default_python "python3" []] [default_lua "lua" []] -- cgit v1.2.3