Skip to content

Correct type widening for slices (fixes #175) #176

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

Merged
merged 4 commits into from
Aug 23, 2022
Merged

Correct type widening for slices (fixes #175) #176

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c75bf3c
New version of setindex
phipsgabler Aug 16, 2022
46bd8e1
Add tests
phipsgabler Aug 16, 2022
e0d635d
Change array literal in test
phipsgabler Aug 16, 2022
434e7e0
Bump version
phipsgabler Aug 23, 2022
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
6 changes: 4 additions & 2 deletions src/setindex.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ Base.@propagate_inbounds function setindex(args...)
end

Base.@propagate_inbounds function setindex(xs::AbstractArray, v, I...)
T = promote_type(eltype(xs), typeof(v))
# we need to distinguish between scalar and sliced assignment
I_normalized = Base.to_indices(xs, I)
T = promote_type(eltype(xs), I_normalized isa Tuple{Vararg{Integer}} ? typeof(v) : eltype(v))
ys = similar(xs, T)
if eltype(xs) !== Union{}
copy!(ys, xs)
end
ys[I...] = v
ys[I_normalized...] = v
return ys
end

Expand Down
3 changes: 3 additions & 0 deletions test/test_setindex.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ end
@test @set(arr[1] = 10) == [10, 2, 3]
@test arr == [1,2,3]
@test Setfield.setindex(arr, 10.0, 1) ==ₜ Float64[10.0, 2.0, 3.0]
@test Setfield.setindex(ones(2, 2), zeros(2), 1, :) ==ₜ Float64[0.0 0.0; 1.0 1.0]
@test Setfield.setindex(ones(BigInt, 2, 2), zeros(Float32, 2), 1, :) ==ₜ BigFloat[0.0 0.0; 1.0 1.0]
@test Setfield.setindex(fill(ones(1), 2, 2), [im, im], :, 1) ==ₜ hcat([im, im], [[1.0], [1.0]])

d = Dict(:a => 1, :b => 2)
@test_throws MethodError Base.setindex(d, 10, :a)
Expand Down