@@ -1121,19 +1121,20 @@ end
11211121
11221122# # scalar-range broadcast operations ##
11231123# DefaultArrayStyle and \ are not available at the time of range.jl
1124- broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), r:: OrdinalRange ) = r
1125- broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), r:: StepRangeLen ) = r
1126- broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), r:: LinRange ) = r
1124+ broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), r:: AbstractRange ) = r
11271125
1128- broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), r:: OrdinalRange ) = range (- first (r), step= - step (r), length= length (r))
1126+ broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), r:: AbstractRange ) = range (- first (r), step= - step (r), length= length (r))
1127+ broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), r:: OrdinalRange ) = range (- first (r), - last (r), step= - step (r))
11291128broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), r:: StepRangeLen ) = StepRangeLen (- r. ref, - r. step, length (r), r. offset)
11301129broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), r:: LinRange ) = LinRange (- r. start, - r. stop, length (r))
11311130
1132- broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), x:: Real , r:: AbstractUnitRange ) = range (x + first (r), length= length (r))
1133- broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), r:: AbstractUnitRange , x:: Real ) = range (first (r) + x, length= length (r))
11341131# For #18336 we need to prevent promotion of the step type:
11351132broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), r:: AbstractRange , x:: Number ) = range (first (r) + x, step= step (r), length= length (r))
11361133broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), x:: Number , r:: AbstractRange ) = range (x + first (r), step= step (r), length= length (r))
1134+ broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), r:: OrdinalRange , x:: Real ) = range (first (r) + x, last (r) + x, step= step (r))
1135+ broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), x:: Real , r:: Real ) = range (x + first (r), x + last (r), step= step (r))
1136+ broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), r:: AbstractUnitRange , x:: Real ) = range (first (r) + x, last (r) + x)
1137+ broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), x:: Real , r:: AbstractUnitRange ) = range (x + first (r), x + last (r))
11371138broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), r:: StepRangeLen{T} , x:: Number ) where T =
11381139 StepRangeLen {typeof(T(r.ref)+x)} (r. ref + x, r. step, length (r), r. offset)
11391140broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), x:: Number , r:: StepRangeLen{T} ) where T =
@@ -1142,9 +1143,11 @@ broadcasted(::DefaultArrayStyle{1}, ::typeof(+), r::LinRange, x::Number) = LinRa
11421143broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), x:: Number , r:: LinRange ) = LinRange (x + r. start, x + r. stop, length (r))
11431144broadcasted (:: DefaultArrayStyle{1} , :: typeof (+ ), r1:: AbstractRange , r2:: AbstractRange ) = r1 + r2
11441145
1145- broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), r:: AbstractUnitRange , x:: Number ) = range (first (r)- x, length= length (r))
1146- broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), r:: AbstractRange , x:: Number ) = range (first (r)- x, step= step (r), length= length (r))
1147- broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), x:: Number , r:: AbstractRange ) = range (x- first (r), step= - step (r), length= length (r))
1146+ broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), r:: AbstractRange , x:: Number ) = range (first (r) - x, step= step (r), length= length (r))
1147+ broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), x:: Number , r:: AbstractRange ) = range (x - first (r), step= - step (r), length= length (r))
1148+ broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), r:: OrdinalRange , x:: Real ) = range (first (r) - x, last (r) - x, step= step (r))
1149+ broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), x:: Real , r:: OrdinalRange ) = range (x - first (r), x - last (r), step= - step (r))
1150+ broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), r:: AbstractUnitRange , x:: Real ) = range (first (r) - x, last (r) - x)
11481151broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), r:: StepRangeLen{T} , x:: Number ) where T =
11491152 StepRangeLen {typeof(T(r.ref)-x)} (r. ref - x, r. step, length (r), r. offset)
11501153broadcasted (:: DefaultArrayStyle{1} , :: typeof (- ), x:: Number , r:: StepRangeLen{T} ) where T =
0 commit comments