[feat] support B for byte strean in Spec Draft 3

Author: fangq

loadbj.m

@@ -107,7 +107,7 @@
     else
         string = urlread(fname);
     end
-elseif (~isempty(fname) && any(fname(1) == '[{SCHiUIulmLMhdDTFZN'))
+elseif (~isempty(fname) && any(fname(1) == '[{SCBHiUIulmLMhdDTFZN'))
     string = fname;
 else
     error('input file does not exist or buffer is invalid');
@@ -166,10 +166,10 @@
             else
                 [data{jsoncount}, pos] = parse_array(inputstr, pos, opt);
             end
-        case {'S', 'C', 'H', 'i', 'U', 'I', 'u', 'l', 'm', 'L', 'M', 'h', 'd', 'D', 'T', 'F', 'Z', 'N'}
+        case {'S', 'C', 'B', 'H', 'i', 'U', 'I', 'u', 'l', 'm', 'L', 'M', 'h', 'd', 'D', 'T', 'F', 'Z', 'N'}
             [data{jsoncount}, pos] = parse_value(inputstr, pos, [], opt);
         otherwise
-            error_pos('Root level structure must start with a valid marker "{[SCHiUIulmLMhdDTFZN"', inputstr, pos);
+            error_pos('Root level structure must start with a valid marker "{[SCBHiUIulmLMhdDTFZN"', inputstr, pos);
     end
     if (jsoncount >= maxobjid)
         break
@@ -219,8 +219,8 @@
                 [data{i}, pos] = parse_value(inputstr, pos, type, varargin{:});
             end
             adv = pos - adv;
-        case 'C'
-            data = inputstr(pos:pos + count);
+        case {'C', 'B'}
+            data = inputstr(pos:pos + count - 1);
             adv = count;
         case {'T', 'F', 'N'}
             error_pos(sprintf('For security reasons, optimized type %c is disabled at position %%d', type), inputstr, pos);
@@ -378,14 +378,14 @@
 function [str, pos] = parseStr(inputstr, pos, type, varargin)
 if (isempty(type))
     type = inputstr(pos);
-    if type ~= 'S' && type ~= 'C' && type ~= 'H'
+    if type ~= 'S' && type ~= 'C' && type ~= 'B' && type ~= 'H'
         error_pos('String starting with S expected at position %d', inputstr, pos);
     else
         pos = pos + 1;
     end
 end
 
-if (type == 'C')
+if (type == 'C' || type == 'B')
     str = inputstr(pos);
     pos = pos + 1;
     return
@@ -432,7 +432,7 @@
     varargout{3} = {};
 end
 switch (cc)
-    case {'S', 'C', 'H'}
+    case {'S', 'C', 'B', 'H'}
         [varargout{1:2}] = parseStr(inputstr, varargout{2}, type, varargin{:});
         return
     case '['
@@ -488,8 +488,10 @@
     object = [];
 end
 count = -1;
+type = [];
 [cc, pos] = next_char(inputstr, pos);
 if (cc == '$')
+    type = inputstr(pos + 1);
     pos = pos + 2;
 end
 [cc, pos] = next_char(inputstr, pos);
@@ -522,7 +524,7 @@
             mmap{end}{2} = [mmap{end}{2}, pos - mmap{end}{2}];
             mmap = [mmap(:); newmmap(:)];
         else
-            [val, pos] = parse_value(inputstr, pos, [], varargin{:});
+            [val, pos] = parse_value(inputstr, pos, type, varargin{:});
         end
         num = num + 1;
         if (usemap)
@@ -537,7 +539,7 @@
             object.(str) = val;
         end
         [cc, pos] = next_char(inputstr, pos);
-        if (count >= 0 && num >= count) || cc == '}'
+        if ((count >= 0 && num >= count) || (~isempty(cc) && cc == '}'))
             break
         end
     end

savebj.m

@@ -870,9 +870,14 @@
 %% -------------------------------------------------------------------------
 function val = S_(str, varargin)
 ismsgpack = varargin{1}.messagepack;
+isdebug = varargin{1}.debug;
 Smarker = varargin{1}.SM_;
 if (length(str) == 1)
-    val = [Smarker(1) str];
+    if (isdebug)
+        val = [Smarker(1) sprintf('<%d>', str)];
+    else
+        val = [Smarker(1) str];
+    end
 else
     if (ismsgpack)
         val = [Imsgpk_(length(str), 218, 160, varargin{:}) str];

test/run_jsonlab_test.m

@@ -217,7 +217,7 @@ function run_jsonlab_test(tests)
     end
     test_jsonlab('row vector', @savebj, [1, 2, 3], '[$U#U<3><1><2><3>', 'debug', 1);
     test_jsonlab('column vector', @savebj, [1; 2; 3], '[$U#[$U#U<2><3><1><1><2><3>', 'debug', 1);
-    test_jsonlab('mixed array', @savebj, {'a', 1, 0.9}, '[CaU<1>D<0.9>]', 'debug', 1);
+    test_jsonlab('mixed array', @savebj, {'a', 1, 0.9}, '[C<97>U<1>D<0.9>]', 'debug', 1);
     test_jsonlab('char array', @savebj, ['AC'; 'EG'], '[SU<2>ACSU<2>EG]', 'debug', 1);
     test_jsonlab('maps', @savebj, struct('a', 1, 'b', 'test'), '{U<1>aU<1>U<1>bSU<4>test}', 'debug', 1);
     test_jsonlab('2d array', @savebj, [1, 2, 3; 4, 5, 6], '[$U#[$U#U<2><2><3><1><2><3><4><5><6>', 'debug', 1);
@@ -241,6 +241,12 @@ function run_jsonlab_test(tests)
                  '[{U<1>iD<1.1>U<1>dSU<3>str}{U<1>iD<1.1>U<1>dSU<3>str}]', 'debug', 1);
     test_jsonlab('encoded fieldnames', @savebj, struct(encodevarname('_i'), 1, encodevarname('i_'), 'str'), ...
                  '{U<2>_iU<1>U<2>i_SU<3>str}', 'debug', 1);
+    test_jsonlab('single byte', @savebj, loadbj(['B' 65]), 'C<65>', 'debug', 1);
+    test_jsonlab('byte 1D vector', @savebj, loadbj(['[$B#U' 3 61 62 65]), 'SU<3>=>A', 'debug', 1);
+    test_jsonlab('optimized byte 1D vector', @savebj, loadbj(['[$B#[$U#U' 1 4 61 62 65 66]), 'SU<4>=>AB', 'debug', 1);
+    test_jsonlab('object with byte key', @savebj, loadbj(['{' 'i' 3 'lat' 'B' -1 'i' 4 'long' 'U' 2 'i' 3 'alt' 'B' 210 '}']), '{U<3>latC<0>U<4>longU<2>U<3>altC<210>}', 'debug', 1);
+    test_jsonlab('optimized object with byte key', @savebj, loadbj(['{$C#U' 3 'i' 3 'lat' 10 'i' 4 'long' 9 'i' 3 'alt' 240]), '{U<3>latC<10>U<4>longC<9>U<3>altC<240>}', 'debug', 1);
+
     if (exist('OCTAVE_VERSION', 'builtin') ~= 0)
         test_jsonlab('encoded fieldnames without decoding', @savebj, struct(encodevarname('_i'), 1, encodevarname('i_'), 'str'), ...
                      '{U<2>_iU<1>U<2>i_SU<3>str}', 'debug', 1, 'UnpackHex', 0);