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 b82d0580095dba42b4f929d27a8870aa3d189fa7..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 sequences.lib
-math.parser combinators kernel memoize csv symbols inspector
-words accessors math.order sorting ;
+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
@@ -21,24 +21,26 @@ ERROR: no-such-state name ;
 M: no-such-state summary drop "No such state" ;
 
 MEMO: string>state ( string -- state )
-    dup states [ word-name = ] with find nip
+    dup states [ name>> = ] with find nip
     [ ] [ no-such-state ] ?if ;
 
 TUPLE: city
 first-zip name state latitude longitude gmt-offset dst-offset ;
 
 MEMO: cities ( -- seq )
-    "resource:extra/zip-codes/zipcode.csv" ascii <file-reader>
-    csv rest-slice [
-        7 firstn {
-            [ string>number ]
-            [ ]
-            [ string>state ]
-            [ string>number ]
-            [ string>number ]
-            [ string>number ]
-            [ string>number ]
-        } spread city boa
+    "resource:extra/usa-cities/zipcode.csv" ascii file>csv
+    rest-slice [
+        [
+            {
+                [ string>number ]
+                [ ]
+                [ string>state ]
+                [ string>number ]
+                [ string>number ]
+                [ string>number ]
+                [ string>number ]
+            } spread
+        ] input<sequence city boa
     ] map ;
 
 MEMO: cities-named ( name -- cities )
@@ -46,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>> <=> ] binsearch* ;
+    cities [ first-zip>> <=> ] with search nip ;