Skip to content

Commit 35a0c4a

Browse files
Format files using DocumentFormat
1 parent a9fa8e2 commit 35a0c4a

File tree

4 files changed

+64
-64
lines changed

4 files changed

+64
-64
lines changed

docs/make.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ using Documenter, ReadStat
33
makedocs(
44
modules = [ReadStat],
55
sitename = "ReadStat.jl",
6-
analytics="UA-132838790-1",
6+
analytics = "UA-132838790-1",
77
pages = [
88
"Introduction" => "index.md"
99
]

src/C_interface.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function readstat_get_var_count(metadata::Ptr{Nothing})
2020
end
2121

2222
function readstat_value_is_missing(value::ReadStatValue, variable::Ptr{Nothing})
23-
return ccall((:readstat_value_is_missing, libreadstat), Bool, (ReadStatValue,Ptr{Nothing}), value, variable)
23+
return ccall((:readstat_value_is_missing, libreadstat), Bool, (ReadStatValue, Ptr{Nothing}), value, variable)
2424
end
2525

2626
function readstat_variable_get_index(variable::Ptr{Nothing})

src/ReadStat.jl

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ mutable struct ReadStatDataFrame
6363
measures::Vector{Cint}
6464
alignments::Vector{Cint}
6565
val_label_keys::Vector{String}
66-
val_label_dict::Dict{String, Dict{Any,String}}
66+
val_label_dict::Dict{String,Dict{Any,String}}
6767
rows::Int
6868
columns::Int
6969
filelabel::String
@@ -72,9 +72,9 @@ mutable struct ReadStatDataFrame
7272
types_as_int::Vector{Cint}
7373
hasmissings::Vector{Bool}
7474

75-
ReadStatDataFrame() =
75+
ReadStatDataFrame() =
7676
new(Any[], Symbol[], DataType[], String[], String[], Csize_t[], Cint[], Cint[],
77-
String[], Dict{String, Dict{Any,String}}(), 0, 0, "", Dates.unix2datetime(0), 0, Cint[], Bool[])
77+
String[], Dict{String,Dict{Any,String}}(), 0, 0, "", Dates.unix2datetime(0), 0, Cint[], Bool[])
7878
end
7979

8080
include("C_interface.jl")
@@ -139,7 +139,7 @@ get_measure(variable::Ptr{Nothing}) = readstat_variable_get_measure(variable)
139139

140140
get_alignment(variable::Ptr{Nothing}) = readstat_variable_get_measure(variable)
141141

