Changeset 77 for Generics/TemplateGenerics/Generic

Timestamp:

Oct 29, 2010, 1:26:32 PM (14 years ago)

Author:

george

Message:

• Added: Generic range type.
• Added: Specialized TListByte type which si simply memory block.
• Added: New functionality to TGList.

Location:

Generics/TemplateGenerics/Generic

Files:

• ListImplementation.tpl (modified) (7 diffs)
• ListInterface.tpl (modified) (5 diffs)
• RangeImplementation.tpl (added)
• RangeInterface.tpl (added)
• SetImplementation.tpl (modified) (1 diff)

Generics/TemplateGenerics/Generic/ListImplementation.tpl

@@ -109 +109 @@
 end;
 
-function TGList.IndexOf(Item: TListItem): TListIndex;
-begin
-  Result := 0;
+function TGList.IndexOf(Item: TListItem; Start: TListIndex): TListIndex;
+begin
+  Result := Start;
   while (Result < FCount) and
   not CompareMem(Addr(FItems[Result]), Addr(Item), SizeOf(TListItem)) do
@@ -138 +138 @@
     I := I + 1;
   end;
+end;
+
+function TGList.IndexOfList(List: TGList; Start: TListIndex): TListIndex;
+var
+  I: TListIndex;
+begin
+  if List.Count > 0 then begin
+    Result := IndexOf(List[0], Start);
+    if Result <> -1 then begin
+      I := 1;
+      while I < List.Count do begin
+        if not CompareMem(Addr(FItems[Result + I]), Addr(List.FItems[I]), SizeOf(TListItem)) then begin
+          Result := -1;
+          Break;
+        end;
+        I := I + 1;
+      end;
+    end;
+  end else Result := -1;
 end;
 
@@ -200 +219 @@
 end;
 
-(*function TGList.Equals(Obj: TObject): Boolean;
-var
-  I: TListIndex;
-begin
-  Result := Count = (Obj as TGList).Count;
+function TGList.Equals(List: TGList): Boolean;
+var
+  I: TListIndex;
+begin
+  Result := Count = List.Count;
   if Result then begin
     I := 0;
     while I < Count do begin
-      if Items[I] <> (Obj as TGList)[I] then begin
+      if not CompareMem(Addr(FItems[I]), Addr(List.FItems[I]), SizeOf(TListItem)) then begin
         Result := False;
         Break;
@@ -215 +234 @@
     end;
   end;
-end;*)
+end;
 
 procedure TGList.Reverse;
@@ -241 +260 @@
   while I <= High(Values) do begin
     Add(Values[I]);
+    I := I + 1;
+  end;
+end;
+
+procedure TGList.SetArray(Values: array of TListItem);
+var
+  I: TListIndex;
+begin
+  Clear;
+  I := 0;
+  while I <= High(Values) do begin
+    Add(Values[I]);
+    I := I + 1;
+  end;
+end;
+
+procedure TGList.InsertArray(Index: TListIndex; Values: array of TListItem);
+var
+  I: TListIndex;
+begin
+  I := 0;
+  while I <= High(Values) do begin
+    Insert(Index + I, Values[I]);
     I := I + 1;
   end;
@@ -255 +297 @@
     if I < (Count - 1) then
       Result := Result + Separator;
+    I := I + 1;
+  end;
+end;
+
+procedure TGList.Perform(Operation: TGListOperation);
+var
+  I: TListIndex;
+begin
+  I := 0;
+  while I < Count do begin
+    Operation(Self, @FItems[I]);
     I := I + 1;
   end;
@@ -309 +362 @@
 end;
 
+procedure TGList.Fill(Start, Count: TListIndex; Value: TListItem);
+begin
+  while Count > 0 do begin
+    Items[Start] := Value;
+    Count := Count - 1;
+    Start := Start + 1;
+  end;
+end;
+
 procedure TGList.Exchange(Index1, Index2: TListIndex);
 var

Generics/TemplateGenerics/Generic/ListInterface.tpl

@@ +1 @@
+
+  PGListItem = ^TListItem;
+  TGList = class;
 
   TGListSortCompare = function(const Item1, Item2: TListItem): Integer of object;
   TGListStringConverter = function(Item: TListItem): string;
+  TGListOperation = procedure(List: TGList; Item: PGListItem);
   //TGListNotification = (lnAdded, lnExtracted, lnDeleted);
 
@@ -16 +20 @@
     procedure SetCount(const AValue: TListIndex);
     procedure QuickSort(L, R : TListIndex; Compare: TGListSortCompare);
-    property Capacity: TListIndex read GetCapacity write SetCapacity;
   public
     // All items
@@ -24 +27 @@
     procedure Sort(Compare: TGListSortCompare);
     function Implode(Separator: string; Converter: TGListStringConverter): string;
+    procedure Perform(Operation: TGListOperation);
     // Many items
     procedure MoveItems(CurIndex, NewIndex, Count: TListIndex);
     procedure DeleteItems(Index, Count: TListIndex);
+    procedure Fill(Start, Count: TListIndex; Value: TListItem);
     // One item
     function Add(Item: TListItem): TListIndex;
@@ -33 +38 @@
     procedure Exchange(Index1, Index2: TListIndex);
     function First: TListItem;
-    function IndexOf(Item: TListItem): TListIndex;
+    function IndexOf(Item: TListItem; Start: TListIndex = 0): TListIndex;
     procedure Insert(Index: TListIndex; Item: TListItem);
     function Last: TListItem;
@@ -42 +47 @@
     procedure AddList(List: TGList);
     procedure Assign(List: TGList);
-    //function Equals(Obj: TObject): Boolean; override;
+    function Equals(List: TGList): Boolean;
     procedure InsertList(Index: TListIndex; List: TGList);
+    function IndexOfList(List: TGList; Start: TListIndex = 0): TListIndex;
     // Other
     property Count: TListIndex read GetCount write SetCount;
-    // Additional
+    property Capacity: TListIndex read GetCapacity write SetCapacity;
+    // Array
     procedure AddArray(Values: array of TListItem);
+    procedure SetArray(Values: array of TListItem);
+    procedure InsertArray(Index: TListIndex; Values: array of TListItem);
   end;

Generics/TemplateGenerics/Generic/SetImplementation.tpl

@@ -3 +3 @@
 { TGSet }
 
+function TGSet.IsIn(Item: TSetItem): Boolean;
+begin
+  Result := FList.IndexOf(Item) <> -1;
+end;
 
+constructor TGSet.Create;
+begin
+  FList := TGList.Create;
+end;
 
+destructor TGSet.Destroy;
+begin
+  FList.Free;
+  inherited Destroy;
+end;