Changeset 76 for Generics/TemplateGenerics/Generic

Timestamp:

Oct 29, 2010, 7:49:29 AM (14 years ago)

Author:

george

Message:

• Added: Partial generic set implementation.
• Modified: TGStack, TGQueue and TGSet owns TGList instead of inherits.
• Added: TList and TListPointer benchmark comparasion.

Location:

Generics/TemplateGenerics/Generic

Files:

• ListImplementation.tpl (modified) (4 diffs)
• QueueImplementation.tpl (modified) (1 diff)
• QueueInterface.tpl (modified) (1 diff)
• SetImplementation.tpl (added)
• SetInterface.tpl (added)
• StackImplementation.tpl (modified) (1 diff)
• StackInterface.tpl (modified) (1 diff)

Generics/TemplateGenerics/Generic/ListImplementation.tpl

@@ -1 +1 @@
 uses
   RtlConsts;
-
-// Used instead of System.Move form because of error: Identifier "System" not found
-procedure SystemMove(const Source; var Dest; Count: SizeInt);
-begin
-  Move(Source, Dest, Count);
-end;
 
 { TGList }
@@ -130 +124 @@
   if FCount = Capacity then Expand;
   if Index < FCount then
-    SystemMove(FItems[Index], FItems[Index + 1], (FCount - Index) * SizeOf(TListItem));
+    System.Move(FItems[Index], FItems[Index + 1], (FCount - Index) * SizeOf(TListItem));
   FItems[Index] := Item;
   FCount := FCount + 1;
@@ -163 +157 @@
     raise EListError.CreateFmt(SlistIndexError, [NewIndex]);
   Temp := FItems[CurIndex];
-  Delete(CurIndex);
-  Insert(NewIndex, Temp);
+  if NewIndex > CurIndex then begin
+    System.Move(FItems[CurIndex + 1], FItems[CurIndex], (NewIndex - CurIndex) * SizeOf(TListItem));
+  end else
+  if NewIndex < CurIndex then begin
+    System.Move(FItems[NewIndex], FItems[NewIndex + 1], (CurIndex - NewIndex) * SizeOf(TListItem));
+  end;
+  FItems[NewIndex] := Temp;
+  //Delete(CurIndex);
+  //Insert(NewIndex, Temp);
 end;
 
@@ -289 +290 @@
     raise EListError.CreateFmt(SListIndexError, [Index]);
   FCount := FCount - 1;
-  SystemMove(FItems[Index + 1], FItems[Index], (FCount - Index) * SizeOf(TListItem));
+  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

Generics/TemplateGenerics/Generic/QueueImplementation.tpl

@@ -5 +5 @@
 procedure TGQueue.Enqueue(Value: TQueueItem);
 begin
-  Add(Value);
+  FList.Add(Value);
 end;
 
 function TGQueue.Peek: TQueueItem;
 begin
-  Result := First;
+  Result := FList.First;
+end;
+
+constructor TGQueue.Create;
+begin
+  FList := TGList.Create;
+end;
+
+destructor TGQueue.Destroy;
+begin
+  FList.Free;
+  inherited Destroy;
 end;
 
 function TGQueue.Dequeue: TQueueItem;
 begin
-  Result := Extract(First);
+  Result := FList.Extract(FList.First);
 end;
 

Generics/TemplateGenerics/Generic/QueueInterface.tpl

@@ -4 +4 @@
   {$INCLUDE 'ListInterface.tpl'}
 
-  // TGQueue<TListIndex, TListItem> = class(TGList)
-  TGQueue = class(TGList)
+  // TGQueue<TSetIndex, TSetItem> = class(TGList)
+  TGQueue = class
   private
+    FList: TGList;
   public
     procedure Enqueue(Value: TQueueItem);
     function Dequeue: TQueueItem;
     function Peek: TQueueItem;
+    constructor Create;
+    destructor Destroy; override;
+    property List: TGList read FList;
   end;

Generics/TemplateGenerics/Generic/StackImplementation.tpl

@@ -5 +5 @@
 procedure TGStack.Push(Value: TStackItem);
 begin
-  Add(Value);
+  FList.Add(Value);
 end;
 
 function TGStack.Pop: TStackItem;
 begin
-  Result := Extract(Last);
+  Result := FList.Extract(FList.Last);
 end;
 
+constructor TGStack.Create;
+begin
+  FList := TGList.Create;
+end;
+
+destructor TGStack.Destroy;
+begin
+  FList.Free;
+  inherited Destroy;
+end;
+

Generics/TemplateGenerics/Generic/StackInterface.tpl

@@ -4 +4 @@
   {$INCLUDE 'ListInterface.tpl'}
 
-  // TGStack<TListIndex, TListItem> = class(TGList)
-  TGStack = class(TGList)
+  // TGStack<TStackIndex, TStackItem> = class(TGList)
+  TGStack = class
   private
+    FList: TGList;
   public
     procedure Push(Value: TStackItem);
     function Pop: TStackItem;
+    constructor Create;
+    destructor Destroy; override;
+    property List: TGList read FList;
   end;