implement the UBJSON Draft12 new name format

git-svn-id: http://svn.code.sf.net/p/iso2mesh/code/trunk/jsonlab@465 786e58fb-9377-0410-9ff7-e4ac0ac0635c

Author: fangq

loadubjson.m

@@ -26,6 +26,11 @@
 %                         in the UBJSON input data. B - Big-Endian format for 
 %                         integers (as required in the UBJSON specification); 
 %                         L - input integer fields are in Little-Endian order.
+%           opt.NameIsString [0|1]: for UBJSON Specification Draft 8 or 
+%                         earlier versions (JSONLab 1.0 final or earlier), 
+%                         the "name" tag is treated as a string. To load 
+%                         these UBJSON data, you need to manually set this 
+%                         flag to 1.
 %
 % output:
 %      dat: a cell array, where {...} blocks are converted into cell arrays,
@@ -200,7 +205,11 @@
     if next_char ~= '}'
         num=0;
         while 1
-            str = parseStr(varargin{:});
+            if(jsonopt('NameIsString',0,varargin{:}))
+                str = parseStr(varargin{:});
+            else
+                str = parse_name(varargin{:});
+            end
             if isempty(str)
                 error_pos('Name of value at position %d cannot be empty');
             end
@@ -347,8 +356,19 @@ function parse_char(c)
     end
 
 %%-------------------------------------------------------------------------
+function str = parse_name(varargin)
+    global pos inStr
+    bytelen=double(parse_number());
+    if(length(inStr)>=pos+bytelen-1)
+        str=inStr(pos:pos+bytelen-1);
+        pos=pos+bytelen;
+    else
+        error_pos('End of file while expecting end of name');
+    end
+%%-------------------------------------------------------------------------
+
 function str = parseStr(varargin)
-    global pos inStr esc index_esc len_esc
+    global pos inStr
  % len, ns = length(inStr), keyboard
     type=inStr(pos);
     if type ~= 'S' && type ~= 'C' && type ~= 'H'

saveubjson.m

@@ -148,13 +148,13 @@
 len=numel(item); % let's handle 1D cell first
 if(len>1) 
     if(~isempty(name))
-        txt=[S_(checkname(name,varargin{:})) '[']; name=''; 
+        txt=[N_(checkname(name,varargin{:})) '[']; name=''; 
     else
         txt='['; 
     end
 elseif(len==0)
     if(~isempty(name))
-        txt=[S_(checkname(name,varargin{:})) 'Z']; name=''; 
+        txt=[N_(checkname(name,varargin{:})) 'Z']; name=''; 
     else
         txt='Z'; 
     end
@@ -182,7 +182,7 @@
 len=numel(item);
 
 if(~isempty(name)) 
-    if(len>1) txt=[S_(checkname(name,varargin{:})) '[']; end
+    if(len>1) txt=[N_(checkname(name,varargin{:})) '[']; end
 else
     if(len>1) txt='['; end
 end
@@ -191,7 +191,7 @@
   for i=1:dim(1)
      names = fieldnames(item(i,j));
      if(~isempty(name) && len==1)
-        txt=[txt S_(checkname(name,varargin{:})) '{']; 
+        txt=[txt N_(checkname(name,varargin{:})) '{']; 
      else
         txt=[txt '{']; 
      end
@@ -217,15 +217,15 @@
 len=size(item,1);
 
 if(~isempty(name)) 
-    if(len>1) txt=[S_(checkname(name,varargin{:})) '[']; end
+    if(len>1) txt=[N_(checkname(name,varargin{:})) '[']; end
 else
     if(len>1) txt='['; end
 end
 isoct=jsonopt('IsOctave',0,varargin{:});
 for e=1:len
     val=item(e,:);
     if(len==1)
-        obj=['' S_(checkname(name,varargin{:})) '' '',S_(val),''];
+        obj=[N_(checkname(name,varargin{:})) '' '',S_(val),''];
 	if(isempty(name)) obj=['',S_(val),'']; end
         txt=[txt,'',obj];
     else
