readcsv can read true and false strings as Bool.

fixes JuliaLang#7463
ssfrr · Jun 30, 2014 · 06ce5df · 06ce5df
1 parent 355da39
commit 06ce5df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/base/datafmt.jl b/base/datafmt.jl
@@ -319,6 +319,7 @@ function dlm_fill(T::DataType, offarr::Vector{Vector{Int}}, dims::NTuple{2,Integ
 end
 
 
+colval{T<:Bool, S<:String}(sval::S, cells::Array{T,2}, row::Int, col::Int, tmp64::Array{Float64,1}) = ((sval=="true") && (cells[row,col]=true; return false); (sval=="false") && (cells[row,col]=false; return false); true)
 colval{T<:Number, S<:String}(sval::S, cells::Array{T,2}, row::Int, col::Int, tmp64::Array{Float64,1}) = (float64_isvalid(sval, tmp64) ? ((cells[row,col] = tmp64[1]); false) : true)
 colval{T<:String, S<:String}(sval::S, cells::Array{T,2}, row::Int, col::Int, tmp64::Array{Float64,1}) = ((cells[row,col] = sval); false)
 colval{S<:String}(sval::S, cells::Array{Any,2}, row::Int, col::Int, tmp64::Array{Float64,1}) = ((cells[row,col] = float64_isvalid(sval, tmp64) ? tmp64[1] : sval); false)

diff --git a/test/readdlm.jl b/test/readdlm.jl
@@ -68,6 +68,12 @@ end
 
 @test isequaldlm(readcsv(IOBuffer("\n1,2,3\n4,5,6\n\n\n")), reshape({"",1.0,4.0,"","","",2.0,5.0,"","","",3.0,6.0,"",""}, 5, 3), Any)
 
+let x = randbool(5, 10), io = IOBuffer()
+    writedlm(io, x)
+    seek(io, 0)
+    @test readdlm(io, Bool) == x
+end
+
 let x = [1,2,3], y = [4,5,6], io = IOBuffer()
     writedlm(io, zip(x,y), ",  ")
     seek(io, 0)