colors: fix parse-colors

diff --git a/basis/colors/colors.factor b/basis/colors/colors.factor
index 1b2848448b3d038ee91e3f4f835d8d9581ea2180..565dc638846de4c46ab4b012dbe286f0784ebc02 100644 (file)
--- a/basis/colors/colors.factor
+++ b/basis/colors/colors.factor
@@ -42,12 +42,12 @@ CONSTANT: transparent T{ rgba f 0.0 0.0 0.0 0.0 }
 
 <PRIVATE
 
-: line-color ( line -- name color )
+: parse-line ( line -- name color )
     first4 [ [ string>number 255 /f ] tri@ 1.0 <rgba> ] dip swap ;
 
-: line-colors ( lines -- assoc )
+: parse-colors ( lines -- assoc )
     [ "!" head? ] reject [
-        [ blank? ] split-when harvest 3 cut "-" join suffix line-color
+        [ blank? ] split-when harvest 3 cut "-" join suffix parse-line
     ] H{ } map>assoc ;
 
 MEMO: colors ( -- assoc )
@@ -57,7 +57,7 @@ MEMO: colors ( -- assoc )
         "resource:basis/colors/factor-colors.txt"
         "resource:basis/colors/solarized-colors.txt"
     } [
-        utf8 file-lines line-colors
+        utf8 file-lines parse-colors
     ] [ assoc-union ] map-reduce ;
 
 ERROR: invalid-hex-color hex ;

diff --git a/basis/ui/theme/base16/base16.factor b/basis/ui/theme/base16/base16.factor
index a8ea16500660f7ac1ebd19a113f9bea733335176..2b0231d33bcc9f6d6b80b6447d80e6e2469faebb 100644 (file)
--- a/basis/ui/theme/base16/base16.factor
+++ b/basis/ui/theme/base16/base16.factor
@@ -9,7 +9,7 @@ base16-theme-name [ "greenscreen" ] initialize
 
 MEMO: base16colors ( name -- assoc )
     "vocab:ui/theme/base16/base16-" swap ".txt" 3append
-    utf8 file-lines line-colors ;
+    utf8 file-lines parse-colors ;
 
 : named-base16 ( name -- color )
     dup base16-theme-name get base16colors at [ ] [ no-such-color ] ?if ;