Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make write/unsafe_write on iobuffer return signed like other io #20609

Merged
merged 3 commits into from
Feb 19, 2017
Merged

make write/unsafe_write on iobuffer return signed like other io #20609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6129ca5
make write/unsafe_write on iobuffer return signed like other io
KristofferC Feb 14, 2017
1f24115
correct doctest
KristofferC Feb 15, 2017
afbe310
add NEWS [ci skip]
KristofferC Feb 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ This section lists changes that do not have deprecation warnings.
[SpecialFunctions.jl package](https://github.com/JuliaMath/SpecialFunctions.jl)
([#20427]).

* `write` on an `IOBuffer` now returns a signed integer in order to be
consistent with other buffers ([#20609]).

Library improvements
--------------------

Expand Down
2 changes: 1 addition & 1 deletion base/base64.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ julia> io = IOBuffer();
julia> iob64_decode = Base64DecodePipe(io);

julia> write(io, "SGVsbG8h")
0x0000000000000008
8

julia> seekstart(io);

Expand Down
2 changes: 1 addition & 1 deletion base/iobuffer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ end
function unsafe_write(to::AbstractIOBuffer, p::Ptr{UInt8}, nb::UInt)
ensureroom(to, nb)
ptr = (to.append ? to.size+1 : to.ptr)
written = min(nb, length(to.data) - ptr + 1)
written = Int(min(nb, length(to.data) - ptr + 1))
towrite = written
d = to.data
while towrite > 0
Expand Down
14 changes: 7 additions & 7 deletions test/iobuffer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ioslength(io::IOBuffer) = (io.seekable ? io.size : nb_available(io))
let io = IOBuffer()
@test eof(io)
@test_throws EOFError read(io,UInt8)
@test write(io,"abc") == 3
@test write(io,"abc") === 3
@test isreadable(io)
@test iswritable(io)
@test isopen(io)
Expand All @@ -29,7 +29,7 @@ truncate(io, 0)
truncate(io, 10)
@test position(io) == 0
@test all(io.data .== 0)
@test write(io,Int16[1,2,3,4,5,6]) == 12
@test write(io,Int16[1,2,3,4,5,6]) === 12
seek(io, 2)
truncate(io, 10)
@test ioslength(io) == 10
Expand All @@ -39,8 +39,8 @@ truncate(io, 0)
@test write(io,"boston\ncambridge\n") > 0
@test String(take!(io)) == "boston\ncambridge\n"
@test String(take!(io)) == ""
@test write(io, Complex{Float64}(0)) == 16
@test write(io, Rational{Int64}(1//2)) == 16
@test write(io, Complex{Float64}(0)) === 16
@test write(io, Rational{Int64}(1//2)) === 16
close(io)
@test_throws ArgumentError write(io,UInt8[0])
@test_throws ArgumentError seek(io,0)
Expand Down Expand Up @@ -115,11 +115,11 @@ write(io,[1,2,3])
@test ioslength(io) == 75
@test length(io.data) == 75
skip(io,1)
@test write(io,UInt8(104)) == 1
@test write(io,UInt8(104)) === 1
skip(io,3)
@test write(io,b"apples") == 3
@test write(io,b"apples") === 3
skip(io,71)
@test write(io,'y') == 1
@test write(io,'y') === 1
@test readstring(io) == "happy"
@test eof(io)
write(io,zeros(UInt8,73))
Expand Down