Changeset 129 for Generics

Timestamp:

Jan 17, 2011, 6:55:36 AM (13 years ago)

Author:

george

Message:

• Modified: Thread exception handling through global handler.
• Modified: CoolStreaming BitStream demo use AsString property.

Location:

Generics/TemplateGenerics

Files:

• Generic/GenericList.inc (modified) (9 diffs)
• Specialized/SpecializedList.pas (modified) (2 diffs)

Generics/TemplateGenerics/Generic/GenericList.inc

@@ -110 +110 @@
 function TGList.Get(Index: TGListIndex): TGListItem;
 begin
+  if (Index < 0) or (Index >= Count) then
+    raise EListError.CreateFmt(SListIndexError, [Index]);
   Result := FItems[Index];
 end;
@@ -115 +117 @@
 procedure TGList.Put(Index: TGListIndex; const AValue: TGListItem);
 begin
+  if (Index < 0) or (Index >= Count) then
+    raise EListError.CreateFmt(SListIndexError, [Index]);
   FItems[Index] := AValue;
 end;
@@ -175 +179 @@
   I := 0;
   while I < Count do begin
-    Items[I] := Source[I];
+    FItems[I] := Source[I];
     I := I + 1;
   end;
@@ -247 +251 @@
     raise EListError.CreateFmt(SListIndexError, [0])
   else
-    Result := Items[FCount - 1];
+    Result := FItems[FCount - 1];
 end;
 
@@ -255 +259 @@
     raise EListError.CreateFmt(SListIndexError, [0])
   else
-    Items[FCount - 1] := AValue;
+    FItems[FCount - 1] := AValue;
 end;
 
@@ -263 +267 @@
     raise EListError.CreateFmt(SListIndexError, [0])
   else
-    Result := Items[0];
+    Result := FItems[0];
 end;
 
@@ -271 +275 @@
     raise EListError.CreateFmt(SListIndexError, [0])
   else
-    Items[0] := AValue;
+    FItems[0] := AValue;
 end;
 
@@ -401 +405 @@
   I := 0;
   while I < Count do begin
-    Result := Result + Converter(Items[I]);
+    Result := Result + Converter(FItems[I]);
     if I < (Count - 1) then
       Result := Result + Separator;
@@ -469 +473 @@
   I := Start;
   while I < Count do begin
-    Items[I] := Value;
+    FItems[I] := Value;
     I := I + 1;
   end;

Generics/TemplateGenerics/Specialized/SpecializedList.pas

@@ -19 +19 @@
 {$DEFINE TGListFromStringConverter := TListIntegerFromStringConverter}
 {$DEFINE TGListItemArray := TListIntegerItemArray}
+{$DEFINE INTERFACE}
+{$I 'GenericList.inc'}
+
+// TListBoolean<Integer, Boolean>
+{$DEFINE TGListIndex := Integer}
+{$DEFINE TGListItem := Boolean}
+{$DEFINE TGList := TListBoolean}
+{$DEFINE TGListSortCompare := TListBooleanSortCompare}
+{$DEFINE TGListToStringConverter := TListBooleanToStringConverter}
+{$DEFINE TGListFromStringConverter := TListBooleanFromStringConverter}
+{$DEFINE TGListItemArray := TListBooleanItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -148 +159 @@
 
 // TListSmallInt<Integer, SmallInt>
-{$DEFINE TGListIndex:=Integer}
-{$DEFINE TGListItem:=SmallInt}
-{$DEFINE TGList:=TListSmallInt}
-{$DEFINE TGListSortCompare:=TListSmallIntSortCompare}
-{$DEFINE TGListToStringConverter:=TListSmallIntToStringConverter}
-{$DEFINE TGListFromStringConverter:=TListSmallIntFromStringConverter}
+{$DEFINE TGListIndex := Integer}
+{$DEFINE TGListItem := SmallInt}
+{$DEFINE TGList := TListSmallInt}
+{$DEFINE TGListSortCompare := TListSmallIntSortCompare}
+{$DEFINE TGListToStringConverter := TListSmallIntToStringConverter}
+{$DEFINE TGListFromStringConverter := TListSmallIntFromStringConverter}
 {$DEFINE TGListItemArray := TListSmallIntItemArray}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericList.inc'}
+
+// TListBoolean<Integer, Boolean>
+{$DEFINE TGListIndex := Integer}
+{$DEFINE TGListItem := Boolean}
+{$DEFINE TGList := TListBoolean}
+{$DEFINE TGListSortCompare := TListBooleanSortCompare}
+{$DEFINE TGListToStringConverter := TListBooleanToStringConverter}
+{$DEFINE TGListFromStringConverter := TListBooleanFromStringConverter}
+{$DEFINE TGListItemArray := TListBooleanItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}