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

colors.constants: clean up naming

db4
Slava Pestov 2009-09-14 21:03:33 -05:00
parent ded68c67c0
commit 05fe9c7ead
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
basis/colors/constants/constants.factor
View File

@ -11,23 +11,23 @@ IN: colors.constants
[ [ string>number 255 /f ] tri@ 1.0 <rgba> ] dip [ [ string>number 255 /f ] tri@ 1.0 <rgba> ] dip
[ blank? ] trim-head { { CHAR: \s CHAR: - } } substitute swap ; [ blank? ] trim-head { { CHAR: \s CHAR: - } } substitute swap ;
: parse-rgb.txt ( lines -- assoc ) : parse-colors ( lines -- assoc )
[ "!" head? not ] filter [ "!" head? not ] filter
[ 11 cut [ " \t" split harvest ] dip suffix ] map [ 11 cut [ " \t" split harvest ] dip suffix ] map
[ parse-color ] H{ } map>assoc ; [ parse-color ] H{ } map>assoc ;
MEMO: rgb.txt ( -- assoc ) MEMO: colors ( -- assoc )
"resource:basis/colors/constants/rgb.txt" "resource:basis/colors/constants/rgb.txt"
"resource:basis/colors/constants/factor-colors.txt" "resource:basis/colors/constants/factor-colors.txt"
[ utf8 file-lines parse-rgb.txt ] bi@ assoc-union ; [ utf8 file-lines parse-colors ] bi@ assoc-union ;
PRIVATE> PRIVATE>
: named-colors ( -- keys ) rgb.txt keys ; : named-colors ( -- keys ) colors keys ;
ERROR: no-such-color name ; ERROR: no-such-color name ;
: named-color ( name -- color ) : named-color ( name -- color )
dup rgb.txt at [ ] [ no-such-color ] ?if ; dup colors at [ ] [ no-such-color ] ?if ;
SYNTAX: COLOR: scan named-color parsed ; SYNTAX: COLOR: scan named-color parsed ;