csv: empty strings and files are valid csv:s

diff --git a/basis/csv/csv-tests.factor b/basis/csv/csv-tests.factor
index 2d55b1745edd6b4057b6b3eba6a83f3d7da5e968..844a77d5e73a4314f512a5fc1ea2b003eb6ed436 100644 (file)
--- a/basis/csv/csv-tests.factor
+++ b/basis/csv/csv-tests.factor
@@ -100,3 +100,5 @@ IN: csv.tests
 ! FIXME: { { { "as,df" "asdf" } } } [ "\"as,\"df  ,asdf" string>csv ] unit-test
 ! FIXME: { { { "asd\"f\"" "asdf" } } } [ "\"asd\"\"\"f\",asdf" string>csv ] unit-test
 { { { "as,d\"f" "asdf" } } } [ "\"as,\"d\"\"\"\"f,asdf" string>csv ] unit-test
+
+[ { } ] [ "" string>csv ] unit-test

diff --git a/basis/csv/csv.factor b/basis/csv/csv.factor
index 27f39190ec93b30157128a3a45ae8201cee4c244..350ee0b02e91ad39289664c45f56ddc00ad75a77 100644 (file)
--- a/basis/csv/csv.factor
+++ b/basis/csv/csv.factor
@@ -68,7 +68,7 @@ PRIVATE>
 
 : stream-read-csv ( stream -- rows )
     [ (stream-read-csv) ] { } make
-    dup last { "" } = [ but-last ] when ; inline
+    dup ?last { "" } = [ but-last ] when ; inline
 
 : read-csv ( -- rows )
     input-stream get stream-read-csv ; inline