@@ -244,13 +244,13 @@
    isempty(item) || jsonopt('ArrayToStruct',0,varargin{:}))
       cid=I_(uint32(max(size(item))));
       if(isempty(name))
-    	txt=['{' S_('_ArrayType_'),S_(class(item)),S_('_ArraySize_'),I_a(size(item),cid(1)) ];
+    	txt=['{' N_('_ArrayType_'),S_(class(item)),N_('_ArraySize_'),I_a(size(item),cid(1)) ];
       else
           if(isempty(item))
-              txt=[S_(checkname(name,varargin{:})),'Z'];
+              txt=[N_(checkname(name,varargin{:})),'Z'];
               return;
           else
-    	      txt=[S_(checkname(name,varargin{:})),'{',S_('_ArrayType_'),S_(class(item)),S_('_ArraySize_'),I_a(size(item),cid(1))];
+    	      txt=[N_(checkname(name,varargin{:})),'{',N_('_ArrayType_'),S_(class(item)),N_('_ArraySize_'),I_a(size(item),cid(1))];
           end
       end
 else
@@ -259,9 +259,9 @@
     else
         if(numel(item)==1 && jsonopt('NoRowBracket',1,varargin{:})==1)
             numtxt=regexprep(regexprep(matdata2ubjson(item,level+1,varargin{:}),'^\[',''),']','');
-           	txt=[S_(checkname(name,varargin{:})) numtxt];
+           	txt=[N_(checkname(name,varargin{:})) numtxt];
         else
-    	    txt=[S_(checkname(name,varargin{:})),matdata2ubjson(item,level+1,varargin{:})];
+    	    txt=[N_(checkname(name,varargin{:})),matdata2ubjson(item,level+1,varargin{:})];
         end
     end
     return;
@@ -276,29 +276,29 @@
            % (Necessary for complex row vector handling below.)
            data=data';
        end
-       txt=[txt,S_('_ArrayIsComplex_'),'T'];
+       txt=[txt,N_('_ArrayIsComplex_'),'T'];
     end
-    txt=[txt,S_('_ArrayIsSparse_'),'T'];
+    txt=[txt,N_('_ArrayIsSparse_'),'T'];
     if(size(item,1)==1)
         % Row vector, store only column indices.
-        txt=[txt,S_('_ArrayData_'),...
+        txt=[txt,N_('_ArrayData_'),...
            matdata2ubjson([iy(:),data'],level+2,varargin{:})];
     elseif(size(item,2)==1)
         % Column vector, store only row indices.
-        txt=[txt,S_('_ArrayData_'),...
+        txt=[txt,N_('_ArrayData_'),...
            matdata2ubjson([ix,data],level+2,varargin{:})];
     else
         % General case, store row and column indices.
-        txt=[txt,S_('_ArrayData_'),...
+        txt=[txt,N_('_ArrayData_'),...
            matdata2ubjson([ix,iy,data],level+2,varargin{:})];
     end
 else
     if(isreal(item))
-        txt=[txt,S_('_ArrayData_'),...
+        txt=[txt,N_('_ArrayData_'),...
             matdata2ubjson(item(:)',level+2,varargin{:})];
     else
-        txt=[txt,S_('_ArrayIsComplex_'),'T'];
-        txt=[txt,S_('_ArrayData_'),...
+        txt=[txt,N_('_ArrayIsComplex_'),'T'];
+        txt=[txt,N_('_ArrayData_'),...
             matdata2ubjson([real(item(:)) imag(item(:))],level+2,varargin{:})];
     end
 end
@@ -385,6 +385,9 @@
     end
 end
 %%-------------------------------------------------------------------------
+function val=N_(str)
+val=[I_(int32(length(str))) str];
+%%-------------------------------------------------------------------------
 function val=S_(str)
 if(length(str)==1)
   val=['C' str];