Permitted to place the escape character before a non-special characte…

…r so don't throw exception
tototoshi · Feb 15, 2016 · 4de296d · 4de296d
1 parent 8fab90a
commit 4de296d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 28 deletions.
diff --git a/src/main/scala/com/github/tototoshi/csv/CSVParser.scala b/src/main/scala/com/github/tototoshi/csv/CSVParser.scala
@@ -89,8 +89,7 @@ object CSVParser {
               pos += 1
             }
             case `escapeChar` => {
-              if (pos + 1 < buflen
-                && (buf(pos + 1) == escapeChar || buf(pos + 1) == delimiter)) {
+              if (pos + 1 < buflen) {
                 field += buf(pos + 1)
                 state = Field
                 pos += 2
@@ -130,14 +129,9 @@ object CSVParser {
           c match {
             case `escapeChar` => {
               if (pos + 1 < buflen) {
-                if (buf(pos + 1) == escapeChar
-                  || buf(pos + 1) == delimiter) {
-                  field += buf(pos + 1)
-                  state = Field
-                  pos += 2
-                } else {
-                  throw new MalformedCSVException(buf.mkString)
-                }
+                field += buf(pos + 1)
+                state = Field
+                pos += 2
               } else {
                 state = QuoteEnd
                 pos += 1
@@ -175,14 +169,9 @@ object CSVParser {
           c match {
             case `escapeChar` if escapeChar != quoteChar => {
               if (pos + 1 < buflen) {
-                if (buf(pos + 1) == escapeChar
-                  || buf(pos + 1) == quoteChar) {
-                  field += buf(pos + 1)
-                  state = QuotedField
-                  pos += 2
-                } else {
-                  throw new MalformedCSVException(buf.mkString)
-                }
+                field += buf(pos + 1)
+                state = QuotedField
+                pos += 2
               } else {
                 throw new MalformedCSVException(buf.mkString)
               }
@@ -236,14 +225,9 @@ object CSVParser {
           c match {
             case `escapeChar` if escapeChar != quoteChar => {
               if (pos + 1 < buflen) {
-                if (buf(pos + 1) == escapeChar
-                  || buf(pos + 1) == quoteChar) {
-                  field += buf(pos + 1)
-                  state = QuotedField
-                  pos += 2
-                } else {
-                  throw new MalformedCSVException(buf.mkString)
-                }
+                field += buf(pos + 1)
+                state = QuotedField
+                pos += 2
               } else {
                 throw new MalformedCSVException(buf.mkString)
               }

diff --git a/src/test/resources/backslash-escape.csv b/src/test/resources/backslash-escape.csv
@@ -1 +1 @@
-"field1","field2","field3 says, \"escaped with backslash\""
+"field1","field2","field3 says, \"escaped with backslash\"","\\\f\i\e\l\d\4",\\\f\i\e\l\d\5
diff --git a/src/test/scala/com/github/tototoshi/csv/CSVReaderSpec.scala b/src/test/scala/com/github/tototoshi/csv/CSVReaderSpec.scala
@@ -126,7 +126,7 @@ class CSVReaderSpec extends FunSpec with ShouldMatchers with Using {
           res = res ++ fields
         }
       }
-      res should be(List("field1", "field2", "field3 says, \"escaped with backslash\""))
+      res should be(List("field1", "field2", "field3 says, \"escaped with backslash\"", "\\field4", "\\field5"))
     }
 
     it("read simple CSV file with empty quoted fields") {