[compat] make optimized parsers work on matlab r2010/octave 5.2

Author: fangq

encodevarname.m

@@ -37,11 +37,25 @@
 %    License: GPLv3 or 3-clause BSD license, see https://github.com/NeuroJSON/easyh5 for details
 %
 
-% Fast path: check first character directly instead of calling isvarname
+% Check first character - use isvarname for the first char check to maintain
+% Octave compatibility (Octave allows underscore as first character)
 c1 = str(1);
-if ~((c1 >= 'a' && c1 <= 'z') || (c1 >= 'A' && c1 <= 'Z'))
-    % First char is not a letter - need to encode it
-    if (exist('unicode2native', 'builtin'))
+firstcharvalid = (c1 >= 'a' && c1 <= 'z') || (c1 >= 'A' && c1 <= 'Z');
+
+% In Octave, underscore is valid as first character; check this case
+if ~firstcharvalid && c1 == '_'
+    persistent isaliasaliased
+    if isempty(isaliasaliased)
+        isaliasaliased = exist('OCTAVE_VERSION', 'builtin') ~= 0;
+    end
+    if isaliasaliased
+        firstcharvalid = true;
+    end
+end
+
+if ~firstcharvalid
+    % First char is not valid - need to encode it
+    if exist('unicode2native', 'builtin')
         str = sprintf('x0x%s_%s', sprintf('%X', unicode2native(c1)), str(2:end));
     else
         str = sprintf('x0x%X_%s', c1 + 0, str(2:end));
@@ -66,11 +80,11 @@
 end
 
 % Slow path: has invalid characters, need full encoding
-if (exist('unicode2native', 'builtin'))
+if exist('unicode2native', 'builtin')
     str = regexprep(str, '([^0-9A-Za-z_])', '_0x${sprintf(''%X'',unicode2native($1))}_');
 else
     cpos = find(~ismember(str, ['0':'9', 'A':'Z', 'a':'z', '_']));
-    if (isempty(cpos))
+    if isempty(cpos)
         return
     end
     str0 = str;
@@ -79,7 +93,7 @@
     for i = 1:length(cpos)
         str = [str str0(pos0(i) + 1:cpos(i) - 1) sprintf('_0x%X_', str0(cpos(i)) + 0)];
     end
-    if (cpos(end) ~= length(str))
+    if cpos(end) ~= length(str)
         str = [str str0(pos0(end - 1) + 1:pos0(end))];
     end
 end

jdataencode.m

@@ -99,6 +99,7 @@
 opt.N_ArrayType = [opt.prefix '_ArrayType_'];
 opt.N_ArraySize = [opt.prefix '_ArraySize_'];
 opt.N_ArrayData = [opt.prefix '_ArrayData_'];
+opt.N_ArrayLabel = [opt.prefix '_ArrayLabel_'];
 opt.N_ArrayZipSize = [opt.prefix '_ArrayZipSize_'];
 opt.N_ArrayZipType = [opt.prefix '_ArrayZipType_'];
 opt.N_ArrayZipData = [opt.prefix '_ArrayZipData_'];
@@ -159,7 +160,7 @@
         attrname = keys(attr);
         for j = 1:length(attrname)
             if (strcmp(attrname{j}, 'dims'))
-                newitem.(attrpath{i}).(encodevarname('_ArrayLabel_')) = attr(attrname{j});
+                newitem.(attrpath{i}).(opt.N_ArrayLabel) = attr(attrname{j});
             else
                 newitem.(attrpath{i}).(attrname{j}) = attr(attrname{j});
             end

loadjson.m

@@ -215,7 +215,12 @@
 if ~isempty(nonws_idx)
     marker = repmat(inputlen + 1, 1, inputlen);
     marker(nonws_idx) = nonws_idx;
-    opt.next_nonws_ = fliplr(cummin(fliplr(marker)));
+    if (exist('cummin', 'builtin'))
+        cummin_ = @cummin;
+    else
+        cummin_ = @(x) arrayfun(@(i) min(x(1:i)), 1:length(x));
+    end
+    opt.next_nonws_ = fliplr(cummin_(fliplr(marker)));
 else
     opt.next_nonws_ = repmat(inputlen + 1, 1, inputlen);
 end