Changeset 251 for Generics

Timestamp:

Jun 13, 2011, 8:21:12 AM (13 years ago)

Author:

george

Message:

• Modified: DebugLog transformed to component.
• Fixed: String compare for template generics.

Location:

Generics/TemplateGenerics/Generic

Files:

• GenericList.inc (modified) (1 diff)
• GenericListString.inc (modified) (2 diffs)

Generics/TemplateGenerics/Generic/GenericList.inc

@@ -42 +42 @@
     function GetArray: TGListItemArray;
     function Implode(Separator: string; Converter: TGListToStringConverter): string;
-    function IndexOf(Item: TGListItem; Start: TGListIndex = 0): TGListIndex;
+    function IndexOf(Item: TGListItem; Start: TGListIndex = 0): TGListIndex; virtual;
     function IndexOfList(List: TGList; Start: TGListIndex = 0): TGListIndex;
     procedure Insert(Index: TGListIndex; Item: TGListItem);

Generics/TemplateGenerics/Generic/GenericListString.inc

@@ -18 +18 @@
     procedure Clear; override;
     procedure Assign(Source: TGList); override;
+    function IndexOf(Item: TGListItem; Start: TGListIndex = 0): TGListIndex; override;
     constructor Create;
     destructor Destroy; override;
@@ -71 +72 @@
 end;
 
+function TGListString.IndexOf(Item: TGListItem; Start: TGListIndex): TGListIndex;
+begin
+  Result := Start;
+  while (Result < Count) and
+  (CompareStr(FItems[Result], Item) = -1) do
+    Result := Result + 1;
+  if Result = FCount then Result := -1;
+end;
+
 constructor TGListString.Create;
 begin