Skip to content

Commit a2dc0bb

Browse files
davidanthoffdavidanthoff
authored
Format files using DocumentFormat
1 parent ade3a8d commit a2dc0bb

File tree

4 files changed

+41
-41
lines changed

4 files changed

+41
-41
lines changed

‎docs/make.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using Documenter, TableTraitsUtils
22

33
makedocs(
4-
modules=[TableTraitsUtils],
5-
sitename="TableTraitsUtils.jl",
6-
analytics="UA-132838790-1",
7-
pages=[
4+
modules=[TableTraitsUtils],
5+
sitename="TableTraitsUtils.jl",
6+
analytics="UA-132838790-1",
7+
pages=[
88
"Introduction" => "index.md"
99
]
1010
)

‎src/collect1.jl

+6-6
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ end
7373
for col_idx in 1:length(fieldnames(T))
7474
if fieldtype(TYPES, col_idx) !== Nothing
7575
if fieldtype(TYPES, col_idx) == Array{Any,1} && fieldtype(T, col_idx) == DataValue{Any}
76-
ex = :( dest[$col_idx][i] = get(el[$col_idx], missing) )
76+
ex = :(dest[$col_idx][i] = get(el[$col_idx], missing))
7777
else
78-
ex = :( dest[$col_idx][i] = el[$col_idx] )
78+
ex = :(dest[$col_idx][i] = el[$col_idx])
7979
end
8080
push!(push_exprs.args, ex)
8181
end
@@ -89,9 +89,9 @@ end
8989
for col_idx in 1:length(fieldnames(T))
9090
if fieldtype(TYPES, col_idx) !== Nothing
9191
if fieldtype(TYPES, col_idx) == Array{Any,1} && fieldtype(T, col_idx) == DataValue{Any}
92-
ex = :( push!(dest[$col_idx], get(el[$col_idx], missing)) )
92+
ex = :(push!(dest[$col_idx], get(el[$col_idx], missing)))
9393
else
94-
ex = :( push!(dest[$col_idx], el[$col_idx]) )
94+
ex = :(push!(dest[$col_idx], el[$col_idx]))
9595
end
9696
push!(push_exprs.args, ex)
9797
end
@@ -119,7 +119,7 @@ function _collect_columns(itr, ::Union{Base.HasShape,Base.HasLength}, array_fact
119119
_collect_to_columns!(dest, itr, 2, y[2], sel_cols, errorhandling)
120120
end
121121

122-
function _collect_to_columns!(dest::T, itr, offs, st, sel_cols, errorhandling) where {T <: NamedTuple}
122+
function _collect_to_columns!(dest::T, itr, offs, st, sel_cols, errorhandling) where {T<:NamedTuple}
123123
i = offs
124124
y = iterate(itr, st)
125125
while y !== nothing
@@ -156,7 +156,7 @@ function _collect_columns(itr, ::Base.SizeUnknown, array_factory, sel_cols, erro
156156
_grow_to_columns!(dest, itr, y[2], sel_cols, errorhandling)
157157
end
158158

159-
function _grow_to_columns!(dest::T, itr, st, sel_cols, errorhandling) where {T <: NamedTuple}
159+
function _grow_to_columns!(dest::T, itr, st, sel_cols, errorhandling) where {T<:NamedTuple}
160160
y = iterate(itr, st)
161161
while y !== nothing
162162
_pushrow(dest, y[1])

‎test/runtests.jl

+28-28
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ include("test_source_without_length.jl")
1010
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable(nothing, errorhandling=:error)
1111
@test TableTraitsUtils.create_columns_from_iterabletable(nothing, errorhandling=:returnvalue) === nothing
1212

13-
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable([1,2,3])
14-
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable([1,2,3], errorhandling=:error)
15-
@test TableTraitsUtils.create_columns_from_iterabletable([1,2,3], errorhandling=:returnvalue) === nothing
13+
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable([1, 2, 3])
14+
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable([1, 2, 3], errorhandling=:error)
15+
@test TableTraitsUtils.create_columns_from_iterabletable([1, 2, 3], errorhandling=:returnvalue) === nothing
1616

17-
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable(Iterators.filter(i -> true, [1,2,3]))
18-
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable(Iterators.filter(i -> true, [1,2,3]), errorhandling=:error)
19-
@test TableTraitsUtils.create_columns_from_iterabletable(Iterators.filter(i -> true, [1,2,3]), errorhandling=:returnvalue) === nothing
17+
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable(Iterators.filter(i -> true, [1, 2, 3]))
18+
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable(Iterators.filter(i -> true, [1, 2, 3]), errorhandling=:error)
19+
@test TableTraitsUtils.create_columns_from_iterabletable(Iterators.filter(i -> true, [1, 2, 3]), errorhandling=:returnvalue) === nothing
2020

21-
@test create_columns_from_iterabletable(NamedTuple{(:a, :b),Tuple{Int,String}}[]) == (Any[Int[],String[]], [:a,:b])
22-
@test create_columns_from_iterabletable((i for i in NamedTuple{(:a, :b),Tuple{Int,String}}[])) == (Any[Int[],String[]], [:a,:b])
21+
@test create_columns_from_iterabletable(NamedTuple{(:a, :b),Tuple{Int,String}}[]) == (Any[Int[], String[]], [:a, :b])
22+
@test create_columns_from_iterabletable((i for i in NamedTuple{(:a, :b),Tuple{Int,String}}[])) == (Any[Int[], String[]], [:a, :b])
2323

2424
@test_throws ArgumentError create_columns_from_iterabletable(Int[])
2525
@test_throws ArgumentError create_columns_from_iterabletable(Int[], errorhandling=:error)
@@ -28,7 +28,7 @@ include("test_source_without_length.jl")
2828
@test_throws ArgumentError create_columns_from_iterabletable((i for i in Int[]), errorhandling=:error)
2929
@test create_columns_from_iterabletable((i for i in Int[]), errorhandling=:returnvalue) === nothing
3030

31-
columns = (Int[1,2,3], Float64[1.,2.,3.], String["John", "Sally", "Drew"])
31+
columns = (Int[1, 2, 3], Float64[1.0, 2.0, 3.0], String["John", "Sally", "Drew"])
3232
names = [:children, :age, :name]
3333

3434
it = TableTraitsUtils.create_tableiterator(columns, names)
@@ -37,7 +37,7 @@ include("test_source_without_length.jl")
3737

3838
columns3, names3 = TableTraitsUtils.create_columns_from_iterabletable(it, sel_cols=:all)
3939

40-
columns23, names23 = TableTraitsUtils.create_columns_from_iterabletable(it, sel_cols=[2,3])
40+
columns23, names23 = TableTraitsUtils.create_columns_from_iterabletable(it, sel_cols=[2, 3])
4141

4242
@test columns[1] == columns2[1] == columns3[1]
4343
@test columns[2] == columns2[2] == columns3[2]
@@ -50,48 +50,48 @@ include("test_source_without_length.jl")
5050
@test names == names2 == names3
5151
@test names[2:3] == names23
5252

53-
@test isequal(create_columns_from_iterabletable([(a = DataValue{Any}(), b = DataValue{Int}())], na_representation=:missing),
54-
([Any[missing], Union{Missing,Int}[missing]], [:a, :b])
55-
)
53+
@test isequal(create_columns_from_iterabletable([(a=DataValue{Any}(), b=DataValue{Int}())], na_representation=:missing),
54+
([Any[missing], Union{Missing,Int}[missing]], [:a, :b])
55+
)
5656

57-
@test create_columns_from_iterabletable([(a = DataValue{Any}(), b = DataValue{Int}())], na_representation=:datavalue) ==
58-
([DataValue{Any}[NA], DataValue{Int}[NA]], [:a, :b])
57+
@test create_columns_from_iterabletable([(a=DataValue{Any}(), b=DataValue{Int}())], na_representation=:datavalue) ==
58+
([DataValue{Any}[NA], DataValue{Int}[NA]], [:a, :b])
5959

6060
it2 = TestSourceWithoutLength()
6161

6262
columns4, names4 = TableTraitsUtils.create_columns_from_iterabletable(it2)
63-
@test columns4[1] == [1,2]
64-
@test columns4[2] == [1.,2.]
63+
@test columns4[1] == [1, 2]
64+
@test columns4[2] == [1.0, 2.0]
6565
@test names4 == [:a, :b]
6666

6767
columns5, names5 = TableTraitsUtils.create_columns_from_iterabletable(it2, sel_cols=:all)
68-
@test columns5[1] == [1,2]
69-
@test columns5[2] == [1.,2.]
68+
@test columns5[1] == [1, 2]
69+
@test columns5[2] == [1.0, 2.0]
7070
@test names5 == [:a, :b]
7171

7272
columns6, names6 = TableTraitsUtils.create_columns_from_iterabletable(it2, sel_cols=[2])
73-
@test columns6[1] == [1.,2.]
73+
@test columns6[1] == [1.0, 2.0]
7474
@test names6 == [:b]
7575

76-
columns_with_nulls = (Union{Int,Missing}[3, 2, missing], Float64[2.,5.,9.], Union{String,Missing}["a", missing, "b"])
76+
columns_with_nulls = (Union{Int,Missing}[3, 2, missing], Float64[2.0, 5.0, 9.0], Union{String,Missing}["a", missing, "b"])
7777
it3 = TableTraitsUtils.create_tableiterator(columns_with_nulls, names)
7878

7979
columns7, names7 = TableTraitsUtils.create_columns_from_iterabletable(it3)
8080

81-
@test columns7[1] == [3,2,NA]
82-
@test columns7[2] == [2.,5.,9.]
83-
@test columns7[3] == ["a",NA,"b"]
81+
@test columns7[1] == [3, 2, NA]
82+
@test columns7[2] == [2.0, 5.0, 9.0]
83+
@test columns7[3] == ["a", NA, "b"]
8484
@test length(columns7) == 3
8585
@test names7 == names
8686

87-
columns_with_DV = ([3, 2, NA], [2.,5.,9.], ["a", NA, "b"])
87+
columns_with_DV = ([3, 2, NA], [2.0, 5.0, 9.0], ["a", NA, "b"])
8888
it4 = TableTraitsUtils.create_tableiterator(columns_with_DV, names)
8989

9090
columns8, names8 = TableTraitsUtils.create_columns_from_iterabletable(it4)
9191

92-
@test columns8[1] == [3,2,NA]
93-
@test columns8[2] == [2.,5.,9.]
94-
@test columns8[3] == ["a",NA,"b"]
92+
@test columns8[1] == [3, 2, NA]
93+
@test columns8[2] == [2.0, 5.0, 9.0]
94+
@test columns8[3] == ["a", NA, "b"]
9595
@test length(columns8) == 3
9696
@test names8 == names
9797

‎test/test_source_without_length.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ function Base.eltype(iter::TestSourceWithoutLength)
55
return NamedTuple{(:a, :b),Tuple{Int,Float64}}
66
end
77

8-
Base.IteratorSize(::Type{T}) where {T <: TestSourceWithoutLength} = Base.SizeUnknown()
8+
Base.IteratorSize(::Type{T}) where {T<:TestSourceWithoutLength} = Base.SizeUnknown()
99

1010
function Base.iterate(iter::TestSourceWithoutLength, state=1)
1111
if state == 1
12-
return (a = 1, b = 1.), 2
12+
return (a=1, b=1.0), 2
1313
elseif state == 2
14-
return (a = 2, b = 2.), 3
14+
return (a=2, b=2.0), 3
1515
else
1616
return nothing
1717
end

0 commit comments

Comments
 (0)