jsonlab compact output polish

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

Author: fangq

ChangeLog.txt

@@ -6,6 +6,11 @@
 
 JSONlab ChangeLog (key features marked by *):
 
+== JSONlab 1.0.0-RC2 (codename: Optimus - RC2), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+
+ 2014/11/17 add Compact option in savejson to output compact JSON format
+ 2014/11/17 add FastArrayParser in loadjson to specify fast parser applicable levels
+
 == JSONlab 1.0.0-RC1 (codename: Optimus - RC1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
 
  2014/09/17  fix several compatibility issues when running on octave versions 3.2-3.8

README.txt

@@ -5,7 +5,7 @@
 
 *Copyright (c) 2011-2014  Qianqian Fang <fangq at nmr.mgh.harvard.edu>
 *License: BSD or GNU General Public License version 3 (GPL v3), see License*.txt
-*Version: 1.0.0-RC1 (Optimus - RC1)
+*Version: 1.0.0-RC1 (Optimus - RC2)
 
 -------------------------------------------------------------------------------
 

examples/jsonlab_selftest.m

@@ -8,6 +8,7 @@
     fprintf(1,'===============================================\n>> %s\n',fname);
     json=savejson('data',loadjson(fname));
     fprintf(1,'%s\n',json);
+    fprintf(1,'%s\n',savejson('data',loadjson(fname),'Compact',1));
     data=loadjson(json);
     savejson('data',data,'selftest.json');
     data=loadjson('selftest.json');
@@ -19,9 +20,8 @@
     fprintf(1,'===============================================\n>> %s\n',fname);
     json=saveubjson('data',loadjson(fname));
     fprintf(1,'%s\n',json);
-    data=loadubjson(json)
-    savejson('',data)
-i
+    data=loadubjson(json);
+    savejson('',data);
     saveubjson('data',data,'selftest.ubj');
     data=loadubjson('selftest.ubj');
 end

savejson.m

@@ -109,11 +109,17 @@
 if((isstruct(obj) || iscell(obj))&& isempty(rootname) && forceroot)
     rootname='root';
 end
-nl=sprintf('\n');
+
+whitespaces=struct('tab',sprintf('\t'),'newline',sprintf('\n'),'sep',sprintf(',\n'));
 if(jsonopt('Compact',0,opt)==1)
-    nl='';
+    whitespaces=struct('tab','','newline','','sep',',');
+end
+if(~isfield(opt,'whitespaces_'))
+    opt.whitespaces_=whitespaces;
 end
 
+nl=whitespaces.newline;
+
 json=obj2json(rootname,obj,rootlevel,opt);
 if(rootisarray)
     json=sprintf('%s%s',json,nl);
@@ -164,12 +170,10 @@
     dim=size(item);
 end
 len=numel(item);
-padding0=repmat(sprintf('\t'),1,level);
-padding2=repmat(sprintf('\t'),1,level+1);
-nl=sprintf('\n');
-if(jsonopt('Compact',0,varargin{:})==1)
-    padding0='';padding2='';nl='';
-end
+ws=jsonopt('whitespaces_',struct('tab',sprintf('\t'),'newline',sprintf('\n'),'sep',sprintf(',\n')),varargin{:});
+padding0=repmat(ws.tab,1,level);
+padding2=repmat(ws.tab,1,level+1);
+nl=ws.newline;
 if(len>1)
     if(~isempty(name))
         txt=sprintf('%s"%s": [%s',padding0, checkname(name,varargin{:}),nl); name=''; 
@@ -207,13 +211,12 @@
     dim=size(item);
 end
 len=numel(item);
-padding0=repmat(sprintf('\t'),1,level);
-padding2=repmat(sprintf('\t'),1,level+1);
-padding1=repmat(sprintf('\t'),1,level+(dim(1)>1)+(len>1));
-nl=sprintf('\n');
-if(jsonopt('Compact',0,varargin{:})==1)
-    padding0='';padding1='';padding2='';nl='';
-end
+ws=struct('tab',sprintf('\t'),'newline',sprintf('\n'));
+ws=jsonopt('whitespaces_',ws,varargin{:});
+padding0=repmat(ws.tab,1,level);
+padding2=repmat(ws.tab,1,level+1);
+padding1=repmat(ws.tab,1,level+(dim(1)>1)+(len>1));
+nl=ws.newline;
 
 if(~isempty(name)) 
     if(len>1) txt=sprintf('%s"%s": [%s',padding0,checkname(name,varargin{:}),nl); end
@@ -253,15 +256,12 @@
 end
 item=reshape(item, max(size(item),[1 0]));
 len=size(item,1);
-nl=sprintf('\n');
-padding1=repmat(sprintf('\t'),1,level);
-padding0=repmat(sprintf('\t'),1,level+1);
-if(jsonopt('Compact',0,varargin{:})==1)
-    padding0='';
-    padding1='';
-    nl='';
-end
-sep=sprintf(',%s',nl);
+ws=struct('tab',sprintf('\t'),'newline',sprintf('\n'),'sep',sprintf(',\n'));
+ws=jsonopt('whitespaces_',ws,varargin{:});
+padding1=repmat(ws.tab,1,level);
+padding0=repmat(ws.tab,1,level+1);
+nl=ws.newline;
+sep=ws.sep;
 
 if(~isempty(name)) 
     if(len>1) txt=sprintf('%s"%s": [%s',padding1,checkname(name,varargin{:}),nl); end
@@ -297,13 +297,12 @@
 if(~isnumeric(item) && ~islogical(item))
         error('input is not an array');
 end
-nl=sprintf('\n');
-padding1=repmat(sprintf('\t'),1,level);
-padding0=repmat(sprintf('\t'),1,level+1);
-if(jsonopt('Compact',0,varargin{:})==1)
-    padding0='';padding1='';nl='';
-end
-sep=sprintf(',%s',nl);
+ws=struct('tab',sprintf('\t'),'newline',sprintf('\n'),'sep',sprintf(',\n'));
+ws=jsonopt('whitespaces_',ws,varargin{:});
+padding1=repmat(ws.tab,1,level);
+padding0=repmat(ws.tab,1,level+1);
+nl=ws.newline;
+sep=ws.sep;
 
 if(length(size(item))>2 || issparse(item) || ~isreal(item) || ...
    isempty(item) ||jsonopt('ArrayToStruct',0,varargin{:}))
@@ -369,13 +368,12 @@
 
 %%-------------------------------------------------------------------------
 function txt=matdata2json(mat,level,varargin)
-if(jsonopt('Compact',0,varargin{:})==1)
-    tab='';
-    nl='';
-else
-    tab=sprintf('\t');
-    nl=sprintf('\n');    
-end
+
+ws=struct('tab',sprintf('\t'),'newline',sprintf('\n'),'sep',sprintf(',\n'));
+ws=jsonopt('whitespaces_',ws,varargin{:});
+tab=ws.tab;
+nl=ws.newline;
+
 if(size(mat,1)==1)
     pre='';
     post='';