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

fixes #4656; ropes.nim checks properly for file equality

Browse source
This commit is contained in:
Andreas Rumpf 2016-08-26 18:00:12 +02:00
commit ff3cf001a3
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/ropes.nim
View file

@ -310,15 +310,19 @@ proc equalsFile*(r: Rope, f: File): bool =
buf: array[bufSize, char] buf: array[bufSize, char]
bpos = buf.len bpos = buf.len
blen = buf.len blen = buf.len
btotal = 0
rtotal = 0
for s in leaves(r): for s in leaves(r):
var spos = 0 var spos = 0
let slen = s.len let slen = s.len
rtotal += slen
while spos < slen: while spos < slen:
if bpos == blen: if bpos == blen:
# Read more data # Read more data
bpos = 0 bpos = 0
blen = readBuffer(f, addr(buf[0]), buf.len) blen = readBuffer(f, addr(buf[0]), buf.len)
btotal += blen
if blen == 0: # no more data in file if blen == 0: # no more data in file
result = false result = false
return return
@ -330,7 +334,8 @@ proc equalsFile*(r: Rope, f: File): bool =
spos += n spos += n
bpos += n bpos += n
result = readBuffer(f, addr(buf[0]), 1) == 0 # check that we've read all result = readBuffer(f, addr(buf[0]), 1) == 0 and
btotal == rtotal # check that we've read all
proc equalsFile*(r: Rope, filename: string): bool = proc equalsFile*(r: Rope, filename: string): bool =
## returns true if the contents of the file `f` equal `r`. If `f` does not ## returns true if the contents of the file `f` equal `r`. If `f` does not