Changeset 78 for Generics/TemplateGenerics/Generic

Timestamp:

Oct 30, 2010, 6:39:12 PM (14 years ago)

Author:

george

Message:

• Added: Ability of TListObject to own items and be able to free them on deletion and list destruction.

Location:

Generics/TemplateGenerics/Generic

Files:

• ListImplementation.tpl (modified) (3 diffs)
• ListInterface.tpl (modified) (4 diffs)

Generics/TemplateGenerics/Generic/ListImplementation.tpl

@@ -17 +17 @@
 begin
   Result := FItems[Index];
-end;
-
-function TGList.GetCount: TListIndex;
-begin
-  Result := FCount;
 end;
 
@@ -89 +84 @@
 end;
 
+procedure TGList.Contract;
+begin
+  if (Capacity > 256) and (FCount < Capacity shr 2) then
+  begin
+    Capacity := Capacity shr 1;
+  end;
+end;
+
 function TGList.Extract(Item: TListItem): TListItem;
 var
@@ -344 +347 @@
   FCount := FCount - 1;
   System.Move(FItems[Index + 1], FItems[Index], (FCount - Index) * SizeOf(TListItem));
-  // Shrink the list if appropriate
-  if (Capacity > 256) and (FCount < Capacity shr 2) then
-  begin
-    Capacity := Capacity shr 1;
-  end;
+  Contract;
 end;
 

Generics/TemplateGenerics/Generic/ListInterface.tpl

@@ -14 +14 @@
     FCount: TListIndex;
     function Get(Index: TListIndex): TListItem;
-    function GetCount: TListIndex;
     function GetCapacity: TListIndex;
     procedure SetCapacity(const AValue: TListIndex);
-    procedure Put(Index: TListIndex; const AValue: TListItem);
+    procedure Put(Index: TListIndex; const AValue: TListItem); virtual;
     procedure SetCount(const AValue: TListIndex);
     procedure QuickSort(L, R : TListIndex; Compare: TGListSortCompare);
@@ -23 +22 @@
     // All items
     procedure Reverse;
-    procedure Clear;
+    procedure Clear; virtual;
     procedure Expand;
+    procedure Contract;
     procedure Sort(Compare: TGListSortCompare);
     function Implode(Separator: string; Converter: TGListStringConverter): string;
@@ -34 +34 @@
     // One item
     function Add(Item: TListItem): TListIndex;
-    procedure Delete(Index: TListIndex);
+    procedure Delete(Index: TListIndex); virtual;
     function Extract(Item: TListItem): TListItem;
     procedure Exchange(Index1, Index2: TListIndex);
@@ -51 +51 @@
     function IndexOfList(List: TGList; Start: TListIndex = 0): TListIndex;
     // Other
-    property Count: TListIndex read GetCount write SetCount;
+    property Count: TListIndex read FCount write SetCount;
     property Capacity: TListIndex read GetCapacity write SetCapacity;
     // Array