paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-19 13:29:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Expose ForeachCall functionality in new Iterate call, but keep backwards compatibiliy

Browse Source 
git-svn-id: trunk@23144 -
This commit is contained in:
michael 2012-12-14 14:56:42 +00:00
parent 37279faba5
commit cecea651b2
1 changed files with 51 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
packages/fcl-base/src/contnrs.pp
View File

@ -413,8 +413,9 @@ type
Procedure AddNode(ANode : THTCustomNode); override;
procedure SetData(const index: string; const AValue: Pointer); virtual;
function GetData(const index: string):Pointer; virtual;
function ForEachCall(aMethod: TDataIteratorMethod): THTDataNode; virtual;
Public
function ForEachCall(aMethod: TDataIteratorMethod): Pointer; virtual;
function Iterate(aMethod: TDataIteratorMethod): Pointer; virtual;
procedure Add(const aKey: string; AItem: pointer); virtual;
property Items[const index: string]: Pointer read GetData write SetData; default;
end;
@ -434,8 +435,9 @@ type
Procedure AddNode(ANode : THTCustomNode); override;
procedure SetData(const Index, AValue: string); virtual;
function GetData(const index: string): String; virtual;
function ForEachCall(aMethod: TStringIteratorMethod): THTStringNode; virtual;
Public
function ForEachCall(aMethod: TStringIteratorMethod): String; virtual;
function Iterate(aMethod: TStringIteratorMethod): String; virtual;
procedure Add(const aKey,aItem: string); virtual;
property Items[const index: string]: String read GetData write SetData; default;
end;
@ -464,10 +466,11 @@ type
Procedure AddNode(ANode : THTCustomNode); override;
procedure SetData(const Index: string; AObject : TObject); virtual;
function GetData(const index: string): TObject; virtual;
function ForEachCall(aMethod: TObjectIteratorMethod): THTObjectNode; virtual;
Public
constructor Create(AOwnsObjects : Boolean = True);
constructor CreateWith(AHashTableSize: Longword; aHashFunc: THashFunction; AOwnsObjects : Boolean = True);
function ForEachCall(aMethod: TObjectIteratorMethod): TObject; virtual;
function Iterate(aMethod: TObjectIteratorMethod): TObject; virtual;
procedure Add(const aKey: string; AItem : TObject); virtual;
property Items[const index: string]: TObject read GetData write SetData; default;
Property OwnsObjects : Boolean Read FOwnsObjects Write FOwnsObjects;
@ -2234,7 +2237,20 @@ begin
Result:=THTDataNode.CreateWith(aKey);
end;
function TFPDataHashTable.ForEachCall(aMethod: TDataIteratorMethod): Pointer;
function TFPDataHashTable.Iterate(aMethod: TDataIteratorMethod): Pointer;
Var
N : THTDataNode;
begin
N:=ForEachCall(AMethod);
if Assigned(N) then
Result:=N.Data
else
Result:=Nil;
end;
function TFPDataHashTable.ForEachCall(aMethod: TDataIteratorMethod): THTDataNode;
var
i, j: Longword;
continue: boolean;
@ -2252,7 +2268,7 @@ begin
aMethod(THTDataNode(Chain(i)[j]).Data, THTDataNode(Chain(i)[j]).Key, continue);
if not continue then
begin
Result := THTDataNode(Chain(i)[j]).Data;
Result := THTDataNode(Chain(i)[j]);
Exit;
end;
end;
@ -2310,13 +2326,25 @@ begin
Result:=THTStringNode.CreateWith(aKey);
end;
function TFPStringHashTable.Iterate(aMethod: TStringIteratorMethod): String;
function TFPStringHashTable.ForEachCall(aMethod: TStringIteratorMethod): String;
Var
N : THTStringNode;
begin
N:=ForEachCall(AMethod);
if Assigned(N) then
Result:=N.Data
else
Result:='';
end;
function TFPStringHashTable.ForEachCall(aMethod: TStringIteratorMethod): THTStringNode;
var
i, j: Longword;
continue: boolean;
begin
Result := '';
Result := Nil;
continue := true;
if FHashTableSize>0 then
for i := 0 to FHashTableSize-1 do
@ -2329,7 +2357,7 @@ begin
aMethod(THTStringNode(Chain(i)[j]).Data, THTStringNode(Chain(i)[j]).Key, continue);
if not continue then
begin
Result := THTStringNode(Chain(i)[j]).Data;
Result := THTStringNode(Chain(i)[j]);
Exit;
end;
end;
@ -2384,7 +2412,20 @@ begin
end;
function TFPObjectHashTable.ForEachCall(aMethod: TObjectIteratorMethod): TObject;
function TFPObjectHashTable.Iterate(aMethod: TObjectIteratorMethod): TObject;
Var
N : THTObjectNode;
begin
N:=ForEachCall(AMethod);
if Assigned(N) then
Result:=N.Data
else
Result:=Nil;
end;
function TFPObjectHashTable.ForEachCall(aMethod: TObjectIteratorMethod): THTObjectNode;
var
i, j: Longword;
continue: boolean;
@ -2402,7 +2443,7 @@ begin
aMethod(THTObjectNode(Chain(i)[j]).Data, THTObjectNode(Chain(i)[j]).Key, continue);
if not continue then
begin
Result := THTObjectNode(Chain(i)[j]).Data;
Result := THTObjectNode(Chain(i)[j]);
Exit;
end;
end;