Changeset 304 for Generics

Timestamp:

Dec 19, 2011, 9:19:00 AM (13 years ago)

Author:

chronos

Message:

• Added: Handling of TStream by TListByte.

Location:

Generics/TemplateGenerics

Files:

• Generic/GenericList.inc (modified) (7 diffs)
• Specialized/SpecializedList.pas (modified) (2 diffs)

Generics/TemplateGenerics/Generic/GenericList.inc

@@ -29 +29 @@
     procedure AddArray(Values: array of TGListItem);
     procedure AddList(List: TGList);
+    procedure AddListPart(List: TGList; ItemIndex, ItemCount: TGListIndex);
     procedure Assign(Source: TGList); virtual;
     constructor Create; virtual;
@@ -42 +43 @@
     function GetArray: TGListItemArray;
     function Implode(Separator: string; Converter: TGListToStringConverter): string;
-    function IndexOf(Item: TGListItem; Start: TGListIndex = 0): TGListIndex; virtual;
+    function IndexOf(Item: TGListItem; Start: TGListIndex = 0): TGListIndex;
     function IndexOfList(List: TGList; Start: TGListIndex = 0): TGListIndex;
     procedure Insert(Index: TGListIndex; Item: TGListItem);
@@ -51 +52 @@
     function Remove(Item: TGListItem): TGListIndex;
     procedure Reverse;
-    procedure Replace(Index: TGListIndex; Source: TGList);
+    procedure ReplaceList(Index: TGListIndex; Source: TGList);
+    procedure ReplaceListPart(Index: TGListIndex; Source: TGList;
+      SourceIndex, SourceCount: TGListIndex);
     procedure Sort(Compare: TGListSortCompare);
     procedure SetArray(Values: array of TGListItem);
@@ -80 +83 @@
 end;
 
-procedure TGList.Replace(Index: TGListIndex; Source: TGList);
+procedure TGList.ReplaceList(Index: TGListIndex; Source: TGList);
 var
   I: TGListIndex;
@@ -87 +90 @@
   while I < Source.Count do begin
     Items[Index + I] := Source[I];
+    I := I + 1;
+  end;
+end;
+
+procedure TGList.ReplaceListPart(Index: TGListIndex; Source: TGList;
+  SourceIndex, SourceCount: TGListIndex);
+var
+  I: TGListIndex;
+begin
+  I := 0;
+  while I < SourceCount do begin
+    Items[Index + I] := Source[SourceIndex + I];
     I := I + 1;
   end;
@@ -374 +389 @@
     I := 0;
     while I < Count do begin
-      if not CompareMem(@FItems[I], @List.FItems[I], SizeOf(TGListItem)) then begin
+      if not CompareMem(Addr(FItems[I]), Addr(List.FItems[I]), SizeOf(TGListItem)) then begin
         Result := False;
         Break;
@@ -469 +484 @@
 var
   I: TGListIndex;
-begin
-  I := 0;
-  while I < List.Count do begin
-    Add(List[I]);
-    I := I + 1;
+  J: TGListIndex;
+begin
+  I := Count;
+  J := 0;
+  Count := Count + List.Count;
+  while I < Count do begin
+    Items[I] := List[J];
+    I := I + 1;
+    J := J + 1;
+  end;
+end;
+
+procedure TGList.AddListPart(List: TGList; ItemIndex, ItemCount: TGListIndex);
+var
+  I: TGListIndex;
+  J: TGListIndex;
+begin
+  I := Count;
+  J := ItemIndex;
+  Count := Count + ItemCount;
+  while I < Count do begin
+    Items[I] := List[J];
+    I := I + 1;
+    J := J + 1;
   end;
 end;

Generics/TemplateGenerics/Specialized/SpecializedList.pas

@@ -90 +90 @@
 TListByte = class(TListByteBase)
   procedure WriteToStream(Stream: TStream);
+  procedure WriteToStreamPart(Stream: TStream; ItemIndex, ItemCount: TGListIndex);
+  procedure ReplaceStream(Stream: TStream);
+  procedure ReplaceStreamPart(Stream: TStream; ItemIndex, ItemCount: TGListIndex);
+  procedure AddStream(Stream: TStream);
+  procedure AddStreamPart(Stream: TStream; ItemCount: TGListIndex);
 end;
 
@@ -338 +343 @@
 end;
 
+{ TListByte }
+
 procedure TListByte.WriteToStream(Stream: TStream);
 var
   I: Integer;
 begin
+  Stream.Position := 0;
   I := 0;
-  while I < Count do
+  while I < Count do begin
     Stream.WriteByte(Items[I]);
-end;
-
+    I := I + 1;
+  end;
+end;
+
+procedure TListByte.WriteToStreamPart(Stream: TStream; ItemIndex, ItemCount: Integer);
+var
+  I: Integer;
+begin
+  I := ItemIndex;
+  while I < ItemCount do begin
+    Stream.WriteByte(Items[I]);
+    I := I + 1;
+  end;
+end;
+
+procedure TListByte.ReplaceStream(Stream: TStream);
+var
+  I: Integer;
+begin
+  Stream.Position := 0;
+  I := 0;
+  while I < Count do begin
+    Items[I] := Stream.ReadByte;
+    I := I + 1;
+  end;
+end;
+
+procedure TListByte.ReplaceStreamPart(Stream: TStream; ItemIndex,
+  ItemCount: Integer);
+var
+  I: Integer;
+begin
+  I := ItemIndex;
+  while I < ItemCount do begin
+    Items[I] := Stream.ReadByte;
+    I := I + 1;
+  end;
+end;
+
+procedure TListByte.AddStream(Stream: TStream);
+var
+  I: Integer;
+begin
+  Stream.Position := 0;
+  I := Count;
+  Count := Count + Stream.Size;
+  while I < Count do begin
+    Items[I] := Stream.ReadByte;
+    I := I + 1;
+  end;
+end;
+
+procedure TListByte.AddStreamPart(Stream: TStream; ItemCount: Integer);
+var
+  I: Integer;
+begin
+  I := Count;
+  Count := Count + ItemCount;
+  while I < Count do begin
+    Items[I] := Stream.ReadByte;
+    I := I + 1;
+  end;
+end;
 
 end.