From 5270f301eba5237feebc8eca14aee6b7a992a819 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Wed, 6 Jul 2022 16:25:43 -0400 Subject: Made exception.report a function. --- stdlib/source/program/aedifex.lux | 8 +++--- .../source/program/aedifex/artifact/time/date.lux | 6 ++--- stdlib/source/program/aedifex/command/deps.lux | 30 +++++++++++----------- .../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 +-- 7 files changed, 38 insertions(+), 38 deletions(-) (limited to 'stdlib/source/program') diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux index 6e6d9abfb..870ae6dd3 100644 --- a/stdlib/source/program/aedifex.lux +++ b/stdlib/source/program/aedifex.lux @@ -99,10 +99,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)))) + (list ["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 02b0d97f2..5cdbd0d1d 100644 --- a/stdlib/source/program/aedifex/artifact/time/date.lux +++ b/stdlib/source/program/aedifex/artifact/time/date.lux @@ -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)))) + (list ["Minimum" (%.int ..min_year)] + ["Maximum" (%.int ..max_year)] + ["Year" (%.int (year.value year))]))) (primitive .public Date date.Date diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux index f0a7b7a9e..4ffc6e641 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 (at ///dependency.order <)) - (exception.listing ..format)) - "Local failures" (|> local_failures - (list.sorted (at ///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 (at ///dependency.order <)) - (exception.listing ..format)) - "Remote failures" (|> remote_failures - (list.sorted (at ///dependency.order <)) - (exception.listing ..format))) + (list ["Local successes" (|> local_successes + (list.sorted (at ///dependency.order <)) + (exception.listing ..format))] + ["Local failures" (|> local_failures + (list.sorted (at ///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 (at ///dependency.order <)) + (exception.listing ..format))] + ["Remote failures" (|> remote_failures + (list.sorted (at ///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 2d48fe6b1..7cabf5b88 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)))] + (list ["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)))) + (list ["Artifact" (%.text (///artifact.format (the //.#artifact dependency)))] + ["Type" (%.text (the //.#type dependency))]))) (with_template [ ] [(def ( console repository artifact) diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux index 1c853512c..b292f004b 100644 --- a/stdlib/source/program/aedifex/hash.lux +++ b/stdlib/source/program/aedifex/hash.lux @@ -84,16 +84,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)))) + (list ["Pseudo hash" (%.text value)] + ["Expected size" (%.nat size)] + ["Actual size" (%.nat (text.size value))]))) (with_template [ ] [(exception .public ( [data Binary]) (exception.report - "Pseudo hash" (%.text (..encoded data)) - "Expected size" (%.nat ) - "Actual size" (%.nat (binary.size data))))] + (list ["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 7be915cb1..d94a31b48 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))) + (list ["Name" (%.text name)]))) (exception .public (circular_dependency [dependee Name dependent Name]) (exception.report - "Dependent" (%.text dependent) - "Dependee" (%.text dependee))) + (list ["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 2cbeae80e..b5b201093 100644 --- a/stdlib/source/program/aedifex/repository/remote.lux +++ b/stdlib/source/program/aedifex/repository/remote.lux @@ -37,8 +37,8 @@ [(exception .public ( [url URL status Nat]) (exception.report - "URL" (%.text url) - "Status Code" (%.nat status)))] + (list ["URL" (%.text url)] + ["Status Code" (%.nat status)])))] [download_failure] [upload_failure] -- cgit v1.2.3