142-
function handle_variable!(var_index::Cint, variable::Ptr{Nothing},
142+
function handle_variable!(var_index::Cint, variable::Ptr{Nothing},
143143
val_label::Cstring, ds_ptr::Ptr{ReadStatDataFrame})
144144
col = var_index + 1
145145
ds = unsafe_pointer_to_objref(ds_ptr)::ReadStatDataFrame
@@ -158,7 +158,7 @@ function handle_variable!(var_index::Cint, variable::Ptr{Nothing},
158158
push!(ds.storagewidths, get_storagewidth(variable))
159159
push!(ds.measures, get_measure(variable))
160160
push!(ds.alignments, get_alignment(variable))
161-
161+
162162
return Cint(0)
163163
end
164164

@@ -191,55 +191,55 @@ function handle_value!(obs_index::Cint, variable::Ptr{Nothing},
191191
readstat_value_is_missing(value, C_NULL)
192192
end
193193

194-
if type_as_int==READSTAT_TYPE_DOUBLE
194+
if type_as_int == READSTAT_TYPE_DOUBLE
195195
col_float64 = data[var_index]::DataValueVector{Float64}
196196

197197
if ismissing
198198
DataValues.unsafe_setindex_isna!(col_float64, true, obs_index + 1)
199199
else
200200
readfield!(col_float64, obs_index + 1, value)
201201
end
202-
elseif type_as_int==READSTAT_TYPE_INT32
202+
elseif type_as_int == READSTAT_TYPE_INT32
203203
col_int32 = data[var_index]::DataValueVector{Int32}
204204

205205
if ismissing
206206
DataValues.unsafe_setindex_isna!(col_int32, true, obs_index + 1)
207207
else
208208
readfield!(col_int32, obs_index + 1, value)
209209
end
210-
elseif type_as_int==READSTAT_TYPE_STRING
210+
elseif type_as_int == READSTAT_TYPE_STRING
211211
col_string = data[var_index]::DataValueVector{String}
212212

213213
if ismissing
214214
DataValues.unsafe_setindex_isna!(col_string, true, obs_index + 1)
215215
else
216216
readfield!(col_string, obs_index + 1, value)
217217
end
218-
elseif type_as_int==READSTAT_TYPE_CHAR
218+
elseif type_as_int == READSTAT_TYPE_CHAR
219219
col_int8 = data[var_index]::DataValueVector{Int8}
220220

221221
if ismissing
222222
DataValues.unsafe_setindex_isna!(col_int8, true, obs_index + 1)
223223
else
224224
readfield!(col_int8, obs_index + 1, value)
225225
end
226-
elseif type_as_int==READSTAT_TYPE_INT16
226+
elseif type_as_int == READSTAT_TYPE_INT16
227227
col_int16 = data[var_index]::DataValueVector{Int16}
228228

229229
if ismissing
230230
DataValues.unsafe_setindex_isna!(col_int16, true, obs_index + 1)
231231
else
232232
readfield!(col_int16, obs_index + 1, value)
233233
end
234-
elseif type_as_int==READSTAT_TYPE_FLOAT
234+
elseif type_as_int == READSTAT_TYPE_FLOAT
235235
col_float32 = data[var_index]::DataValueVector{Float32}
236236

237237
if ismissing
238238
DataValues.unsafe_setindex_isna!(col_float32, true, obs_index + 1)
239239
else
240240
readfield!(col_float32, obs_index + 1, value)
241241
end
242-
else
242+
else
243243
col_untyped = data[var_index]
244244

245245
if ismissing
@@ -284,7 +284,7 @@ function handle_value_label!(val_labels::Cstring, value::Value, label::Cstring,
284284
ds = unsafe_pointer_to_objref(ds_ptr)
285285
dict = get!(ds.val_label_dict, unsafe_string(val_labels), Dict{Any,String}())
286286
dict[as_native(value)] = unsafe_string(label)
287-
287+
288288
return Cint(0)
289289
end
290290

@@ -311,7 +311,7 @@ function Parser()
311311
ccall((:readstat_set_value_handler, libreadstat), Int, (Ptr{Nothing}, Ptr{Nothing}), parser, val_fxn)
312312
ccall((:readstat_set_value_label_handler, libreadstat), Int, (Ptr{Nothing}, Ptr{Nothing}), parser, label_fxn)
313313
return parser
314-
end
314+
end
315315

316316
function parse_data_file!(ds::ReadStatDataFrame, parser::Ptr{Nothing}, filename::AbstractString, filetype::Val)
317317
retval = readstat_parse(filename, filetype, parser, ds)
@@ -324,4 +324,4 @@ read_sav(filename::AbstractString) = read_data_file(filename, Val(:sav))
324324
read_por(filename::AbstractString) = read_data_file(filename, Val(:por))
325325
read_sas7bdat(filename::AbstractString) = read_data_file(filename, Val(:sas7bdat))
326326

327-
end #module ReadStat
327+
end # module ReadStat

test/runtests.jl

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,52 @@ using Test
44

55
@testset "ReadStat" begin
66

7-
@testset "DTA files" begin
8-
9-
dtafile = joinpath(dirname(@__FILE__), "types.dta")
10-
rsdf = read_dta(dtafile)
11-
data = rsdf.data
12-
13-
@test length(data) == 6
14-
@test rsdf.headers == [:vfloat, :vdouble, :vlong, :vint, :vbyte, :vstring]
15-
@test data[1] == DataValueArray{Float32}([3.14, 7., NA])
16-
@test data[2] == DataValueArray{Float64}([3.14, 7., NA])
17-
@test data[3] == DataValueArray{Int32}([2, 7, NA])
18-
@test data[4] == DataValueArray{Int16}([2, 7, NA])
19-
@test data[5] == DataValueArray{Int8}([2, 7., NA])
20-
@test data[6] == DataValueArray{String}(["2", "7", ""])
21-
end
22-
23-
@testset "SAV files" begin
24-
25-
dtafile = joinpath(dirname(@__FILE__), "types.sav")
26-
rsdf = read_sav(dtafile)
27-
data = rsdf.data
28-
29-
@test length(data) == 6
30-
@test rsdf.headers == [:vfloat, :vdouble, :vlong, :vint, :vbyte, :vstring]
31-
@test data[1] == DataValueArray{Float32}([3.14, 7., NA])
32-
@test data[2] == DataValueArray{Float64}([3.14, 7., NA])
33-
@test data[3] == DataValueArray{Int32}([2, 7, NA])
34-
@test data[4] == DataValueArray{Int16}([2, 7, NA])
35-
@test data[5] == DataValueArray{Int8}([2, 7., NA])
36-
@test data[6] == DataValueArray{String}(["2", "7", ""])
37-
end
38-
39-
@testset "SAS7BDAT files" begin
40-
41-
dtafile = joinpath(dirname(@__FILE__), "types.sas7bdat")
42-
rsdf = read_sas7bdat(dtafile)
43-
data = rsdf.data
44-
45-
@test length(data) == 6
46-
@test rsdf.headers == [:vfloat, :vdouble, :vlong, :vint, :vbyte, :vstring]
47-
@test data[1] == DataValueArray{Float32}([3.14, 7., NA])
48-
@test data[2] == DataValueArray{Float64}([3.14, 7., NA])
49-
@test data[3] == DataValueArray{Int32}([2, 7, NA])
50-
@test data[4] == DataValueArray{Int16}([2, 7, NA])
51-
@test data[5] == DataValueArray{Int8}([2, 7., NA])
52-
@test data[6] == DataValueArray{String}(["2", "7", ""])
53-
end
7+
@testset "DTA files" begin
8+
9+
dtafile = joinpath(dirname(@__FILE__), "types.dta")
10+
rsdf = read_dta(dtafile)
11+
data = rsdf.data
12+
13+
@test length(data) == 6
14+
@test rsdf.headers == [:vfloat, :vdouble, :vlong, :vint, :vbyte, :vstring]
15+
@test data[1] == DataValueArray{Float32}([3.14, 7., NA])
16+
@test data[2] == DataValueArray{Float64}([3.14, 7., NA])
17+
@test data[3] == DataValueArray{Int32}([2, 7, NA])
18+
@test data[4] == DataValueArray{Int16}([2, 7, NA])
19+
@test data[5] == DataValueArray{Int8}([2, 7., NA])
20+
@test data[6] == DataValueArray{String}(["2", "7", ""])
21+
end
22+
23+
@testset "SAV files" begin
24+
25+
dtafile = joinpath(dirname(@__FILE__), "types.sav")
26+
rsdf = read_sav(dtafile)
27+
data = rsdf.data
28+
29+
@test length(data) == 6
30+
@test rsdf.headers == [:vfloat, :vdouble, :vlong, :vint, :vbyte, :vstring]
31+
@test data[1] == DataValueArray{Float32}([3.14, 7., NA])
32+
@test data[2] == DataValueArray{Float64}([3.14, 7., NA])
33+
@test data[3] == DataValueArray{Int32}([2, 7, NA])
34+
@test data[4] == DataValueArray{Int16}([2, 7, NA])
35+
@test data[5] == DataValueArray{Int8}([2, 7., NA])
36+
@test data[6] == DataValueArray{String}(["2", "7", ""])
37+
end
38+
39+
@testset "SAS7BDAT files" begin
40+
41+
dtafile = joinpath(dirname(@__FILE__), "types.sas7bdat")
42+
rsdf = read_sas7bdat(dtafile)
43+
data = rsdf.data
44+
45+
@test length(data) == 6
46+
@test rsdf.headers == [:vfloat, :vdouble, :vlong, :vint, :vbyte, :vstring]
47+
@test data[1] == DataValueArray{Float32}([3.14, 7., NA])
48+
@test data[2] == DataValueArray{Float64}([3.14, 7., NA])
49+
@test data[3] == DataValueArray{Int32}([2, 7, NA])
50+
@test data[4] == DataValueArray{Int16}([2, 7, NA])
51+
@test data[5] == DataValueArray{Int8}([2, 7., NA])
52+
@test data[6] == DataValueArray{String}(["2", "7", ""])
53+
end
5454

5555
end

0 commit comments

Comments
 (0)