factor: trim using lists

[factor.git] / extra / usa-cities / usa-cities.factor

diff --git a/extra/usa-cities/usa-cities.factor b/extra/usa-cities/usa-cities.factor
index 25ec30ac78673bac67927e9c6d34f2cfa84f970e..e688921e2c8570f51f54192942dff3d474d18263 100644 (file)
--- a/extra/usa-cities/usa-cities.factor
+++ b/extra/usa-cities/usa-cities.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io.files io.encodings.ascii sequences generalizations
-math.parser combinators kernel memoize csv summary
-words accessors math.order binary-search combinators.smart ;
+USING: accessors binary-search combinators combinators.smart csv
+io.encodings.ascii kernel math.order math.parser sequences
+summary ;
 IN: usa-cities
 
 SINGLETONS: AK AL AR AS AZ CA CO CT DC DE FL GA HI IA ID IL IN
@@ -28,8 +28,8 @@ TUPLE: city
 first-zip name state latitude longitude gmt-offset dst-offset ;
 
 MEMO: cities ( -- seq )
-    "resource:extra/usa-cities/zipcode.csv" ascii <file-reader>
-    csv rest-slice [
+    "resource:extra/usa-cities/zipcode.csv" ascii file>csv
+    rest-slice [
         [
             {
                 [ string>number ]
@@ -48,8 +48,8 @@ MEMO: cities-named ( name -- cities )
 
 MEMO: cities-named-in ( name state -- cities )
     cities [
-        tuck [ name>> = ] [ state>> = ] 2bi* and
-    ] with with filter ;
+        [ name>> = ] [ state>> = ] bi-curry bi* and
+    ] 2with filter ;
 
 : find-zip-code ( code -- city )
     cities [ first-zip>> <=> ] with search nip ;