Skip to content

Commit 84f29ec

Browse files
davidanthoffdavidanthoff
committed
Format files using DocumentFormat
1 parent 1ac9031 commit 84f29ec

4 files changed

Lines changed: 80 additions & 84 deletions

File tree

‎docs/make.jl‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
using Documenter, ReadStat
22

3-
makedocs(
4-
modules = [ReadStat],
3+
makedocs(modules = [ReadStat],
54
sitename = "ReadStat.jl",
6-
analytics="UA-132838790-1",
5+
analytics = "UA-132838790-1",
76
pages = [
87
"Introduction" => "index.md"
9-
]
10-
)
8+
])
119

12-
deploydocs(
13-
repo = "github.com/queryverse/ReadStat.jl.git"
14-
)
10+
deploydocs(repo = "github.com/queryverse/ReadStat.jl.git")

‎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: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ module ReadStat
22

33
using ReadStat_jll
44

5-
##############################################################################
6-
##
7-
## Import
8-
##
9-
##############################################################################
5+
# #############################################################################
6+
# #
7+
# # Import
8+
# #
9+
# #############################################################################
1010

1111
using DataValues: DataValueVector
1212
using Dates
1313

1414
export ReadStatDataFrame, read_dta, read_sav, read_por, read_sas7bdat
1515

16-
##############################################################################
17-
##
18-
## Julia types that mirror C types
19-
##
20-
##############################################################################
16+
# #############################################################################
17+
# #
18+
# # Julia types that mirror C types
19+
# #
20+
# #############################################################################
2121

2222
const READSTAT_TYPE_STRING = Cint(0)
2323
const READSTAT_TYPE_CHAR = Cint(1)
@@ -33,11 +33,11 @@ const READSTAT_ERROR_MALLOC = Cint(3)
3333
const READSTAT_ERROR_USER_ABORT = Cint(4)
3434
const READSTAT_ERROR_PARSE = Cint(5)
3535

36-
##############################################################################
37-
##
38-
## Pure Julia types
39-
##
40-
##############################################################################
36+
# #############################################################################
37+
# #
38+
# # Pure Julia types
39+
# #
40+
# #############################################################################
4141

4242
struct ReadStatValue
4343
union::Int64
@@ -62,25 +62,25 @@ mutable struct ReadStatDataFrame
6262
measures::Vector{Cint}
6363
alignments::Vector{Cint}
6464
val_label_keys::Vector{String}
65-
val_label_dict::Dict{String, Dict{Any,String}}
65+
val_label_dict::Dict{String,Dict{Any,String}}
6666
rows::Int
6767
columns::Int
6868
filelabel::String
6969
timestamp::DateTime
7070
format::Clong
7171

72-
ReadStatDataFrame() =
72+
ReadStatDataFrame() =
7373
new(Any[], Symbol[], DataType[], String[], String[], Csize_t[], Cint[], Cint[],
74-
String[], Dict{String, Dict{Any,String}}(), 0, 0, "", Dates.unix2datetime(0), 0)
74+
String[], Dict{String,Dict{Any,String}}(), 0, 0, "", Dates.unix2datetime(0), 0)
7575
end
7676

7777
include("C_interface.jl")
7878

79-
##############################################################################
80-
##
81-
## Julia functions
82-
##
83-
##############################################################################
79+
# #############################################################################
80+
# #
81+
# # Julia functions
82+
# #
83+
# #############################################################################
8484

8585
function handle_info!(obs_count::Cint, var_count::Cint, ds_ptr::Ptr{ReadStatDataFrame})
8686
ds = unsafe_pointer_to_objref(ds_ptr)
@@ -136,7 +136,7 @@ get_measure(variable::Ptr{Nothing}) = readstat_variable_get_measure(variable)
136136

137137
get_alignment(variable::Ptr{Nothing}) = readstat_variable_get_measure(variable)
138138

139-
function handle_variable!(var_index::Cint, variable::Ptr{Nothing},
139+
function handle_variable!(var_index::Cint, variable::Ptr{Nothing},
140140
val_label::Cstring, ds_ptr::Ptr{ReadStatDataFrame})
141141
col = var_index + 1
142142
ds = unsafe_pointer_to_objref(ds_ptr)
@@ -151,7 +151,7 @@ function handle_variable!(var_index::Cint, variable::Ptr{Nothing},
151151
push!(ds.storagewidths, get_storagewidth(variable))
152152
push!(ds.measures, get_measure(variable))
153153
push!(ds.alignments, get_alignment(variable))
154-
154+
155155
return Cint(0)
156156
end
157157

@@ -214,7 +214,7 @@ function handle_value_label!(val_labels::Cstring, value::Value, label::Cstring,
214214
ds = unsafe_pointer_to_objref(ds_ptr)
215215
dict = get!(ds.val_label_dict, unsafe_string(val_labels), Dict{Any,String}())
216216
dict[as_native(value)] = unsafe_string(label)
217-
217+
218218
return Cint(0)
219219
end
220220

@@ -241,7 +241,7 @@ function Parser()
241241
ccall((:readstat_set_value_handler, libreadstat), Int, (Ptr{Nothing}, Ptr{Nothing}), parser, val_fxn)
242242
ccall((:readstat_set_value_label_handler, libreadstat), Int, (Ptr{Nothing}, Ptr{Nothing}), parser, label_fxn)
243243
return parser
244-
end
244+
end
245245

246246
function parse_data_file!(ds::ReadStatDataFrame, parser::Ptr{Nothing}, filename::AbstractString, filetype::Val)
247247
retval = readstat_parse(filename, filetype, parser, ds)
@@ -254,4 +254,4 @@ read_sav(filename::AbstractString) = read_data_file(filename, Val(:sav))
254254
read_por(filename::AbstractString) = read_data_file(filename, Val(:por))
255255
read_sas7bdat(filename::AbstractString) = read_data_file(filename, Val(:sas7bdat))
256256

257-
end #module ReadStat
257+
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)