Support empty literals

JuliaStats · Jul 2, 2014 · 695c21c · 695c21c
1 parent 140a526
commit 695c21c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/literals.jl b/src/literals.jl
@@ -1,7 +1,7 @@
 function fixargs(args::Vector{Any}, stub::Any)
     n = length(args)
     data = Array(Any, n)
-    na = Array(Any, n)
+    na = BitArray(n)
     for i in 1:n
         if args[i] == :NA
             data[i] = stub
@@ -47,12 +47,11 @@ end
 function parsevector(ex::Expr)
     if ex.head in (:ref, :typed_hcat, :typed_vcat)
         data, na = fixargs(ex.args[2:end], :(zero($(ex.args[1]))))
-        return Expr(ex.head, ex.args[1], data...),
-               Expr(ex.head == :typed_hcat ? :hcat : :vcat, na...)
+        return Expr(ex.head, ex.args[1], data...), ex.head == :typed_hcat ? na' : na
     else
         stub = findstub_vector(ex)
         data, na = fixargs(ex.args, stub)
-        return Expr(ex.head, data...), Expr(ex.head, na...)
+        return Expr(ex.head, data...), ex.head == :hcat ? na' : na
     end
 end
 

diff --git a/test/literals.jl b/test/literals.jl
@@ -2,6 +2,14 @@ module TestLiterals
     using Base.Test
     using DataArrays
 
+    dv = @data []
+    @test isequal(dv, DataArray([], Bool[]))
+    @test typeof(dv) == DataVector{None}
+
+    dv = @data Float64[]
+    @test isequal(dv, DataArray(Float64[], Bool[]))
+    @test typeof(dv) == DataVector{Float64}
+
     dv = @data [1, NA, 3]
     @test isequal(dv,
                   DataArray([1, 0, 3],