paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-05 20:50:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

lazutil: avltree: when using a custom nodeclass do not use the default nodememmanager

Browse Source 
git-svn-id: trunk@54534 -
This commit is contained in:
mattias 2017-04-06 08:45:56 +00:00
parent af03331f08
commit 0ddb1e74c5
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/lazutils/avglvltree.pas
View File

@ -380,10 +380,8 @@ begin
begin
TObject(aNode.Data).Free;
aNode.Data := nil;
aNode.Free;
end
else
inherited DisposeNode(aNode);
end;
inherited DisposeNode(aNode);
end;
procedure TAvgLvlTree.FreeAndDelete(ANode: TAVLTreeNode);
@ -837,7 +835,7 @@ end;
procedure TIndexedAVLTree.Init;
begin
FNodeClass:=TIndexedAVLTreeNode;
NodeClass:=TIndexedAVLTreeNode;
end;
procedure TIndexedAVLTree.NodeAdded(aNode: TAvlTreeNode);

20
components/lazutils/laz_avl_tree.pp
View File

@ -103,6 +103,7 @@ type
procedure SetOnObjectCompare(const AValue: TObjectSortCompare);
procedure SetCompares(const NewCompare: TListSortCompare;
const NewObjectCompare: TObjectSortCompare);
procedure SetNodeClass(const AValue: TAVLTreeNodeClass);
public
constructor Create(const OnCompareMethod: TListSortCompare);
constructor CreateObjectCompare(const OnCompareMethod: TObjectSortCompare);
@ -110,7 +111,7 @@ type
destructor Destroy; override;
property OnCompare: TListSortCompare read FOnCompare write SetOnCompare;
property OnObjectCompare: TObjectSortCompare read FOnObjectCompare write SetOnObjectCompare;
property NodeClass: TAVLTreeNodeClass read FNodeClass write FNodeClass; // used for new nodes
property NodeClass: TAVLTreeNodeClass read FNodeClass write SetNodeClass; // used for new nodes
procedure SetNodeManager(NewMgr: TBaseAVLTreeNodeManager;
AutoFree: boolean = false);
function NewNode: TAVLTreeNode; virtual; // create a node outside the tree
@ -498,6 +499,17 @@ begin
end;
end;
procedure TAVLTree.SetNodeClass(const AValue: TAVLTreeNodeClass);
begin
if FNodeClass=AValue then Exit;
if Count>0 then
raise Exception.Create(ClassName+'.SetNodeClass Count='+IntToStr(Count)
+' Old='+fNodeMgr.ClassName+' New='+AValue.ClassName);
FNodeClass:=AValue;
if fNodeMgr=LazNodeMemManager then
fNodeMgr:=nil;
end;
procedure TAVLTree.BalanceAfterInsert(ANode: TAVLTreeNode);
var
OldParent, OldRight, OldLeft: TAVLTreeNode;
@ -687,7 +699,7 @@ begin
DisposeNode(ANode);
end;
function TAvlTree.Remove(Data: Pointer): boolean;
function TAVLTree.Remove(Data: Pointer): boolean;
var
ANode: TAvlTreeNode;
begin
@ -699,7 +711,7 @@ begin
Result:=false;
end;
function TAvlTree.RemovePointer(Data: Pointer): boolean;
function TAVLTree.RemovePointer(Data: Pointer): boolean;
var
ANode: TAvlTreeNode;
begin
@ -1206,7 +1218,7 @@ begin
if IsEqual(aTree,true) then exit;
Clear;
SetCompares(aTree.OnCompare,aTree.OnObjectCompare);
FNodeClass:=aTree.NodeClass;
NodeClass:=aTree.NodeClass;
if aTree.Root<>nil then
AssignNode(fRoot,aTree.Root);
FCount:=aTree.Count;