Merge pull request #286 from RafaelArutjunjan/patch-1

Allow for MArrays

Author: YingboMa

src/code.jl

@@ -464,6 +464,15 @@ end
     SArray{Tuple{dims...}, T}(elems...)
 end
 
+## MArray
+@inline function create_array(::Type{<:MArray}, ::Nothing, nd::Val, ::Val{dims}, elems...) where dims
+    MArray{Tuple{dims...}}(elems...)
+end
+
+@inline function create_array(::Type{<:MArray}, T, nd::Val, ::Val{dims}, elems...) where dims
+    MArray{Tuple{dims...}, T}(elems...)
+end
+
 ## LabelledArrays
 @inline function create_array(A::Type{<:SLArray}, T, nd::Val, d::Val{dims}, elems...) where {dims}
     a = create_array(SArray, T, nd, d, elems...)

test/code.jl

@@ -119,6 +119,12 @@ test_repr(a, b) = @test repr(Base.remove_linenums!(a)) == repr(Base.remove_linen
 
     @test eval(toexpr(Let([a ← 1, b ← 2, arr ← @SLVector((:a, :b))(@SVector[1,2])],
                           MakeArray([a+b,a/b], arr)))) === @SLVector((:a, :b))(@SVector [3, 1/2])
+    
+    R1 = eval(toexpr(Let([a ← 1, b ← 2, arr ← @MVector([1,2])],MakeArray([a,b,a+b,a/b], arr))))
+    @test R1 == (@MVector [1, 2, 3, 1/2]) && R1 isa MVector
+
+    R2 = eval(toexpr(Let([a ← 1, b ← 2, arr ← @MVector([1,2])],MakeArray([a b;a+b a/b], arr))))
+    @test R2 == (@MArray [1 2; 3 1/2]) && R2 isa MMatrix
 
     mksp = MakeSparseArray(sparse([1,2,31,32,2],
                                   [1,2,31,32,2],