Skip to content
This repository has been archived by the owner on Feb 27, 2024. It is now read-only.

when delphi boolean type if json have no boolean type or string type will be error #46

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
25 changes: 21 additions & 4 deletions superobject.pas
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@
{$define VER230ORGREATER}
{$ifend}

{$if defined(FPC) or defined(VER170) or defined(VER180) or defined(VER190)
{$if defined(FPC) or defined(VER170) or defined(VER180) or defined(VER190)
or defined(VER200) or defined(VER210ORGREATER)}
{$DEFINE HAVE_INLINE}
{$ifend}

{$if defined(VER210ORGREATER)}
{$define HAVE_RTTI}
{$define HAVE_RTTI}
{$ifend}

{$if defined(VER230ORGREATER)}
Expand Down Expand Up @@ -1468,6 +1468,11 @@ function serialfromboolean(ctx: TSuperRttiContext; const obj: ISuperObject; var
var
o: ISuperObject;
begin
if obj = nil then
begin
TValueData(Value).FAsSLong := ord(False);
Exit(True);
end;
case ObjectGetType(obj) of
stBoolean:
begin
Expand All @@ -1483,8 +1488,20 @@ function serialfromboolean(ctx: TSuperRttiContext; const obj: ISuperObject; var
begin
o := SO(obj.AsString);
if not ObjectIsType(o, stString) then
Result := serialfromboolean(ctx, SO(obj.AsString), Value) else
Result := False;
Result := serialfromboolean(ctx, SO(obj.AsString), Value)
else
begin
if SameText(obj.AsString, 'True') then
begin
TValueData(Value).FAsSLong := ord(True);
Result := True;
end else if SameText(obj.AsString, 'False') then
begin
TValueData(Value).FAsSLong := ord(False);
Result := True;
end else
Result := False;
end;
end;
else
Result := False;
Expand Down