one more...

JuliaLang · Apr 30, 2021 · 38c5643 · 38c5643
1 parent 1019b3a
commit 38c5643
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/base/broadcast.jl b/base/broadcast.jl
@@ -1156,10 +1156,12 @@ broadcasted(::DefaultArrayStyle{1}, ::typeof(-), r1::AbstractRange, r2::Abstract
 broadcasted(::DefaultArrayStyle{1}, ::typeof(*), x::Number, r::AbstractRange) = StepRangeLen(x*first(r), x*step(r), length(r))
 broadcasted(::DefaultArrayStyle{1}, ::typeof(*), x::Number, r::StepRangeLen{T}) where {T} = StepRangeLen{typeof(x*T(r.ref))}(x*r.ref, x*r.step, length(r), r.offset)
 broadcasted(::DefaultArrayStyle{1}, ::typeof(*), x::Number, r::LinRange) = LinRange(x * r.start, x * r.stop, r.len)
+broadcasted(::DefaultArrayStyle{1}, ::typeof(*), x::AbstractFloat, r::AbstractRange{<:Integer}) = Base.range_start_step_length(x*first(r), x, length(r))
 # separate in case of noncommutative multiplication:
 broadcasted(::DefaultArrayStyle{1}, ::typeof(*), r::AbstractRange, x::Number) = StepRangeLen(first(r)*x, step(r)*x, length(r))
 broadcasted(::DefaultArrayStyle{1}, ::typeof(*), r::StepRangeLen{T}, x::Number) where {T} = StepRangeLen{typeof(T(r.ref)*x)}(r.ref*x, r.step*x, length(r), r.offset)
 broadcasted(::DefaultArrayStyle{1}, ::typeof(*), r::LinRange, x::Number) = LinRange(r.start * x, r.stop * x, r.len)
+broadcasted(::DefaultArrayStyle{1}, ::typeof(*), r::AbstractRange{<:Integer}, x::AbstractFloat) = Base.range_start_step_length(first(r)*x, x, length(r))
 
 broadcasted(::DefaultArrayStyle{1}, ::typeof(/), r::AbstractRange, x::Number) = range(first(r)/x, step=step(r)/x, length=length(r))
 broadcasted(::DefaultArrayStyle{1}, ::typeof(/), r::StepRangeLen{T}, x::Number) where {T} =

diff --git a/test/ranges.jl b/test/ranges.jl
@@ -1082,7 +1082,7 @@ end
  @test sprint(show, StepRange(1, 2, 5)) == "1:2:5"
 end
 
-@testset "Issue 11049 and related" begin
+@testset "Issue 11049, and related" begin
  @test promote(range(0f0, stop=1f0, length=3), range(0., stop=5., length=2)) ===
  (range(0., stop=1., length=3), range(0., stop=5., length=2))
  @test convert(LinRange{Float64}, range(0., stop=1., length=3)) === LinRange(0., 1., 3)
@@ -1144,6 +1144,7 @@ end
  @test [reverse(range(1.0, stop=27.0, length=1275));] ==
  reverse([range(1.0, stop=27.0, length=1275);])
 end
+
 @testset "PR 12200 and related" begin
  for _r in (1:2:100, 1:100, 1f0:2f0:100f0, 1.0:2.0:100.0,
  range(1, stop=100, length=10), range(1f0, stop=100f0, length=10))
@@ -1894,3 +1895,14 @@ end
  @test_throws BoundsError r[true:true:false]
  @test_throws BoundsError r[true:true:true]
 end
+
+@testset "PR 40320 nanosoldier" begin
+ @test 0.2 * (-2:2) == -0.4:0.2:0.4 # from tests of AbstractFFTs, needs Base.TwicePrecision
+ @test 0.2f0 * (-2:2) == Float32.(-0.4:0.2:0.4) # likewise needs Float64
+
+ @test 0.2 * (-2:1:2) == -0.4:0.2:0.4
+ @test 0.0 * (-2:2) == fill(0.0, 5)
+ @test 0.0 * (-2:1:2) == fill(0.0, 5)
+ @test 0 * (-2:2) == fill(0.0, 5)
+ @test 0 * (-2:1:2) == fill(0.0, 5)
+end