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

renamed optional to discardable

Browse source
This commit is contained in:
Araq 2011-09-24 19:18:08 +02:00
commit 485c371942
15 changed files with 72 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/system/sysio.nim
View file

@ -56,8 +56,12 @@ proc rawReadLine(f: TFile, result: var string) =
add result, chr(int(c))
proc readLine(f: TFile): TaintedString =
result = TaintedString("")
rawReadLine(f, result)
when taintMode:
result = TaintedString""
rawReadLine(f, result.string)
else:
result = ""
rawReadLine(f, result)
proc write(f: TFile, i: int) =
when sizeof(int) == 8:
@ -86,9 +90,14 @@ proc readFile(filename: string): TaintedString =
try:
var len = getFileSize(f)
if len < high(int):
result = newString(int(len))
if readBuffer(f, addr(result[0]), int(len)) != len:
raiseEIO("error while reading from file")
when taintMode:
result = newString(int(len)).TaintedString
if readBuffer(f, addr(string(result)[0]), int(len)) != len:
raiseEIO("error while reading from file")
else:
result = newString(int(len))
if readBuffer(f, addr(result[0]), int(len)) != len:
raiseEIO("error while reading from file")
else:
raiseEIO("file too big to fit in memory")
finally: