Update dep method for 0.6 and change Array constructor (#100)

* Update dep method for 0.6 and change Array constructor

* Explicit about Array size

Author: musm

src/engine.jl

@@ -21,7 +21,7 @@ type MSession
         # hide the MATLAB command window on Windows
         is_windows() && ccall(eng_set_visible[], Cint, (Ptr{Void}, Cint), ep, 0)
 
-        buf = Array(UInt8, bufsize)
+        buf = Vector{UInt8}(bufsize)
         if bufsize > 0
             bufptr = pointer(buf)
             ccall(eng_output_buffer[], Cint, (Ptr{Void}, Ptr{UInt8}, Cint),
@@ -163,7 +163,7 @@ function _mput_multi(vs::Symbol...)
         v = vs[1]
         :( MATLAB.put_variable($(Meta.quot(v)), $(v)) )
     else
-        stmts = Array(Expr, nv)
+        stmts = Vector{Expr}(nv)
         for i = 1 : nv
             v = vs[i]
             stmts[i] = :( MATLAB.put_variable($(Meta.quot(v)), $(v)) )
@@ -196,7 +196,7 @@ function _mget_multi(vs::Union{Symbol, Expr}...)
     if nv == 1
         make_getvar_statement(vs[1])
     else
-        stmts = Array(Expr, nv)
+        stmts = Vector{Expr}(nv)
         for i = 1:nv
             stmts[i] = make_getvar_statement(vs[i])
         end
@@ -227,8 +227,8 @@ function mxcall(session::MSession, mfun::Symbol, nout::Integer, in_args...)
 
     # generate temporary variable names
 
-    in_arg_names = Array(String, nin)
-    out_arg_names = Array(String, nout)
+    in_arg_names = Vector{String}(nin)
+    out_arg_names = Vector{String}(nout)
 
     for i = 1:nin
         in_arg_names[i] = _gen_marg_name(mfun, "in", i)
@@ -276,8 +276,8 @@ function mxcall(session::MSession, mfun::Symbol, nout::Integer, in_args...)
     ret = if nout == 1
         jvalue(get_mvariable(session, Symbol(out_arg_names[1])))
     elseif nout >= 2
-        results = Array(Any, nout)
-        for i = 1 : nout
+        results = Vector{Any}(nout)
+        for i = 1:nout
             results[i] = jvalue(get_mvariable(session, Symbol(out_arg_names[i])))
         end
         tuple(results...)

src/mxarray.jl

@@ -183,7 +183,7 @@ function size(mx::MxArray)
     nd = ndims(mx)
     pdims::Ptr{mwSize} = @mxget_attr(mx_get_dims[], Ptr{mwSize}, mx)
     _dims = unsafe_wrap(Array, pdims, (nd,))
-    dims = Array(Int, nd)
+    dims = Vector{Int}(nd)
     for i = 1:nd
         dims[i] = convert(Int, _dims[i])
     end
@@ -216,7 +216,7 @@ end
 
 function _dims_to_mwSize(dims::Tuple{Vararg{Int}})
     ndim = length(dims)
-    _dims = Array(mwSize, ndim)
+    _dims = Vector{mwSize}(ndim)
     for i = 1:ndim
         _dims[i] = convert(mwSize, dims[i])
     end
@@ -227,7 +227,6 @@ function mxarray{T<:MxNum}(ty::Type{T}, dims::Tuple{Vararg{Int}})
     pm = ccall(mx_create_numeric_array[], Ptr{Void},
         (mwSize, Ptr{mwSize}, mxClassID, mxComplexity),
         length(dims), _dims_to_mwSize(dims), mxclassid(ty), mxcomplexflag(ty))
-
     MxArray(pm)
 end
 mxarray{T<:MxNum}(ty::Type{T}, dims::Int...) = mxarray(ty, dims)
@@ -382,7 +381,7 @@ mxarray(a::Array) = mxcellarray(a)
 
 function _fieldname_array(fieldnames::String...)
     n = length(fieldnames)
-    a = Array(Ptr{UInt8}, n)
+    a = Vector{Ptr{UInt8}}(n)
     for i = 1:n
         a[i] = unsafe_convert(Ptr{UInt8}, fieldnames[i])
     end
@@ -437,7 +436,7 @@ typealias Pairs Union{Pair,NTuple{2}}
 
 function mxstruct(pairs::Pairs...)
     nf = length(pairs)
-    fieldnames = Array(String, nf)
+    fieldnames = Vector{String}(nf)
     for i = 1:nf
         fn = pairs[i][1]
         fieldnames[i] = string(fn)
@@ -494,17 +493,17 @@ function _jarrayx(fun::String, mx::MxArray, siz::Tuple)
         if is_complex(mx)
             rdat = unsafe_wrap(Array, real_ptr(mx), siz)
             idat = unsafe_wrap(Array, imag_ptr(mx), siz)
-            a = complex(rdat, idat)
+            a = complex.(rdat, idat)
         else
-            a = Array(T, siz)
+            a = Array{T}(siz)
             if !isempty(a)
                 ccall(:memcpy, Ptr{Void}, (Ptr{Void}, Ptr{Void}, UInt), a, data_ptr(mx), length(a)*sizeof(T))
             end
         end
         return a
         #unsafe_wrap(Array, data_ptr(mx), siz)
     elseif is_cell(mx)
-        a = Array(Any, siz)
+        a = Array{Any}(siz)
         for i = 1:length(a)
             a[i] = jvalue(get_cell(mx, i))
         end
@@ -546,8 +545,8 @@ function _jsparse{T<:MxRealNum}(ty::Type{T}, mx::MxArray)
     jc_a::Vector{mwIndex} = unsafe_wrap(Array, jc_ptr, (n+1,))
     nnz = jc_a[n+1]
 
-    ir = Array(Int, nnz)
-    jc = Array(Int, n+1)
+    ir = Vector{Int}(nnz)
+    jc = Vector{Int}(n+1)
 
     ir_x = unsafe_wrap(Array, ir_ptr, (nnz,))
     for i = 1:nnz
@@ -582,8 +581,8 @@ function Dict(mx::MxArray)
         throw(ArgumentError("Dict(mx::MxArray) only applies to a single struct"))
     end
     nf = mxnfields(mx)
-    fnames = Array(String, nf)
-    fvals = Array(Any, nf)
+    fnames = Vector{String}(nf)
+    fvals = Vector{Any}(nf)
     for i = 1:nf
         fnames[i] = get_fieldname(mx, i)
         pv = ccall(mx_get_field_bynum[], Ptr{Void}, (Ptr{Void}, mwIndex, Cint), mx, 0, i-1)

test/mxarray.jl

@@ -342,7 +342,7 @@ a = rand(3, 4, 5)
 x = mxarray(a)
 y = jvalue(x)
 delete(x)
-@test isa(y, Array{Float64, 3})
+@test isa(y, Array{Float64,3})
 @test isequal(y, a)
 
 a = "MATLAB"