Changeset 65 for Generics

Timestamp:

Oct 27, 2010, 2:09:59 PM (14 years ago)

Author:

george

Message:

• Updated: Generic List unit.

Location:

Generics/units

Files:

• GenericList.pas (modified) (11 diffs)
• GenericPoint.pas (added)

Generics/units/GenericList.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, fgl;
+
+resourcestring
+  SNotImplemented = 'Not implememnted';
 
 type
@@ -48 +51 @@
     property Capacity: TIndexType read GetCapacity write SetCapacity;
   public
+    // All items
+    procedure Reverse;
+    procedure Clear;
+    procedure Expand;
+    procedure Sort(Compare: TGListSortCompare);
+    function Implode(Separator: string): string;
+    // Many items
+    procedure MoveItems(CurIndex, NewIndex, Count: TIndexType);
+    // One item
     function Add(Item: TItemType): TIndexType;
-    function AddList(var Source): TIndexType;
-    procedure Clear;
     procedure Delete(Index: TIndexType);
-    procedure DeleteItems(Index, Count: TIndexType);
     procedure Exchange(Index1, Index2: TIndexType);
-    procedure Expand;
     function Extract(Item: TItemType): TItemType;
-    function ExtractList(Item: TItemType; Count: TIndexType): TItemType;
     function First: TItemType;
     function IndexOf(Item: TItemType): TIndexType;
     procedure Insert(Index: TIndexType; Item: TItemType);
-    procedure InsertList(Index: TIndexType; var Source);
     function Last: TItemType;
     procedure Move(CurIndex, NewIndex: TIndexType);
-    procedure MoveItems(CurIndex, NewIndex, Count: TIndexType);
     function Remove(Item: TItemType): TIndexType;
-    procedure Reverse;
-    procedure Sort(Compare: TGListSortCompare);
     property Items[Index: TIndexType]: TItemType read Get write Put; default;
+    // List
+    function AddList(var Source): TIndexType;
+    procedure Assign(var List);
+    procedure DeleteItems(Index, Count: TIndexType);
+    function Equals(Obj: TObject): Boolean; override;
+    function ExtractList(Item: TItemType; Count: TIndexType): TItemType;
+    procedure InsertList(Index: TIndexType; var Source);
+    // Other
     property Count: TIndexType read GetCount write SetCount;
+    // Additional
+    procedure SetArray(Values: array of TItemType);
   end;
 
@@ -157 +170 @@
    P := FItems[ (L + R) div 2 ];
    repeat
-     while Compare(P, FItems[i]) > 0 do
+     while Compare(P, FItems[I]) > 0 do
        I := I + 1;
      while Compare(P, FItems[J]) < 0 do
@@ -176 +189 @@
 end;
 
+procedure TGList.Assign(var List);
+var
+  I: Integer;
+begin
+  (*Count := List.Count;
+  I := 0;
+  while I < Count do begin
+    Items[I] := List[I];
+  end;*)
+  raise Exception.Create(SNotImplemented);
+end;
+
 procedure TGList.Expand;
 var
@@ -191 +216 @@
 function TGList.Extract(Item: TItemType): TItemType;
 var
-  I: Integer;
+  I: TIndexType;
 begin
   I := IndexOf(Item);
@@ -203 +228 @@
 function TGList.ExtractList(Item: TItemType; Count: TIndexType): TItemType;
 begin
-
+  raise Exception.Create(SNotImplemented);
 end;
 
@@ -243 +268 @@
   end;
   *)
+  raise Exception.Create(SNotImplemented);
 end;
 
@@ -268 +294 @@
 procedure TGList.MoveItems(CurIndex, NewIndex, Count: TIndexType);
 begin
-
+  raise Exception.Create(SNotImplemented);
 end;
 
@@ -278 +304 @@
 end;
 
+function TGList.Equals(Obj: TObject): Boolean;
+var
+  I: TIndexType;
+begin
+(*  Result := Count = List.Count;
+  if Result then begin
+    I := 0;
+    while I < Count do
+      if Items[I] <> List[I] then Result := False;
+  end;
+  *)
+  // Not implemented
+  raise Exception.Create(SNotImplemented);
+  Result := False;
+end;
+
 procedure TGList.Reverse;
 begin
-
+  raise Exception.Create(SNotImplemented);
 end;
 
@@ -287 +329 @@
   if FCount > 1 then
     QuickSort(0, FCount - 1, Compare);
+end;
+
+procedure TGList.SetArray(Values: array of TItemType);
+var
+  I: TIndexType;
+begin
+  Clear;
+  I := 0;
+  while I <= High(Values) do begin
+    Add(Values[I]);
+    I := I + 1;
+  end;
+end;
+
+function TGList.Implode(Separator: string): string;
+var
+  I: TIndexType;
+begin
+  Result := '';
+  I := 0;
+  while I < Count do begin
+//    Result := Result + string(Items[I]);
+    if I < (Count - 1) then
+      Result := Result + Separator;
+    I := I + 1;
+  end;
 end;
 
@@ -308 +376 @@
   end;
   *)
+ // Not implemented
+ Result := 0;
+ raise Exception.Create(SNotImplemented);
 end;