Skip to content

fixed return value for AsJson/Value if NodeKind is nkObject #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
niehoff90 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed return value for AsJson/Value if NodeKind is nkObject #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions jsontools.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ TJsonNode = class
procedure ParseObject(Node: TJsonNode; var C: PChar);
procedure ParseArray(Node: TJsonNode; var C: PChar);
procedure Error(const Msg: string = '');
function Format(const Indent: string): string;
function FormatCompact: string;
function Format(const Indent: string; IncludeKey: Boolean = False): string;
function FormatCompact(IncludeKey: Boolean = False): string;
function Add(Kind: TJsonNodeKind; const Name, Value: string): TJsonNode; overload;
function GetRoot: TJsonNode;
procedure SetKind(Value: TJsonNodeKind);
Expand Down Expand Up @@ -1147,7 +1147,7 @@ function TJsonNode.Force(const Path: string): TJsonNode;
Result := N;
end;

function TJsonNode.Format(const Indent: string): string;
function TJsonNode.Format(const Indent: string; IncludeKey: Boolean = False): string;

function EnumNodes: string;
var
Expand All @@ -1161,7 +1161,7 @@ function TJsonNode.Format(const Indent: string): string;
S := Indent + #9;
for I := 0 to J do
begin
Result := Result + TJsonNode(FList[I]).Format(S);
Result := Result + TJsonNode(FList[I]).Format(S, True);
if I < J then
Result := Result + ','#10
else
Expand All @@ -1173,7 +1173,7 @@ function TJsonNode.Format(const Indent: string): string;
Prefix: string;
begin
Result := '';
if (FParent <> nil) and (FParent.FKind = nkObject) then
if IncludeKey and (FParent.FKind = nkObject) then
Prefix := JsonStringEncode(FName) + ': '
else
Prefix := '';
Expand All @@ -1185,7 +1185,7 @@ function TJsonNode.Format(const Indent: string): string;
end;
end;

function TJsonNode.FormatCompact: string;
function TJsonNode.FormatCompact(IncludeKey: Boolean = False): string;

function EnumNodes: string;
var
Expand All @@ -1197,7 +1197,7 @@ function TJsonNode.FormatCompact: string;
J := FList.Count - 1;
for I := 0 to J do
begin
Result := Result + TJsonNode(FList[I]).FormatCompact;
Result := Result + TJsonNode(FList[I]).FormatCompact(True);
if I < J then
Result := Result + ',';
end;
Expand All @@ -1207,7 +1207,7 @@ function TJsonNode.FormatCompact: string;
Prefix: string;
begin
Result := '';
if (FParent <> nil) and (FParent.FKind = nkObject) then
if IncludeKey and (FParent.FKind = nkObject) then
Prefix := JsonStringEncode(FName) + ':'
else
Prefix := '';
Expand Down