From cd4acad53fb730af0722345ef3a02236ccbf80f4 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 10 Aug 2022 22:16:18 -0500 Subject: [PATCH] assocs.extras: fix usages of collect-key-by collect-value-by --- extra/wordlet/wordlet.factor | 2 +- extra/zoneinfo/zoneinfo.factor | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extra/wordlet/wordlet.factor b/extra/wordlet/wordlet.factor index 151a6d72fe..05a0bbd5ed 100644 --- a/extra/wordlet/wordlet.factor +++ b/extra/wordlet/wordlet.factor @@ -49,7 +49,7 @@ TUPLE: wordlet-game secret-word chances guesses ; guess>chars ] with map concat members [ background of ] assoc-map - [ first ] collect-value-by + [ drop ] collect-value-by [ [ color>n ] zip-with sort-values reverse first first ] assoc-map CHAR: a CHAR: z [a..b] [ 1string COLOR: white ] { } map>assoc [ or ] assoc-merge ; diff --git a/extra/zoneinfo/zoneinfo.factor b/extra/zoneinfo/zoneinfo.factor index 96aed5d375..58782b4ed3 100644 --- a/extra/zoneinfo/zoneinfo.factor +++ b/extra/zoneinfo/zoneinfo.factor @@ -55,10 +55,10 @@ MEMO: zoneinfo-country-zones ( -- seq ) : lookup-country-names ( seq -- seq' ) [ lookup-country-name ] map ; : timezone>country-map ( -- alist ) - parse-zonetabs [ second ] collect-key-by ; + parse-zonetabs [ nip ] collect-key-by ; : country>timezones-map ( -- alist ) - parse-zonetabs [ first ] collect-value-by ; + parse-zonetabs [ drop ] collect-value-by ; : country-timezones-map ( -- alist ) country>timezones-map [ dup lookup-country-names zip ] map-values ; -- 2.34.1