diff -u -r usgs/zipcodes/zip-api.cl usgs 2/zipcodes/zip-api.cl --- usgs/zipcodes/zip-api.cl 2007-01-10 17:07:40.000000000 -0800 +++ usgs 2/zipcodes/zip-api.cl 2007-01-19 17:09:44.000000000 -0800 @@ -9,10 +9,6 @@ ;; This file defines the API for the `zipcodes' module. -(eval-when (compile) - (load (merge-pathnames "zip-package.fasl" *compile-file-pathname*)) - (load (merge-pathnames "zip-util.fasl" *compile-file-pathname*))) - (provide :zipcodes) (in-package :util.zipcodes) @@ -42,22 +38,22 @@ ;; simple-vector or structs written out by the compiler. (defvar *zipcode-data* - #.(let ((zips - (prog2 - (progn (format t "reading zips.cvs...") - (force-output)) - (read-zips-csv - (merge-pathnames "zips.csv" *compile-file-pathname*)) - (format t "done~%")))) - (list 'list - (vector-of zips #'zip-code) - (vector-of zips #'zip-state-abbrev) - (vector-of zips (lambda (zip) - (let ((loc (zip-location zip))) - (cons (location-latitude loc) - (location-longitude loc))))) - (vector-of zips #'zip-city) - (vector-of zips #'zip-state)))) + (let ((zips + (prog2 + (progn (format t "reading zips.cvs...") + (force-output)) + (read-zips-csv + (merge-pathnames "zips.csv" *load-pathname*)) + (format t "done~%")))) + (list + (vector-of zips #'zip-code) + (vector-of zips #'zip-state-abbrev) + (vector-of zips (lambda (zip) + (let ((loc (zip-location zip))) + (cons (location-latitude loc) + (location-longitude loc))))) + (vector-of zips #'zip-city) + (vector-of zips #'zip-state)))) (defvar *zipcodes* (destructuring-bind (codes abbrevs locations cities states) diff -u -r usgs/zipcodes/zip-util.cl usgs 2/zipcodes/zip-util.cl --- usgs/zipcodes/zip-util.cl 2007-01-10 17:07:40.000000000 -0800 +++ usgs 2/zipcodes/zip-util.cl 2007-01-19 17:10:08.000000000 -0800 @@ -9,9 +9,6 @@ ;; This file contains utilities used only at compile time. -(eval-when (compile) - (load (merge-pathnames "zip-package.fasl" *compile-file-pathname*))) - (in-package :util.zipcodes) (defun read-zips-csv (csv-file) diff -u -r usgs/zipcodes/zipcodes.asd usgs 2/zipcodes/zipcodes.asd --- usgs/zipcodes/zipcodes.asd 2007-01-10 16:05:56.000000000 -0800 +++ usgs 2/zipcodes/zipcodes.asd 2007-01-19 17:10:27.000000000 -0800 @@ -1,5 +1,5 @@ (defsystem zipcodes :components ((:file "zip-package") - (:file "zip-util") - (:file "zip-api")) + (:file "zip-util" :depends-on ("zip-package")) + (:file "zip-api" :depends-on ("zip-package" "zip-util"))) :depends-on ("measures"))