From 464920eef72c73787f423359c5a7780a04dd9a52 Mon Sep 17 00:00:00 2001 From: Taylor McDonnell Date: Tue, 23 Nov 2021 08:49:46 -0700 Subject: [PATCH 1/3] update examples --- examples/exn_thrower.m | 6 ++++++ examples/matlab_exception.m | 2 -- examples/performance.m | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 examples/exn_thrower.m diff --git a/examples/exn_thrower.m b/examples/exn_thrower.m new file mode 100644 index 0000000..9212a10 --- /dev/null +++ b/examples/exn_thrower.m @@ -0,0 +1,6 @@ +function exn_thrower() + +error('I take exception to everything.'); + +end + diff --git a/examples/matlab_exception.m b/examples/matlab_exception.m index 1df2a82..23edece 100644 --- a/examples/matlab_exception.m +++ b/examples/matlab_exception.m @@ -2,8 +2,6 @@ % MATLAB (with the Julia backtrace appended) function matlab_exception() -exn_thrower = @() error('I take exception to everything.'); - try jl.call('Mex.call_matlab', int32(0), exn_thrower) catch e diff --git a/examples/performance.m b/examples/performance.m index ca9eaf0..9b51daf 100644 --- a/examples/performance.m +++ b/examples/performance.m @@ -30,7 +30,6 @@ function performance() %% mexjulia raw % For maximum performance. This requires dealing with the MEX pointer arrays -jleval('using MATLAB: MxArray, jscalar, mxarray'); jleval(sprintf('%s\n',... 'function divrem_raw(plhs::Vector{Ptr{Cvoid}}, prhs::Vector{Ptr{Cvoid}})',... 'out = divrem(jscalar(MxArray(prhs[1], false)), jscalar(MxArray(prhs[2], false)))',... From 67ce30f5c4d3cfc207cd09d694197a49a96d4edc Mon Sep 17 00:00:00 2001 From: Taylor McDonnell Date: Fri, 17 Dec 2021 20:53:04 -0700 Subject: [PATCH 2/3] add 1.7 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 1949a69..a93b1d3 100644 --- a/Project.toml +++ b/Project.toml @@ -9,6 +9,6 @@ MATLAB = "10e44e05-a98a-55b3-a45b-ba969058deb6" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" [compat] -julia = "1.5" MATLAB = "0.8" Reexport = "1" +julia = "~1.5, ~1.7" From 990f263045f85d3a68452dbff33a5f4b656fa52e Mon Sep 17 00:00:00 2001 From: Taylor McDonnell Date: Fri, 17 Dec 2021 20:53:29 -0700 Subject: [PATCH 3/3] add 1.7 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index a93b1d3..b5f698c 100644 --- a/Project.toml +++ b/Project.toml @@ -11,4 +11,4 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" [compat] MATLAB = "0.8" Reexport = "1" -julia = "~1.5, ~1.7" +julia = "~1.5, 1.7"