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

Parsecsv mutability (#7253)

Browse source 
* parsecsv: immutable vars into lets

improving readability

* parsecsv.rowEntry: add mutable access
This commit is contained in:
Misha Kotwica 2018-02-24 14:55:38 +01:00 • committed by Andreas Rumpf
commit ba6e11fc88
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/pure/parsecsv.nim
View file

@ -32,7 +32,7 @@
## import parsecsv ## import parsecsv
## import os ## import os
## # Prepare a file ## # Prepare a file
## var content = """One,Two,Three,Four ## let content = """One,Two,Three,Four
## 1,2,3,4 ## 1,2,3,4
## 10,20,30,40 ## 10,20,30,40
## 100,200,300,400 ## 100,200,300,400
@ -123,7 +123,7 @@ proc parseField(my: var CsvParser, a: var string) =
if buf[pos] == my.quote and my.quote != '\0': if buf[pos] == my.quote and my.quote != '\0':
inc(pos) inc(pos)
while true: while true:
var c = buf[pos] let c = buf[pos]
if c == '\0': if c == '\0':
my.bufpos = pos # can continue after exception? my.bufpos = pos # can continue after exception?
error(my, pos, my.quote & " expected") error(my, pos, my.quote & " expected")
@ -153,7 +153,7 @@ proc parseField(my: var CsvParser, a: var string) =
inc(pos) inc(pos)
else: else:
while true: while true:
var c = buf[pos] let c = buf[pos]
if c == my.sep: break if c == my.sep: break
if c in {'\c', '\l', '\0'}: break if c in {'\c', '\l', '\0'}: break
add(a, c) add(a, c)
@ -171,9 +171,9 @@ proc readRow*(my: var CsvParser, columns = 0): bool =
## ##
## Blank lines are skipped. ## Blank lines are skipped.
var col = 0 # current column var col = 0 # current column
var oldpos = my.bufpos let oldpos = my.bufpos
while my.buf[my.bufpos] != '\0': while my.buf[my.bufpos] != '\0':
var oldlen = my.row.len let oldlen = my.row.len
if oldlen < col+1: if oldlen < col+1:
setLen(my.row, col+1) setLen(my.row, col+1)
my.row[col] = "" my.row[col] = ""
@ -208,16 +208,16 @@ proc close*(my: var CsvParser) {.inline.} =
proc readHeaderRow*(my: var CsvParser) = proc readHeaderRow*(my: var CsvParser) =
## Reads the first row and creates a look-up table for column numbers ## Reads the first row and creates a look-up table for column numbers
## See also `rowEntry <#rowEntry.CsvParser.string>`_. ## See also `rowEntry <#rowEntry.CsvParser.string>`_.
var present = my.readRow() let present = my.readRow()
if present: if present:
my.headers = my.row my.headers = my.row
proc rowEntry*(my: var CsvParser, entry: string): string = proc rowEntry*(my: var CsvParser, entry: string): var string =
## Reads a specified `entry` from the current row. ## Acceses a specified `entry` from the current row.
## ##
## Assumes that `readHeaderRow <#readHeaderRow.CsvParser>`_ has already been ## Assumes that `readHeaderRow <#readHeaderRow.CsvParser>`_ has already been
## called. ## called.
var index = my.headers.find(entry) let index = my.headers.find(entry)
if index >= 0: if index >= 0:
result = my.row[index] result = my.row[index]
@ -237,14 +237,14 @@ when isMainModule:
import os import os
import strutils import strutils
block: # Tests for reading the header row block: # Tests for reading the header row
var content = "One,Two,Three,Four\n1,2,3,4\n10,20,30,40,\n100,200,300,400\n" let content = "One,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
p.open("temp.csv") p.open("temp.csv")
p.readHeaderRow() p.readHeaderRow()
while p.readRow(): while p.readRow():
var zeros = repeat('0', p.currRow-2) let zeros = repeat('0', p.currRow-2)
doAssert p.rowEntry("One") == "1" & zeros doAssert p.rowEntry("One") == "1" & zeros
doAssert p.rowEntry("Two") == "2" & zeros doAssert p.rowEntry("Two") == "2" & zeros
doAssert p.rowEntry("Three") == "3" & zeros doAssert p.rowEntry("Three") == "3" & zeros