Skip to content

MAT_v4: Return variable name for zero-dimensional arrays #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
foreverallama wants to merge 2 commits into
base: master
Choose a base branch
from
Open

MAT_v4: Return variable name for zero-dimensional arrays #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b993992
Fix: Return varname for zero-dimensional vars (#240)
foreverallama May 9, 2026
6162b5e
Add test
foreverallama May 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/MAT_v4.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function checkv4(f::IO)
swap_bytes = false
return (true, swap_bytes)
else
seek(f, 0)
seek(f, 0)
M, O, P, T, mrows, ncols, imagf, namlen = MAT_v4.read_header(f, true)
if 0<=M<=4 && O == 0 && 0<=P<=5 && 0<=T<=2 && mrows>=0 && ncols>=0 && 0<=imagf<=1 && namlen>0
swap_bytes = true
Expand All @@ -114,7 +114,7 @@ function read_header(f::IO, swap_bytes::Bool)
ncols = read_bswap(f, swap_bytes, Int32)
imagf = read_bswap(f, swap_bytes, Int32)
namlen = read_bswap(f, swap_bytes, Int32)

M, O, P, T, mrows, ncols, imagf, namlen
end

Expand All @@ -129,7 +129,8 @@ function read_matrix(f::IO, swap_bytes::Bool)
# a = {[], [], []}
# then MATLAB does not save the empty cells as zero-byte matrices. To avoid
# surprises, we produce an empty array in both cases.
return ("", Matrix{Union{}}(undef, 0, 0))
name = strip(String(read_bswap(f, M==mBIG_ENDIAN, Vector{UInt8}(undef, namlen))), '\0')
return (name, Matrix{Union{}}(undef, 0, 0))
end
name = strip(String(read_bswap(f, M==mBIG_ENDIAN, Vector{UInt8}(undef, namlen))), '\0')
if T == tNUMERIC || T == tSPARSE
Expand Down Expand Up @@ -186,7 +187,7 @@ function getvarnames(matfile::Matlabv4File)
offset = position(matfile.ios)
M, O, P, T, mrows, ncols, imagf, namlen = read_header(matfile.ios, matfile.swap_bytes)
f = matfile.ios

name = strip(String(read_bswap(f, M==mBIG_ENDIAN, Vector{UInt8}(undef, namlen))), '\0')
varnames[name] = offset
imag_offset = 0
Expand Down Expand Up @@ -240,7 +241,7 @@ function write(parent::Matlabv4File, name::String, s)
P = p
end
end
if pTYPE[P] != eltype(s) && Complex{pTYPE[P]} != eltype(s) &&
if pTYPE[P] != eltype(s) && Complex{pTYPE[P]} != eltype(s) &&
!(s isa AbstractString && pTYPE[P] == Float64) &&
!(s isa Vector{String} && pTYPE[P] == Float64)
error("invalid value type when writing v4 file")
Expand Down Expand Up @@ -276,7 +277,7 @@ function write(parent::Matlabv4File, name::String, s)
end
write(parent.ios, Int32(mrows))
write(parent.ios, Int32(ncols))

imagf = 0
if eltype(s) <: Complex && T == tNUMERIC
imagf = 1
Expand Down
19 changes: 19 additions & 0 deletions test/readwrite4.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ function check(filename, result)
end
cd(dirname(@__FILE__))
for filename in readdir("v4")
endswith(filename, ".mat") || continue
#println("testing $filename")
d = matread("v4/$filename")
matwrite("v4/tmp.mat", d; version="v4")
Expand Down Expand Up @@ -73,3 +74,21 @@ let tmp = "v4/tmp.mat"
@test first(values(d)) == data
rm(tmp)
end

# Read zero-dimensional vars
let tmp = "v4/tmp.mat"
open(tmp, "w") do fid
name = "testnamelen";
L = ncodeunits(name)
write(fid, Int32(0));
write(fid, Int32(0));
write(fid, Int32(0));
write(fid, Int32(0));
write(fid, Int32(L));
# name is store without null-terminator '\0'
write(fid, name)
end
d = MAT.matread(tmp)
@test haskey(d, "testnamelen")
rm(tmp)
end
Loading