jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle empty lines in parsecsv; fixes #8365 (#9343)

Browse source
This commit is contained in:
Federico Ceratto 2019-01-26 09:27:08 +00:00 • committed by Andreas Rumpf
commit 68dd9be0f5
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pure/parsecsv.nim
View file

@ -255,6 +255,12 @@ proc readRow*(my: var CsvParser, columns = 0): bool =
var col = 0 # current column var col = 0 # current column
let oldpos = my.bufpos let oldpos = my.bufpos
# skip initial empty lines #8365
while true:
case my.buf[my.bufpos]
of '\c': my.bufpos = handleCR(my, my.bufpos)
of '\l': my.bufpos = handleLF(my, my.bufpos)
else: break
while my.buf[my.bufpos] != '\0': while my.buf[my.bufpos] != '\0':
let oldlen = my.row.len let oldlen = my.row.len
if oldlen < col+1: if oldlen < col+1:
@ -354,7 +360,7 @@ when isMainModule:
import os import os
import strutils import strutils
block: # Tests for reading the header row block: # Tests for reading the header row
let content = "One,Two,Three,Four\n1,2,3,4\n10,20,30,40,\n100,200,300,400\n" let content = "\nOne,Two,Three,Four\n1,2,3,4\n10,20,30,40,\n100,200,300,400\n"
writeFile("temp.csv", content) writeFile("temp.csv", content)
var p: CsvParser var p: CsvParser