Skip to content

Fix previous carriage return logic #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guymers merged 1 commit into from
Oct 5, 2025
Merged

Fix previous carriage return logic #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions modules/core/src/main/scala/ceesvee/CsvParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,24 +90,25 @@ object CsvParser {
}

/**
* Splits the given strings into CSV lines by splitting on either '\r\n' and
* Splits the given strings into CSV lines by splitting on either '\r\n' or
* '\n'.
*
* '"' is the only valid escape for nested double quotes.
*/
@throws[Error.LineTooLong]("if a line is longer than `maximumLineLength`")
def splitLines(in: Iterator[String], options: Options): Iterator[String] = new SplitLinesIterator(in, options)
@SuppressWarnings(Array(
"org.wartremover.warts.MutableDataStructures",
"org.wartremover.warts.Throw",
"org.wartremover.warts.Var",
))
def splitLines(in: Iterator[String], options: Options): Iterator[String] = new Iterator[String] {
private final class SplitLinesIterator(in: Iterator[String], options: Options) extends Iterator[String] {
private val toOutput = mutable.Queue.empty[String]
private var state = State.initial

override def hasNext: Boolean = toOutput.nonEmpty || in.hasNext || state.leftover.nonEmpty
override def hasNext = toOutput.nonEmpty || in.hasNext || state.leftover.nonEmpty

@tailrec override def next(): String = {
@tailrec override def next() = {
if (toOutput.nonEmpty) {
toOutput.dequeue()
} else {
Expand Down Expand Up @@ -204,8 +205,7 @@ object CsvParser {
if (insideQuote) {
i += 1
} else {
val sliceEnd = if (previousCarriageReturn) i - 1 else i
val _ = builder += concat.substring(sliceStart, sliceEnd)
val _ = builder += concat.substring(sliceStart, i)
i += 1
sliceStart = i
}
Expand Down
16 changes: 16 additions & 0 deletions modules/core/src/test/scala/ceesvee/CsvParserSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,22 @@ object CsvParserSpec extends ZIOSpecDefault with CsvParserParserSuite {
assertTrue(lines == List("abc\rdef", "ghi", "jkl")) &&
assertTrue(state.leftover == "mno")
},
test("trailing new lines aligned to vector boundary") {
val strings = List(
"012345678901234567890123456789012345678901234567890123456789abc\r",
"012345678901234567890123456789012345678901234567890123456789abc\r",
"\n012345678901234567890123456789012345678901234567890123456789ab\n",
"012345678901234567890123456789012345678901234567890123456789abcd",
"\nmno",
)
val (state, lines) = CsvParser.splitStrings(strings, CsvParser.State.initial)
assertTrue(lines == List(
"012345678901234567890123456789012345678901234567890123456789abc\r012345678901234567890123456789012345678901234567890123456789abc",
"012345678901234567890123456789012345678901234567890123456789ab",
"012345678901234567890123456789012345678901234567890123456789abcd",
)) &&
assertTrue(state.leftover == "mno")
},
test("trailing double quotes") {
val strings = List(
"a,\"b\"",
Expand Down