Changeset 342 for Generics

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

Files:

• Additional (added)
• Additional/UBinarySerializer.pas (added)
• Generic/GenericList.inc (modified) (21 diffs)
• Generic/GenericRectangle.inc (modified) (4 diffs)
• Generic/GenericStream.inc (modified) (1 diff)
• Specialized/SpecializedList.pas (modified) (2 diffs)
• Specialized/SpecializedStream.pas (modified) (8 diffs)
• TemplateGenerics.lpk (modified) (4 diffs)
• TemplateGenerics.pas (modified) (1 diff)

Generics/TemplateGenerics/Generic/GenericList.inc

@@ -24 +24 @@
     FItems: array of TGListItem;
     FCount: TGListIndex;
+    FUpdateCount: NativeInt;
+    FOnUpdate: TNotifyEvent;
     function Get(Index: TGListIndex): TGListItem;
     function GetCapacity: TGListIndex;
@@ -72 +74 @@
     procedure Sort(Compare: TGListSortCompare);
     procedure SetArray(Values: array of TGListItem);
+    procedure BeginUpdate;
+    procedure EndUpdate;
+    procedure Update;
     property Count: TGListIndex read FCount write SetCount;
     property Capacity: TGListIndex read GetCapacity write SetCapacity;
@@ -107 +112 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -118 +124 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -130 +137 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -248 +256 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -294 +303 @@
   InsertCount(Index, 1);
   FItems[Index] := Item;
+  Update;
 end;
 
@@ -319 +329 @@
   if Index < FCount then
     System.Move(FItems[Index], FItems[Index + ACount], (FCount - ACount - Index) * SizeOf(TGListItem));
+  Update;
 end;
 
@@ -409 +420 @@
   //Delete(CurIndex);
   //Insert(NewIndex, Temp);
+  Update;
 end;
 
@@ -434 +446 @@
     end;
   end;
+  Update;
 end;
 
@@ -469 +482 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -475 +489 @@
   if FCount > 1 then
     QuickSort(0, FCount - 1, Compare);
+  Update;
 end;
 
@@ -486 +501 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -498 +514 @@
     I := I + 1;
   end;
+end;
+
+procedure TGList.BeginUpdate;
+begin
+  Inc(FUpdateCount);
+end;
+
+procedure TGList.EndUpdate;
+begin
+  Dec(FUpdateCount);
+  Update;
+end;
+
+procedure TGList.Update;
+begin
+  if Assigned(FOnUpdate) and (FUpdateCount = 0) then FOnUpdate(Self);
 end;
 
@@ -530 +562 @@
   Result := FCount - 1;
   FItems[Result] := Item;
+  Update;
 end;
 
@@ -545 +578 @@
     J := J + 1;
   end;
+  Update;
 end;
 
@@ -560 +594 @@
     J := J + 1;
   end;
+  Update;
 end;
 
@@ -575 +610 @@
   System.Move(FItems[Index + 1], FItems[Index], (FCount - Index) * SizeOf(TGListItem));
   SetCapacityOptimized(Capacity - 1);
+  Update;
 end;
 
@@ -586 +622 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -597 +634 @@
     I := I + 1;
   end;
+  Update;
 end;
 
@@ -610 +648 @@
   FItems[Index1] := FItems[Index2];
   FItems[Index2] := Temp;
+  Update;
 end;
 

Generics/TemplateGenerics/Generic/GenericRectangle.inc

@@ -11 +11 @@
   function GetTopRight: TGRectanglePoint;
   function GetWidth: TGRectangleDimension;
+  function GetEmpty: Boolean;
   procedure SetBottom(const AValue: TGRectangleDimension);
   procedure SetBottomLeft(const AValue: TGRectanglePoint);
@@ -21 +22 @@
   procedure SetTopLeft(const AValue: TGRectanglePoint);
   procedure SetTopRight(const AValue: TGRectanglePoint);
-
   procedure SetWidth(const AValue: TGRectangleDimension);
+  procedure SetEmpty(const AValue: Boolean);
 public
   FLeft: TGRectangleDimension;
@@ -52 +53 @@
 
   property Size: TGRectanglePoint read GetSize write SetSize;
+  property Empty: Boolean read GetEmpty write SetEmpty;
 end;
 
@@ -199 +201 @@
 procedure TGRectangle.Intersect(Rect1, Rect2: TGRectangle);
 begin
-  Left := Max(Rect1.Left, Rect2.Left);
-  Top := Max(Rect1.Top, Rect2.Top);
-  Right := Min(Rect1.Right, Rect2.Right);
-  Bottom := Min(Rect1.Bottom, Rect2.Bottom);
+  if Rect1.Empty or Rect2.Empty then Empty := True
+  else begin
+    Left := Max(Rect1.Left, Rect2.Left);
+    Top := Max(Rect1.Top, Rect2.Top);
+    Right := Min(Rect1.Right, Rect2.Right);
+    Bottom := Min(Rect1.Bottom, Rect2.Bottom);
+  end;
 end;
 
 procedure TGRectangle.IntersectWith(Rect: TGRectangle);
 begin
