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

fixes #11049, wrong streams.readBool and streams.peekBool (#11284)

Browse source
This commit is contained in:
Miran 2019-05-20 19:39:38 +02:00 • committed by Andreas Rumpf
commit dc6a4b1d43
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/pure/streams.nim
View file

@ -412,7 +412,11 @@ proc peekChar*(s: Stream): char =
if peekData(s, addr(result), sizeof(result)) != 1: result = '\0' if peekData(s, addr(result), sizeof(result)) != 1: result = '\0'
proc readBool*(s: Stream): bool = proc readBool*(s: Stream): bool =
## Reads a bool from the stream `s`. Raises `IOError` if an error occurred. ## Reads a bool from the stream `s`.
##
## A bool is one byte long and it is `true` for every non-zero
## (`0000_0000`) value.
## Raises `IOError` if an error occurred.
runnableExamples: runnableExamples:
var strm = newStringStream() var strm = newStringStream()
## setup for reading data ## setup for reading data
@ -426,10 +430,16 @@ proc readBool*(s: Stream): bool =
doAssertRaises(IOError): discard strm.readBool() doAssertRaises(IOError): discard strm.readBool()
strm.close() strm.close()
read(s, result) var t: byte
read(s, t)
result = t != 0.byte
proc peekBool*(s: Stream): bool = proc peekBool*(s: Stream): bool =
## Peeks a bool from the stream `s`. Raises `IOError` if an error occurred. ## Peeks a bool from the stream `s`.
##
## A bool is one byte long and it is `true` for every non-zero
## (`0000_0000`) value.
## Raises `IOError` if an error occurred.
runnableExamples: runnableExamples:
var strm = newStringStream() var strm = newStringStream()
## setup for reading data ## setup for reading data
@ -445,7 +455,9 @@ proc peekBool*(s: Stream): bool =
doAssert strm.peekBool() == false doAssert strm.peekBool() == false
strm.close() strm.close()
peek(s, result) var t: byte
peek(s, t)
result = t != 0.byte
proc readInt8*(s: Stream): int8 = proc readInt8*(s: Stream): int8 =
## Reads an int8 from the stream `s`. Raises `IOError` if an error occurred. ## Reads an int8 from the stream `s`. Raises `IOError` if an error occurred.