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

Beg->data, Len->size to address Varriount's issue. I was unaware of

Browse source 
lower case members as a strict style convention.
This commit is contained in:
Charles Blake 2015-07-24 17:23:11 -04:00
commit 3f4255dd14
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/pure/memfiles.nim
View file

@ -246,8 +246,8 @@ proc close*(f: var MemFile) =
if error: raiseOSError(lastErr) if error: raiseOSError(lastErr)
type Record* {.unchecked.} = object type Record* {.unchecked.} = object
Beg*: cstring data*: cstring
Len*: int size*: int
iterator records*(mfile: MemFile, delim='\l', eat='\r'): Record {.inline.} = iterator records*(mfile: MemFile, delim='\l', eat='\r'): Record {.inline.} =
proc c_memchr(cstr: cstring, c: char, n: csize): cstring {. proc c_memchr(cstr: cstring, c: char, n: csize): cstring {.
@ -255,24 +255,24 @@ iterator records*(mfile: MemFile, delim='\l', eat='\r'): Record {.inline.} =
proc `-!`(p, q: cstring): int {.inline.} = return cast[int](p) -% cast[int](q) proc `-!`(p, q: cstring): int {.inline.} = return cast[int](p) -% cast[int](q)
var rec: Record var rec: Record
var End: cstring var End: cstring
rec.Beg = cast[cstring](mfile.mem) rec.data = cast[cstring](mfile.mem)
var remaining = mfile.size var remaining = mfile.size
while remaining > 0: while remaining > 0:
End = c_memchr(rec.Beg, delim, remaining) End = c_memchr(rec.data, delim, remaining)
if End == nil: # unterminated final record if End == nil: # unterminated final record
rec.Len = remaining rec.size = remaining
yield rec yield rec
break break
rec.Len = End -! rec.Beg # delimiter is not included rec.size = End -! rec.data # delimiter is not included
if eat != '\0' and rec.Len > 0 and rec.Beg[rec.Len - 1] == eat: if eat != '\0' and rec.size > 0 and rec.data[rec.size - 1] == eat:
dec(rec.Len) # exclude extra pre-delim ch dec(rec.size) # exclude extra pre-delim ch
yield rec yield rec
rec.Beg = cast[cstring](cast[int](End) +% 1) # skip delimiter rec.data = cast[cstring](cast[int](End) +% 1) # skip delimiter
remaining = mfile.size - (rec.Beg -! cast[cstring](mfile.mem)) remaining = mfile.size - (rec.data -! cast[cstring](mfile.mem))
proc toString*(rec: Record): string {.inline.} = proc toString*(rec: Record): string {.inline.} =
proc toNimStr(str: cstring, len: int): string {. importc: "toNimStr" .} proc toNimStr(str: cstring, len: int): string {. importc: "toNimStr" .}
result = toNimStr(cast[cstring](rec.Beg), rec.Len) result = toNimStr(cast[cstring](rec.data), rec.size)
result[result.len] = '\0' result[result.len] = '\0'
iterator lines*(mfile: MemFile): string {.inline.} = iterator lines*(mfile: MemFile): string {.inline.} =