Fixed zero-dimensional multiplication to match Base

Fixes #8 (second attempt)
JuliaArrays · Aug 3, 2016 · c7f2599 · c7f2599
1 parent b622673
commit c7f2599
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/matrix_multiply.jl b/src/matrix_multiply.jl
@@ -117,7 +117,7 @@ end
     if sA[2] != 0
         exprs = [reduce((ex1,ex2) -> :(+($ex1,$ex2)), [:(A[$(sub2ind(sA, k, j))]*b[$j]) for j = 1:sA[2]]) for k = 1:sA[1]]
     else
-        exprs = []
+        exprs = [zero(T) for k = 1:sA[1]]
     end
 
     return quote
@@ -253,7 +253,7 @@ end
     if sA[2] != 0
         exprs = [reduce((ex1,ex2) -> :(+($ex1,$ex2)), [:(A[$(sub2ind(sA, k1, j))]*B[$(sub2ind(sB, j, k2))]) for j = 1:sA[2]]) for k1 = 1:sA[1], k2 = 1:sB[2]]
     else
-        exprs = []
+        exprs = [zero(T) for k1 = 1:sA[1], k2 = 1:sB[2]]
     end
 
     return quote
@@ -382,7 +382,7 @@ end
     if sA[2] != 0
         exprs = [reduce((ex1,ex2) -> :(+($ex1,$ex2)), [:(A[$(sub2ind(sA, k, j))]*b[$j]) for j = 1:sA[2]]) for k = 1:sA[1]]
     else
-        exprs = []
+        exprs = [zero(T) for k = 1:sA[1]]
     end
 
     return quote
@@ -533,7 +533,7 @@ end
     if sA[2] != 0
         exprs = [:(C[$(sub2ind(s, k1, k2))] = $(reduce((ex1,ex2) -> :(+($ex1,$ex2)), [:(A[$(sub2ind(sA, k1, j))]*B[$(sub2ind(sB, j, k2))]) for j = 1:sA[2]]))) for k1 = 1:sA[1], k2 = 1:sB[2]]
     else
-        exprs = []
+        exprs = [:(C[$(sub2ind(s, k1, k2))] = $(zero(T))) for k1 = 1:sA[1], k2 = 1:sB[2]]
     end
 
     return quote