diff options
Diffstat (limited to 'stdlib/source/test/lux/locale/territory.lux')
| -rw-r--r-- | stdlib/source/test/lux/locale/territory.lux | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/stdlib/source/test/lux/locale/territory.lux b/stdlib/source/test/lux/locale/territory.lux index 0d2b463c6..381c8f673 100644 --- a/stdlib/source/test/lux/locale/territory.lux +++ b/stdlib/source/test/lux/locale/territory.lux @@ -23,7 +23,7 @@ ["." /]]) (type: Bundle - {#count Nat + {#amount Nat #names (Set Text) #shorts (Set Text) #longs (Set Text) @@ -34,14 +34,14 @@ (template [<bundle> <territories>] [(def: <bundle> Bundle - (let [count (template.count <territories>) - territories (`` (list (~~ (template.splice <territories>))))] - {#count count - #names (|> territories (list\map /.name) (set.from_list text.hash)) - #shorts (|> territories (list\map /.short_code) (set.from_list text.hash)) - #longs (|> territories (list\map /.long_code) (set.from_list text.hash)) - #numbers (|> territories (list\map /.numeric_code) (set.from_list n.hash)) - #territories (|> territories (set.from_list /.hash)) + (let [amount (template.amount <territories>) + territories (`` (list (~~ (template.spliced <territories>))))] + {#amount amount + #names (|> territories (list\map /.name) (set.of_list text.hash)) + #shorts (|> territories (list\map /.short_code) (set.of_list text.hash)) + #longs (|> territories (list\map /.long_code) (set.of_list text.hash)) + #numbers (|> territories (list\map /.numeric_code) (set.of_list n.hash)) + #territories (|> territories (set.of_list /.hash)) #test (_.cover <territories> true)}))] @@ -142,8 +142,8 @@ (Hash a) (List Bundle) [Nat (Set a)])) - (list\fold (function (_ bundle [count set]) - [(n.+ count (get@ #count bundle)) + (list\fold (function (_ bundle [amount set]) + [(n.+ amount (get@ #amount bundle)) (set.union set (lens bundle))]) [0 (set.new hash)] territories)) @@ -156,9 +156,9 @@ (list\fold _.and (`` ($_ _.and (~~ (template [<lens> <tag> <hash>] - [(let [[count set] (..aggregate (get@ <tag>) <hash> ..territories)] + [(let [[amount set] (..aggregate (get@ <tag>) <hash> ..territories)] (_.cover [<lens>] - (n.= count (set.size set))))] + (n.= amount (set.size set))))] [/.name #names text.hash] [/.short_code #shorts text.hash] @@ -171,7 +171,7 @@ (template: (!aliases <reference> <aliases>) (_.cover <aliases> (list.every? (\ /.equivalence = <reference>) - (`` (list (~~ (template.splice <aliases>))))))) + (`` (list (~~ (template.spliced <aliases>))))))) (def: aliases_test Test |