Changeset 426 for Generics/TemplateGenerics/Specialized
- Timestamp:
- Sep 24, 2012, 1:47:39 PM (12 years ago)
- Location:
- Generics/TemplateGenerics/Specialized
- Files:
-
- 8 edited
-
SpecializedDictionary.pas (modified) (4 diffs)
-
SpecializedList.pas (modified) (26 diffs)
-
SpecializedMatrix.pas (modified) (6 diffs)
-
SpecializedQueue.pas (modified) (6 diffs)
-
SpecializedSet.pas (modified) (4 diffs)
-
SpecializedStack.pas (modified) (4 diffs)
-
SpecializedStream.pas (modified) (8 diffs)
-
SpecializedTree.pas (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
Generics/TemplateGenerics/Specialized/SpecializedDictionary.pas
r301 r426 18 18 {$DEFINE TGDictionary := TDictionaryStringString} 19 19 {$DEFINE TGDictionaryList := TDictionaryStringStringList} 20 {$DEFINE TGDictionarySortCompare := TDictionaryStringStringSortCompare}21 {$DEFINE TGDictionaryToStringConverter := TDictionaryStringStringToStringConverter}22 {$DEFINE TGDictionaryFromStringConverter := TDictionaryStringStringFromStringConverter}23 {$DEFINE TGDictionaryItemArray := TDictionaryStringStringItemArray}24 20 {$DEFINE INTERFACE} 25 21 {$I 'GenericDictionary.inc'} … … 32 28 {$DEFINE TGDictionary := TDictionaryIntegerString} 33 29 {$DEFINE TGDictionaryList := TDictionaryIntegerStringList} 34 {$DEFINE TGDictionarySortCompare := TDictionaryIntegerStringSortCompare}35 {$DEFINE TGDictionaryToStringConverter := TDictionaryIntegerStringToStringConverter}36 {$DEFINE TGDictionaryFromStringConverter := TDictionaryIntegerStringFromStringConverter}37 {$DEFINE TGDictionaryItemArray := TDictionaryIntegerStringItemArray}38 30 {$DEFINE INTERFACE} 39 31 {$I 'GenericDictionary.inc'} … … 53 45 {$DEFINE TGDictionary := TDictionaryStringString} 54 46 {$DEFINE TGDictionaryList := TDictionaryStringStringList} 55 {$DEFINE TGDictionarySortCompare := TDictionaryStringStringSortCompare}56 {$DEFINE TGDictionaryToStringConverter := TDictionaryStringStringToStringConverter}57 {$DEFINE TGDictionaryFromStringConverter := TDictionaryStringStringFromStringConverter}58 {$DEFINE TGDictionaryItemArray := TDictionaryStringStringItemArray}59 47 {$DEFINE IMPLEMENTATION} 60 48 {$I 'GenericDictionary.inc'} … … 67 55 {$DEFINE TGDictionary := TDictionaryIntegerString} 68 56 {$DEFINE TGDictionaryList := TDictionaryIntegerStringList} 69 {$DEFINE TGDictionarySortCompare := TDictionaryIntegerStringSortCompare}70 {$DEFINE TGDictionaryToStringConverter := TDictionaryIntegerStringToStringConverter}71 {$DEFINE TGDictionaryFromStringConverter := TDictionaryIntegerStringFromStringConverter}72 {$DEFINE TGDictionaryItemArray := TDictionaryIntegerStringItemArray}73 57 {$DEFINE IMPLEMENTATION} 74 58 {$I 'GenericDictionary.inc'} -
Generics/TemplateGenerics/Specialized/SpecializedList.pas
r398 r426 15 15 {$DEFINE TGListItem := Integer} 16 16 {$DEFINE TGList := TListInteger} 17 {$DEFINE TGListSortCompare := TListIntegerSortCompare}18 {$DEFINE TGListToStringConverter := TListIntegerToStringConverter}19 {$DEFINE TGListFromStringConverter := TListIntegerFromStringConverter}20 {$DEFINE TGListItemArray := TListIntegerItemArray}21 17 {$DEFINE INTERFACE} 22 18 {$I 'GenericList.inc'} … … 26 22 {$DEFINE TGListItem := Boolean} 27 23 {$DEFINE TGList := TListBoolean} 28 {$DEFINE TGListSortCompare := TListBooleanSortCompare}29 {$DEFINE TGListToStringConverter := TListBooleanToStringConverter}30 {$DEFINE TGListFromStringConverter := TListBooleanFromStringConverter}31 {$DEFINE TGListItemArray := TListBooleanItemArray}32 24 {$DEFINE INTERFACE} 33 25 {$I 'GenericList.inc'} … … 37 29 {$DEFINE TGListItem := SmallInt} 38 30 {$DEFINE TGList := TListSmallInt} 39 {$DEFINE TGListSortCompare := TListSmallIntSortCompare}40 {$DEFINE TGListToStringConverter := TListSmallIntToStringConverter}41 {$DEFINE TGListFromStringConverter := TListSmallIntFromStringConverter}42 {$DEFINE TGListItemArray := TListSmallIntItemArray}43 31 {$DEFINE INTERFACE} 44 32 {$I 'GenericList.inc'} … … 48 36 {$DEFINE TGListItem := Double} 49 37 {$DEFINE TGList := TListDouble} 50 {$DEFINE TGListSortCompare := TListDoubleSortCompare}51 {$DEFINE TGListToStringConverter := TListDoubleToStringConverter}52 {$DEFINE TGListFromStringConverter := TListDoubleFromStringConverter}53 {$DEFINE TGListItemArray := TListDoubleItemArray}54 38 {$DEFINE INTERFACE} 55 39 {$INCLUDE '..\Generic\GenericList.inc'} … … 59 43 {$DEFINE TGListItem := Pointer} 60 44 {$DEFINE TGList := TListPointer} 61 {$DEFINE TGListSortCompare := TListPointerSortCompare}62 {$DEFINE TGListToStringConverter := TListPointerToStringConverter}63 {$DEFINE TGListFromStringConverter := TListPointerFromStringConverter}64 {$DEFINE TGListItemArray := TListPointerItemArray}65 45 {$DEFINE INTERFACE} 66 46 {$I 'GenericList.inc'} … … 70 50 {$DEFINE TGListStringItem := string} 71 51 {$DEFINE TGListString := TListString} 72 {$DEFINE TGListStringSortCompare := TListStringSortCompare}73 {$DEFINE TGListStringToStringConverter := TListStringToStringConverter}74 {$DEFINE TGListStringFromStringConverter := TListStringFromStringConverter}75 {$DEFINE TGListItemArray := TListStringItemArray}76 52 {$DEFINE INTERFACE} 77 53 {$I 'GenericListString.inc'} … … 81 57 {$DEFINE TGListItem := Byte} 82 58 {$DEFINE TGList := TListByteBase} 83 {$DEFINE TGListSortCompare := TListByteSortCompare}84 {$DEFINE TGListToStringConverter := TListByteToStringConverter}85 {$DEFINE TGListFromStringConverter := TListByteFromStringConverter}86 {$DEFINE TGListItemArray := TListByteItemArray}87 59 {$DEFINE INTERFACE} 88 60 {$I 'GenericList.inc'} … … 103 75 {$DEFINE TGListItem := Char} 104 76 {$DEFINE TGList := TListCharBase} 105 {$DEFINE TGListSortCompare := TListSortCompareChar}106 {$DEFINE TGListToStringConverter := TListToStringConverterChar}107 {$DEFINE TGListFromStringConverter := TListFromStringConverterChar}108 {$DEFINE TGListItemArray := TListStringItemArray}109 77 {$DEFINE INTERFACE} 110 78 {$I 'GenericList.inc'} … … 115 83 {$DEFINE TGListObjectList := TListObjectList} 116 84 {$DEFINE TGListObject := TListObject} 117 {$DEFINE TGListObjectSortCompare := TListObjectSortCompare}118 {$DEFINE TGListObjectToStringConverter := TListObjectToStringConverter}119 {$DEFINE TGListObjectFromStringConverter := TListObjectFromStringConverter}120 {$DEFINE TGListItemArray := TListObjectItemArray}121 85 {$DEFINE INTERFACE} 122 86 {$I 'GenericListObject.inc'} … … 138 102 {$DEFINE TGListItem := TMethod} 139 103 {$DEFINE TGList := TListMethodBase} 140 {$DEFINE TGListSortCompare := TListMethodSortCompare}141 {$DEFINE TGListToStringConverter := TListMethodToStringConverter}142 {$DEFINE TGListFromStringConverter := TListMethodFromStringConverter}143 {$DEFINE TGListItemArray := TListMethodItemArray}144 104 {$DEFINE INTERFACE} 145 105 {$I 'GenericList.inc'} … … 154 114 {$DEFINE TGListItem := TNotifyEvent} 155 115 {$DEFINE TGList := TListNotifyEventBase} 156 {$DEFINE TGListSortCompare := TListNotifyEventSortCompare}157 {$DEFINE TGListToStringConverter := TListNotifyEventToStringConverter}158 {$DEFINE TGListFromStringConverter := TListNotifyEventFromStringConverter}159 {$DEFINE TGListItemArray := TListNotifyEventItemArray}160 116 {$DEFINE INTERFACE} 161 117 {$I 'GenericList.inc'} … … 173 129 {$DEFINE TGListItem := TBaseEvent} 174 130 {$DEFINE TGList := TListSimpleEventBase} 175 {$DEFINE TGListSortCompare := TListSimpleEventSortCompare}176 {$DEFINE TGListToStringConverter := TListSimpleEventToStringConverter}177 {$DEFINE TGListFromStringConverter := TListSimpleEventFromStringConverter}178 {$DEFINE TGListItemArray := TListSimpleEventItemArray}179 131 {$DEFINE INTERFACE} 180 132 {$I 'GenericList.inc'} … … 186 138 187 139 140 // TFileListByte<Integer, Byte> 141 {$DEFINE TGFileListIndex := Integer} 142 {$DEFINE TGFileListItem := Byte} 143 {$DEFINE TGFileListList := TFileListListByte} 144 {$DEFINE TGFileList := TFileListByte} 145 {$DEFINE INTERFACE} 146 {$I 'GenericFileList.inc'} 147 188 148 function StrToStr(Value: string): string; 149 150 151 152 189 153 190 154 implementation … … 197 161 {$DEFINE TGListItem := Integer} 198 162 {$DEFINE TGList := TListInteger} 199 {$DEFINE TGListSortCompare := TListIntegerSortCompare}200 {$DEFINE TGListToStringConverter := TListIntegerToStringConverter}201 {$DEFINE TGListFromStringConverter := TListIntegerFromStringConverter}202 {$DEFINE TGListItemArray := TListIntegerItemArray}203 163 {$DEFINE IMPLEMENTATION} 204 164 {$I 'GenericList.inc'} … … 208 168 {$DEFINE TGListItem := SmallInt} 209 169 {$DEFINE TGList := TListSmallInt} 210 {$DEFINE TGListSortCompare := TListSmallIntSortCompare}211 {$DEFINE TGListToStringConverter := TListSmallIntToStringConverter}212 {$DEFINE TGListFromStringConverter := TListSmallIntFromStringConverter}213 {$DEFINE TGListItemArray := TListSmallIntItemArray}214 170 {$DEFINE IMPLEMENTATION} 215 171 {$I 'GenericList.inc'} … … 219 175 {$DEFINE TGListItem := Boolean} 220 176 {$DEFINE TGList := TListBoolean} 221 {$DEFINE TGListSortCompare := TListBooleanSortCompare}222 {$DEFINE TGListToStringConverter := TListBooleanToStringConverter}223 {$DEFINE TGListFromStringConverter := TListBooleanFromStringConverter}224 {$DEFINE TGListItemArray := TListBooleanItemArray}225 177 {$DEFINE IMPLEMENTATION} 226 178 {$I 'GenericList.inc'} … … 230 182 {$DEFINE TGListItem := Double} 231 183 {$DEFINE TGList := TListDouble} 232 {$DEFINE TGListSortCompare := TListDoubleSortCompare}233 {$DEFINE TGListToStringConverter := TListDoubleToStringConverter}234 {$DEFINE TGListFromStringConverter := TListDoubleFromStringConverter}235 {$DEFINE TGListItemArray := TListDoubleItemArray}236 184 {$DEFINE IMPLEMENTATION} 237 185 {$I 'GenericList.inc'} … … 241 189 {$DEFINE TGListItem := Pointer} 242 190 {$DEFINE TGList := TListPointer} 243 {$DEFINE TGListSortCompare := TListPointerSortCompare}244 {$DEFINE TGListToStringConverter := TListPointerToStringConverter}245 {$DEFINE TGListFromStringConverter := TListPointerFromStringConverter}246 {$DEFINE TGListItemArray := TListPointerItemArray}247 191 {$DEFINE IMPLEMENTATION} 248 192 {$I 'GenericList.inc'} … … 252 196 {$DEFINE TGListStringItem := string} 253 197 {$DEFINE TGListString := TListString} 254 {$DEFINE TGListStringSortCompare := TListStringSortCompare}255 {$DEFINE TGListStringToStringConverter := TListStringToStringConverter}256 {$DEFINE TGListStringFromStringConverter := TListStringFromStringConverter}257 {$DEFINE TGListItemArray := TListStringItemArray}258 198 {$DEFINE IMPLEMENTATION} 259 199 {$I 'GenericListString.inc'} … … 263 203 {$DEFINE TGListItem := Byte} 264 204 {$DEFINE TGList := TListByteBase} 265 {$DEFINE TGListSortCompare := TListByteSortCompare}266 {$DEFINE TGListToStringConverter := TListByteToStringConverter}267 {$DEFINE TGListFromStringConverter := TListByteFromStringConverter}268 {$DEFINE TGListItemArray := TListByteItemArray}269 205 {$DEFINE IMPLEMENTATION} 270 206 {$I 'GenericList.inc'} … … 274 210 {$DEFINE TGListItem := Char} 275 211 {$DEFINE TGList := TListCharBase} 276 {$DEFINE TGListSortCompare := TListSortCompareChar}277 {$DEFINE TGListToStringConverter := TListToStringConverterChar}278 {$DEFINE TGListFromStringConverter := TListFromStringConverterChar}279 {$DEFINE TGListItemArray := TListStringItemArray}280 212 {$DEFINE IMPLEMENTATION} 281 213 {$I 'GenericList.inc'} … … 286 218 {$DEFINE TGListObjectList := TListObjectList} 287 219 {$DEFINE TGListObject := TListObject} 288 {$DEFINE TGListObjectSortCompare := TListObjectSortCompare}289 {$DEFINE TGListObjectToStringConverter := TListObjectToStringConverter}290 {$DEFINE TGListObjectFromStringConverter := TListObjectFromStringConverter}291 {$DEFINE TGListItemArray := TListObjectItemArray}292 220 {$DEFINE IMPLEMENTATION} 293 221 {$I 'GenericListObject.inc'} … … 297 225 {$DEFINE TGListItem := TMethod} 298 226 {$DEFINE TGList := TListMethodBase} 299 {$DEFINE TGListSortCompare := TListMethodSortCompare}300 {$DEFINE TGListToStringConverter := TListMethodToStringConverter}301 {$DEFINE TGListFromStringConverter := TListMethodFromStringConverter}302 {$DEFINE TGListItemArray := TListMethodItemArray}303 227 {$DEFINE IMPLEMENTATION} 304 228 {$I 'GenericList.inc'} … … 308 232 {$DEFINE TGListItem := TNotifyEvent} 309 233 {$DEFINE TGList := TListNotifyEventBase} 310 {$DEFINE TGListSortCompare := TListNotifyEventSortCompare}311 {$DEFINE TGListToStringConverter := TListNotifyEventToStringConverter}312 {$DEFINE TGListFromStringConverter := TListNotifyEventFromStringConverter}313 {$DEFINE TGListItemArray := TListNotifyEventItemArray}314 234 {$DEFINE IMPLEMENTATION} 315 235 {$I 'GenericList.inc'} … … 319 239 {$DEFINE TGListItem := TBaseEvent} 320 240 {$DEFINE TGList := TListSimpleEventBase} 321 {$DEFINE TGListSortCompare := TListSimpleEventSortCompare} 322 {$DEFINE TGListToStringConverter := TListSimpleEventToStringConverter} 323 {$DEFINE TGListFromStringConverter := TListSimpleEventFromStringConverter} 324 {$DEFINE TGListItemArray := TListSimpleEventItemArray} 325 {$DEFINE IMPLEMENTATION} 326 {$I 'GenericList.inc'} 327 241 {$DEFINE IMPLEMENTATION} 242 {$I 'GenericList.inc'} 243 244 // TFileListByte<Integer, Byte> 245 {$DEFINE TGFileListIndex := Integer} 246 {$DEFINE TGFileListItem := Byte} 247 {$DEFINE TGFileListList := TFileListListByte} 248 {$DEFINE TGFileList := TFileListByte} 249 {$DEFINE IMPLEMENTATION} 250 {$I 'GenericFileList.inc'} 328 251 329 252 … … 501 424 end; 502 425 426 503 427 end. -
Generics/TemplateGenerics/Specialized/SpecializedMatrix.pas
r175 r426 18 18 {$DEFINE TGMatrixRow := TMatrixIntegerRow} 19 19 {$DEFINE TGMatrix := TMatrixInteger} 20 {$DEFINE TGMatrixSortCompare := TMatrixIntegerSortCompare}21 {$DEFINE TGMatrixToStringConverter := TMatrixIntegerToStringConverter}22 {$DEFINE TGMatrixFromStringConverter := TMatrixIntegerFromStringConverter}23 {$DEFINE TGMatrixMerge := TMatrixIntegerMerge}24 20 {$DEFINE INTERFACE} 25 21 {$I 'GenericMatrix.inc'} … … 32 28 {$DEFINE TGMatrixRow := TMatrixByteRow} 33 29 {$DEFINE TGMatrix := TMatrixByte} 34 {$DEFINE TGMatrixSortCompare := TMatrixByteSortCompare}35 {$DEFINE TGMatrixToStringConverter := TMatrixByteToStringConverter}36 {$DEFINE TGMatrixFromStringConverter := TMatrixByteFromStringConverter}37 {$DEFINE TGMatrixMerge := TMatrixByteMerge}38 30 {$DEFINE INTERFACE} 39 31 {$I 'GenericMatrix.inc'} … … 46 38 {$DEFINE TGMatrixRow := TMatrixObjectRow} 47 39 {$DEFINE TGMatrix := TMatrixObject} 48 {$DEFINE TGMatrixSortCompare := TMatrixObjectSortCompare}49 {$DEFINE TGMatrixToStringConverter := TMatrixObjectToStringConverter}50 {$DEFINE TGMatrixFromStringConverter := TMatrixObjectFromStringConverter}51 {$DEFINE TGMatrixMerge := TMatrixStringMerge}52 40 {$DEFINE INTERFACE} 53 41 {$I 'GenericMatrix.inc'} … … 65 53 {$DEFINE TGMatrixRow := TMatrixIntegerRow} 66 54 {$DEFINE TGMatrix := TMatrixInteger} 67 {$DEFINE TGMatrixSortCompare := TMatrixIntegerSortCompare}68 {$DEFINE TGMatrixToStringConverter := TMatrixIntegerToStringConverter}69 {$DEFINE TGMatrixFromStringConverter := TMatrixIntegerFromStringConverter}70 {$DEFINE TGMatrixMerge := TMatrixIntegerMerge}71 55 {$DEFINE IMPLEMENTATION} 72 56 {$I 'GenericMatrix.inc'} … … 79 63 {$DEFINE TGMatrixRow := TMatrixByteRow} 80 64 {$DEFINE TGMatrix := TMatrixByte} 81 {$DEFINE TGMatrixSortCompare := TMatrixByteSortCompare}82 {$DEFINE TGMatrixToStringConverter := TMatrixByteToStringConverter}83 {$DEFINE TGMatrixFromStringConverter := TMatrixByteFromStringConverter}84 {$DEFINE TGMatrixMerge := TMatrixByteMerge}85 65 {$DEFINE IMPLEMENTATION} 86 66 {$I 'GenericMatrix.inc'} … … 93 73 {$DEFINE TGMatrixRow := TMatrixObjectRow} 94 74 {$DEFINE TGMatrix := TMatrixObject} 95 {$DEFINE TGMatrixSortCompare := TMatrixObjectSortCompare}96 {$DEFINE TGMatrixToStringConverter := TMatrixObjectToStringConverter}97 {$DEFINE TGMatrixFromStringConverter := TMatrixObjectFromStringConverter}98 {$DEFINE TGMatrixMerge := TMatrixStringMerge}99 75 {$DEFINE IMPLEMENTATION} 100 76 {$I 'GenericMatrix.inc'} -
Generics/TemplateGenerics/Specialized/SpecializedQueue.pas
r112 r426 16 16 {$DEFINE TGQueue := TQueueInteger} 17 17 {$DEFINE TGQueueList := TQueueListInteger} 18 {$DEFINE TGQueueSortCompare := TQueueSortCompareInteger}19 {$DEFINE TGQueueToStringConverter := TQueueToStringConverterInteger}20 {$DEFINE TGQueueFromStringConverter := TQueueFromStringConverterInteger}21 {$DEFINE TGQueueItemArray := TQueueIntegerItemArray}22 18 {$DEFINE INTERFACE} 23 19 {$I 'GenericQueue.inc'} … … 28 24 {$DEFINE TGQueue := TQueuePointer} 29 25 {$DEFINE TGQueueList := TQueueListPointer} 30 {$DEFINE TGQueueSortCompare := TQueueSortComparePointer}31 {$DEFINE TGQueueToStringConverter := TQueueToStringConverterPointer}32 {$DEFINE TGQueueFromStringConverter := TQueueFromStringConverterPointer}33 {$DEFINE TGQueueItemArray := TQueuePointerItemArray}34 26 {$DEFINE INTERFACE} 35 27 {$I 'GenericQueue.inc'} … … 40 32 {$DEFINE TGQueue := TQueueByte} 41 33 {$DEFINE TGQueueList := TQueueListByte} 42 {$DEFINE TGQueueSortCompare := TQueueSortCompareByte}43 {$DEFINE TGQueueToStringConverter := TQueueToStringConverterByte}44 {$DEFINE TGQueueFromStringConverter := TQueueFromStringConverterByte}45 {$DEFINE TGQueueItemArray := TQueueByteItemArray}46 34 {$DEFINE INTERFACE} 47 35 {$I 'GenericQueue.inc'} … … 57 45 {$DEFINE TGQueue := TQueueInteger} 58 46 {$DEFINE TGQueueList := TQueueListInteger} 59 {$DEFINE TGQueueSortCompare := TQueueSortCompareInteger}60 {$DEFINE TGQueueToStringConverter := TQueueToStringConverterInteger}61 {$DEFINE TGQueueFromStringConverter := TQueueFromStringConverterInteger}62 {$DEFINE TGQueueItemArray := TQueueIntegerItemArray}63 47 {$DEFINE IMPLEMENTATION} 64 48 {$I '..\Generic\GenericQueue.inc'} … … 69 53 {$DEFINE TGQueue := TQueuePointer} 70 54 {$DEFINE TGQueueList := TQueueListPointer} 71 {$DEFINE TGQueueSortCompare := TQueueSortComparePointer}72 {$DEFINE TGQueueToStringConverter := TQueueToStringConverterPointer}73 {$DEFINE TGQueueFromStringConverter := TQueueFromStringConverterPointer}74 {$DEFINE TGQueueItemArray := TQueuePointerItemArray}75 55 {$DEFINE IMPLEMENTATION} 76 56 {$I 'GenericQueue.inc'} … … 81 61 {$DEFINE TGQueue := TQueueByte} 82 62 {$DEFINE TGQueueList := TQueueListByte} 83 {$DEFINE TGQueueSortCompare := TQueueSortCompareByte}84 {$DEFINE TGQueueToStringConverter := TQueueToStringConverterByte}85 {$DEFINE TGQueueFromStringConverter := TQueueFromStringConverterByte}86 {$DEFINE TGQueueItemArray := TQueueByteItemArray}87 63 {$DEFINE IMPLEMENTATION} 88 64 {$I 'GenericQueue.inc'} -
Generics/TemplateGenerics/Specialized/SpecializedSet.pas
r112 r426 16 16 {$DEFINE TGSetList := TSetListInteger} 17 17 {$DEFINE TGSet := TSetInteger} 18 {$DEFINE TGSetSortCompare := TSetSortCompareInteger}19 {$DEFINE TGSetToStringConverter := TSetToStringConverterInteger}20 {$DEFINE TGSetFromStringConverter := TSetFromStringConverterInteger}21 {$DEFINE TGSetItemArray := TSetIntegerItemArray}22 18 {$DEFINE INTERFACE} 23 19 {$I 'GenericSet.inc'} … … 28 24 {$DEFINE TGSetList := TSetListPointer} 29 25 {$DEFINE TGSet := TSetPointer} 30 {$DEFINE TGSetSortCompare := TSetSortComparePointer}31 {$DEFINE TGSetToStringConverter := TSetToStringConverterPointer}32 {$DEFINE TGSetFromStringConverter := TSetFromStringConverterPointer}33 {$DEFINE TGSetItemArray := TSetPointerItemArray}34 26 {$DEFINE INTERFACE} 35 27 {$I 'GenericSet.inc'} … … 45 37 {$DEFINE TGSetList := TSetListInteger} 46 38 {$DEFINE TGSet := TSetInteger} 47 {$DEFINE TGSetSortCompare := TSetSortCompareInteger}48 {$DEFINE TGSetToStringConverter := TSetToStringConverterInteger}49 {$DEFINE TGSetFromStringConverter := TSetFromStringConverterInteger}50 {$DEFINE TGSetItemArray := TSetIntegerItemArray}51 39 {$DEFINE IMPLEMENTATION} 52 40 {$I 'GenericSet.inc'} … … 57 45 {$DEFINE TGSetList := TSetListPointer} 58 46 {$DEFINE TGSet := TSetPointer} 59 {$DEFINE TGSetSortCompare := TSetSortComparePointer}60 {$DEFINE TGSetToStringConverter := TSetToStringConverterPointer}61 {$DEFINE TGSetFromStringConverter := TSetFromStringConverterPointer}62 {$DEFINE TGSetItemArray := TSetPointerItemArray}63 47 {$DEFINE IMPLEMENTATION} 64 48 {$I 'GenericSet.inc'} -
Generics/TemplateGenerics/Specialized/SpecializedStack.pas
r112 r426 16 16 {$DEFINE TGStackList := TListStackInteger} 17 17 {$DEFINE TGStack := TStackInteger} 18 {$DEFINE TGStackSortCompare := TStackSortCompareInteger}19 {$DEFINE TGStackToStringConverter := TStackToStringConverterInteger}20 {$DEFINE TGStackFromStringConverter := TStackFromStringConverterInteger}21 {$DEFINE TGStackItemArray := TStackIntegerItemArray}22 18 {$DEFINE INTERFACE} 23 19 {$I 'GenericStack.inc'} … … 28 24 {$DEFINE TGStackList := TListStackPointer} 29 25 {$DEFINE TGStack := TStackPointer} 30 {$DEFINE TGStackSortCompare := TStackSortComparePointer}31 {$DEFINE TGStackToStringConverter := TStackToStringConverterPointer}32 {$DEFINE TGStackFromStringConverter := TStackFromStringConverterPointer}33 {$DEFINE TGStackItemArray := TStackStringItemArray}34 26 {$DEFINE INTERFACE} 35 27 {$I 'GenericStack.inc'} … … 46 38 {$DEFINE TGStackList := TListStackInteger} 47 39 {$DEFINE TGStack := TStackInteger} 48 {$DEFINE TGStackSortCompare := TStackSortCompareInteger}49 {$DEFINE TGStackToStringConverter := TStackToStringConverterInteger}50 {$DEFINE TGStackFromStringConverter := TStackFromStringConverterInteger}51 {$DEFINE TGStackItemArray := TStackIntegerItemArray}52 40 {$DEFINE IMPLEMENTATION} 53 41 {$I 'GenericStack.inc'} … … 58 46 {$DEFINE TGStackList := TListStackPointer} 59 47 {$DEFINE TGStack := TStackPointer} 60 {$DEFINE TGStackSortCompare := TStackSortComparePointer}61 {$DEFINE TGStackToStringConverter := TStackToStringConverterPointer}62 {$DEFINE TGStackFromStringConverter := TStackFromStringConverterPointer}63 {$DEFINE TGStackItemArray := TStackStringItemArray}64 48 {$DEFINE IMPLEMENTATION} 65 49 {$I 'GenericStack.inc'} -
Generics/TemplateGenerics/Specialized/SpecializedStream.pas
r342 r426 18 18 {$DEFINE TGStreamList := TListStreamInteger} 19 19 {$DEFINE TGStream := TStreamInteger} 20 {$DEFINE TGStreamSortCompare := TStreamIntegerSortCompare}21 {$DEFINE TGStreamToStringConverter := TStreamIntegerToStringConverter}22 {$DEFINE TGStreamFromStringConverter := TStreamIntegerFromStringConverter}23 {$DEFINE TGStreamItemArray := TStreamIntegerItemArray}24 20 {$DEFINE INTERFACE} 25 21 {$I 'GenericStream.inc'} … … 30 26 {$DEFINE TGStreamList := TListStreamByte} 31 27 {$DEFINE TGStream := TBaseStreamByte} 32 {$DEFINE TGStreamSortCompare := TStreamByteSortCompare}33 {$DEFINE TGStreamToStringConverter := TStreamByteToStringConverter}34 {$DEFINE TGStreamFromStringConverter := TStreamByteFromStringConverter}35 {$DEFINE TGStreamItemArray := TStreamByteItemArray}36 28 {$DEFINE INTERFACE} 37 29 {$I 'GenericStream.inc'} … … 42 34 {$DEFINE TGStreamList := TListStreamPointer} 43 35 {$DEFINE TGStream := TStreamPointer} 44 {$DEFINE TGStreamSortCompare := TStreamPointerSortCompare}45 {$DEFINE TGStreamToStringConverter := TStreamPointerToStringConverter}46 {$DEFINE TGStreamFromStringConverter := TStreamPointerFromStringConverter}47 {$DEFINE TGStreamItemArray := TStreamPointerItemArray}48 36 {$DEFINE INTERFACE} 49 37 {$I 'GenericStream.inc'} … … 69 57 procedure WriteStream(Stream: TBaseStreamByte; Count: Integer); override; 70 58 function Read: Byte; override; 71 function ReadArray(Count: Integer): T StreamByteItemArray; override;59 function ReadArray(Count: Integer): TItemArray; override; 72 60 function ReadList(List: TListByte; Count: Integer): Integer; 73 61 function ReadBuffer(var Buffer; Count: Integer): Integer; override; … … 134 122 end; 135 123 136 function TMemoryStreamByte.ReadArray(Count: Integer): T StreamByteItemArray;124 function TMemoryStreamByte.ReadArray(Count: Integer): TItemArray; 137 125 begin 138 126 Result := FList.GetArray(FPosition, Count); … … 211 199 {$DEFINE TGStreamList := TListStreamInteger} 212 200 {$DEFINE TGStream := TStreamInteger} 213 {$DEFINE TGStreamSortCompare := TStreamIntegerSortCompare}214 {$DEFINE TGStreamToStringConverter := TStreamIntegerToStringConverter}215 {$DEFINE TGStreamFromStringConverter := TStreamIntegerFromStringConverter}216 {$DEFINE TGStreamItemArray := TStreamIntegerItemArray}217 201 {$DEFINE IMPLEMENTATION} 218 202 {$I 'GenericStream.inc'} … … 223 207 {$DEFINE TGStreamList := TListStreamByte} 224 208 {$DEFINE TGStream := TBaseStreamByte} 225 {$DEFINE TGStreamSortCompare := TStreamByteSortCompare}226 {$DEFINE TGStreamToStringConverter := TStreamByteToStringConverter}227 {$DEFINE TGStreamFromStringConverter := TStreamByteFromStringConverter}228 {$DEFINE TGStreamItemArray := TStreamByteItemArray}229 209 {$DEFINE IMPLEMENTATION} 230 210 {$I 'GenericStream.inc'} … … 235 215 {$DEFINE TGStreamList := TListStreamPointer} 236 216 {$DEFINE TGStream := TStreamPointer} 237 {$DEFINE TGStreamSortCompare := TStreamPointerSortCompare}238 {$DEFINE TGStreamToStringConverter := TStreamPointerToStringConverter}239 {$DEFINE TGStreamFromStringConverter := TStreamPointerFromStringConverter}240 {$DEFINE TGStreamItemArray := TStreamPointerItemArray}241 217 {$DEFINE IMPLEMENTATION} 242 218 {$I 'GenericStream.inc'} -
Generics/TemplateGenerics/Specialized/SpecializedTree.pas
r112 r426 16 16 {$DEFINE TGTreeNode := TTreeNodeInteger} 17 17 {$DEFINE TGTreeNodeList := TTreeNodeListInteger} 18 {$DEFINE TGTreeSortCompare := TTreeSortCompareInteger}19 {$DEFINE TGTreeToStringConverter := TTreeToStringConverterInteger}20 {$DEFINE TGTreeFromStringConverter := TTreeFromStringConverterInteger}21 {$DEFINE TGTreeItemArray := TTreeIntegerItemArray}22 18 {$DEFINE INTERFACE} 23 19 {$I 'GenericTree.inc'} … … 29 25 {$DEFINE TGTreeNode := TTreeNodeString} 30 26 {$DEFINE TGTreeNodeList := TTreeNodeListString} 31 {$DEFINE TGTreeSortCompare := TTreeSortCompareString}32 {$DEFINE TGTreeToStringConverter := TTreeToStringConverterString}33 {$DEFINE TGTreeFromStringConverter := TTreeFromStringConverterString}34 {$DEFINE TGTreeItemArray := TTreeStringItemArray}35 27 {$DEFINE INTERFACE} 36 28 {$I 'GenericTree.inc'} … … 42 34 {$DEFINE TGTreeNode := TTreeNodePointer} 43 35 {$DEFINE TGTreeNodeList := TTreeNodeListPointer} 44 {$DEFINE TGTreeSortCompare := TTreeSortComparePointer}45 {$DEFINE TGTreeToStringConverter := TTreeToStringConverterPointer}46 {$DEFINE TGTreeFromStringConverter := TTreeFromStringConverterPointer}47 {$DEFINE TGTreeItemArray := TTreePointerItemArray}48 36 {$DEFINE INTERFACE} 49 37 {$I 'GenericTree.inc'} … … 60 48 {$DEFINE TGTreeNode := TTreeNodeInteger} 61 49 {$DEFINE TGTreeNodeList := TTreeNodeListInteger} 62 {$DEFINE TGTreeSortCompare := TTreeSortCompareInteger}63 {$DEFINE TGTreeToStringConverter := TTreeToStringConverterInteger}64 {$DEFINE TGTreeFromStringConverter := TTreeFromStringConverterInteger}65 {$DEFINE TGTreeItemArray := TTreeIntegerItemArray}66 50 {$DEFINE IMPLEMENTATION} 67 51 {$I 'GenericTree.inc'} … … 73 57 {$DEFINE TGTreeNode := TTreeNodeString} 74 58 {$DEFINE TGTreeNodeList := TTreeNodeListString} 75 {$DEFINE TGTreeSortCompare := TTreeSortCompareString}76 {$DEFINE TGTreeToStringConverter := TTreeToStringConverterString}77 {$DEFINE TGTreeFromStringConverter := TTreeFromStringConverterString}78 {$DEFINE TGTreeItemArray := TTreeStringItemArray}79 59 {$DEFINE IMPLEMENTATION} 80 60 {$I 'GenericTree.inc'} … … 86 66 {$DEFINE TGTreeNode := TTreeNodePointer} 87 67 {$DEFINE TGTreeNodeList := TTreeNodeListPointer} 88 {$DEFINE TGTreeSortCompare := TTreeSortComparePointer}89 {$DEFINE TGTreeToStringConverter := TTreeToStringConverterPointer}90 {$DEFINE TGTreeFromStringConverter := TTreeFromStringConverterPointer}91 {$DEFINE TGTreeItemArray := TTreePointerItemArray}92 68 {$DEFINE IMPLEMENTATION} 93 69 {$I 'GenericTree.inc'}
Note:
See TracChangeset
for help on using the changeset viewer.
