From 207d40aab625e3b39442f535227b59fad16e4846 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Wed, 19 Oct 2011 18:58:11 +0000
Subject: [PATCH] codetools: added TFilenameToPointerTree

git-svn-id: trunk@32985 -
---
 components/codetools/codetoolsstructs.pas | 37 ++++++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/components/codetools/codetoolsstructs.pas b/components/codetools/codetoolsstructs.pas
index 6307653d31..4d0b68ba32 100644
--- a/components/codetools/codetoolsstructs.pas
+++ b/components/codetools/codetoolsstructs.pas
@@ -133,12 +133,12 @@ type
   public
     constructor Create(TheCaseSensitive: boolean);
     destructor Destroy; override;
-    procedure Clear;
+    procedure Clear; virtual;
     function Contains(const s: string): boolean;
     function ContainsIdentifier(P: PChar): boolean;
     function FindNodeWithIdentifierAsPrefix(P: PChar): TAVLTreeNode;
     procedure GetNames(List: TStrings);
-    procedure Remove(const Name: string);
+    procedure Remove(const Name: string); virtual;
     property CaseSensitive: boolean read FCaseSensitive;
     property Tree: TAVLTree read FTree; // tree of PStringMapItem
     function Equals(OtherTree: TStringMap): boolean; reintroduce;
@@ -180,7 +180,7 @@ type
     procedure AssignItem(Src, Dest: Pointer); override;
   public
     function GetString(const Name: string; out Value: string): boolean;
-    procedure Add(const Name, Value: string);
+    procedure Add(const Name, Value: string); virtual;
     property Strings[const s: string]: string read GetStrings write SetStrings; default;
     function AsText: string;
     procedure Assign(Source: TStringMap); override;
@@ -210,6 +210,7 @@ type
 
   TStringToPointerTree = class(TStringMap)
   private
+    FFreeValues: boolean;
     function GetItems(const s: string): Pointer;
     procedure SetItems(const s: string; AValue: Pointer);
   protected
@@ -218,10 +219,11 @@ type
     procedure AssignItem(Src, Dest: Pointer); override;
   public
     function GetItem(const Name: string; out Value: Pointer): boolean;
-    procedure Add(const Name: string; const Value: Pointer);
+    procedure Add(const Name: string; const Value: Pointer); virtual;
     property Items[const s: string]: Pointer read GetItems write SetItems; default;
     procedure Assign(Source: TStringMap); override;
     function GetEnumerator: TStringToPointerTreeEnumerator;
+    property FreeValues: boolean read FFreeValues write FFreeValues;
   end;
 
   { TFilenameToStringTree }
@@ -231,6 +233,13 @@ type
     constructor Create(CaseInsensitive: boolean); // false = system default
   end;
 
+  { TFilenameToPointerTree }
+
+  TFilenameToPointerTree = class(TStringToPointerTree)
+  public
+    constructor Create(CaseInsensitive: boolean); // false = system default
+  end;
+
   TStringTree = class;
 
   { TStringTreeEnumerator }
@@ -412,6 +421,19 @@ begin
   Result:=CompareStr(AnsiString(Data1),AnsiString(Data2));
 end;
 
+{ TFilenameToPointerTree }
+
+constructor TFilenameToPointerTree.Create(CaseInsensitive: boolean);
+begin
+  inherited Create(true);
+  if CaseInsensitive then
+    SetCompareFuncs(@CompareFilenameToStringItemsI,
+                    @CompareFilenameAndFilenameToStringTreeItemI)
+  else
+    SetCompareFuncs(@CompareFilenameToStringItems,
+                    @CompareFilenameAndFilenameToStringTreeItem);
+end;
+
 { TStringToPointerTree }
 
 function TStringToPointerTree.GetItems(const s: string): Pointer;
@@ -432,7 +454,10 @@ var
 begin
   Node:=FindNode(s);
   if Node<>nil then begin
-    PStringToPointerTreeItem(Node.Data)^.Value:=AValue;
+    NewItem:=PStringToPointerTreeItem(Node.Data);
+    if FreeValues then
+      TObject(NewItem^.Value).Free;
+    NewItem^.Value:=AValue;
   end else begin
     New(NewItem);
     NewItem^.Name:=s;
@@ -445,6 +470,8 @@ procedure TStringToPointerTree.DisposeItem(p: Pointer);
 var
   Item: PStringToPointerTreeItem absolute p;
 begin
+  if FreeValues then
+    TObject(Item^.Value).Free;
   Dispose(Item);
 end;