Issue 66

src/main/scala/com/github/tototoshi/csv/CSVParser.scala

@@ -71,7 +71,7 @@ object CSVParser {
               pos += 1
             }
             case '\r' => {
-              if (pos + 1 < buflen && buf(1) == '\n') {
+              if (pos + 1 < buflen && buf(pos + 1) == '\n') {
                 pos += 1
               }
               fields :+= field.toString
@@ -115,7 +115,7 @@ object CSVParser {
               pos += 1
             }
             case '\r' => {
-              if (pos + 1 < buflen && buf(1) == '\n') {
+              if (pos + 1 < buflen && buf(pos + 1) == '\n') {
                 pos += 1
               }
               fields :+= field.toString
@@ -160,7 +160,7 @@ object CSVParser {
               pos += 1
             }
             case '\r' => {
-              if (pos + 1 < buflen && buf(1) == '\n') {
+              if (pos + 1 < buflen && buf(pos + 1) == '\n') {
                 pos += 1
               }
               fields :+= field.toString
@@ -223,7 +223,7 @@ object CSVParser {
               pos += 1
             }
             case '\r' => {
-              if (pos + 1 < buflen && buf(1) == '\n') {
+              if (pos + 1 < buflen && buf(pos + 1) == '\n') {
                 pos += 1
               }
               fields :+= field.toString
@@ -283,14 +283,11 @@ object CSVParser {
         None
       }
       case _ => {
-        if (!field.isEmpty) {
-          // When no crlf at end of file
-          state match {
-            case Field | QuoteEnd => {
-              fields :+= field.toString
-            }
-            case _ => {
-            }
+        state match {
+          case Field | QuoteEnd => {
+            fields :+= field.toString
+          }
+          case _ => {
           }
         }
         Some(fields.toList)

src/test/resources/simple-crlf.csv

@@ -0,0 +1,3 @@
+a,b,c
+d,e,f
+

src/test/scala/com/github/tototoshi/csv/CSVReaderSpec.scala

@@ -60,18 +60,49 @@ class CSVReaderSpec extends FunSpec with Matchers with Using {
       }
     }
 
-    it("should be able to read an empty line") {
-      using(CSVReader.open("src/test/resources/has-empty-line.csv", "utf-8")) { reader =>
-        val lines = reader.all()
-        lines(1) should be(List(""))
+    describe("#emptyLines") {
+      it("should be able to read an empty line") {
+        using(CSVReader.open("src/test/resources/has-empty-line.csv", "utf-8")) { reader =>
+          val lines = reader.all()
+          lines(1) should be(List(""))
+        }
+      }
+
+      it("should treat empty line as Nil") {
+        val format = new DefaultCSVFormat {
+          override val treatEmptyLineAsNil = true
+        }
+        using(CSVReader.open("src/test/resources/has-empty-line.csv", "utf-8")(format)) { reader =>
+          val lines = reader.all()
+          lines(1) should be(Nil)
+        }
       }
 
-      val format = new DefaultCSVFormat {
-        override val treatEmptyLineAsNil = true
+      it("should be able to read empty field with line feed") {
+        val csvString = "\"\"\r\n"
+        var res: List[String] = Nil
+        using(CSVReader.open(new StringReader(csvString))) { reader =>
+          val lines = reader.all()
+          lines(0) should be(List(""))
+        }
       }
-      using(CSVReader.open("src/test/resources/has-empty-line.csv", "utf-8")(format)) { reader =>
-        val lines = reader.all()
-        lines(1) should be(Nil)
+
+      it("should be able to read empty field without line feed") {
+        val csvString = "\"\""
+        var res: List[String] = Nil
+        using(CSVReader.open(new StringReader(csvString))) { reader =>
+          val lines = reader.all()
+          lines(0) should be(List(""))
+        }
+      }
+
+      it("should be able to read empty last field without line feed") {
+        val csvString = "a,b,c,\"\",d,\"\""
+        var res: List[String] = Nil
+        using(CSVReader.open(new StringReader(csvString))) { reader =>
+          val lines = reader.all()
+          lines(0) should be(List("a", "b", "c", "", "d", ""))
+        }
       }
     }
 
@@ -96,6 +127,16 @@ class CSVReaderSpec extends FunSpec with Matchers with Using {
       res.mkString should be("abcdef")
     }
 
+    it("read simple CSV from file with CRLF") {
+      var res: List[String] = Nil
+      using(CSVReader.open(new FileReader("src/test/resources/simple-crlf.csv"))) { reader =>
+        reader foreach { fields =>
+          res = res ++ fields
+        }
+      }
+      res.mkString should be("abcdef")
+    }
+
     it("issue #22") {
       var res: List[String] = Nil
       using(CSVReader.open("src/test/resources/issue22.csv")) { reader =>