From 208793014be821c22e61aff18e218e7b130ea942 Mon Sep 17 00:00:00 2001
From: JeremyBejanin <jbejanin@uwaterloo.ca>
Date: Mon, 2 Dec 2019 18:23:55 -0500
Subject: [PATCH 1/3] Avoid error with MATLAB classes that we can't handle

---
 src/MAT_HDF5.jl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/MAT_HDF5.jl b/src/MAT_HDF5.jl
index 3001e70..1c35575 100644
--- a/src/MAT_HDF5.jl
+++ b/src/MAT_HDF5.jl
@@ -169,6 +169,9 @@ function m_read(dset::HDF5Dataset)
             end
         end
         return out
+    elseif !haskey(str2type_matlab,mattype)
+        @warn "MATLAB $mattype values are currently not supported"
+        return missing
     end
 
     # Regular arrays of values

From 693ea0d3c7b8c9940bb3d6082ccc286736c5e2b2 Mon Sep 17 00:00:00 2001
From: JeremyBejanin <jbejanin@uwaterloo.ca>
Date: Mon, 2 Dec 2019 18:30:08 -0500
Subject: [PATCH 2/3] Add test for MATLAB classes that can't be read

---
 test/read.jl                        |  11 +++++++++++
 test/v7.3/struct_table_datetime.mat | Bin 0 -> 34400 bytes
 2 files changed, 11 insertions(+)
 create mode 100644 test/v7.3/struct_table_datetime.mat

diff --git a/test/read.jl b/test/read.jl
index db27d60..034df73 100644
--- a/test/read.jl
+++ b/test/read.jl
@@ -212,3 +212,14 @@ let objtestfile = "figure.fig"
     @test vars["hgS_070000"]["handle"] == 1.0
     @test vars["hgS_070000"]["type"] == "figure"
 end
+
+# test reading file containing Matlab table and datetime objects
+# since we don't support these objects, just make sure that there are no errors
+# reading the file and that the variables are there and replaced with `missing`
+let objtestfile = "struct_table_datetime.mat"
+    vars = matopen(m->read(m,"s"), joinpath(dirname(@__FILE__), "v7.3", objtestfile))
+    @test "testTable" in keys(vars)
+    @test ismissing(vars["testTable"])
+    @test "testDatetime" in keys(vars)
+    @test ismissing(vars["testDatetime"])
+end
diff --git a/test/v7.3/struct_table_datetime.mat b/test/v7.3/struct_table_datetime.mat
new file mode 100644
index 0000000000000000000000000000000000000000..9082308c5624adaf05a4ffd4e33dc9cabf4a8b38
GIT binary patch
literal 34400
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

literal 0
HcmV?d00001


From 661a2ed3821140288a113ae114f09771a161c3b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20B=C3=A9janin?= <jeremy.bejanin@gmail.com>
Date: Tue, 28 Apr 2020 12:25:37 -0400
Subject: [PATCH 3/3] fix reading variable names in mfiles with a subsystem
 entry

---
 src/MAT_HDF5.jl | 2 +-
 test/read.jl    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MAT_HDF5.jl b/src/MAT_HDF5.jl
index 1c35575..aa2c57f 100644
--- a/src/MAT_HDF5.jl
+++ b/src/MAT_HDF5.jl
@@ -275,7 +275,7 @@ Return a list of variables in an opened Matlab file.
 
 See `matopen`.
 """
-names(f::MatlabHDF5File) = filter!(x->x != "#refs#", names(f.plain))
+names(f::MatlabHDF5File) = filter!(x -> x!="#refs#" && x!="#subsystem#", names(f.plain))
 
 """
     exists(matfile_handle, varname) -> Bool
diff --git a/test/read.jl b/test/read.jl
index 034df73..e1f388b 100644
--- a/test/read.jl
+++ b/test/read.jl
@@ -217,7 +217,7 @@ end
 # since we don't support these objects, just make sure that there are no errors
 # reading the file and that the variables are there and replaced with `missing`
 let objtestfile = "struct_table_datetime.mat"
-    vars = matopen(m->read(m,"s"), joinpath(dirname(@__FILE__), "v7.3", objtestfile))
+    vars = matread(joinpath(dirname(@__FILE__), "v7.3", objtestfile))["s"]
     @test "testTable" in keys(vars)
     @test ismissing(vars["testTable"])
     @test "testDatetime" in keys(vars)