Changeset 323 for Generics/NativeGenerics

Timestamp:

Feb 8, 2012, 9:52:27 AM (13 years ago)

Author:

chronos

Message:

• Modified: TGStream renamed to TGAbstractStream. TGMemoryStream renamed to TGStream as memory implementation will be most used class.

Location:

Generics/NativeGenerics

Files:

• Demo/Demo.lpi (modified) (3 diffs)
• Demo/UMainForm.pas (modified) (2 diffs)
• Units/GenericStream.pas (modified) (14 diffs)

Generics/NativeGenerics/Demo/Demo.lpi

@@ -60 +60 @@
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="191"/>
-        <CursorPos X="1" Y="205"/>
+        <TopLine Value="178"/>
+        <CursorPos X="15" Y="191"/>
         <UsageCount Value="233"/>
         <Bookmarks Count="1">
@@ -462 +462 @@
         <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="148"/>
-        <CursorPos X="3" Y="150"/>
+        <TopLine Value="102"/>
+        <CursorPos X="20" Y="117"/>
         <UsageCount Value="15"/>
         <Loaded Value="True"/>
@@ -558 +558 @@
       </Unit58>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="28">
+    <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="23" Column="22" TopLine="10"/>
+        <Caret Line="443" Column="1" TopLine="429"/>
       </Position1>
       <Position2>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="669" Column="21" TopLine="656"/>
+        <Caret Line="442" Column="3" TopLine="429"/>
       </Position2>
       <Position3>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="185" Column="19" TopLine="179"/>
+        <Caret Line="656" Column="20" TopLine="643"/>
       </Position3>
       <Position4>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="49" Column="14" TopLine="36"/>
+        <Caret Line="189" Column="3" TopLine="182"/>
       </Position4>
       <Position5>
         <Filename Value="../Units/GenericStream.pas"/>
-        <Caret Line="45" Column="48" TopLine="27"/>
+        <Caret Line="43" Column="15" TopLine="30"/>
       </Position5>
       <Position6>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="198" Column="25" TopLine="185"/>
+        <Caret Line="191" Column="1" TopLine="182"/>
       </Position6>
       <Position7>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="669" Column="21" TopLine="656"/>
+        <Caret Line="192" Column="1" TopLine="182"/>
       </Position7>
       <Position8>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="164" Column="1" TopLine="151"/>
+        <Caret Line="193" Column="1" TopLine="182"/>
       </Position8>
       <Position9>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="442" Column="1" TopLine="429"/>
+        <Caret Line="194" Column="1" TopLine="182"/>
       </Position9>
       <Position10>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="443" Column="1" TopLine="429"/>
+        <Caret Line="195" Column="1" TopLine="182"/>
       </Position10>
       <Position11>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="442" Column="3" TopLine="429"/>
+        <Caret Line="196" Column="1" TopLine="182"/>
       </Position11>
       <Position12>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="656" Column="20" TopLine="643"/>
+        <Caret Line="197" Column="1" TopLine="182"/>
       </Position12>
       <Position13>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="189" Column="3" TopLine="182"/>
+        <Caret Line="198" Column="1" TopLine="182"/>
       </Position13>
       <Position14>
-        <Filename Value="../Units/GenericStream.pas"/>
-        <Caret Line="43" Column="15" TopLine="30"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="199" Column="1" TopLine="182"/>
       </Position14>
       <Position15>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="191" Column="1" TopLine="182"/>
+        <Caret Line="200" Column="1" TopLine="182"/>
       </Position15>
       <Position16>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="192" Column="1" TopLine="182"/>
+        <Caret Line="201" Column="1" TopLine="182"/>
       </Position16>
       <Position17>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="193" Column="1" TopLine="182"/>
+        <Caret Line="202" Column="1" TopLine="191"/>
       </Position17>
       <Position18>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="194" Column="1" TopLine="182"/>
+        <Caret Line="203" Column="1" TopLine="191"/>
       </Position18>
       <Position19>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="195" Column="1" TopLine="182"/>
+        <Caret Line="204" Column="1" TopLine="191"/>
       </Position19>
       <Position20>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="196" Column="1" TopLine="182"/>
+        <Caret Line="205" Column="1" TopLine="191"/>
       </Position20>
       <Position21>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="197" Column="1" TopLine="182"/>
