Changeset 76 for Generics/TemplateGenerics/Generic/ListImplementation.tpl

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.

File:

• Generics/TemplateGenerics/Generic/ListImplementation.tpl (modified) (4 diffs)

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