jsonV: support array in array

Author: stijnsanders

CHANGELOG.txt

@@ -3,6 +3,7 @@ v1.1.0
 - JSON function: use '{' key suffix to start embedded document (instead of value '[')
 - IJSONDocument.ToString re-done using IJSONEnumerator
 - IJSONDocWithReUse to fix re-using pre-allocated keys
+- jsonV: now supports array as element in array
 
 v1.0.5
 - IJSONDocument.Delete

jsonDoc.pas

@@ -384,13 +384,16 @@ function TJSONDocument.Parse(const JSONData: WideString): IJSONDocument;
   const
     VicinityExtent=8;
   begin
-    if di<=VicinityExtent then
-      Result:=#13#10'(#'+IntToStr(di)+')"'+Copy(jsonData,1,di-1)+
-        ' >>> '+jsonData[di]+' <<< '+Copy(jsonData,di+1,VicinityExtent)+'"'
+    if l>VicinityExtent then
+      if di<=VicinityExtent then
+        Result:=#13#10'(#'+IntToStr(di)+')"'+Copy(jsonData,1,di-1)+
+          ' >>> '+jsonData[di]+' <<< '+Copy(jsonData,di+1,VicinityExtent)+'"'
+      else
+        Result:=#13#10'(#'+IntToStr(di)+')"...'+
+          Copy(jsonData,di-VicinityExtent,VicinityExtent)+
+          ' >>> '+jsonData[di]+' <<< '+Copy(jsonData,di+1,VicinityExtent)+'"'
     else
-      Result:=#13#10'(#'+IntToStr(di)+')"...'+
-        Copy(jsonData,di-VicinityExtent,VicinityExtent)+
-        ' >>> '+jsonData[di]+' <<< '+Copy(jsonData,di+1,VicinityExtent)+'"';
+      Result:=#13#10'(#'+IntToStr(di)+')"'+jsonData+'"';
   end;
   procedure Expect(c:WideChar;const msg:string);
   begin

jsonTS.pas

@@ -397,13 +397,16 @@ function TJSONDocumentThreadSafe.Parse(const JSONData: WideString): IJSONDocumen
   const
     VicinityExtent=8;
   begin
-    if di<=VicinityExtent then
-      Result:=#13#10'(#'+IntToStr(di)+')"'+Copy(jsonData,1,di-1)+
-        ' >>> '+jsonData[di]+' <<< '+Copy(jsonData,di+1,VicinityExtent)+'"'
+    if l>VicinityExtent then
+      if di<=VicinityExtent then
+        Result:=#13#10'(#'+IntToStr(di)+')"'+Copy(jsonData,1,di-1)+
+          ' >>> '+jsonData[di]+' <<< '+Copy(jsonData,di+1,VicinityExtent)+'"'
+      else
+        Result:=#13#10'(#'+IntToStr(di)+')"...'+
+          Copy(jsonData,di-VicinityExtent,VicinityExtent)+
+          ' >>> '+jsonData[di]+' <<< '+Copy(jsonData,di+1,VicinityExtent)+'"'
     else
-      Result:=#13#10'(#'+IntToStr(di)+')"...'+
-        Copy(jsonData,di-VicinityExtent,VicinityExtent)+
-        ' >>> '+jsonData[di]+' <<< '+Copy(jsonData,di+1,VicinityExtent)+'"';
+      Result:=#13#10'(#'+IntToStr(di)+')"'+jsonData+'"';
   end;
   procedure Expect(c:WideChar;const msg:string);
   begin

jsonV1.pas

@@ -100,31 +100,36 @@ function TfrmJsonViewer.LoadJSON(const FilePath: string): IJSONDocument;
   m:=TMemoryStream.Create;
   try
     m.LoadFromFile(FilePath);
-    //UTF-16
-    if (PAnsiChar(m.Memory)[0]=#$FF) and
-       (PAnsiChar(m.Memory)[1]=#$FE) then
-     begin
-      SetLength(w,i div 2);
-      Move(w[1],PAnsiChar(m.Memory)[2],i);
-     end
-    else
-    //UTF-8
-    if (PAnsiChar(m.Memory)[0]=#$EF) and
-       (PAnsiChar(m.Memory)[1]=#$BB) and
-       (PAnsiChar(m.Memory)[2]=#$BF) then
-     begin
-      m.Position:=m.Size;
-      i:=0;
-      m.Write(i,1);
-      w:=UTF8Decode(PAnsiChar(@PAnsiChar(m.Memory)[3]));
-     end
-    //ANSI
+    if m.Size=0 then
+      w:=''
     else
      begin
-      m.Position:=m.Size;
-      i:=0;
-      m.Write(i,1);
-      w:=PAnsiChar(m.Memory);
+      //UTF-16
+      if (PAnsiChar(m.Memory)[0]=#$FF) and
+         (PAnsiChar(m.Memory)[1]=#$FE) then
+       begin
+        SetLength(w,i div 2);
+        Move(w[1],PAnsiChar(m.Memory)[2],i);
+       end
+      else
+      //UTF-8
+      if (PAnsiChar(m.Memory)[0]=#$EF) and
+         (PAnsiChar(m.Memory)[1]=#$BB) and
+         (PAnsiChar(m.Memory)[2]=#$BF) then
+       begin
+        m.Position:=m.Size;
+        i:=0;
+        m.Write(i,1);
+        w:=UTF8Decode(PAnsiChar(@PAnsiChar(m.Memory)[3]));
+       end
+      //ANSI
+      else
+       begin
+        m.Position:=m.Size;
+        i:=0;
+        m.Write(i,1);
+        w:=PAnsiChar(m.Memory);
+       end;
      end;
   finally
     m.Free;
@@ -136,9 +141,10 @@ function TfrmJsonViewer.LoadJSON(const FilePath: string): IJSONDocument;
 procedure TfrmJsonViewer.TreeView1Expanding(Sender: TObject;
   Node: TTreeNode; var AllowExpansion: Boolean);
 var
-  p:TJSONNode;
+  p,q:TJSONNode;
   v:OleVariant;
   i,j,k:integer;
+  ii:array of integer;
   x:IJSONDocument;
 begin
   p:=Node as TJSONNode;
@@ -154,7 +160,26 @@ procedure TfrmJsonViewer.TreeView1Expanding(Sender: TObject;
 //        else
          begin
           v:=p.Data[p.Key];
-          if p.Index<>-1 then v:=v[VarArrayLowBound(v,1)+p.Index];
+          i:=0;
+          if p.Index<>-1 then
+           begin
+            q:=p;
+            while (q<>nil) and (q.Index<>-1) do
+             begin
+              inc(i);
+              q:=q.Parent as TJSONNode;
+             end;
+            SetLength(ii,i);
+            q:=p;
+            while i<>0 do //while (q<>nil) and (q.Index<>-1) do
+             begin
+              dec(i);
+              ii[i]:=q.Index;
+              q:=q.Parent as TJSONNode;
+             end;
+            for i:=0 to Length(ii)-1 do
+              v:=v[VarArrayLowBound(v,1)+ii[i]];
+           end;
           //case VarType(v)
           if VarIsArray(v) then
            begin