[compat] make jsonschema and tests work on MATLAB R2010b

Author: fangq

jdict.m

@@ -548,7 +548,12 @@
                     if (isa(opcell{i}, 'containers.Map') || isa(opcell{i}, 'dictionary'))
                         idx = struct('type', '()', 'subs', idx.subs);
                     end
-                    opcell{end - 1} = subsasgn(opcell{i}, idx, otherobj);
+                    try
+                        opcell{end - 1} = subsasgn(opcell{i}, idx, otherobj);
+                    catch
+                        opcell{i}.(idx.subs) = otherobj;
+                        opcell{end - 1} = opcell{i};
+                    end
                 end
             end
 
@@ -573,7 +578,11 @@
                 elseif (ischar(idx.subs) && ~isempty(idx.subs) && idx.subs(1) == char(36))
                     opcell{i} = obj.call_('jsonpath', opcell{i}, idx.subs, opcell{i + 1});
                 else
-                    opcell{i} = subsasgn(opcell{i}, idx, opcell{i + 1});
+                    try
+                        opcell{i} = subsasgn(opcell{i}, idx, opcell{i + 1});
+                    catch
+                        opcell{i}.(idx.subs) = opcell{i + 1};
+                    end
                 end
             end
 
@@ -760,7 +769,7 @@
 
             if (isa(schemadata, 'containers.Map'))
                 obj.schema = schemadata;
-            elseif (ischar(schemadata) || isstring(schemadata) || isstruct(schemadata))
+            elseif (ischar(schemadata) || isa(schemadata, 'string') || isstruct(schemadata))
                 if (isstruct(schemadata))
                     schemadata = savejson('', schemadata);
                 end

jsonschema.m

@@ -33,7 +33,7 @@
 % Generation mode: jsonschema(schema) or jsonschema(schema, [])
 if nargin == 1 || (nargin >= 2 && isempty(schema))
     schemaarg = data;
-    if ischar(schemaarg) || isstring(schemaarg) || isstruct(schemaarg)
+    if ischar(schemaarg) || isa(schemaarg, 'string') || isstruct(schemaarg)
         if (isstruct(schemaarg))
             schemaarg = savejson('', schemaarg);
         end
@@ -45,7 +45,7 @@
     return
 end
 
-if ischar(schema) || isstring(schema) || isstruct(schema)
+if ischar(schema) || isa(schema, 'string') || isstruct(schema)
     if (isstruct(schema))
         schema = savejson('', schema);
     end
@@ -112,14 +112,14 @@
 if isKey(schema, 'enum')
     enumvalues = schema('enum');
     match = false;
-    data_is_empty_str = (ischar(data) && isempty(data)) || (isstring(data) && strlength(data) == 0);
+    data_is_empty_str = (ischar(data) && isempty(data)) || (isa(data, 'string') && strlength(data) == 0);
     for i = 1:length(enumvalues)
         enumval = enumvalues{i};
-        enum_is_empty_str = isempty(enumval) || (isstring(enumval) && strlength(enumval) == 0);
+        enum_is_empty_str = isempty(enumval) || (isa(enumval, 'string') && strlength(enumval) == 0);
         if data_is_empty_str && enum_is_empty_str
             match = true;
             break
-        elseif (ischar(data) || isstring(data)) && (ischar(enumval) || isstring(enumval))
+        elseif (ischar(data) || isa(data, 'string')) && (ischar(enumval) || isa(enumval, 'string'))
             if strcmp(char(data), char(enumval))
                 match = true;
                 break
@@ -151,7 +151,7 @@
 end
 
 % string
-if ischar(data) || isstring(data)
+if ischar(data) || isa(data, 'string')
     [isvalid, errmsg] = validatestring(char(data), schema, path);
     if ~isvalid
         valid = false;
@@ -263,7 +263,7 @@
     case 'number'
         ok = isnumeric(data) && isscalar(data);
     case 'string'
-        ok = ischar(data) || isstring(data);
+        ok = ischar(data) || isa(data, 'string');
     case 'array'
         ok = iscell(data) || (isnumeric(data) && ~isscalar(data)) || (islogical(data) && ~isscalar(data));
     case 'object'
@@ -275,7 +275,7 @@
 %% -------------------------------------------------------------------------
 function typestr = gettype(data)
 
-if ischar(data) || isstring(data)
+if ischar(data) || isa(data, 'string')
     typestr = 'string';
 elseif isnumeric(data) && isempty(data)
     typestr = 'null';

test/run_jsonlab_test.m

@@ -675,7 +675,8 @@ function run_jsonlab_test(tests)
     test_jsonlab('getattr return all attributes', @savejson, jd7.getattr('$.data'), '{"dims":["x","y"],"sampling_rate":1000}', 'compact', 1);
     test_jsonlab('getattr get one attr', @savejson, jd7.getattr('$.data', 'dims'), '["x","y"]', 'compact', 1);
     test_jsonlab('savejson with _ArrayLabel_', @savejson, jd7, '{"data":{"_ArrayType_":"double","_ArraySize_":[3,4],"_ArrayData_":[1,1,1,1,1,1,1,1,1,1,1,1],"_ArrayLabel_":["x","y"],"sampling_rate":1000}}', 'compact', 1);
-    test_jsonlab('loadjson with _ArrayLabel_', @savejson, loadjson(jd7.tojson()).data.getattr('$', 'dims'), '["x","y"]', 'compact', 1);
+    jd7 = loadjson(jd7.tojson());
+    test_jsonlab('loadjson with _ArrayLabel_', @savejson, jd7.data.getattr('$', 'dims'), '["x","y"]', 'compact', 1);
 
     % Test 12: Multiple attributes different types
     jd8 = jdict(rand(10, 20));