Skip to content

Commit 10a0e00

Browse files
committed
Fix ambiguity
1 parent 6ddfdf1 commit 10a0e00

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/lazynameddimsarrays.jl

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,10 @@ function mul_lazy(a)
202202
end
203203
# Note that this is nested by default.
204204
mul_lazy(a1, a2) = lazy(Mul([a1, a2]))
205-
mul_lazy(c::Number, a) = error("Not implemented.")
206-
mul_lazy(a, c::Number) = error("Not implemented.")
207-
div_lazy(a, c::Number) = error("Not implemented.")
205+
mul_lazy(a1::Number, a2) = error("Not implemented.")
206+
mul_lazy(a1, a2::Number) = error("Not implemented.")
207+
mul_lazy(a1::Number, a2::Number) = a1 * a2
208+
div_lazy(a1, a2::Number) = error("Not implemented.")
208209

209210
# NamedDimsArrays.jl interface.
210211
function inds_lazy(a)
@@ -340,9 +341,9 @@ Base.:*(a::LazyNamedDimsArray) = mul_lazy(a)
340341
Base.:*(a1::LazyNamedDimsArray, a2::LazyNamedDimsArray) = mul_lazy(a1, a2)
341342
Base.:+(a1::LazyNamedDimsArray, a2::LazyNamedDimsArray) = add_lazy(a1, a2)
342343
Base.:-(a1::LazyNamedDimsArray, a2::LazyNamedDimsArray) = sub_lazy(a1, a2)
343-
Base.:*(c::Number, a::LazyNamedDimsArray) = mul_lazy(c, a)
344-
Base.:*(a::LazyNamedDimsArray, c::Number) = mul_lazy(a, c)
345-
Base.:/(a::LazyNamedDimsArray, c::Number) = div_lazy(a, c)
344+
Base.:*(a1::Number, a2::LazyNamedDimsArray) = mul_lazy(a1, a2)
345+
Base.:*(a1::LazyNamedDimsArray, a2::Number) = mul_lazy(a1, a2)
346+
Base.:/(a1::LazyNamedDimsArray, a2::Number) = div_lazy(a1, a2)
346347
Base.:-(a::LazyNamedDimsArray) = sub_lazy(a)
347348

348349
struct SymbolicArray{T, N, Name, Axes <: NTuple{N, AbstractUnitRange{<:Integer}}} <: AbstractArray{T, N}

0 commit comments

Comments
 (0)