Changeset 25 for trunk


Ignore:
Timestamp:
Dec 4, 2010, 10:05:05 PM (14 years ago)
Author:
george
Message:
  • Updated: Support for newer generic library.
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Compiler/Analyze/UAnalyzer.pas

    r20 r25  
    392392        // Update cursor position
    393393        Inc(CodePosition.X);
    394         if (CurrentChar = LineEnding[1]) then begin
     394        if (CurrentChar = LineEnding) then begin
    395395          CodePosition.X := 0;
    396396          Inc(CodePosition.Y);

  • trunk/Compiler/USourceCode.pas

    r24 r25  
    6363  {$DEFINE TGObjectList := TListExpression}
    6464  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareExpression}
    65   {$DEFINE TGObjectListStringConverter := TObjectListStringConverterExpression}
     65  {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterExpression}
     66  {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterExpression}
    6667  {$DEFINE INTERFACE}
    6768  {$I 'GenericObjectList.inc'}
    … …  
    133134  {$DEFINE TGObjectList := TListCaseOfEndBranche}
    134135  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareCaseOfEndBranche}
    135   {$DEFINE TGObjectListStringConverter := TObjectListStringConverterCaseOfEndBranche}
     136  {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterCaseOfEndBranche}
     137  {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterCaseOfEndBranche}
    136138  {$DEFINE INTERFACE}
    137139  {$I 'GenericObjectList.inc'}
    … …  
    161163  {$DEFINE TGObjectList := TCommandList}
    162164  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareCommand}
    163   {$DEFINE TGObjectListStringConverter := TObjectListStringConverterCommand}
     165  {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterCommand}
     166  {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterCommand}
    164167  {$DEFINE INTERFACE}
    165168  {$I 'GenericObjectList.inc'}
    … …  
    205208  {$DEFINE TGObjectList := TListType}
    206209  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareType}
    207   {$DEFINE TGObjectListStringConverter := TObjectListStringConverterType}
     210  {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterType}
     211  {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterType}
    208212  {$DEFINE INTERFACE}
    209213  {$I 'GenericObjectList.inc'}
    … …  
    248252  {$DEFINE TGObjectList := TListEnumItem}
    249253  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareEnumItem}
    250   {$DEFINE TGObjectListStringConverter := TObjectListStringConverterEnumItem}
     254  {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterEnumItem}
     255  {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterEnumItem}
    251256  {$DEFINE INTERFACE}
    252257  {$I 'GenericObjectList.inc'}
    … …  
    280285  {$DEFINE TGObjectList := TListConstant}
    281286  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareConstant}
    282   {$DEFINE TGObjectListStringConverter := TObjectListStringConverterConstant}
     287  {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterConstant}
     288  {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterConstant}
    283289  {$DEFINE INTERFACE}
    284290  {$I 'GenericObjectList.inc'}
    … …  
    303309  {$DEFINE TGObjectList := TListVariable}
    304310  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareVariable}
    305   {$DEFINE TGObjectListStringConverter := TObjectListStringConverterVariable}
     311  {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterVariable}
     312  {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterVariable}
    306313  {$DEFINE INTERFACE}
    307314  {$I 'GenericObjectList.inc'}
    … …  
    322329  {$DEFINE TGObjectList := TListParameter}
    323330  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareParameter}
    324   {$DEFINE TGObjectListStringConverter := TObjectListStringConverterParameter}
     331  {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterParameter}
     332  {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterParameter}
    325333  {$DEFINE INTERFACE}
    326334  {$I 'GenericObjectList.inc'}
    … …  
    370378  {$DEFINE TGObjectList := TListFunction}
    371379  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareFunction}
    372   {$DEFINE TGObjectListStringConverter := TObjectListStringConverterFunction}
     380  {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterFunction}
     381  {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterFunction}
    373382  {$DEFINE INTERFACE}
    374383  {$I 'GenericObjectList.inc'}
    … …  
    393402  {$DEFINE TGObjectList := TListUsedModule}
    394403  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareUsedModule}
    395   {$DEFINE TGObjectListStringConverter := TObjectListStringConverterUsedModule}
     404  {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterUsedModule}
     405  {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterUsedModule}
    396406  {$DEFINE INTERFACE}
    397407  {$I 'GenericObjectList.inc'}
    … …  
    447457  {$DEFINE TGObjectList := TListModule}
    448458  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareModule}
    449   {$DEFINE TGObjectListStringConverter := TObjectListStringConverterModule}
     459  {$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterModule}
     460  {$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterModule}
    450461  {$DEFINE INTERFACE}
    451462  {$I 'GenericObjectList.inc'}
    … …  
    489500{$DEFINE TGObjectList := TListExpression}
    490501{$DEFINE TGObjectListSortCompare := TObjectListSortCompareExpression}
    491 {$DEFINE TGObjectListStringConverter := TObjectListStringConverterExpression}
     502{$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterExpression}
     503{$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterExpression}
    492504{$DEFINE IMPLEMENTATION}
    493505{$I 'GenericObjectList.inc'}
    … …  
    499511{$DEFINE TGObjectList := TListCaseOfEndBranche}
    500512{$DEFINE TGObjectListSortCompare := TObjectListSortCompareCaseOfEndBranche}
    501 {$DEFINE TGObjectListStringConverter := TObjectListStringConverterCaseOfEndBranche}
     513{$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterCaseOfEndBranche}
     514{$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterCaseOfEndBranche}
    502515{$DEFINE IMPLEMENTATION}
    503516{$I 'GenericObjectList.inc'}
    … …  
    509522{$DEFINE TGObjectList := TCommandList}
    510523{$DEFINE TGObjectListSortCompare := TObjectListSortCompareCommand}
    511 {$DEFINE TGObjectListStringConverter := TObjectListStringConverterCommand}
     524{$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterCommand}
     525{$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterCommand}
    512526{$DEFINE IMPLEMENTATION}
    513527{$I 'GenericObjectList.inc'}
    … …  
    519533{$DEFINE TGObjectList := TListEnumItem}
    520534{$DEFINE TGObjectListSortCompare := TObjectListSortCompareEnumItem}
    521 {$DEFINE TGObjectListStringConverter := TObjectListStringConverterEnumItem}
     535{$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterEnumItem}
     536{$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterEnumItem}
    522537{$DEFINE IMPLEMENTATION}
    523538{$I 'GenericObjectList.inc'}
    … …  
    529544{$DEFINE TGObjectList := TListType}
    530545{$DEFINE TGObjectListSortCompare := TObjectListSortCompareType}
    531 {$DEFINE TGObjectListStringConverter := TObjectListStringConverterType}
     546{$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterType}
     547{$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterType}
    532548{$DEFINE IMPLEMENTATION}
    533549{$I 'GenericObjectList.inc'}
    … …  
    539555{$DEFINE TGObjectList := TListConstant}
    540556{$DEFINE TGObjectListSortCompare := TObjectListSortCompareConstant}
    541 {$DEFINE TGObjectListStringConverter := TObjectListStringConverterConstant}
     557{$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterConstant}
     558{$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterConstant}
    542559{$DEFINE IMPLEMENTATION}
    543560{$I 'GenericObjectList.inc'}
    … …  
    549566{$DEFINE TGObjectList := TListVariable}
    550567{$DEFINE TGObjectListSortCompare := TObjectListSortCompareVariable}
    551 {$DEFINE TGObjectListStringConverter := TObjectListStringConverterVariable}
     568{$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterVariable}
     569{$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterVariable}
    552570{$DEFINE IMPLEMENTATION}
    553571{$I 'GenericObjectList.inc'}
    … …  
    559577{$DEFINE TGObjectList := TListParameter}
    560578{$DEFINE TGObjectListSortCompare := TObjectListSortCompareParameter}
    561 {$DEFINE TGObjectListStringConverter := TObjectListStringConverterParameter}
     579{$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterParameter}
     580{$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterParameter}
    562581{$DEFINE IMPLEMENTATION}
    563582{$I 'GenericObjectList.inc'}
    … …  
    569588{$DEFINE TGObjectList := TListFunction}
    570589{$DEFINE TGObjectListSortCompare := TObjectListSortCompareFunction}
    571 {$DEFINE TGObjectListStringConverter := TObjectListStringConverterFunction}
     590{$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterFunction}
     591{$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterFunction}
    572592{$DEFINE IMPLEMENTATION}
    573593{$I 'GenericObjectList.inc'}
    … …  
    579599{$DEFINE TGObjectList := TListUsedModule}
    580600{$DEFINE TGObjectListSortCompare := TObjectListSortCompareUsedModule}
    581 {$DEFINE TGObjectListStringConverter := TObjectListStringConverterUsedModule}
     601{$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterUsedModule}
     602{$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterUsedModule}
    582603{$DEFINE IMPLEMENTATION}
    583604{$I 'GenericObjectList.inc'}
    … …  
    589610{$DEFINE TGObjectList := TListModule}
    590611{$DEFINE TGObjectListSortCompare := TObjectListSortCompareModule}
    591 {$DEFINE TGObjectListStringConverter := TObjectListStringConverterModule}
     612{$DEFINE TGObjectListToStringConverter := TObjectListToStringConverterModule}
     613{$DEFINE TGObjectListFromStringConverter := TObjectListFromStringConverterModule}
    592614{$DEFINE IMPLEMENTATION}
    593615{$I 'GenericObjectList.inc'}

  • trunk/IDE/Forms/UMainForm.pas

    r24 r25  
    165165  CompiledForm.Show;
    166166
    167   TCoolDockManager(Container2.Panel.DockManager).DockStyle := dsTabs;
     167  //TCoolDockManager(Container2.Panel.DockManager).DockStyle := dsTabs;
    168168
    169169  ProjectManager.Parent.Parent.Width := 200;
Note: See TracChangeset for help on using the changeset viewer.