refs #25 improve logic

doyaaaaaken · Aug 25, 2019 · f90bd5a · f90bd5a
1 parent a7ea069
commit f90bd5a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/main/kotlin/com/github/doyaaaaaken/kotlincsv/parser/ParseStateMachine.kt b/src/main/kotlin/com/github/doyaaaaaken/kotlincsv/parser/ParseStateMachine.kt
@@ -57,16 +57,12 @@ internal class ParseStateMachine(
             ParseState.FIELD -> {
                 when (ch) {
                     escapeChar -> {
-                        if (nextCh != null) {
-                            if (nextCh == escapeChar || nextCh == delimiter) {
-                                field.append(nextCh)
-                                state = ParseState.FIELD
-                                pos += 1
-                            } else {
-                                throw MalformedCSVException("$pos")
-                            }
+                        if (nextCh != null && nextCh == escapeChar) {
+                            field.append(nextCh)
+                            state = ParseState.FIELD
+                            pos += 1
                         } else {
-                            state = ParseState.QUOTE_END
+                            throw MalformedCSVException("$pos")
                         }
                     }
                     delimiter -> {

diff --git a/src/test/kotlin/com/github/doyaaaaaken/kotlincsv/parser/CsvParserTest.kt b/src/test/kotlin/com/github/doyaaaaaken/kotlincsv/parser/CsvParserTest.kt
@@ -51,6 +51,9 @@ class CsvParserTest : WordSpec() {
                 parser.parseRow("a\r") shouldBe listOf("a")
                 parser.parseRow("a\r\n") shouldBe listOf("a")
             }
+            "parse escape character after field" {
+                parser.parseRow("a\"\"") shouldBe listOf("a\"")
+            }
         }
     }
 }