Changeset 321 for Generics/NativeGenerics/Units/GenericList.pas

Timestamp:

Feb 7, 2012, 3:35:32 PM (13 years ago)

Author:

chronos

Message:

• Partial commit of NativeGenerics.

File:

• Generics/NativeGenerics/Units/GenericList.pas (modified) (7 diffs)

Generics/NativeGenerics/Units/GenericList.pas

@@ -9 +9 @@
 
 type
+
+  { TGList }
+
   TGList<TItem> = class
-  private
+  public
   type
     TIndex = NativeInt;
@@ -17 +20 @@
     TFromStringConverter = function(Text: string): TItem;
     TItemArray = array of TItem;
-  var
+  private
+    FCount: TIndex;
     FItems: array of TItem;
-    FCount: TIndex;
     function Get(Index: TIndex): TItem;
     function GetCapacity: TIndex;
+    function GetFirst: TItem;
     function GetLast: TItem;
-    function GetFirst: TItem;
     procedure SetCapacity(const AValue: TIndex);
     procedure SetCapacityOptimized(const NewCapacity: TIndex);
+    procedure SetCount(const AValue: TIndex);
+    procedure SetFirst(AValue: TItem);
     procedure SetLast(AValue: TItem);
-    procedure SetFirst(AValue: TItem);
     procedure Put(Index: TIndex; const AValue: TItem); virtual;
-    procedure SetCount(const AValue: TIndex); virtual;
     procedure QuickSort(L, R : TIndex; Compare: TSortCompare);
   public
@@ -52 +55 @@
     procedure InsertList(Index: TIndex; List: TGList<TItem>);
     procedure InsertArray(Index: TIndex; Values: array of TItem);
+    procedure InsertCount(Index: TIndex; ACount: TIndex);
     procedure Move(CurIndex, NewIndex: TIndex);
     procedure MoveItems(CurIndex, NewIndex, Count: TIndex);
     function Remove(Item: TItem): TIndex;
     procedure Reverse;
+    procedure ReplaceArray(Index: TIndex; Values: array of TItem);
+    procedure ReplaceList(Index: TIndex; Source: TGList<TItem>);
+    procedure ReplaceListPart(Index: TIndex; Source: TGList<TItem>;
+      SourceIndex, SourceCount: TIndex);
     procedure Sort(Compare: TSortCompare);
     procedure SetArray(Values: array of TItem);
@@ -84 +92 @@
     constructor Create;
     destructor Destroy; override;
-
   end;
 
@@ -230 +237 @@
 procedure TGList<TItem>.Insert(Index: TIndex; Item: TItem);
 begin
-  if (Index < 0) or (Index > FCount ) then
+  if (Index < 0) or (Index > FCount) then
     raise EListError.CreateFmt(SListIndexError, [Index]);
-  if FCount = Capacity then SetCapacityOptimized(Capacity + 1);
-  if Index < FCount then
-    System.Move(FItems[Index], FItems[Index + 1], (FCount - Index) * SizeOf(TItem));
+  InsertCount(Index, 1);
   FItems[Index] := Item;
-  FCount := FCount + 1;
 end;
 
 procedure TGList<TItem>.InsertList(Index: TIndex; List: TGList<TItem>);
-var
-  I: TIndex;
-begin
-  I := 0;
-  while (I < List.Count) do begin
-    Insert(Index + I, List[I]);
-    I := I + 1;
-  end;
+begin
+  if (Index < 0) or (Index > FCount) then
+    raise EListError.CreateFmt(SListIndexError, [Index]);
+  InsertCount(Index, List.Count);
+  ReplaceList(Index, List);
 end;
 
@@ -381 +382 @@
 end;
 
+procedure TGList<TItem>.ReplaceArray(Index: TIndex;
+  Values: array of TItem);
+var
+  I: TIndex;
+begin
+  I := 0;
+  while I < Length(Values) do begin
+    Items[Index + I] := Values[I];
+    I := I + 1;
+  end;
+end;
+
+procedure TGList<TItem>.ReplaceList(Index: TIndex; Source: TGList<TItem>);
+var
+  I: TIndex;
+begin
+  I := 0;
+  while I < Source.Count do begin
+    Items[Index + I] := Source[I];
+    I := I + 1;
+  end;
+end;
+
+procedure TGList<TItem>.ReplaceListPart(Index: TIndex; Source: TGList<TItem>;
+  SourceIndex, SourceCount: TIndex);
+var
+  I: TIndex;
+begin
+  I := 0;
+  while I < SourceCount do begin
+    Items[Index + I] := Source[SourceIndex + I];
+    I := I + 1;
+  end;
+end;
+
 procedure TGList<TItem>.Sort(Compare: TSortCompare);
 begin
@@ -411 +447 @@
 
 procedure TGList<TItem>.InsertArray(Index: TIndex; Values: array of TItem);
-var
-  I: TIndex;
-begin
-  I := 0;
-  while I <= High(Values) do begin
-    Insert(Index + I, Values[I]);
-    I := I + 1;
-  end;
+begin
+  if (Index < 0) or (Index > FCount) then
+    raise EListError.CreateFmt(SListIndexError, [Index]);
+  InsertCount(Index, Length(Values));
+  ReplaceArray(Index, Values);
+end;
+
+procedure TGList<TItem>.InsertCount(Index: TIndex; ACount: TIndex);
+begin
+  if (Index < 0) or (Index > FCount) then
+    raise EListError.CreateFmt(SListIndexError, [Index]);
+  Count := Count + ACount;
+  if Index < FCount then
+    System.Move(FItems[Index], FItems[Index + ACount], (FCount - ACount - Index) * SizeOf(TItem));
 end;