steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zoneinfo: removing a few empty words and unused tuples

locals-and-roots
Björn Lindqvist 2016-04-01 02:42:16 +02:00
parent 37fc051506
commit a921e35af3
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
extra/zoneinfo/zoneinfo.factor
View File

@ -32,8 +32,6 @@ TUPLE: raw-leap year month day hms corr r/s ;
TUPLE: zone name ; TUPLE: zone name ;
TUPLE: rule name from to at-time ; TUPLE: rule name from to at-time ;
TUPLE: link ;
TUPLE: leap ;
: rule-to ( m string -- m n ) : rule-to ( m string -- m n )
{ {
@ -42,9 +40,6 @@ TUPLE: leap ;
[ string>number ] [ string>number ]
} case ; } case ;
: raw-rule>rule ( raw-rule -- rule )
;
: parse-rule ( seq -- rule ) : parse-rule ( seq -- rule )
[ [
{ {
@ -61,9 +56,6 @@ TUPLE: leap ;
} spread } spread
] input<sequence raw-rule boa ; ] input<sequence raw-rule boa ;
: raw-zone>zone ( raw-zone -- zone )
;
: parse-zone ( seq -- zone ) : parse-zone ( seq -- zone )
{ {
[ second ] [ second ]
@ -82,9 +74,6 @@ TUPLE: leap ;
[ 3 tail harvest ] [ 3 tail harvest ]
} cleave raw-zone boa ; } cleave raw-zone boa ;
: raw-link>link ( raw-link -- link )
;
: parse-link ( seq -- link ) : parse-link ( seq -- link )
[ [
{ {
@ -94,9 +83,6 @@ TUPLE: leap ;
} spread } spread
] input<sequence raw-link boa ; ] input<sequence raw-link boa ;
: raw-leap>leap ( raw-leap -- leap )
;
: parse-leap ( seq -- link ) : parse-leap ( seq -- link )
[ [
{ {
@ -113,10 +99,10 @@ TUPLE: leap ;
: parse-line ( seq -- tuple ) : parse-line ( seq -- tuple )
dup first >lower dup first >lower
{ {
{ "zone" [ parse-zone dup last-zone set raw-zone>zone ] } { "zone" [ parse-zone dup last-zone set ] }
{ "rule" [ parse-rule raw-rule>rule ] } { "rule" [ parse-rule ] }
{ "link" [ parse-link raw-link>link ] } { "link" [ parse-link ] }
{ "leap" [ parse-leap raw-leap>leap ] } { "leap" [ parse-leap ] }
[ drop harvest parse-partial-zone ] [ drop harvest parse-partial-zone ]
} case ; } case ;
@ -132,7 +118,6 @@ MEMO: zoneinfo-files ( -- seq )
MEMO: zoneinfo-array ( -- seq ) MEMO: zoneinfo-array ( -- seq )
zoneinfo-files concat ; zoneinfo-files concat ;
: raw-rule-map ( -- assoc ) : raw-rule-map ( -- assoc )
zoneinfo-array [ raw-rule? ] filter [ name>> ] collect-by ; zoneinfo-array [ raw-rule? ] filter [ name>> ] collect-by ;