colors: fix shadowing of parse-color

diff --git a/basis/colors/colors.factor b/basis/colors/colors.factor
index 413b087f0cfe27a3d8bc67eef5b6d82520da53f4..1b2848448b3d038ee91e3f4f835d8d9581ea2180 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
 
-: parse-color ( line -- name color )
+: line-color ( line -- name color )
     first4 [ [ string>number 255 /f ] tri@ 1.0 <rgba> ] dip swap ;
 
-: parse-colors ( lines -- assoc )
+: line-colors ( lines -- assoc )
     [ "!" head? ] reject [
-        [ blank? ] split-when harvest 3 cut "-" join suffix parse-color
+        [ blank? ] split-when harvest 3 cut "-" join suffix line-color
     ] 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 parse-colors
+        utf8 file-lines line-colors
     ] [ assoc-union ] map-reduce ;
 
 ERROR: invalid-hex-color hex ;