|
@@ -721,8 +721,8 @@ Type
|
|
procedure Iterate(Iterator : TJSONObjectIterator; Data: TObject);
|
|
procedure Iterate(Iterator : TJSONObjectIterator; Data: TObject);
|
|
function IndexOf(Item: TJSONData): Integer;
|
|
function IndexOf(Item: TJSONData): Integer;
|
|
Function IndexOfName(const AName: TJSONStringType; CaseInsensitive : Boolean = False): Integer;
|
|
Function IndexOfName(const AName: TJSONStringType; CaseInsensitive : Boolean = False): Integer;
|
|
- Function Find(Const AName : String) : TJSONData; overload;
|
|
|
|
- Function Find(Const AName : String; AType : TJSONType) : TJSONData; overload;
|
|
|
|
|
|
+ Function Find(Const AName : TJSONStringType) : TJSONData; overload;
|
|
|
|
+ Function Find(Const AName : TJSONStringType; AType : TJSONType) : TJSONData; overload;
|
|
function Find(const key: TJSONStringType; out AValue: TJSONData): boolean;
|
|
function Find(const key: TJSONStringType; out AValue: TJSONData): boolean;
|
|
function Find(const key: TJSONStringType; out AValue: TJSONObject): boolean;
|
|
function Find(const key: TJSONStringType; out AValue: TJSONObject): boolean;
|
|
function Find(const key: TJSONStringType; out AValue: TJSONArray): boolean;
|
|
function Find(const key: TJSONStringType; out AValue: TJSONArray): boolean;
|
|
@@ -4221,7 +4221,7 @@ begin
|
|
Result:=ADefault;
|
|
Result:=ADefault;
|
|
end;
|
|
end;
|
|
|
|
|
|
-function TJSONObject.Find(const AName: String): TJSONData;
|
|
|
|
|
|
+function TJSONObject.Find(const AName: TJSONStringType): TJSONData;
|
|
{$IFDEF PAS2JS}
|
|
{$IFDEF PAS2JS}
|
|
begin
|
|
begin
|
|
if FHash.hasOwnProperty('%'+AName) then
|
|
if FHash.hasOwnProperty('%'+AName) then
|
|
@@ -4242,7 +4242,7 @@ begin
|
|
end;
|
|
end;
|
|
{$ENDIF}
|
|
{$ENDIF}
|
|
|
|
|
|
-function TJSONObject.Find(const AName: String; AType: TJSONType): TJSONData;
|
|
|
|
|
|
+function TJSONObject.Find(const AName: TJSONStringType; AType: TJSONType): TJSONData;
|
|
begin
|
|
begin
|
|
Result:=Find(AName);
|
|
Result:=Find(AName);
|
|
If Assigned(Result) and (Result.JSONType<>AType) then
|
|
If Assigned(Result) and (Result.JSONType<>AType) then
|