From 5d4583aebd00adced10275b32ff1a93ab418be50 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Wed, 28 Jul 2021 04:48:42 -0400 Subject: Re-named List's tags: Nil => End && Cons => Item --- stdlib/source/program/aedifex/command/auto.lux | 4 ++-- stdlib/source/program/aedifex/command/build.lux | 12 ++++++------ stdlib/source/program/aedifex/command/deps.lux | 2 +- stdlib/source/program/aedifex/dependency/resolution.lux | 12 ++++++------ stdlib/source/program/aedifex/format.lux | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'stdlib/source/program/aedifex') diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux index a80193663..994f192fe 100644 --- a/stdlib/source/program/aedifex/command/auto.lux +++ b/stdlib/source/program/aedifex/command/auto.lux @@ -65,10 +65,10 @@ [_ (..pause delay) events (\ watcher poll [])] (case events - (#.Cons _) + (#.Item _) (do ! [_ ] (recur [])) - #.Nil + #.End (recur [])))))))))) diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index 6a0b6bcd0..b675bb5cd 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -139,19 +139,19 @@ (loop [left (text.split_all_with ..version_separator left) right (text.split_all_with ..version_separator right)] (case [left right] - [(#.Cons leftH leftT) (#.Cons rightH rightT)] + [(#.Item leftH leftT) (#.Item rightH rightT)] (if (text\= leftH rightH) (recur leftT rightT) (or (n.< (text.size leftH) (text.size rightH)) (text\< leftH rightH))) - [(#.Cons leftH leftT) #.Nil] + [(#.Item leftH leftT) #.End] false - [#.Nil (#.Cons rightH rightT)] + [#.End (#.Item rightH rightT)] true - [#.Nil #.Nil] + [#.End #.End] false)))) (def: #export (host_dependencies fs home) @@ -245,14 +245,14 @@ (def: (jvm_class_path host_dependencies) (-> (List Path) Text) (|> host_dependencies - (#.Cons ".") + (#.Item ".") (text.join_with ..jvm_class_path_separator) %.text)) (def: #export (with_jvm_class_path host_dependencies runtime) (-> (List Path) ///runtime.Runtime ///runtime.Runtime) (case host_dependencies - #.Nil + #.End runtime _ diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux index 434bedbdd..0238f64cd 100644 --- a/stdlib/source/program/aedifex/command/deps.lux +++ b/stdlib/source/program/aedifex/command/deps.lux @@ -42,7 +42,7 @@ (do async.monad [#let [dependencies (|> (get@ #///.dependencies profile) set.to_list - (#.Cons (get@ #///.compiler profile)))] + (#.Item (get@ #///.compiler profile)))] [local_successes local_failures cache] (///dependency/resolution.all console (list local) new_repository diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 8c7b6ab6a..3bd510675 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -177,12 +177,12 @@ (def: #export (any console repositories dependency) (-> (Console Async) (List (Repository Async)) Dependency (Async (Try Package))) (case repositories - #.Nil + #.End (|> dependency (exception.except ..cannot_resolve) (\ async.monad in)) - (#.Cons repository alternatives) + (#.Item repository alternatives) (do {! async.monad} [_ (..announce_fetching console repository (get@ #//.artifact dependency)) outcome (..one repository dependency)] @@ -208,11 +208,11 @@ dependencies dependencies resolution resolution] (case dependencies - #.Nil + #.End (\ async.monad in [successes failures resolution]) - (#.Cons head tail) + (#.Item head tail) (case (get@ [#//.artifact #///artifact.version] head) ## Skip if there is no version "" (recur repositories @@ -243,7 +243,7 @@ ## sub_repositories (list\compose repositories package_repositories) sub_repositories repositories] [successes failures resolution] (recur sub_repositories - (#.Cons head successes) + (#.Item head successes) failures sub_dependencies (dictionary.put head package resolution))] @@ -256,6 +256,6 @@ (#try.Failure error) (recur repositories successes - (#.Cons head failures) + (#.Item head failures) tail resolution))))))) diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux index 1896415ea..f87fcfaae 100644 --- a/stdlib/source/program/aedifex/format.lux +++ b/stdlib/source/program/aedifex/format.lux @@ -81,7 +81,7 @@ (All [a] (-> Text (List a) (Format a) Aggregate Aggregate)) (case value - #.Nil + #.End aggregate value -- cgit v1.2.3