Merge pull request #47 from dfmorrison/parallel-iter-csv

"move special bindings just around reader construction, fixing issues #43 and #44

Author: bobbysmith007

csv.lisp

@@ -13,7 +13,7 @@
   ((format-control :accessor format-control :initarg :format-control :initform nil)
    (format-args :accessor format-args :initarg :format-args :initform nil))
   (:report (lambda (c s &aux (ctrl (format-control c)))
-	     (typecase ctrl
+             (typecase ctrl
                (condition
                 (format s "CSV-PARSE-ERROR: internal-error ~A" ctrl))
                (string
@@ -245,10 +245,10 @@ always-quote: Defaults to *always-quote*"
       ;; can't bind values in a `with`, so listify and destructure
       (with (,stream ,opened?) = (multiple-value-list
                                   (%in-stream ,input)))
-      (with *separator* = (or ,separator *separator*))
-      (with *quote* = (or ,quote *quote*))
-      (with *quote-escape* = (or ,escaped-quote *quote-escape*))
-      (with ,csv-reader = (make-default-csv-reader))
+      (with ,csv-reader = (let ((*separator* (or ,separator *separator*))
+                                (*quote* (or ,quote *quote*))
+                                (*quote-escape* (or ,escaped-quote *quote-escape*)))
+                            (make-default-csv-reader)))
       (finally-protected
        (when (and ,stream ,opened?)
          (close ,stream)))
@@ -349,7 +349,7 @@ body: body of the macro"
     (stream-or-string
      &rest all-keys
      &key
-     csv-reader row-fn map-fn data-map-fn sample skip-first-p 
+     csv-reader row-fn map-fn data-map-fn sample skip-first-p
      ((:separator *separator*) *separator*)
      ((:quote *quote*) *quote*)
      ((:escape *quote-escape*) *quote-escape*)

tests/csv.lisp

@@ -260,7 +260,19 @@ multiline" (nth 3 (first data)) ))
     (assert-equal  "5" b)
     (assert-equal  "6" c)
     (for i from 0)
-    (finally (assert-equal 0 i))))
+    (finally (assert-equal 0 i)))
+
+  ;; test multiple files
+  (assert-equal '(("1" "a" "2" "b") ("3" "c" "4" "d"))
+                (iter (for (x y) in-csv #P"numbers.csv")
+                      (for (u v) in-csv #P"letters.csv")
+                      (collect (list x u y v))))
+
+  ;; test nested reads
+  (assert-equal '(("1" (("a" "b") ("c" "d")) "2") ("3" (("a" "b") ("c" "d")) "4"))
+                (iter (for (x y) in-csv #P"numbers.txt" separator #\Tab)
+                      (collect (list x (read-csv #P"letters.csv") y)))))
+
 
 (define-test sampling-iterate (:tags '(sampling iterate))
   (assert-length

tests/letters.csv

@@ -0,0 +1,2 @@
+a,b
+c,d

tests/numbers.csv

@@ -0,0 +1,2 @@
+1,2
+3,4

tests/numbers.txt

@@ -0,0 +1,2 @@
+1	2
+3	4