From 9224e54bf175ebe13c3fae42f04b649413c737e7 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Thu, 7 Apr 2022 03:27:59 -0400 Subject: De-sigil-ification: & --- stdlib/source/test/aedifex/cache.lux | 2 +- stdlib/source/test/aedifex/cli.lux | 4 +-- stdlib/source/test/lux.lux | 8 ++--- stdlib/source/test/lux/control/security/policy.lux | 2 +- .../source/test/lux/data/collection/dictionary.lux | 2 +- stdlib/source/test/lux/data/collection/set.lux | 2 +- .../test/lux/data/collection/set/ordered.lux | 6 ++-- stdlib/source/test/lux/data/collection/stream.lux | 2 +- stdlib/source/test/lux/data/collection/tree.lux | 40 +++++++++++----------- .../test/lux/data/collection/tree/finger.lux | 4 +-- stdlib/source/test/lux/math/number/i64.lux | 2 +- stdlib/source/test/lux/meta.lux | 22 ++++++------ stdlib/source/test/lux/meta/configuration.lux | 2 +- .../tool/compiler/language/lux/analysis/module.lux | 16 ++++----- stdlib/source/test/lux/tool/compiler/meta/cli.lux | 6 ++-- stdlib/source/test/lux/type/check.lux | 8 ++--- stdlib/source/test/lux/world/file.lux | 4 +-- 17 files changed, 66 insertions(+), 66 deletions(-) (limited to 'stdlib/source/test') diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux index 09e022c89..06b33d138 100644 --- a/stdlib/source/test/aedifex/cache.lux +++ b/stdlib/source/test/aedifex/cache.lux @@ -96,7 +96,7 @@ content ..content] (in [dependency (has //package.#origin {//repository/origin.#Remote ""} (//package.local pom content))])))))] - (in (dictionary.of_list //dependency.hash (list& [main_dependency main_package] dependencies))))) + (in (dictionary.of_list //dependency.hash (partial_list [main_dependency main_package] dependencies))))) (def: singular Test diff --git a/stdlib/source/test/aedifex/cli.lux b/stdlib/source/test/aedifex/cli.lux index 0dd70ae6d..3f3f79b1c 100644 --- a/stdlib/source/test/aedifex/cli.lux +++ b/stdlib/source/test/aedifex/cli.lux @@ -66,7 +66,7 @@ {/.#Install} (list "install") {/.#Deploy repository [user password]} (list "deploy" repository user password) {/.#Compilation compilation} (..compilation_format compilation) - {/.#Auto compilation} (list& "auto" (..compilation_format compilation)))) + {/.#Auto compilation} (partial_list "auto" (..compilation_format compilation)))) (def: without_profile Test @@ -92,7 +92,7 @@ (_.test "With profile." (|> expected_command ..format - (list& "with" expected_profile) + (partial_list "with" expected_profile) (cli.result /.command) (pipe.case {try.#Success [actual_profile actual_command]} diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux index 9e52c5465..e0798b844 100644 --- a/stdlib/source/test/lux.lux +++ b/stdlib/source/test/lux.lux @@ -179,9 +179,9 @@ _ false)) - (_.cover [/.list&] - (case (/.list& e/0 e/1 (/.list e/2 e/3)) - (pattern (/.list& a/0 a/1 (/.list a/2 a/3))) + (_.cover [/.partial_list] + (case (/.partial_list e/0 e/1 (/.list e/2 e/3)) + (pattern (/.partial_list a/0 a/1 (/.list a/2 a/3))) (and (n.= e/0 a/0) (n.= e/1 a/1) (n.= e/2 a/2) @@ -1131,7 +1131,7 @@ let/3 .local]) (in (list (code.bit (case (the .#scopes *lux*) - (pattern (list& scope/2 _)) + (pattern (partial_list scope/2 _)) (let [locals/2 (the .#locals scope/2) expected_locals/2 (set.of_list text.hash (list fn/2 var/2 let/2 let/3)) diff --git a/stdlib/source/test/lux/control/security/policy.lux b/stdlib/source/test/lux/control/security/policy.lux index 6d72ff177..cbdc528bd 100644 --- a/stdlib/source/test/lux/control/security/policy.lux +++ b/stdlib/source/test/lux/control/security/policy.lux @@ -54,7 +54,7 @@ (implementation (def: &hash (implementation - (def: &equivalence + (def: equivalence (implementation (def: (= reference sample) (text#= (%#can_downgrade reference) diff --git a/stdlib/source/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux index 491e35448..2f9465e94 100644 --- a/stdlib/source/test/lux/data/collection/dictionary.lux +++ b/stdlib/source/test/lux/data/collection/dictionary.lux @@ -56,7 +56,7 @@ [constant random.nat .let [hash (is (Hash Nat) (implementation - (def: &equivalence n.equivalence) + (def: equivalence n.equivalence) (def: (hash _) constant)))]] (_.cover [/.key_hash] diff --git a/stdlib/source/test/lux/data/collection/set.lux b/stdlib/source/test/lux/data/collection/set.lux index 0d6f31475..a5336f6f7 100644 --- a/stdlib/source/test/lux/data/collection/set.lux +++ b/stdlib/source/test/lux/data/collection/set.lux @@ -55,7 +55,7 @@ [hash (# ! each (function (_ constant) (is (Hash Nat) (implementation - (def: &equivalence n.equivalence) + (def: equivalence n.equivalence) (def: (hash _) constant)))) diff --git a/stdlib/source/test/lux/data/collection/set/ordered.lux b/stdlib/source/test/lux/data/collection/set/ordered.lux index 04a3eed86..b4b97a984 100644 --- a/stdlib/source/test/lux/data/collection/set/ordered.lux +++ b/stdlib/source/test/lux/data/collection/set/ordered.lux @@ -23,15 +23,15 @@ (random.Random Nat) (# random.monad each (n.% 100) random.nat)) -(def: .public (random size &order gen_value) +(def: .public (random size order gen_value) (All (_ a) (-> Nat (Order a) (Random a) (Random (Set a)))) (case size 0 - (random#in (/.empty &order)) + (random#in (/.empty order)) _ (do random.monad - [partial (random (-- size) &order gen_value) + [partial (random (-- size) order gen_value) value (random.only (|>> (/.member? partial) not) gen_value)] (in (/.has value partial))))) diff --git a/stdlib/source/test/lux/data/collection/stream.lux b/stdlib/source/test/lux/data/collection/stream.lux index d7fa8a191..64c5d6337 100644 --- a/stdlib/source/test/lux/data/collection/stream.lux +++ b/stdlib/source/test/lux/data/collection/stream.lux @@ -111,7 +111,7 @@ (/.iterations (function (_ n) [(++ n) (%.nat n)]) offset))))) (_.cover [/.cycle] - (let [cycle (list& cycle_start cycle_next)] + (let [cycle (partial_list cycle_start cycle_next)] (list#= (list.together (list.repeated size cycle)) (/.first (n.* size (list.size cycle)) (/.cycle [cycle_start cycle_next]))))) diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux index 8973e4818..b8569005e 100644 --- a/stdlib/source/test/lux/data/collection/tree.lux +++ b/stdlib/source/test/lux/data/collection/tree.lux @@ -1,23 +1,23 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - ["[0]" monad {"+" do}] - [\\specification - ["$[0]" equivalence] - ["$[0]" mix] - ["$[0]" functor]]] - [data - ["[0]" product] - [collection - ["[0]" list ("[1]#[0]" functor mix)]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]]]] - [\\library - ["[0]" / {"+" Tree}]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + ["[0]" monad {"+" do}] + [\\specification + ["$[0]" equivalence] + ["$[0]" mix] + ["$[0]" functor]]] + [data + ["[0]" product] + [collection + ["[0]" list ("[1]#[0]" functor mix)]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]]]] + [\\library + ["[0]" / {"+" Tree}]]) (def: .public (tree gen_value) (All (_ a) (-> (Random a) (Random [Nat (Tree a)]))) @@ -62,7 +62,7 @@ children (random.list num_children random.nat)] (_.cover [/.branch] (# (list.equivalence n.equivalence) = - (list& value children) + (partial_list value children) (/.flat (/.branch value (list#each /.leaf children)))))) (do random.monad [expected/0 random.nat diff --git a/stdlib/source/test/lux/data/collection/tree/finger.lux b/stdlib/source/test/lux/data/collection/tree/finger.lux index 85c5ec037..fb4ddc214 100644 --- a/stdlib/source/test/lux/data/collection/tree/finger.lux +++ b/stdlib/source/test/lux/data/collection/tree/finger.lux @@ -90,8 +90,8 @@ (# builder branch tree (# builder leaf tag value))) (# builder leaf tags/H values/H) (list.zipped_2 tags/T values/T))] - (and (# tags_equivalence = (list& tags/H tags/T) (/.tags tree)) - (# values_equivalence = (list& values/H values/T) (/.values tree)))))) + (and (# tags_equivalence = (partial_list tags/H tags/T) (/.tags tree)) + (# values_equivalence = (partial_list values/H values/T) (/.values tree)))))) (_.cover [/.one] (let [can_find_correct_one! (|> (# ..builder leaf tag_left expected_left) diff --git a/stdlib/source/test/lux/math/number/i64.lux b/stdlib/source/test/lux/math/number/i64.lux index 561ab0f04..ec6b56f7e 100644 --- a/stdlib/source/test/lux/math/number/i64.lux +++ b/stdlib/source/test/lux/math/number/i64.lux @@ -140,7 +140,7 @@ (function (_ narrow) (# random.functor each narrow random.i64)))]] ($_ _.and - ($equivalence.spec (# sub &equivalence) (random (# sub narrow))) + ($equivalence.spec (# sub sub_equivalence) (random (# sub narrow))) (_.cover [/.sub] (let [actual (|> expected .i64 (# sub narrow) (# sub wide))] (#= expected actual))) diff --git a/stdlib/source/test/lux/meta.lux b/stdlib/source/test/lux/meta.lux index 33e22c581..b01cdd67a 100644 --- a/stdlib/source/test/lux/meta.lux +++ b/stdlib/source/test/lux/meta.lux @@ -709,17 +709,17 @@ [label_module [.#module_hash 0 .#module_aliases (list) - .#definitions (list& [name_0 {.#Type [true type_0 {.#Left tags_0}]}] - [name_1 {.#Type [true type_1 {.#Right tags_1}]}] - ($_ list#composite - (|> {.#Item tags_0} - list.enumeration - (list#each (function (_ [index short]) - [short {.#Tag [true type_0 {.#Item tags_0} index]}]))) - (|> {.#Item tags_1} - list.enumeration - (list#each (function (_ [index short]) - [short {.#Slot [true type_1 {.#Item tags_1} index]}]))))) + .#definitions (partial_list [name_0 {.#Type [true type_0 {.#Left tags_0}]}] + [name_1 {.#Type [true type_1 {.#Right tags_1}]}] + ($_ list#composite + (|> {.#Item tags_0} + list.enumeration + (list#each (function (_ [index short]) + [short {.#Tag [true type_0 {.#Item tags_0} index]}]))) + (|> {.#Item tags_1} + list.enumeration + (list#each (function (_ [index short]) + [short {.#Slot [true type_1 {.#Item tags_1} index]}]))))) .#imports (list) .#module_state {.#Active}]]) .#scopes (list) diff --git a/stdlib/source/test/lux/meta/configuration.lux b/stdlib/source/test/lux/meta/configuration.lux index fc300a01d..f3b4b2a5f 100644 --- a/stdlib/source/test/lux/meta/configuration.lux +++ b/stdlib/source/test/lux/meta/configuration.lux @@ -33,7 +33,7 @@ _ (do [! random.monad] [feature (random.ascii/upper amount) value (random.ascii/lower amount)] - (# ! each (|>> (list& [feature value])) + (# ! each (|>> (partial_list [feature value])) (random (-- amount)))))) (syntax: (failure [it .any]) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux index f87e34b08..538f8375a 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux @@ -231,8 +231,8 @@ [definition] [{.#Type [public? def_type {.#Left [labels|head labels|tail]}]}] [{.#Type [public? def_type {.#Right [labels|head labels|tail]}]}] - [{.#Tag [public? def_type (list& labels|head labels|tail) index]}] - [{.#Slot [public? def_type (list& labels|head labels|tail) index]}])) + [{.#Tag [public? def_type (partial_list labels|head labels|tail) index]}] + [{.#Slot [public? def_type (partial_list labels|head labels|tail) index]}])) (|> (/.with hash module_name (do /phase.monad [_ (/.define def_name definition)] @@ -255,8 +255,8 @@ [{.#Definition [public? def_type []]}] [{.#Type [public? def_type {.#Left [labels|head labels|tail]}]}] [{.#Type [public? def_type {.#Right [labels|head labels|tail]}]}] - [{.#Tag [public? def_type (list& labels|head labels|tail) index]}] - [{.#Slot [public? def_type (list& labels|head labels|tail) index]}])) + [{.#Tag [public? def_type (partial_list labels|head labels|tail) index]}] + [{.#Slot [public? def_type (partial_list labels|head labels|tail) index]}])) (|> (/.with hash module_name (do /phase.monad [_ (/.define def_name definition) @@ -294,9 +294,9 @@ (do [! /phase.monad] [.let [it {.#Named [module_name def_name] def_type}] _ (/.define def_name {.#Type [public? it { [labels|head labels|tail]}]}) - _ (/.declare_labels (list& labels|head labels|tail) public? it)] + _ (/.declare_labels (partial_list labels|head labels|tail) public? it)] (monad.each ! (|>> [module_name] /extension.lifted) - (list& labels|head labels|tail)))) + (partial_list labels|head labels|tail)))) (/phase.result state) (pipe.case {try.#Success _} @@ -312,7 +312,7 @@ (do [! /phase.monad] [.let [it def_type] _ (/.define def_name {.#Type [public? it { [labels|head labels|tail]}]})] - (/.declare_labels (list& labels|head labels|tail) public? it))) + (/.declare_labels (partial_list labels|head labels|tail) public? it))) (/phase.result state) (pipe.case {try.#Success _} @@ -329,7 +329,7 @@ (do [! /phase.monad] [.let [it {.#Named [foreign_module def_name] def_type}] _ (/.define def_name {.#Type [public? it { [labels|head labels|tail]}]})] - (/.declare_labels (list& labels|head labels|tail) public? it))) + (/.declare_labels (partial_list labels|head labels|tail) public? it))) (/phase.result state) (pipe.case {try.#Success _} diff --git a/stdlib/source/test/lux/tool/compiler/meta/cli.lux b/stdlib/source/test/lux/tool/compiler/meta/cli.lux index ab9504ee5..97ee8ac28 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/cli.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/cli.lux @@ -59,7 +59,7 @@ (`` ($_ _.and (~~ (template [ ] [(_.cover [] - (|> (list& "build" compilation') + (|> (partial_list "build" compilation') (.result /.service) (try#each (|>> (pipe.case {/.#Compilation it} @@ -82,7 +82,7 @@ ))) (_.cover [/.Interpretation] (`` (and (~~ (template [ ] - [(|> (list& "repl" compilation') + [(|> (partial_list "repl" compilation') (.result /.service) (try#each (|>> (pipe.case {/.#Interpretation it} @@ -104,7 +104,7 @@ ))))) (_.cover [/.Export] (`` (and (~~ (template [ ] - [(|> (list& "export" export) + [(|> (partial_list "export" export) (.result /.service) (try#each (|>> (pipe.case {/.#Export it} diff --git a/stdlib/source/test/lux/type/check.lux b/stdlib/source/test/lux/type/check.lux index 37c006732..fab083c9e 100644 --- a/stdlib/source/test/lux/type/check.lux +++ b/stdlib/source/test/lux/type/check.lux @@ -489,8 +489,8 @@ (succeeds? (do [! /.monad] [[var/head var/tail+ var/last] (..build_ring tail_size) _ (/.check var/head nominal/0) - failures (monad.each ! (|>> (/.check nominal/1) ..verdict) (list& var/head var/tail+)) - successes (monad.each ! (|>> (/.check nominal/0) ..verdict) (list& var/head var/tail+))] + failures (monad.each ! (|>> (/.check nominal/1) ..verdict) (partial_list var/head var/tail+)) + successes (monad.each ! (|>> (/.check nominal/0) ..verdict) (partial_list var/head var/tail+))] (/.assertion "" (and (list.every? (bit#= false) failures) (list.every? (bit#= true) successes))))) @@ -500,8 +500,8 @@ [var/head/1 var/tail+/1 var/last/1] (..build_ring tail_size) _ (/.check var/head/0 var/head/1) _ (/.check var/head/0 nominal/0) - .let [all_variables (list#composite (list& var/head/0 var/tail+/0) - (list& var/head/1 var/tail+/1))] + .let [all_variables (list#composite (partial_list var/head/0 var/tail+/0) + (partial_list var/head/1 var/tail+/1))] failures (monad.each ! (|>> (/.check nominal/1) ..verdict) all_variables) successes (monad.each ! (|>> (/.check nominal/0) ..verdict) all_variables)] (/.assertion "" (and (list.every? (bit#= false) failures) diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux index ae9d7ff01..5d1654269 100644 --- a/stdlib/source/test/lux/world/file.lux +++ b/stdlib/source/test/lux/world/file.lux @@ -78,7 +78,7 @@ [_ (atom.compare_and_swap! disk' (dictionary.has @ {.#Left [now it]} disk') disk)] (case (/.parent fs @) {.#Some parent} - (alert_parent! disk (|>> (list& @)) parent) + (alert_parent! disk (|>> (partial_list @)) parent) {.#None} (in {try.#Success []}))) @@ -174,7 +174,7 @@ [_ (atom.compare_and_swap! disk' (dictionary.has @ {.#Right (list)} disk') disk)] (case (/.parent mock @) {.#Some parent} - (alert_parent! disk (|>> (list& @)) parent) + (alert_parent! disk (|>> (partial_list @)) parent) {.#None} (in {try.#Success []}))) -- cgit v1.2.3