Changeset 342 for Generics/TemplateGenerics/Specialized

Timestamp:

Apr 3, 2012, 7:35:26 AM (13 years ago)

Author:

chronos

Message:

• Added: Update locking support for TGList.
• Modified: Enhanced TGStream methods.

Location:

Generics/TemplateGenerics/Specialized

Files:

• SpecializedList.pas (modified) (2 diffs)
• SpecializedStream.pas (modified) (8 diffs)

Generics/TemplateGenerics/Specialized/SpecializedList.pas

@@ -95 +95 @@
   procedure AddStream(Stream: TStream);
   procedure AddStreamPart(Stream: TStream; ItemCount: TGListIndex);
+  procedure WriteBuffer(var Buffer; Count: Integer);
+  procedure ReadBuffer(var Buffer; Count: Integer);
 end;
 
@@ -417 +419 @@
 end;
 
+procedure TListByte.WriteBuffer(var Buffer; Count: Integer);
+begin
+
+end;
+
+procedure TListByte.ReadBuffer(var Buffer; Count: Integer);
+begin
+
+end;
+
 end.

Generics/TemplateGenerics/Specialized/SpecializedStream.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, SpecializedList;
+  Classes, SysUtils, SpecializedList, DateUtils;
 
 type
@@ -29 +29 @@
 {$DEFINE TGStreamItem := Byte}
 {$DEFINE TGStreamList := TListStreamByte}
-{$DEFINE TGStream := TStreamByte}
+{$DEFINE TGStream := TBaseStreamByte}
 {$DEFINE TGStreamSortCompare := TStreamByteSortCompare}
 {$DEFINE TGStreamToStringConverter := TStreamByteToStringConverter}
@@ -49 +49 @@
 {$I 'GenericStream.inc'}
 
+  TStreamByte = class(TBaseStreamByte)
+    function ReadBuffer(var Buffer; Count: Integer): Integer; virtual; abstract;
+    function WriteBuffer(var Buffer; Count: Integer): Integer; virtual; abstract;
+  end;
+
+  { TMemoryStreamByte }
+
+  TMemoryStreamByte = class(TStreamByte)
+  private
+    FList: TListByte;
+    FOwnsList: Boolean;
+    FPosition: Integer;
+  public
+    procedure Assign(Source: TBaseStreamByte); override;
+    procedure Write(Item: Byte); override;
+    procedure WriteArray(Values: array of Byte); override;
+    procedure WriteList(List: TListByte);
+    function WriteBuffer(var Buffer; Count: Integer): Integer; override;
+    procedure WriteStream(Stream: TBaseStreamByte; Count: Integer); override;
+    function Read: Byte; override;
+    function ReadArray(Count: Integer): TStreamByteItemArray; override;
+    function ReadList(List: TListByte; Count: Integer): Integer;
+    function ReadBuffer(var Buffer; Count: Integer): Integer; override;
+    function ReadStream(Stream: TBaseStreamByte; Count: Integer): Integer; override;
+    function Insert(Count: Integer): Integer; override;
+    function Remove(Count: Integer): Integer; override;
+    function Seek(Offset: Integer; Origin: TSeekOrigin = soCurrent): Integer; override;
+    constructor Create; override; overload;
+    constructor Create(AList: TListByte); overload;
+    destructor Destroy; override;
+    property OwnsList: Boolean read FOwnsList write FOwnsList;
+    property List: TListByte read FList;
+  end;
+
+
+implementation
+
 { TMemoryStreamByte }
 
-TMemoryStreamByte = class(TStreamByte)
-private
-  FList: TListByte;
-  FPosition: Integer;
-public
-  procedure Assign(Source: TStreamByte); override;
-  procedure Write(Item: Byte); override;
-  procedure WriteArray(Values: array of Byte); override;
-  procedure WriteList(List: TListByte);
-  function Read: Byte; override;
-  function ReadArray(Count: Integer): TStreamByteItemArray; override;
-  function ReadList(List: TListByte; Count: Integer): Integer;
-  function Insert(Count: Integer): Integer; override;
-  function Remove(Count: Integer): Integer; override;
-  function Seek(Offset: Integer; Origin: TSeekOrigin = soCurrent): Integer; override;
-  constructor Create; override;
-  destructor Destroy; override;
-  property List: TListByte read FList;
-end;
-
-
-implementation
-
-{ TMemoryStreamByte }
-
-procedure TMemoryStreamByte.Assign(Source: TStreamByte);
+procedure TMemoryStreamByte.Assign(Source: TBaseStreamByte);
 begin
   inherited;
@@ -106 +118 @@
 end;
 
+procedure TMemoryStreamByte.WriteStream(Stream: TBaseStreamByte; Count: Integer);
+begin
+
+end;
+
+function TMemoryStreamByte.WriteBuffer(var Buffer; Count: Integer): Integer;
+begin
+
+end;
+
 function TMemoryStreamByte.Read: Byte;
 begin
@@ -125 +147 @@
 end;
 
+function TMemoryStreamByte.ReadBuffer(var Buffer; Count: Integer): Integer;
+begin
+
+end;
+
+function TMemoryStreamByte.ReadStream(Stream: TBaseStreamByte; Count: Integer
+  ): Integer;
+begin
+
+end;
+
 function TMemoryStreamByte.Insert(Count: Integer): Integer;
 begin
@@ -154 +187 @@
   inherited;
   FList := TListByte.Create;
+  OwnsList := True;
+end;
+
+constructor TMemoryStreamByte.Create(AList: TListByte);
+begin
+  inherited Create;
+  FList := AList;
+  OwnsList := False;
 end;
 
 destructor TMemoryStreamByte.Destroy;
 begin
-  FList.Free;
+  if OwnsList then FList.Free;
   inherited Destroy;
 end;
@@ -181 +222 @@
 {$DEFINE TGStreamItem := Byte}
 {$DEFINE TGStreamList := TListStreamByte}
-{$DEFINE TGStream := TStreamByte}
+{$DEFINE TGStream := TBaseStreamByte}
 {$DEFINE TGStreamSortCompare := TStreamByteSortCompare}
 {$DEFINE TGStreamToStringConverter := TStreamByteToStringConverter}
@@ -200 +241 @@
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericStream.inc'}
+
+
+
 end.