+        <Filename Value="../Units/GenericStream.pas"/>
+        <Caret Line="11" Column="19" TopLine="1"/>
       </Position21>
       <Position22>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="198" Column="1" TopLine="182"/>
+        <Filename Value="../Units/GenericStream.pas"/>
+        <Caret Line="23" Column="32" TopLine="10"/>
       </Position22>
       <Position23>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="199" Column="1" TopLine="182"/>
+        <Filename Value="../Units/GenericStream.pas"/>
+        <Caret Line="38" Column="43" TopLine="25"/>
       </Position23>
       <Position24>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="200" Column="1" TopLine="182"/>
+        <Filename Value="../Units/GenericStream.pas"/>
+        <Caret Line="43" Column="40" TopLine="30"/>
       </Position24>
       <Position25>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="201" Column="1" TopLine="182"/>
+        <Filename Value="../Units/GenericStream.pas"/>
+        <Caret Line="64" Column="52" TopLine="51"/>
       </Position25>
       <Position26>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="202" Column="1" TopLine="191"/>
+        <Filename Value="../Units/GenericStream.pas"/>
+        <Caret Line="105" Column="23" TopLine="90"/>
       </Position26>
       <Position27>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="203" Column="1" TopLine="191"/>
+        <Filename Value="../Units/GenericStream.pas"/>
+        <Caret Line="38" Column="11" TopLine="25"/>
       </Position27>
       <Position28>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="204" Column="1" TopLine="191"/>
+        <Filename Value="../Units/GenericStream.pas"/>
+        <Caret Line="199" Column="15" TopLine="174"/>
       </Position28>
       <Position29>
         <Filename Value="UMainForm.pas"/>
-        <Caret Line="205" Column="1" TopLine="191"/>
+        <Caret Line="744" Column="81" TopLine="1"/>
       </Position29>
       <Position30>
-        <Filename Value="../Units/GenericStream.pas"/>
-        <Caret Line="150" Column="3" TopLine="148"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="184" Column="13" TopLine="171"/>
       </Position30>
     </JumpHistory>

Generics/NativeGenerics/Demo/UMainForm.pas

@@ -182 +182 @@
 procedure TMainForm.ButtonStreamByteClick(Sender: TObject);
 var
-  Stream: TGMemoryStream<Byte>;
+  Stream: TGStream<Byte>;
   I: Integer;
   ByteArray: array of Byte;
@@ -189 +189 @@
   ListViewOutput.Clear;
   LabelTestName.Caption := 'TStreamByte test';
-  Stream := TGMemoryStream<Byte>.Create;
+  Stream := TGStream<Byte>.Create;
   with Stream do try
     WriteOutput('Size := ', IntToStr(Stream.Size));

Generics/NativeGenerics/Units/GenericStream.pas

@@ -9 +9 @@
 
 type
-  TGStream<TItem> = class
+  TGAbstractStream<TItem> = class
   public
     type
@@ -21 +21 @@
     function GetPosition: TIndex;
   public
-    procedure Assign(Source: TGStream<TItem>); virtual;
+    procedure Assign(Source: TGAbstractStream<TItem>); virtual;
     procedure Write(Item: TItem); virtual; abstract;
     procedure WriteArray(Item: array of TItem); virtual; abstract;
@@ -36 +36 @@
   end;
 
-  TGMemoryStream<TItem> = class(TGStream<TItem>)
+  TGStream<TItem> = class(TGAbstractStream<TItem>)
   private
     FList: TGList<TItem>;
     FPosition: TIndex;
   public
-    procedure Assign(Source: TGStream<TItem>); override;
+    procedure Assign(Source: TGAbstractStream<TItem>); override;
     procedure Write(Item: TItem); override;
     procedure WriteArray(Values: array of TItem); override;
@@ -62 +62 @@
 { TGStream }
 
-procedure TGStream<TItem>.Assign(Source: TGStream<TItem>);
+procedure TGAbstractStream<TItem>.Assign(Source: TGAbstractStream<TItem>);
 begin
 end;
 
-procedure TGStream<TItem>.SetPosition(AValue: TIndex);
+procedure TGAbstractStream<TItem>.SetPosition(AValue: TIndex);
 begin
   Seek(AValue, soBeginning);
 end;
 
