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

further steps to get rid of deprecated endOfFile and readLine

Browse source
This commit is contained in:
Araq 2011-11-29 01:24:58 +01:00
commit e261a88d07
11 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pure/streams.nim
View file

@ -113,7 +113,7 @@ proc read[T](s: PStream, result: var T) =
proc readChar*(s: PStream): char =
## reads a char from the stream `s`. Raises `EIO` if an error occured.
## Returns '\0' as an EOF marker.
discard readData(s, addr(result), sizeof(result))
if readData(s, addr(result), sizeof(result)) != 1: result = '\0'
proc readBool*(s: PStream): bool =
## reads a bool from the stream `s`. Raises `EIO` if an error occured.
@ -238,7 +238,9 @@ type
proc fsClose(s: PStream) = close(PFileStream(s).f)
proc fsFlush(s: PStream) = flushFile(PFileStream(s).f)
{.push warning[Deprecated]: off.}
proc fsAtEnd(s: PStream): bool = return EndOfFile(PFileStream(s).f)
{.pop.}
proc fsSetPosition(s: PStream, pos: int) = setFilePos(PFileStream(s).f, pos)
proc fsGetPosition(s: PStream): int = return int(getFilePos(PFileStream(s).f))