From b1ae5fa911b2a3011215fd3c2a343cb0810973d0 Mon Sep 17 00:00:00 2001
From: Qianqian Fang <fangqq@gmail.com>
Date: Wed, 23 Jun 2021 14:23:58 -0400
Subject: [PATCH] fix #73 as a regression to #22
---
loadjson.m | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/loadjson.m b/loadjson.m
index 69811ed..db03df3 100644
--- a/loadjson.m
+++ b/loadjson.m
@@ -114,7 +114,7 @@ function data = loadjson(fname,varargin)
opt.arraytoken_=arraytoken;
opt.arraytokenidx_=arraytokenidx;
opt.simplifycell=jsonopt('SimplifyCell',1,opt);
- opt.simplifycellarray=jsonopt('SimplifyCellArray',0,opt);
+ opt.simplifycellarray=jsonopt('SimplifyCellArray',opt.simplifycell,opt);
opt.formatversion=jsonopt('FormatVersion',2,opt);
opt.fastarrayparser=jsonopt('FastArrayParser',1,opt);
opt.parsestringarray=jsonopt('ParseStringArray',0,opt);
@@ -281,7 +281,7 @@ function [object, pos,index_esc] = parse_array(inputstr, pos, esc, index_esc, va
end
if(varargin{1}.simplifycell)
- if(iscell(object) && ~isempty(object) && isnumeric(object{1}))
+ if(iscell(object) && ~isempty(object) && (isnumeric(object{1}) || isstruct(object{1})) )
if(all(cellfun(@(e) isequal(size(object{1}), size(e)) , object(2:end))))
try
oldobj=object;
--
GitLab