Convert fill!(AbstractArray, x) to Cartesian

JuliaLang · Jan 13, 2014 · da8f1dd · ivarne · Jan 14, 2014 · timholy
1 parent c6bb39c
commit da8f1dd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/base/abstractarray.jl b/base/abstractarray.jl
@@ -162,13 +162,6 @@ function squeeze(A::AbstractArray, dims)
     reshape(A, d)
 end
 
-function fill!(A::AbstractArray, x)
-    for i = 1:length(A)
-        A[i] = x
-    end
-    return A
-end
-
 function copy!(dest::AbstractArray, src)
     i = 1
     for x in src

diff --git a/base/multidimensional.jl b/base/multidimensional.jl
@@ -118,6 +118,14 @@ eval(ngenerate(:N, :(setindex!{T}(s::SubArray{T,N}, v, ind::Integer)), gen_setin
 
 
 ### from abstractarray.jl
+
+@ngenerate N function fill!{T,N}(A::AbstractArray{T,N}, x)
+    @nloops N i A begin
+        @inbounds (@nref N A i) = x
+    end
+    return A
+end
+
 ## code generator for specializing on the number of dimensions ##
 
 #otherbodies are the bodies that reside between loops, if its a 2 dimension array.

diff --git a/test/arrayops.jl b/test/arrayops.jl
@@ -715,6 +715,12 @@ end
 
 # fill
 @test fill!(Array(Float64,1),-0.0)[1] === -0.0
+A = ones(3,3)
+S = sub(A, 2, 1:3)
+fill!(S, 2)
+S = sub(A, 1:2, 3)
+fill!(S, 3)
+@test A == [1 1 3; 2 2 3; 1 1 1]
 
 # splice!
 for idx in {1, 2, 5, 9, 10, 1:0, 2:1, 1:1, 2:2, 1:2, 2:4, 9:8, 10:9, 9:9, 10:10,