![(please configure the [header_logo] section in trac.ini)](/Transpascal/chrome/site/your_project_logo.png){kind=logo}
Changeset 26 for trunk/Compiler/USourceCode.pas
- Timestamp:
- Dec 8, 2010, 10:00:30 AM (13 years ago)
- File:
-
- 1 edited
-
trunk/Compiler/USourceCode.pas (modified) (24 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Compiler/USourceCode.pas
r25 r26 58 58 59 59 // TListExpression = TGObjectList<Integer, TExpression> 60 {$DEFINE TGObjectListIndex := Integer} 61 {$DEFINE TGObjectListItem := TExpression} 62 {$DEFINE TGObjectListList := TObjectListExpression} 63 {$DEFINE TGObjectList := TListExpression} 64 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareExpression} 65 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterExpression} 66 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterExpression} 67 {$DEFINE INTERFACE} 68 {$I 'GenericObjectList.inc'} 60 TListExpression = class(TListObject); 69 61 70 62 { TFunctionCall } … … 129 121 130 122 // TListCaseOfEndBranche = TGObjectList<Integer, TCaseOfEndBranche> 131 {$DEFINE TGObjectListIndex := Integer} 132 {$DEFINE TGObjectListItem := TCaseOfEndBranche} 133 {$DEFINE TGObjectListList := TObjectListCaseOfEndBranche} 134 {$DEFINE TGObjectList := TListCaseOfEndBranche} 135 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareCaseOfEndBranche} 136 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterCaseOfEndBranche} 137 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterCaseOfEndBranche} 138 {$DEFINE INTERFACE} 139 {$I 'GenericObjectList.inc'} 123 TListCaseOfEndBranche = class(TListObject); 140 124 141 125 TCaseOfEnd = class(TCommand) … … 158 142 159 143 // TCommandList = TGObjectList<Integer, TCommand> 160 {$DEFINE TGObjectListIndex := Integer} 161 {$DEFINE TGObjectListItem := TCommand} 162 {$DEFINE TGObjectListList := TObjectListCommand} 163 {$DEFINE TGObjectList := TCommandList} 164 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareCommand} 165 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterCommand} 166 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterCommand} 167 {$DEFINE INTERFACE} 168 {$I 'GenericObjectList.inc'} 144 TCommandList = class(TListObject); 169 145 170 146 TCommonBlockSection = (cbsVariable, cbsType, cbsConstant); … … 203 179 204 180 // TListType = TGObjectList<Integer, TType> 205 {$DEFINE TGObjectListIndex := Integer} 206 {$DEFINE TGObjectListItem := TType} 207 {$DEFINE TGObjectListList := TObjectListType} 208 {$DEFINE TGObjectList := TListType} 209 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareType} 210 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterType} 211 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterType} 212 {$DEFINE INTERFACE} 213 {$I 'GenericObjectList.inc'} 181 TListType = class(TListObject); 214 182 215 183 TTypeList = class(TListType) … … 247 215 248 216 // TListEnumItem = TGObjectList<Integer, TEnumItem> 249 {$DEFINE TGObjectListIndex := Integer} 250 {$DEFINE TGObjectListItem := TEnumItem} 251 {$DEFINE TGObjectListList := TObjectListEnumItem} 252 {$DEFINE TGObjectList := TListEnumItem} 253 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareEnumItem} 254 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterEnumItem} 255 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterEnumItem} 256 {$DEFINE INTERFACE} 257 {$I 'GenericObjectList.inc'} 217 TListEnumItem = class(TListObject); 258 218 259 219 TTypeEnumeration = class(TType) … … 266 226 267 227 TTypeClass = class(TType) 268 Items: TListType;228 CommonBlock: TCommonBlock; 269 229 constructor Create; 270 230 destructor Destroy; override; … … 280 240 281 241 // TListConstant = TGObjectList<Integer, TConstant> 282 {$DEFINE TGObjectListIndex := Integer} 283 {$DEFINE TGObjectListItem := TConstant} 284 {$DEFINE TGObjectListList := TObjectListConstant} 285 {$DEFINE TGObjectList := TListConstant} 286 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareConstant} 287 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterConstant} 288 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterConstant} 289 {$DEFINE INTERFACE} 290 {$I 'GenericObjectList.inc'} 242 TListConstant = class(TListObject); 291 243 292 244 TConstantList = class(TListConstant) … … 304 256 305 257 // TListVariable = TGObjectList<Integer, TVariable> 306 {$DEFINE TGObjectListIndex := Integer} 307 {$DEFINE TGObjectListItem := TVariable} 308 {$DEFINE TGObjectListList := TObjectListVariable} 309 {$DEFINE TGObjectList := TListVariable} 310 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareVariable} 311 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterVariable} 312 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterVariable} 313 {$DEFINE INTERFACE} 314 {$I 'GenericObjectList.inc'} 258 TListVariable = class(TListObject); 315 259 316 260 TVariableList = class(TListVariable) … … 324 268 325 269 // TListParameter = TGObjectList<Integer, TParameter> 326 {$DEFINE TGObjectListIndex := Integer} 327 {$DEFINE TGObjectListItem := TParameter} 328 {$DEFINE TGObjectListList := TObjectListParameter} 329 {$DEFINE TGObjectList := TListParameter} 330 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareParameter} 331 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterParameter} 332 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterParameter} 333 {$DEFINE INTERFACE} 334 {$I 'GenericObjectList.inc'} 270 TListParameter = class(TListObject); 335 271 336 272 TParameterList = class(TListParameter) … … 373 309 374 310 // TListFunction = TGObjectList<Integer, TFunction> 375 {$DEFINE TGObjectListIndex := Integer} 376 {$DEFINE TGObjectListItem := TFunction} 377 {$DEFINE TGObjectListList := TObjectListFunction} 378 {$DEFINE TGObjectList := TListFunction} 379 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareFunction} 380 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterFunction} 381 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterFunction} 382 {$DEFINE INTERFACE} 383 {$I 'GenericObjectList.inc'} 311 TListFunction = class(TListObject); 384 312 385 313 TFunctionList = class(TListFunction) … … 397 325 398 326 // TListUsedModule = TGObjectList<Integer, TUsedModule> 399 {$DEFINE TGObjectListIndex := Integer} 400 {$DEFINE TGObjectListItem := TUsedModule} 401 {$DEFINE TGObjectListList := TObjectListUsedModule} 402 {$DEFINE TGObjectList := TListUsedModule} 403 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareUsedModule} 404 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterUsedModule} 405 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterUsedModule} 406 {$DEFINE INTERFACE} 407 {$I 'GenericObjectList.inc'} 327 TListUsedModule = class(TListObject); 408 328 409 329 TUsedModuleList = class(TListUsedModule) … … 452 372 453 373 // TListModule = TGObjectList<Integer, TModule> 454 {$DEFINE TGObjectListIndex := Integer} 455 {$DEFINE TGObjectListItem := TModule} 456 {$DEFINE TGObjectListList := TObjectListModule} 457 {$DEFINE TGObjectList := TListModule} 458 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareModule} 459 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterModule} 460 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterModule} 461 {$DEFINE INTERFACE} 462 {$I 'GenericObjectList.inc'} 374 TListModule = class(TListObject); 463 375 464 376 { TModuleList } … … 491 403 implementation 492 404 493 {$DEFINE IMPLEMENTATION_USES}494 {$I 'GenericObjectList.inc'}495 496 // TListExpression = TGObjectList<Integer, TExpression>497 {$DEFINE TGObjectListIndex := Integer}498 {$DEFINE TGObjectListItem := TExpression}499 {$DEFINE TGObjectListList := TObjectListExpression}500 {$DEFINE TGObjectList := TListExpression}501 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareExpression}502 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterExpression}503 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterExpression}504 {$DEFINE IMPLEMENTATION}505 {$I 'GenericObjectList.inc'}506 507 // TListCaseOfEndBranche = TGObjectList<Integer, TCaseOfEndBranche>508 {$DEFINE TGObjectListIndex := Integer}509 {$DEFINE TGObjectListItem := TCaseOfEndBranche}510 {$DEFINE TGObjectListList := TObjectListCaseOfEndBranche}511 {$DEFINE TGObjectList := TListCaseOfEndBranche}512 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareCaseOfEndBranche}513 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterCaseOfEndBranche}514 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterCaseOfEndBranche}515 {$DEFINE IMPLEMENTATION}516 {$I 'GenericObjectList.inc'}517 518 // TCommandList = TGObjectList<Integer, TCommand>519 {$DEFINE TGObjectListIndex := Integer}520 {$DEFINE TGObjectListItem := TCommand}521 {$DEFINE TGObjectListList := TObjectListCommand}522 {$DEFINE TGObjectList := TCommandList}523 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareCommand}524 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterCommand}525 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterCommand}526 {$DEFINE IMPLEMENTATION}527 {$I 'GenericObjectList.inc'}528 529 // TListEnumItem = TGObjectList<Integer, TEnumItem>530 {$DEFINE TGObjectListIndex := Integer}531 {$DEFINE TGObjectListItem := TEnumItem}532 {$DEFINE TGObjectListList := TObjectListEnumItem}533 {$DEFINE TGObjectList := TListEnumItem}534 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareEnumItem}535 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterEnumItem}536 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterEnumItem}537 {$DEFINE IMPLEMENTATION}538 {$I 'GenericObjectList.inc'}539 540 // TListType = TGObjectList<Integer, TType>541 {$DEFINE TGObjectListIndex := Integer}542 {$DEFINE TGObjectListItem := TType}543 {$DEFINE TGObjectListList := TObjectListType}544 {$DEFINE TGObjectList := TListType}545 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareType}546 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterType}547 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterType}548 {$DEFINE IMPLEMENTATION}549 {$I 'GenericObjectList.inc'}550 551 // TListConstant = TGObjectList<Integer, TConstant>552 {$DEFINE TGObjectListIndex := Integer}553 {$DEFINE TGObjectListItem := TConstant}554 {$DEFINE TGObjectListList := TObjectListConstant}555 {$DEFINE TGObjectList := TListConstant}556 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareConstant}557 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterConstant}558 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterConstant}559 {$DEFINE IMPLEMENTATION}560 {$I 'GenericObjectList.inc'}561 562 // TListVariable = TGObjectList<Integer, TVariable>563 {$DEFINE TGObjectListIndex := Integer}564 {$DEFINE TGObjectListItem := TVariable}565 {$DEFINE TGObjectListList := TObjectListVariable}566 {$DEFINE TGObjectList := TListVariable}567 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareVariable}568 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterVariable}569 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterVariable}570 {$DEFINE IMPLEMENTATION}571 {$I 'GenericObjectList.inc'}572 573 // TListParameter = TGObjectList<Integer, TParameter>574 {$DEFINE TGObjectListIndex := Integer}575 {$DEFINE TGObjectListItem := TParameter}576 {$DEFINE TGObjectListList := TObjectListParameter}577 {$DEFINE TGObjectList := TListParameter}578 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareParameter}579 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterParameter}580 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterParameter}581 {$DEFINE IMPLEMENTATION}582 {$I 'GenericObjectList.inc'}583 584 // TListFunction = TGObjectList<Integer, TFunction>585 {$DEFINE TGObjectListIndex := Integer}586 {$DEFINE TGObjectListItem := TFunction}587 {$DEFINE TGObjectListList := TObjectListFunction}588 {$DEFINE TGObjectList := TListFunction}589 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareFunction}590 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterFunction}591 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterFunction}592 {$DEFINE IMPLEMENTATION}593 {$I 'GenericObjectList.inc'}594 595 // TListUsedModule = TGObjectList<Integer, TUsedModule>596 {$DEFINE TGObjectListIndex := Integer}597 {$DEFINE TGObjectListItem := TUsedModule}598 {$DEFINE TGObjectListList := TObjectListUsedModule}599 {$DEFINE TGObjectList := TListUsedModule}600 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareUsedModule}601 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterUsedModule}602 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterUsedModule}603 {$DEFINE IMPLEMENTATION}604 {$I 'GenericObjectList.inc'}605 606 // TListModule = TGObjectList<Integer, TModule>607 {$DEFINE TGObjectListIndex := Integer}608 {$DEFINE TGObjectListItem := TModule}609 {$DEFINE TGObjectListList := TObjectListModule}610 {$DEFINE TGObjectList := TListModule}611 {$DEFINE TGObjectListSortCompare := TObjectListSortCompareModule}612 {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterModule}613 {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterModule}614 {$DEFINE IMPLEMENTATION}615 {$I 'GenericObjectList.inc'}616 617 405 { TFunction } 618 406 … … 661 449 begin 662 450 I := 0; 663 while (I < Count) and (LowerCase( Items[I].Name) <> LowerCase(Name)) do Inc(I);664 if I < Count then Result := Items[I]else begin451 while (I < Count) and (LowerCase(TConstant(Items[I]).Name) <> LowerCase(Name)) do Inc(I); 452 if I < Count then Result := TConstant(Items[I]) else begin 665 453 if Assigned(Parent.Parent) then Result := Parent.Parent.Constants.Search(Name) 666 454 else begin … … 742 530 // Search in own list 743 531 I := 0; 744 while (I < Count) and (LowerCase( Items[I].Name) <> LowerCase(Name)) do Inc(I);745 if I < Count then Result := Items[I]532 while (I < Count) and (LowerCase(TType(Items[I]).Name) <> LowerCase(Name)) do Inc(I); 533 if I < Count then Result := TType(Items[I]) 746 534 else Result := nil; 747 535 … … 769 557 // Search in own list 770 558 I := 0; 771 while (I < Count) and (LowerCase( Items[I].Name) <> LowerCase(Name)) do Inc(I);559 while (I < Count) and (LowerCase(TVariable(Items[I]).Name) <> LowerCase(Name)) do Inc(I); 772 560 if I < Count then Result := TVariable(Items[I]) else Result := nil; 773 561 … … 814 602 // Search in own list 815 603 I := 0; 816 while (I < Count) and (LowerCase( Items[I].Name) <> LowerCase(Name)) do Inc(I);817 if I < Count then Result := Items[I]else Result := nil;604 while (I < Count) and (LowerCase(TFunction(Items[I]).Name) <> LowerCase(Name)) do Inc(I); 605 if I < Count then Result := TFunction(Items[I]) else Result := nil; 818 606 819 607 // Search parent block list … … 865 653 begin 866 654 I := 0; 867 while (I < Count) and (LowerCase( Items[I].Name) <> LowerCase(Name)) do Inc(I);868 if I < Count then Result := Items[I]655 while (I < Count) and (LowerCase(TParameter(Items[I]).Name) <> LowerCase(Name)) do Inc(I); 656 if I < Count then Result := TParameter(Items[I]) 869 657 else Result := nil; 870 658 end; … … 995 783 begin 996 784 I := 0; 997 while (I < Count) and (LowerCase(Items[I].Name) <> LowerCase(Name)) do Inc(I); 998 if I < Count then Result := Items[I] else Result := nil; 785 while (I < Count) and (LowerCase(TModule(Items[I]).Name) <> LowerCase(Name)) do Inc(I); 786 if I < Count then Result := TModule(Items[I]) 787 else Result := nil; 999 788 end; 1000 789 … … 1010 799 I := 0; 1011 800 while (I < UsedModules.Count) and (not Assigned(Result)) do begin 1012 Result := UsedModules[I].Module.SearchVariable(Name, False);801 Result := TUsedModule(UsedModules[I]).Module.SearchVariable(Name, False); 1013 802 Inc(I); 1014 803 end; … … 1030 819 I := 0; 1031 820 while (I < UsedModules.Count) and (not Assigned(Result)) do begin 1032 with UsedModules[I]do821 with TUsedModule(UsedModules[I]) do 1033 822 if Assigned(Module) then 1034 823 with Module do … … 1048 837 I := 0; 1049 838 while (I < UsedModules.Count) and (not Assigned(Result)) do begin 1050 if Assigned( UsedModules[I].Module) then1051 Result := UsedModules[I].Module.SearchFunction(Name, False);839 if Assigned(TUsedModule(UsedModules[I]).Module) then 840 Result := TUsedModule(UsedModules[I]).Module.SearchFunction(Name, False); 1052 841 Inc(I); 1053 842 end; … … 1103 892 begin 1104 893 inherited; 1105 Items := TListType.Create;894 CommonBlock := TCommonBlock.Create; 1106 895 end; 1107 896 1108 897 destructor TTypeClass.Destroy; 1109 898 begin 1110 Items.Free;899 CommonBlock.Free; 1111 900 inherited Destroy; 1112 901 end; … … 1125 914 NewType := TType.Create; 1126 915 //NewType := TType(Source.Parameters[I].ClassType.Create); 1127 NewType.Assign( Source.Parameters[I]);916 NewType.Assign(TType(Source.Parameters[I])); 1128 917 Parameters.Add(NewType); 1129 918 end;
Note:
See TracChangeset
for help on using the changeset viewer.