-  Left := Max(Left, Rect.Left);
-  Top := Max(Top, Rect.Top);
-  Right := Min(Right, Rect.Right);
-  Bottom := Min(Bottom, Rect.Bottom);
+  if Empty or Rect.Empty then Empty := True
+  else begin
+    Left := Max(Left, Rect.Left);
+    Top := Max(Top, Rect.Top);
+    Right := Min(Right, Rect.Right);
+    Bottom := Min(Bottom, Rect.Bottom);
+  end;
 end;
 
 procedure TGRectangle.Union(Rect1, Rect2: TGRectangle);
 begin
-  Left := Min(Rect1.Left, Rect2.Left);
-  Top := Min(Rect1.Top, Rect2.Top);
-  Right := Max(Rect1.Right, Rect2.Right);
-  Bottom := Max(Rect1.Bottom, Rect2.Bottom);
+  if Rect1.Empty then Assign(Rect2)
+  else
+  if Rect2.Empty then Assign(Rect1)
+  else begin
+    Left := Min(Rect1.Left, Rect2.Left);
+    Top := Min(Rect1.Top, Rect2.Top);
+    Right := Max(Rect1.Right, Rect2.Right);
+    Bottom := Max(Rect1.Bottom, Rect2.Bottom);
+  end;
 end;
 
 procedure TGRectangle.UnionWith(Rect: TGRectangle);
 begin
-  Left := Min(Left, Rect.Left);
-  Top := Min(Top, Rect.Top);
-  Right := Max(Right, Rect.Right);
-  Bottom := Max(Bottom, Rect.Bottom);
+  if Empty then Assign(Rect)
+  else
+  if not Rect.Empty then begin
+    Left := Min(Left, Rect.Left);
+    Top := Min(Top, Rect.Top);
+    Right := Max(Right, Rect.Right);
+    Bottom := Max(Bottom, Rect.Bottom);
+  end;
+end;
+
+function TGRectangle.GetEmpty: Boolean;
+begin
+  Result := (Bottom <= Top) or (Right <= Left);
+end;
+
+procedure TGRectangle.SetEmpty(const AValue: Boolean);
+begin
+  Top := 0;
+  Bottom := 0;
+  Left := 0;
+  Right := 0;
 end;
 

Generics/TemplateGenerics/Generic/GenericStream.inc

@@ -13 +13 @@
   procedure Write(Item: TGStreamItem); virtual; abstract;
   procedure WriteArray(Item: array of TGStreamItem); virtual; abstract;
+  procedure WriteStream(Stream: TGStream; Count: TGStreamIndex); virtual; abstract;
   function Read: TGStreamItem; virtual; abstract;
   function ReadArray(Count: TGStreamIndex): TGStreamItemArray; virtual; abstract;
+  function ReadStream(Stream: TGStream; Count: TGStreamIndex): TGStreamIndex; virtual; abstract;
   function Insert(Count: TGStreamIndex): TGStreamIndex; virtual; abstract;
   function Remove(Count: TGStreamIndex): TGStreamIndex; virtual; abstract;

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.

Generics/TemplateGenerics/TemplateGenerics.lpk

@@ -11 +11 @@
       <SearchPaths>
         <IncludeFiles Value="Generic"/>
-        <OtherUnitFiles Value="Specialized;Generic"/>
+        <OtherUnitFiles Value="Specialized;Generic;Additional"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
@@ -29 +29 @@
     <Description Value="Generic classes implemented as templates."/>
     <Version Minor="4"/>
-    <Files Count="26">
+    <Files Count="27">
       <Item1>
         <Filename Value="ReadMe.txt"/>
@@ -88 +88 @@
       <Item15>
         <Filename Value="Generic\GenericRectangle.inc"/>
+        <UnitName Value="GenericRectangle"/>
       </Item15>
       <Item16>
@@ -133 +134 @@
         <UnitName Value="SpecializedRectangle"/>
       </Item26>
+      <Item27>
+        <Filename Value="Additional\UBinarySerializer.pas"/>
+        <UnitName Value="UBinarySerializer"/>
+      </Item27>
     </Files>
     <Type Value="RunAndDesignTime"/>

Generics/TemplateGenerics/TemplateGenerics.pas

@@ -11 +11 @@
   SpecializedQueue, SpecializedSet, SpecializedPoint, SpecializedMatrix, 
   SpecializedBitmap, SpecializedStream, SpecializedRectangle, 
-  LazarusPackageIntf;
+  UBinarySerializer, LazarusPackageIntf;
 
 implementation