From 59e24e8ab07be0ab303a63c1eb46f90c99fdca58 Mon Sep 17 00:00:00 2001
From: Phil Dawes <phil@phildawes.net>
Date: Thu, 1 May 2008 11:54:09 +0100
Subject: [PATCH] csv: Applied patch from  from Philip Fominykh to fix
 newline-after-quote bug

---
 extra/csv/csv-tests.factor | 7 +++++--
 extra/csv/csv.factor       | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extra/csv/csv-tests.factor b/extra/csv/csv-tests.factor
index 6ab26c7e40..7e96dbc0a6 100644
--- a/extra/csv/csv-tests.factor
+++ b/extra/csv/csv-tests.factor
@@ -46,9 +46,7 @@ IN: csv.tests
 [ "Year,Make,Model\n1997,Ford,E350\n2000,Mercury,Cougar" 
    <string-reader> csv ] named-unit-test
 
-   
 
-   
 ! !!!!!!!!  other tests
    
 [ { { "Phil Dawes" } } ] 
@@ -65,3 +63,8 @@ IN: csv.tests
 "allows setting of delimiting character"
 [ { { "foo" "bah" "baz" } } ] 
 [ "foo\tbah\tbaz\n" <string-reader> CHAR: \t [ csv ] with-delimiter ] named-unit-test
+
+"Quoted field followed immediately by newline"
+[ { { "foo" "bar" }
+    { "1"   "2" } } ]
+[ "foo,\"bar\"\n1,2" <string-reader> csv ] named-unit-test
diff --git a/extra/csv/csv.factor b/extra/csv/csv.factor
index 3953ce057b..b1953f5b57 100644
--- a/extra/csv/csv.factor
+++ b/extra/csv/csv.factor
@@ -31,6 +31,7 @@ VAR: delimiter
   read1 dup 
   { { CHAR: "    [ , quoted-field ] }  ! " is an escaped quote
     { delimiter> [ ] }                 ! end of quoted field 
+    { CHAR: \n   [ ] }
     [ 2drop skip-to-field-end ]       ! end of quoted field + padding
   } case ;