X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=blobdiff_plain;f=extra%2Fzoneinfo%2Fzoneinfo.factor;h=1c3f1e329b734d9a6666c3e8776f1f57cfec7ad3;hp=58782b4ed31a0cdec6e289695ad224c73d713792;hb=714c6d2b9464e193e24cb45fab1961d96a9d422c;hpb=e766b83ac0fcc5857602dcfae2791be3b93602b6 diff --git a/extra/zoneinfo/zoneinfo.factor b/extra/zoneinfo/zoneinfo.factor index 58782b4ed3..1c3f1e329b 100644 --- a/extra/zoneinfo/zoneinfo.factor +++ b/extra/zoneinfo/zoneinfo.factor @@ -147,7 +147,7 @@ MEMO: zoneinfo-assoc ( -- assoc ) : zoneinfo-zones ( -- seq ) raw-zone-map keys - [ "/" subseq-index? ] partition + [ "/" subseq-of? ] 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 ">=" subseq-index? ] [ ">=" split1 swap [ string>number >>day ] dip day-abbrev>= ] } - { [ dup "<=" subseq-index? ] [ "<=" split1 swap [ string>number >>day ] dip day-abbrev<= ] } + { [ dup ">=" subseq-of? ] [ ">=" split1 swap [ string>number >>day ] dip day-abbrev>= ] } + { [ dup "<=" subseq-of? ] [ "<=" split1 swap [ string>number >>day ] dip day-abbrev<= ] } [ string>number >>day ] } cond ;