-function TGStream<TItem>.GetPosition: TIndex;
+function TGAbstractStream<TItem>.GetPosition: TIndex;
 begin
   Result := Seek(0, soCurrent);
 end;
 
-procedure TGStream<TItem>.SetSize(AValue: TIndex);
+procedure TGAbstractStream<TItem>.SetSize(AValue: TIndex);
 var
   StreamSize: TIndex;
@@ -94 +94 @@
 end;
 
-function TGStream<TItem>.GetSize: TIndex;
+function TGAbstractStream<TItem>.GetSize: TIndex;
 var
   OldPosition: Integer;
@@ -103 +103 @@
 end;
 
-constructor TGStream<TItem>.Create;
+constructor TGAbstractStream<TItem>.Create;
 begin
   inherited;
 end;
 
-{ TMemoryStreamByte }
+{ TGStream }
 
-procedure TGMemoryStream<TItem>.Assign(Source: TGStream<TItem>);
+procedure TGStream<TItem>.Assign(Source: TGAbstractStream<TItem>);
 begin
   inherited;
-  if Source is TGMemoryStream<TItem> then begin
-    FList.Assign(TGMemoryStream<TItem>(Source).FList);
-    FPosition := TGMemoryStream<TItem>(Source).FPosition;
+  if Source is TGStream<TItem> then begin
+    FList.Assign(TGStream<TItem>(Source).FList);
+    FPosition := TGStream<TItem>(Source).FPosition;
   end;
 end;
 
-procedure TGMemoryStream<TItem>.Write(Item: TItem);
+procedure TGStream<TItem>.Write(Item: TItem);
 begin
   if FList.Count < (FPosition + 1) then
@@ -127 +127 @@
 end;
 
-procedure TGMemoryStream<TItem>.WriteArray(Values: array of TItem);
+procedure TGStream<TItem>.WriteArray(Values: array of TItem);
 begin
   if FList.Count < (FPosition + Length(Values)) then
@@ -135 +135 @@
 end;
 
-procedure TGMemoryStream<TItem>.WriteList(List: TGList<TItem>);
+procedure TGStream<TItem>.WriteList(List: TGList<TItem>);
 begin
   FList.ReplaceList(FPosition, List);
 end;
 
-function TGMemoryStream<TItem>.Read: TItem;
+function TGStream<TItem>.Read: TItem;
 begin
   Result := FList[FPosition];
@@ -146 +146 @@
 end;
 
-function TGMemoryStream<TItem>.ReadArray(Count: TIndex): TItemArray;
+function TGStream<TItem>.ReadArray(Count: TIndex): TItemArray;
 begin
   Result := FList.GetArray(FPosition, Count);
 end;
 
-function TGMemoryStream<TItem>.ReadList(List: TGList<TItem>; Count: TIndex): TIndex;
+function TGStream<TItem>.ReadList(List: TGList<TItem>; Count: TIndex): TIndex;
 begin
   if (FPosition + Count) > FList.Count then
@@ -159 +159 @@
 end;
 
-function TGMemoryStream<TItem>.Insert(Count: TIndex): TIndex;
+function TGStream<TItem>.Insert(Count: TIndex): TIndex;
 begin
   FList.InsertCount(FPosition, Count);
@@ -165 +165 @@
 end;
 
-function TGMemoryStream<TItem>.Remove(Count: TIndex): TIndex;
+function TGStream<TItem>.Remove(Count: TIndex): TIndex;
 begin
   Result := FList.Count - FPosition;
@@ -172 +172 @@
 end;
 
-function TGMemoryStream<TItem>.Seek(Offset: TIndex; Origin: TSeekOrigin): TIndex;
+function TGStream<TItem>.Seek(Offset: TIndex; Origin: TSeekOrigin): TIndex;
 begin
   case Origin of
@@ -184 +184 @@
 end;
 
-constructor TGMemoryStream<TItem>.Create;
+constructor TGStream<TItem>.Create;
 begin
   inherited;
@@ -190 +190 @@
 end;
 
-destructor TGMemoryStream<TItem>.Destroy;
+destructor TGStream<TItem>.Destroy;
 begin
   FList.Free;