assocs.extras: fix usages of collect-key-by collect-value-by

[factor.git] / extra / zoneinfo / zoneinfo.factor

diff --git a/extra/zoneinfo/zoneinfo.factor b/extra/zoneinfo/zoneinfo.factor
index 5503f7bf961ea6e20794923a77f98b12cec0c766..58782b4ed31a0cdec6e289695ad224c73d713792 100644 (file)
--- 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 ;
@@ -147,7 +147,7 @@ MEMO: zoneinfo-assoc ( -- assoc )
 
 : zoneinfo-zones ( -- seq )
     raw-zone-map keys
-    [ "/" find-subseq? ] partition
+    [ "/" subseq-index? ] partition
     [ natural-sort ] bi@ append ;
 
 GENERIC: zone-matches? ( string rule -- ? )
@@ -232,8 +232,8 @@ ERROR: unknown-day-abbrev day ;
 
 : comparison-day-string ( timestamp string -- timestamp )
     {
-        { [ dup ">=" find-subseq? ] [ ">=" split1 swap [ string>number >>day ] dip day-abbrev>= ] }
-        { [ dup "<=" find-subseq? ] [ "<=" split1 swap [ string>number >>day ] dip day-abbrev<= ] }
+        { [ dup ">=" subseq-index? ] [ ">=" split1 swap [ string>number >>day ] dip day-abbrev>= ] }
+        { [ dup "<=" subseq-index? ] [ "<=" split1 swap [ string>number >>day ] dip day-abbrev<= ] }
         [ string>number >>day ]
     } cond ;