Changeset 83

Timestamp:

Oct 31, 2010, 9:40:18 PM (14 years ago)

Author:

george

Message:

• Modified: TObjectList replaced by generics templates.

Location:

branches/Transpascal

Files:

• Common/ULastOpenedList.pas (modified) (2 diffs)
• Compiler/Analyze/UParser.pas (modified) (1 diff)
• Compiler/USourceCode.pas (modified) (28 diffs)
• Forms/UMainForm.lfm (modified) (6 diffs)
• Forms/UMainForm.pas (modified) (1 diff)
• Transpascal.lpi (modified) (50 diffs)
• Transpascal.lpr (modified) (1 diff)
• UProject.pas (modified) (5 diffs)

branches/Transpascal/Common/ULastOpenedList.pas

@@ -75 +75 @@
     ReloadMenu;
   finally
-    Destroy;
+    Free;
   end;
 end;
@@ -91 +91 @@
       WriteString('File' + IntToStr(I), UTF8Decode(Strings[I]));
   finally
-    Destroy;
+    Free;
   end;
 end;

branches/Transpascal/Compiler/Analyze/UParser.pas

@@ -360 +360 @@
         // Update cursor position
         Inc(CodePosition.X);
-        if (CurrentChar = #13) then begin
+        if (CurrentChar = LineEnding) then begin
           CodePosition.X := 0;
           Inc(CodePosition.Y);

branches/Transpascal/Compiler/USourceCode.pas

@@ -2 +2 @@
 
 {$MODE Delphi}
+{$MACRO ON}
 
 interface
 
 uses
-  SysUtils, Variants, Classes, Dialogs, ListObject;
+  SysUtils, Variants, Classes, Dialogs;
 
 type
@@ -55 +56 @@
   end;
 
+  // TListExpression = TGObjectList<Integer, TExpression>
+  {$DEFINE TGObjectListIndex := Integer}
+  {$DEFINE TGObjectListItem := TExpression}
+  {$DEFINE TGObjectListList := TObjectListExpression}
+  {$DEFINE TGObjectList := TListExpression}
+  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareExpression}
+  {$DEFINE TGObjectListStringConverter := TObjectListStringConverterExpression}
+  {$DEFINE INTERFACE}
+  {$I 'GenericObjectList.inc'}
+
   { TFunctionCall }
 
   TFunctionCall = class(TCommand)
     FunctionRef: TFunction;
-    ParameterExpression: TListObject; // TListObject<TExpression>
+    ParameterExpression: TListExpression;
     constructor Create;
     destructor Destroy; override;
@@ -115 +126 @@
   end;
 
+  // TListCaseOfEndBranche = TGObjectList<Integer, TCaseOfEndBranche>
+  {$DEFINE TGObjectListIndex := Integer}
+  {$DEFINE TGObjectListItem := TCaseOfEndBranche}
+  {$DEFINE TGObjectListList := TObjectListCaseOfEndBranche}
+  {$DEFINE TGObjectList := TListCaseOfEndBranche}
+  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareCaseOfEndBranche}
+  {$DEFINE TGObjectListStringConverter := TObjectListStringConverterCaseOfEndBranche}
+  {$DEFINE INTERFACE}
+  {$I 'GenericObjectList.inc'}
+
   TCaseOfEnd = class(TCommand)
     Expression: TExpression;
-    Branches: TListObject; // TListObject<TCaseOfEndBranche>
+    Branches: TListCaseOfEndBranche;
     ElseCommand: TCommand;
     constructor Create;
@@ -133 +154 @@
   end;
 
-  TCommandList = class(TListObject)
-
-  end;
+  // TCommandList = TGObjectList<Integer, TCommand>
+  {$DEFINE TGObjectListIndex := Integer}
+  {$DEFINE TGObjectListItem := TCommand}
+  {$DEFINE TGObjectListList := TObjectListCommand}
+  {$DEFINE TGObjectList := TCommandList}
+  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareCommand}
+  {$DEFINE TGObjectListStringConverter := TObjectListStringConverterCommand}
+  {$DEFINE INTERFACE}
+  {$I 'GenericObjectList.inc'}
 
   TCommonBlock = class
@@ -161 +188 @@
   end;
 
+  // TListType = TGObjectList<Integer, TType>
+  {$DEFINE TGObjectListIndex := Integer}
+  {$DEFINE TGObjectListItem := TType}
+  {$DEFINE TGObjectListList := TObjectListType}
+  {$DEFINE TGObjectList := TListType}
+  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareType}
+  {$DEFINE TGObjectListStringConverter := TObjectListStringConverterType}
+  {$DEFINE INTERFACE}
+  {$I 'GenericObjectList.inc'}
+
+  TTypeList = class(TListType)
+    Parent: TCommonBlock;
+    function Search(Name: string; Exported: Boolean = False): TType;
+    destructor Destroy; override;
+  end;
+
   TTypeInherited = class(TType)
   end;
@@ -188 +231 @@
   end;
 
+  // TListEnumItem = TGObjectList<Integer, TEnumItem>
+  {$DEFINE TGObjectListIndex := Integer}
+  {$DEFINE TGObjectListItem := TEnumItem}
+  {$DEFINE TGObjectListList := TObjectListEnumItem}
+  {$DEFINE TGObjectList := TListEnumItem}
+  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareEnumItem}
+  {$DEFINE TGObjectListStringConverter := TObjectListStringConverterEnumItem}
+  {$DEFINE INTERFACE}
+  {$I 'GenericObjectList.inc'}
+
   TTypeEnumeration = class(TType)
-    Items: TListObject; // TListObject<TEnumItem>
+    Items: TListEnumItem;
     constructor Create;
     destructor Destroy; override;
@@ -197 +250 @@
 
   TTypeClass = class(TType)
-    Items: TListObject; // TListObject<TType>
-    constructor Create;
-    destructor Destroy; override;
-  end;
-
-  TTypeList = class(TListObject)
-    Parent: TCommonBlock;
-    function Search(Name: string; Exported: Boolean = False): TType;
+    Items: TListType;
+    constructor Create;
     destructor Destroy; override;
   end;
@@ -216 +263 @@
   end;
 
-  TConstantList = class(TListObject)
+  // TListConstant = TGObjectList<Integer, TConstant>
+  {$DEFINE TGObjectListIndex := Integer}
+  {$DEFINE TGObjectListItem := TConstant}
+  {$DEFINE TGObjectListList := TObjectListConstant}
+  {$DEFINE TGObjectList := TListConstant}
+  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareConstant}
+  {$DEFINE TGObjectListStringConverter := TObjectListStringConverterConstant}
+  {$DEFINE INTERFACE}
+  {$I 'GenericObjectList.inc'}
+
+  TConstantList = class(TListConstant)
     Parent: TCommonBlock;
     function Search(Name: string): TConstant;
@@ -229 +286 @@
   end;
 
-  TVariableList = class(TListObject)
+  // TListVariable = TGObjectList<Integer, TVariable>
+  {$DEFINE TGObjectListIndex := Integer}
+  {$DEFINE TGObjectListItem := TVariable}
+  {$DEFINE TGObjectListList := TObjectListVariable}
+  {$DEFINE TGObjectList := TListVariable}
+  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareVariable}
+  {$DEFINE TGObjectListStringConverter := TObjectListStringConverterVariable}
+  {$DEFINE INTERFACE}
+  {$I 'GenericObjectList.inc'}
+
+  TVariableList = class(TListVariable)
     Parent: TCommonBlock;
     function Search(Name: string; Exported: Boolean = False): TVariable;
@@ -238 +305 @@
   end;
 
-  TParameterList = class(TListObject)
+  // TListParameter = TGObjectList<Integer, TParameter>
+  {$DEFINE TGObjectListIndex := Integer}
+  {$DEFINE TGObjectListItem := TParameter}
+  {$DEFINE TGObjectListList := TObjectListParameter}
+  {$DEFINE TGObjectList := TListParameter}
+  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareParameter}
+  {$DEFINE TGObjectListStringConverter := TObjectListStringConverterParameter}
+  {$DEFINE INTERFACE}
+  {$I 'GenericObjectList.inc'}
+
+  TParameterList = class(TListParameter)
     Parent: TFunction;
     function Search(Name: string): TParameter;
@@ -261 +338 @@
   end;
 
-  TExpressionList = class(TListObject)
+  TExpressionList = class(TListExpression)
     destructor Destroy; override;
   end;
@@ -278 +355 @@
   end;
 
-  TFunctionList = class(TListObject)
+  // TListFunction = TGObjectList<Integer, TFunction>
+  {$DEFINE TGObjectListIndex := Integer}
+  {$DEFINE TGObjectListItem := TFunction}
+  {$DEFINE TGObjectListList := TObjectListFunction}
+  {$DEFINE TGObjectList := TListFunction}
+  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareFunction}
+  {$DEFINE TGObjectListStringConverter := TObjectListStringConverterFunction}
+  {$DEFINE INTERFACE}
+  {$I 'GenericObjectList.inc'}
+
+  TFunctionList = class(TListFunction)
     Parent: TCommonBlock;
     function Search(Name: string; Exported: Boolean = False): TFunction;
@@ -291 +378 @@
   end;
 
-  TUsedModuleList = class(TListObject)
+  // TListUsedModule = TGObjectList<Integer, TUsedModule>
+  {$DEFINE TGObjectListIndex := Integer}
+  {$DEFINE TGObjectListItem := TUsedModule}
+  {$DEFINE TGObjectListList := TObjectListUsedModule}
+  {$DEFINE TGObjectList := TListUsedModule}
+  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareUsedModule}
+  {$DEFINE TGObjectListStringConverter := TObjectListStringConverterUsedModule}
+  {$DEFINE INTERFACE}
+  {$I 'GenericObjectList.inc'}
+
+  TUsedModuleList = class(TListUsedModule)
     ParentModule: TModule;
   end;
@@ -332 +429 @@
   end;
 
+  // TListModule = TGObjectList<Integer, TModule>
+  {$DEFINE TGObjectListIndex := Integer}
+  {$DEFINE TGObjectListItem := TModule}
+  {$DEFINE TGObjectListList := TObjectListModule}
+  {$DEFINE TGObjectList := TListModule}
+  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareModule}
+  {$DEFINE TGObjectListStringConverter := TObjectListStringConverterModule}
+  {$DEFINE INTERFACE}
+  {$I 'GenericObjectList.inc'}
+
   { TModuleList }
 
-  TModuleList = class(TListObject)
+  TModuleList = class(TListModule)
     function Search(Name: string): TModule;
   end;
@@ -358 +465 @@
 implementation
 
+{$DEFINE IMPLEMENTATION_USES}
+{$I 'GenericObjectList.inc'}
+
+// TListExpression = TGObjectList<Integer, TExpression>
+{$DEFINE TGObjectListIndex := Integer}
+{$DEFINE TGObjectListItem := TExpression}
+{$DEFINE TGObjectListList := TObjectListExpression}
+{$DEFINE TGObjectList := TListExpression}
+{$DEFINE TGObjectListSortCompare := TObjectListSortCompareExpression}
+{$DEFINE TGObjectListStringConverter := TObjectListStringConverterExpression}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericObjectList.inc'}
+
+// TListCaseOfEndBranche = TGObjectList<Integer, TCaseOfEndBranche>
+{$DEFINE TGObjectListIndex := Integer}
+{$DEFINE TGObjectListItem := TCaseOfEndBranche}
+{$DEFINE TGObjectListList := TObjectListCaseOfEndBranche}
+{$DEFINE TGObjectList := TListCaseOfEndBranche}
+{$DEFINE TGObjectListSortCompare := TObjectListSortCompareCaseOfEndBranche}
+{$DEFINE TGObjectListStringConverter := TObjectListStringConverterCaseOfEndBranche}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericObjectList.inc'}
+
+// TCommandList = TGObjectList<Integer, TCommand>
+{$DEFINE TGObjectListIndex := Integer}
+{$DEFINE TGObjectListItem := TCommand}
+{$DEFINE TGObjectListList := TObjectListCommand}
+{$DEFINE TGObjectList := TCommandList}
+{$DEFINE TGObjectListSortCompare := TObjectListSortCompareCommand}
+{$DEFINE TGObjectListStringConverter := TObjectListStringConverterCommand}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericObjectList.inc'}
+
+// TListEnumItem = TGObjectList<Integer, TEnumItem>
+{$DEFINE TGObjectListIndex := Integer}
+{$DEFINE TGObjectListItem := TEnumItem}
+{$DEFINE TGObjectListList := TObjectListEnumItem}
+{$DEFINE TGObjectList := TListEnumItem}
+{$DEFINE TGObjectListSortCompare := TObjectListSortCompareEnumItem}
+{$DEFINE TGObjectListStringConverter := TObjectListStringConverterEnumItem}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericObjectList.inc'}
+
+// TListType = TGObjectList<Integer, TType>
+{$DEFINE TGObjectListIndex := Integer}
+{$DEFINE TGObjectListItem := TType}
+{$DEFINE TGObjectListList := TObjectListType}
+{$DEFINE TGObjectList := TListType}
+{$DEFINE TGObjectListSortCompare := TObjectListSortCompareType}
+{$DEFINE TGObjectListStringConverter := TObjectListStringConverterType}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericObjectList.inc'}
+
+// TListConstant = TGObjectList<Integer, TConstant>
+{$DEFINE TGObjectListIndex := Integer}
+{$DEFINE TGObjectListItem := TConstant}
+{$DEFINE TGObjectListList := TObjectListConstant}
+{$DEFINE TGObjectList := TListConstant}
+{$DEFINE TGObjectListSortCompare := TObjectListSortCompareConstant}
+{$DEFINE TGObjectListStringConverter := TObjectListStringConverterConstant}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericObjectList.inc'}
+
+// TListVariable = TGObjectList<Integer, TVariable>
+{$DEFINE TGObjectListIndex := Integer}
+{$DEFINE TGObjectListItem := TVariable}
+{$DEFINE TGObjectListList := TObjectListVariable}
+{$DEFINE TGObjectList := TListVariable}
+{$DEFINE TGObjectListSortCompare := TObjectListSortCompareVariable}
+{$DEFINE TGObjectListStringConverter := TObjectListStringConverterVariable}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericObjectList.inc'}
+
+// TListParameter = TGObjectList<Integer, TParameter>
+{$DEFINE TGObjectListIndex := Integer}
+{$DEFINE TGObjectListItem := TParameter}
+{$DEFINE TGObjectListList := TObjectListParameter}
+{$DEFINE TGObjectList := TListParameter}
+{$DEFINE TGObjectListSortCompare := TObjectListSortCompareParameter}
+{$DEFINE TGObjectListStringConverter := TObjectListStringConverterParameter}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericObjectList.inc'}
+
+// TListFunction = TGObjectList<Integer, TFunction>
+{$DEFINE TGObjectListIndex := Integer}
+{$DEFINE TGObjectListItem := TFunction}
+{$DEFINE TGObjectListList := TObjectListFunction}
+{$DEFINE TGObjectList := TListFunction}
+{$DEFINE TGObjectListSortCompare := TObjectListSortCompareFunction}
+{$DEFINE TGObjectListStringConverter := TObjectListStringConverterFunction}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericObjectList.inc'}
+
+// TListUsedModule = TGObjectList<Integer, TUsedModule>
+{$DEFINE TGObjectListIndex := Integer}
+{$DEFINE TGObjectListItem := TUsedModule}
+{$DEFINE TGObjectListList := TObjectListUsedModule}
+{$DEFINE TGObjectList := TListUsedModule}
+{$DEFINE TGObjectListSortCompare := TObjectListSortCompareUsedModule}
+{$DEFINE TGObjectListStringConverter := TObjectListStringConverterUsedModule}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericObjectList.inc'}
+
+// TListModule = TGObjectList<Integer, TModule>
+{$DEFINE TGObjectListIndex := Integer}
+{$DEFINE TGObjectListItem := TModule}
+{$DEFINE TGObjectListList := TObjectListModule}
+{$DEFINE TGObjectList := TListModule}
+{$DEFINE TGObjectListSortCompare := TObjectListSortCompareModule}
+{$DEFINE TGObjectListStringConverter := TObjectListStringConverterModule}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericObjectList.inc'}
+
 { TFunction }
 
@@ -404 +624 @@
 begin
   I := 0;
-  while (I < Count) and (LowerCase(TConstant(Items[I]).Name) <> LowerCase(Name)) do Inc(I);
-  if I < Count then Result := TConstant(Items[I]) else begin
+  while (I < Count) and (LowerCase(Items[I].Name) <> LowerCase(Name)) do Inc(I);
+  if I < Count then Result := Items[I] else begin
     if Assigned(Parent.Parent) then Result := Parent.Parent.Constants.Search(Name)
       else begin
@@ -482 +702 @@
   // Search in own list
   I := 0;
-  while (I < Count) and (LowerCase(TType(Items[I]).Name) <> LowerCase(Name)) do Inc(I);
-  if I < Count then Result := TType(Items[I]) else Result := nil;
+  while (I < Count) and (LowerCase(Items[I].Name) <> LowerCase(Name)) do Inc(I);
+  if I < Count then Result := Items[I] else Result := nil;
 
   // Search in parent
@@ -508 +728 @@
   // Search in own list
   I := 0;
-  while (I < Count) and (LowerCase(TVariable(Items[I]).Name) <> LowerCase(Name)) do Inc(I);
+  while (I < Count) and (LowerCase(Items[I].Name) <> LowerCase(Name)) do Inc(I);
   if I < Count then Result := TVariable(Items[I]) else Result := nil;
 
@@ -553 +773 @@
   // Search in own list
   I := 0;
-  while (I < Count) and (LowerCase(TFunction(Items[I]).Name) <> LowerCase(Name)) do Inc(I);
-  if I < Count then Result := TFunction(Items[I]) else Result := nil;
+  while (I < Count) and (LowerCase(Items[I].Name) <> LowerCase(Name)) do Inc(I);
+  if I < Count then Result := Items[I] else Result := nil;
 
   // Search parent block list
@@ -611 +831 @@
 begin
   I := 0;
-  while (I < Count) and (LowerCase(TParameter(Items[I]).Name) <> LowerCase(Name)) do Inc(I);
-  if I < Count then Result := TParameter(Items[I])
+  while (I < Count) and (LowerCase(Items[I].Name) <> LowerCase(Name)) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -668 +888 @@
 begin
   inherited;
-  Branches := TListObject.Create
+  Branches := TListCaseOfEndBranche.Create
 end;
 
@@ -695 +915 @@
 begin
   inherited;
-  ParameterExpression := TListObject.Create;
+  ParameterExpression := TListExpression.Create;
 end;
 
@@ -741 +961 @@
 begin
   I := 0;
-  while (I < Count) and (LowerCase(TModule(Items[I]).Name) <> LowerCase(Name)) do Inc(I);
-  if I < Count then Result := TModule(Items[I]) else Result := nil;
+  while (I < Count) and (LowerCase(Items[I].Name) <> LowerCase(Name)) do Inc(I);
+  if I < Count then Result := Items[I] else Result := nil;
 end;
 
@@ -756 +976 @@
     I := 0;
     while (I < UsedModules.Count) and (not Assigned(Result)) do begin
-      Result := TUsedModule(UsedModules[I]).Module.SearchVariable(Name, False);
+      Result := UsedModules[I].Module.SearchVariable(Name, False);
       Inc(I);
     end;
@@ -776 +996 @@
     I := 0;
     while (I < UsedModules.Count) and (not Assigned(Result)) do begin
-      with TUsedModule(UsedModules[I]) do
+      with UsedModules[I] do
         if Assigned(Module) then
         with Module do
@@ -794 +1014 @@
     I := 0;
     while (I < UsedModules.Count) and (not Assigned(Result)) do begin
-    if Assigned(TUsedModule(UsedModules[I]).Module) then
-      Result := TUsedModule(UsedModules[I]).Module.SearchFunction(Name, False);
+    if Assigned(UsedModules[I].Module) then
+      Result := UsedModules[I].Module.SearchFunction(Name, False);
       Inc(I);
     end;
@@ -829 +1049 @@
 begin
   inherited;
-  Items := TListObject.Create;
+  Items := TListEnumItem.Create;
 end;
 
@@ -842 +1062 @@
 constructor TTypeClass.Create;
 begin
-  Items := TListObject.Create;
+  Items := TListType.Create;
 end;
 

branches/Transpascal/Forms/UMainForm.lfm

@@ -2 +2 @@
   Left = 362
   Height = 501
-  Top = 113
+  Top = 115
   Width = 695
   Caption = 'Transpascal IDE'
-  ClientHeight = 482
+  ClientHeight = 476
   ClientWidth = 695
   Font.Height = -11
@@ -20 +20 @@
     Left = 0
     Height = 5
-    Top = 477
+    Top = 471
     Width = 695
     Align = alBottom
@@ -27 +27 @@
   object DockPanel: TPanel
     Left = 0
-    Height = 451
+    Height = 445
     Top = 26
     Width = 695
@@ -43 +43 @@
     object ComboBoxTargetSelection: TComboBox
       Left = 192
-      Height = 21
+      Height = 24
       Top = 2
       Width = 135
       Align = alLeft
-      ItemHeight = 13
+      ItemHeight = 0
       ItemIndex = 1
       Items.Strings = (
@@ -73 +73 @@
       Height = 24
       Top = 2
-      Width = 105
+      Width = 122
       Align = alLeft
       Caption = 'Log parsing to file'
@@ -80 +80 @@
     object ComboBoxAnalyzerType: TComboBox
       Left = 40
-      Height = 21
+      Height = 24
       Top = 2
       Width = 124
       Align = alLeft
-      ItemHeight = 13
+      ItemHeight = 0
       Style = csDropDownList
       TabOrder = 3

branches/Transpascal/Forms/UMainForm.pas

@@ -9 +9 @@
   Dialogs, StdCtrls, UCompiler, UProducerAsm8051, Registry,
   UProducerDynamicC, ComCtrls, ExtCtrls, SynEdit, SynHighlighterPas, UProducerTreeView,
-  UProducerPascal, ListObject, UProject, FileUtil, Menus, ActnList, UCoolDocking,
+  UProducerPascal, UProject, FileUtil, Menus, ActnList, UCoolDocking,
   UCompiledForm, UCodeTreeForm, URegistry, ULastOpenedList, UApplicationInfo,
   UDebugLog;

branches/Transpascal/Transpascal.lpi

@@ -20 +20 @@
       <StringTable ProductVersion=""/>
     </VersionInfo>
-    <BuildModes Count="1">
-      <Item1 Name="default" Default="True"/>
-    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
@@ -53 +50 @@
       </Item5>
     </RequiredPackages>
-    <Units Count="57">
+    <Units Count="79">
       <Unit0>
         <Filename Value="Transpascal.lpr"/>
@@ -71 +68 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UMainForm"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="8"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="123"/>
-        <CursorPos X="5" Y="152"/>
+        <EditorIndex Value="14"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1"/>
+        <CursorPos X="20" Y="11"/>
         <UsageCount Value="215"/>
         <Loaded Value="True"/>
@@ -84 +80 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UTextSource"/>
-        <EditorIndex Value="3"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="1" Y="6"/>
         <UsageCount Value="215"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit2>
@@ -98 +92 @@
         <TopLine Value="745"/>
         <CursorPos X="46" Y="759"/>
-        <UsageCount Value="140"/>
+        <UsageCount Value="139"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit3>
@@ -107 +101 @@
         <TopLine Value="1"/>
         <CursorPos X="40" Y="11"/>
-        <UsageCount Value="140"/>
+        <UsageCount Value="139"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit4>
@@ -116 +110 @@
         <TopLine Value="187"/>
         <CursorPos X="34" Y="201"/>
-        <UsageCount Value="140"/>
+        <UsageCount Value="139"/>
       </Unit5>
       <Unit6>
@@ -124 +118 @@
         <TopLine Value="1"/>
         <CursorPos X="1" Y="14"/>
-        <UsageCount Value="140"/>
+        <UsageCount Value="139"/>
       </Unit6>
       <Unit7>
@@ -132 +126 @@
         <TopLine Value="124"/>
         <CursorPos X="42" Y="136"/>
-        <UsageCount Value="140"/>
+        <UsageCount Value="139"/>
       </Unit7>
       <Unit8>
@@ -140 +134 @@
         <TopLine Value="442"/>
         <CursorPos X="47" Y="455"/>
-        <UsageCount Value="140"/>
+        <UsageCount Value="139"/>
       </Unit8>
       <Unit9>
@@ -148 +142 @@
         <TopLine Value="78"/>
         <CursorPos X="27" Y="86"/>
-        <UsageCount Value="32"/>
+        <UsageCount Value="31"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit9>
@@ -156 +150 @@
         <TopLine Value="61"/>
         <CursorPos X="7" Y="68"/>
-        <UsageCount Value="42"/>
+        <UsageCount Value="41"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit10>
@@ -164 +158 @@
         <TopLine Value="139"/>
         <CursorPos X="16" Y="146"/>
-        <UsageCount Value="42"/>
+        <UsageCount Value="41"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit11>
@@ -173 +167 @@
         <TopLine Value="69"/>
         <CursorPos X="1" Y="82"/>
-        <UsageCount Value="102"/>
+        <UsageCount Value="101"/>
       </Unit12>
       <Unit13>
@@ -180 +174 @@
         <TopLine Value="591"/>
         <CursorPos X="3" Y="604"/>
-        <UsageCount Value="4"/>
+        <UsageCount Value="3"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit13>
@@ -189 +183 @@
         <TopLine Value="320"/>
         <CursorPos X="1" Y="327"/>
-        <UsageCount Value="56"/>
+        <UsageCount Value="55"/>
       </Unit14>
       <Unit15>
@@ -195 +189 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UProject"/>
-        <EditorIndex Value="4"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="51"/>
-        <CursorPos X="58" Y="62"/>
+        <EditorIndex Value="15"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="68"/>
+        <CursorPos X="12" Y="77"/>
+        <FoldState Value=" TM HP215"/>
         <UsageCount Value="223"/>
         <Loaded Value="True"/>
@@ -208 +203 @@
         <TopLine Value="17"/>
         <CursorPos X="11" Y="30"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit16>
@@ -217 +212 @@
         <TopLine Value="1"/>
         <CursorPos X="33" Y="1"/>
-        <UsageCount Value="20"/>
+        <UsageCount Value="19"/>
       </Unit17>
       <Unit18>
         <Filename Value="Compiler\UCompiler.pas"/>
         <UnitName Value="UCompiler"/>
-        <EditorIndex Value="19"/>
         <WindowIndex Value="0"/>
         <TopLine Value="55"/>
         <CursorPos X="15" Y="63"/>
-        <UsageCount Value="103"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="102"/>
       </Unit18>
       <Unit19>
         <Filename Value="Compiler\USourceCode.pas"/>
         <UnitName Value="USourceCode"/>
-        <EditorIndex Value="1"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="246"/>
-        <CursorPos X="31" Y="263"/>
-        <UsageCount Value="96"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="0"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1037"/>
+        <CursorPos X="71" Y="1063"/>
+        <UsageCount Value="103"/>
         <Loaded Value="True"/>
       </Unit19>
@@ -242 +236 @@
         <Filename Value="Compiler\Analyze\UParser.pas"/>
         <UnitName Value="UParser"/>
-        <EditorIndex Value="20"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="24"/>
-        <CursorPos X="19" Y="85"/>
-        <UsageCount Value="103"/>
-        <Loaded Value="True"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="295"/>
+        <CursorPos X="1" Y="362"/>
+        <UsageCount Value="102"/>
       </Unit20>
       <Unit21>
@@ -255 +247 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UProjectManager"/>
-        <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="29" Y="44"/>
         <UsageCount Value="207"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit21>
@@ -281 +271 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UMessagesForm"/>
-        <EditorIndex Value="7"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="38" Y="76"/>
         <UsageCount Value="207"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit23>
@@ -296 +284 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UCompiledForm"/>
-        <EditorIndex Value="12"/>
         <WindowIndex Value="0"/>
         <TopLine Value="2"/>
         <CursorPos X="28" Y="21"/>
         <UsageCount Value="206"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit24>
@@ -322 +308 @@
         <TopLine Value="141"/>
         <CursorPos X="81" Y="154"/>
-        <UsageCount Value="19"/>
+        <UsageCount Value="18"/>
       </Unit26>
       <Unit27>
@@ -330 +316 @@
         <TopLine Value="316"/>
         <CursorPos X="14" Y="329"/>
-        <UsageCount Value="18"/>
+        <UsageCount Value="17"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit27>
@@ -338 +324 @@
         <TopLine Value="1762"/>
         <CursorPos X="1" Y="1769"/>
-        <UsageCount Value="18"/>
+        <UsageCount Value="17"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit28>
@@ -345 +331 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="URegistry"/>
-        <EditorIndex Value="14"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="23" Y="22"/>
         <UsageCount Value="200"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit29>
@@ -359 +343 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
-        <CursorPos X="68" Y="11"/>
+        <CursorPos X="48" Y="11"/>
         <UsageCount Value="200"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
@@ -367 +351 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UApplicationInfo"/>
-        <EditorIndex Value="5"/>
         <WindowIndex Value="0"/>
         <TopLine Value="35"/>
         <CursorPos X="19" Y="58"/>
         <UsageCount Value="200"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit31>
@@ -378 +360 @@
         <Filename Value="Compiler\Produce\UProducerDynamicC.pas"/>
         <UnitName Value="UProducerDynamicC"/>
-        <EditorIndex Value="17"/>
         <WindowIndex Value="0"/>
         <TopLine Value="270"/>
         <CursorPos X="50" Y="283"/>
-        <UsageCount Value="100"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="99"/>
       </Unit32>
       <Unit33>
@@ -389 +369 @@
         <UnitName Value="UProducerAsm8051"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="144"/>
+        <TopLine Value="1"/>
         <CursorPos X="56" Y="157"/>
-        <UsageCount Value="15"/>
+        <UsageCount Value="14"/>
       </Unit33>
       <Unit34>
         <Filename Value="Compiler\Produce\UProducerPascal.pas"/>
         <UnitName Value="UProducerPascal"/>
-        <EditorIndex Value="18"/>
         <WindowIndex Value="0"/>
         <TopLine Value="301"/>
         <CursorPos X="50" Y="314"/>
         <UsageCount Value="46"/>
-        <Loaded Value="True"/>
       </Unit34>
       <Unit35>
         <Filename Value="Compiler\Analyze\UPascalParser.pas"/>
         <UnitName Value="UPascalParser"/>
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="48" Y="41"/>
-        <UsageCount Value="111"/>
-        <Loaded Value="True"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="187"/>
+        <CursorPos X="17" Y="246"/>
+        <UsageCount Value="110"/>
       </Unit35>
       <Unit36>
@@ -419 +395 @@
         <TopLine Value="15"/>
         <CursorPos X="1" Y="28"/>
-        <UsageCount Value="45"/>
+        <UsageCount Value="44"/>
       </Unit36>
       <Unit37>
@@ -427 +403 @@
         <TopLine Value="828"/>
         <CursorPos X="27" Y="841"/>
-        <UsageCount Value="21"/>
+        <UsageCount Value="20"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit37>
@@ -436 +412 @@
         <TopLine Value="56"/>
         <CursorPos X="3" Y="69"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit38>
@@ -445 +421 @@
         <TopLine Value="113"/>
         <CursorPos X="3" Y="120"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit39>
@@ -453 +429 @@
         <TopLine Value="1"/>
         <CursorPos X="24" Y="11"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit40>
@@ -461 +437 @@
         <TopLine Value="1"/>
         <CursorPos X="17" Y="5"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
         <DefaultSyntaxHighlighter Value="None"/>
       </Unit41>
@@ -470 +446 @@
         <TopLine Value="1"/>
         <CursorPos X="8" Y="8"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit42>
       <Unit43>
@@ -476 +452 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UDebugLog"/>
-        <EditorIndex Value="13"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="28" Y="22"/>
-        <UsageCount Value="133"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="145"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit43>
@@ -489 +463 @@
         <TopLine Value="365"/>
         <CursorPos X="5" Y="370"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="24"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit44>
@@ -498 +472 @@
         <TopLine Value="3"/>
         <CursorPos X="6" Y="16"/>
-        <UsageCount Value="4"/>
+        <UsageCount Value="3"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit45>
@@ -504 +478 @@
         <Filename Value="Compiler\Produce\UProducerGCCC.pas"/>
         <UnitName Value="UProducerGCCC"/>
-        <EditorIndex Value="21"/>
         <WindowIndex Value="0"/>
         <TopLine Value="270"/>
         <CursorPos X="30" Y="278"/>
         <UsageCount Value="44"/>
-        <Loaded Value="True"/>
       </Unit46>
       <Unit47>
@@ -517 +489 @@
         <TopLine Value="66"/>
         <CursorPos X="14" Y="91"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit47>
@@ -525 +497 @@
         <TopLine Value="1"/>
         <CursorPos X="1" Y="1"/>
-        <UsageCount Value="38"/>
+        <UsageCount Value="45"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="LFM"/>
@@ -532 +504 @@
         <Filename Value="..\..\..\..\..\..\..\usr\share\fpcsrc\packages\fcl-registry\src\registry.pp"/>
         <UnitName Value="registry"/>
-        <EditorIndex Value="15"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="36" Y="55"/>
-        <UsageCount Value="38"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="37"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit49>
       <Unit50>
         <Filename Value="..\..\..\..\..\..\..\usr\share\fpcsrc\packages\fcl-registry\src\regdef.inc"/>
-        <EditorIndex Value="16"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="3" Y="21"/>
-        <UsageCount Value="38"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="37"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit50>
       <Unit51>
         <Filename Value="..\..\..\..\lazarus\trunk\lcl\interfaces\gtk2\gtk2widgetset.inc"/>
-        <EditorIndex Value="10"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1377"/>
         <CursorPos X="32" Y="1396"/>
-        <UsageCount Value="38"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="37"/>
       </Unit51>
       <Unit52>
@@ -564 +530 @@
         <TopLine Value="22"/>
         <CursorPos X="7" Y="47"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
         <DefaultSyntaxHighlighter Value="None"/>
       </Unit52>
@@ -572 +538 @@
         <TopLine Value="171"/>
         <CursorPos X="7" Y="200"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
         <DefaultSyntaxHighlighter Value="None"/>
       </Unit53>
@@ -578 +544 @@
         <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Specialized\ListObject.pas"/>
         <UnitName Value="ListObject"/>
-        <EditorIndex Value="2"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="39"/>
-        <CursorPos X="7" Y="66"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="38"/>
+        <CursorPos X="1" Y="74"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
       </Unit54>
       <Unit55>
         <Filename Value="..\..\..\..\lazarus\trunk\lcl\include\listitem.inc"/>
-        <EditorIndex Value="11"/>
         <WindowIndex Value="0"/>
         <TopLine Value="525"/>
         <CursorPos X="24" Y="548"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="9"/>
       </Unit55>
       <Unit56>
         <Filename Value="..\..\..\PascalClassLibrary\Docking\CoolDocking\UCoolDocking.pas"/>
         <UnitName Value="UCoolDocking"/>
-        <EditorIndex Value="9"/>
         <WindowIndex Value="0"/>
         <TopLine Value="814"/>
         <CursorPos X="19" Y="828"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit56>
+      <Unit57>
+        <Filename Value="..\..\..\..\..\..\..\usr\share\fpcsrc\2.4.0\rtl\unix\sysunixh.inc"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="15"/>
+        <CursorPos X="2" Y="28"/>
+        <UsageCount Value="9"/>
+        <DefaultSyntaxHighlighter Value="Delphi"/>
+      </Unit57>
+      <Unit58>
+        <Filename Value="..\..\..\..\..\..\..\usr\share\fpcsrc\2.4.0\packages\fcl-registry\src\registry.pp"/>
+        <UnitName Value="registry"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="194"/>
+        <CursorPos X="12" Y="206"/>
+        <UsageCount Value="9"/>
+        <DefaultSyntaxHighlighter Value="Delphi"/>
+      </Unit58>
+      <Unit59>
+        <Filename Value="..\..\..\..\..\..\..\usr\share\fpcsrc\2.4.0\packages\fcl-registry\src\xregreg.inc"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1"/>
+        <CursorPos X="45" Y="15"/>
+        <UsageCount Value="9"/>
+        <DefaultSyntaxHighlighter Value="Delphi"/>
+      </Unit59>
+      <Unit60>
+        <Filename Value="..\..\..\..\..\..\..\usr\share\fpcsrc\2.4.0\rtl\objpas\sysutils\osutilsh.inc"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="22"/>
+        <CursorPos X="10" Y="37"/>
+        <UsageCount Value="9"/>
+        <DefaultSyntaxHighlighter Value="Delphi"/>
+      </Unit60>
+      <Unit61>
+        <Filename Value="..\..\..\..\..\..\..\usr\share\fpcsrc\2.4.0\rtl\unix\sysutils.pp"/>
+        <UnitName Value="sysutils"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1294"/>
+        <CursorPos X="47" Y="1321"/>
+        <UsageCount Value="9"/>
+        <DefaultSyntaxHighlighter Value="Delphi"/>
+      </Unit61>
+      <Unit62>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Generic\ObjectListInterface.tpl"/>
+        <TopLine Value="1"/>
+        <CursorPos X="1" Y="13"/>
+        <UsageCount Value="9"/>
+        <DefaultSyntaxHighlighter Value="None"/>
+      </Unit62>
+      <Unit63>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Generic\ObjectListImplementation.tpl"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1"/>
+        <CursorPos X="7" Y="17"/>
+        <UsageCount Value="9"/>
+        <DefaultSyntaxHighlighter Value="None"/>
+      </Unit63>
+      <Unit64>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Generic\GenericObjectList.inc"/>
+        <EditorIndex Value="3"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1"/>
+        <CursorPos X="40" Y="13"/>
+        <UsageCount Value="19"/>
+        <Loaded Value="True"/>
+      </Unit64>
+      <Unit65>
+        <Filename Value="Generics\Generic\GenericObjectList.inc"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="27"/>
+        <CursorPos X="84" Y="48"/>
+        <UsageCount Value="31"/>
+      </Unit65>
+      <Unit66>
+        <Filename Value="Generics\Generic\GenericList.inc"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="100"/>
+        <CursorPos X="43" Y="102"/>
+        <UsageCount Value="31"/>
+      </Unit66>
+      <Unit67>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Generic\GenericList.inc"/>
+        <EditorIndex Value="2"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="24"/>
+        <CursorPos X="14" Y="43"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit67>
+      <Unit68>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Generic\GenericDictionary.inc"/>
+        <EditorIndex Value="1"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="69"/>
+        <CursorPos X="4" Y="41"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit68>
+      <Unit69>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Generic\GenericQueue.inc"/>
+        <EditorIndex Value="4"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1"/>
+        <CursorPos X="8" Y="30"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit69>
+      <Unit70>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Generic\GenericSet.inc"/>
+        <EditorIndex Value="5"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="12"/>
+        <CursorPos X="8" Y="28"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit70>
+      <Unit71>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Generic\GenericStack.inc"/>
+        <EditorIndex Value="6"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="31"/>
+        <CursorPos X="4" Y="42"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit71>
+      <Unit72>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Generic\GenericTree.inc"/>
+        <EditorIndex Value="7"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="27"/>
+        <CursorPos X="4" Y="47"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit72>
+      <Unit73>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Specialized\SpecializedList.pas"/>
+        <UnitName Value="SpecializedList"/>
+        <EditorIndex Value="8"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="166"/>
+        <CursorPos X="6" Y="203"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit73>
+      <Unit74>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Specialized\SpecializedDictionary.pas"/>
+        <UnitName Value="SpecializedDictionary"/>
+        <EditorIndex Value="9"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="2"/>
+        <CursorPos X="6" Y="39"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit74>
+      <Unit75>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Specialized\SpecializedStack.pas"/>
+        <UnitName Value="SpecializedStack"/>
+        <EditorIndex Value="10"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="21"/>
+        <CursorPos X="6" Y="57"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit75>
+      <Unit76>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Specialized\SpecializedTree.pas"/>
+        <UnitName Value="SpecializedTree"/>
+        <EditorIndex Value="11"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="46"/>
+        <CursorPos X="6" Y="83"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit76>
+      <Unit77>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Specialized\SpecializedQueue.pas"/>
+        <UnitName Value="SpecializedQueue"/>
+        <EditorIndex Value="12"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="41"/>
+        <CursorPos X="6" Y="78"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit77>
+      <Unit78>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Specialized\SpecializedSet.pas"/>
+        <UnitName Value="SpecializedSet"/>
+        <EditorIndex Value="13"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="21"/>
+        <CursorPos X="23" Y="32"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit78>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="30" HistoryIndex="28">
       <Position1>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="129" Column="1" TopLine="109"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="63" Column="1" TopLine="44"/>
       </Position1>
       <Position2>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="130" Column="1" TopLine="109"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="494" Column="34" TopLine="458"/>
       </Position2>
       <Position3>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="131" Column="1" TopLine="109"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="478" Column="31" TopLine="460"/>
       </Position3>
       <Position4>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="132" Column="1" TopLine="109"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="472" Column="42" TopLine="306"/>
       </Position4>
       <Position5>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="134" Column="1" TopLine="109"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="468" Column="46" TopLine="460"/>
       </Position5>
       <Position6>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="135" Column="1" TopLine="109"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="890" Column="36" TopLine="871"/>
       </Position6>
       <Position7>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="136" Column="1" TopLine="109"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="917" Column="41" TopLine="898"/>
       </Position7>
       <Position8>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="138" Column="1" TopLine="120"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="1051" Column="25" TopLine="1032"/>
       </Position8>
       <Position9>
         <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="139" Column="1" TopLine="120"/>
+        <Caret Line="30" Column="51" TopLine="1"/>
       </Position9>
       <Position10>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="140" Column="1" TopLine="120"/>
+        <Filename Value="UProject.pas"/>
+        <Caret Line="62" Column="58" TopLine="51"/>
       </Position10>
       <Position11>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="141" Column="1" TopLine="120"/>
+        <Filename Value="UProject.pas"/>
+        <Caret Line="8" Column="22" TopLine="1"/>
       </Position11>
       <Position12>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="143" Column="1" TopLine="120"/>
+        <Filename Value="UProject.pas"/>
+        <Caret Line="78" Column="1" TopLine="62"/>
       </Position12>
       <Position13>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="144" Column="1" TopLine="120"/>
+        <Filename Value="UProject.pas"/>
+        <Caret Line="10" Column="67" TopLine="1"/>
       </Position13>
       <Position14>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="146" Column="1" TopLine="130"/>
+        <Filename Value="UProject.pas"/>
+        <Caret Line="4" Column="8" TopLine="1"/>
       </Position14>
       <Position15>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="147" Column="1" TopLine="130"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="192" Column="74" TopLine="177"/>
       </Position15>
       <Position16>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="149" Column="1" TopLine="130"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="62" Column="43" TopLine="47"/>
       </Position16>
       <Position17>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="150" Column="1" TopLine="130"/>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Specialized\SpecializedList.pas"/>
+        <Caret Line="20" Column="6" TopLine="1"/>
       </Position17>
       <Position18>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="152" Column="1" TopLine="130"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="66" Column="4" TopLine="47"/>
       </Position18>
       <Position19>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="154" Column="1" TopLine="140"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="36" Column="38" TopLine="23"/>
       </Position19>
       <Position20>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="155" Column="1" TopLine="140"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="241" Column="6" TopLine="222"/>
       </Position20>
       <Position21>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="156" Column="1" TopLine="140"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="273" Column="6" TopLine="254"/>
       </Position21>
       <Position22>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="153" Column="3" TopLine="125"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="296" Column="8" TopLine="277"/>
       </Position22>
       <Position23>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="252" Column="1" TopLine="235"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="315" Column="8" TopLine="296"/>
       </Position23>
       <Position24>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="143" Column="1" TopLine="123"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="365" Column="8" TopLine="346"/>
       </Position24>
       <Position25>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="154" Column="3" TopLine="123"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="388" Column="8" TopLine="369"/>
       </Position25>
       <Position26>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="155" Column="5" TopLine="123"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="439" Column="8" TopLine="420"/>
       </Position26>
       <Position27>
-        <Filename Value="Forms\UMainForm.pas"/>
-        <Caret Line="152" Column="54" TopLine="123"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="468" Column="6" TopLine="449"/>
       </Position27>
       <Position28>
-        <Filename Value="..\..\..\PascalClassLibrary\Docking\CoolDocking\UCoolDocking.pas"/>
-        <Caret Line="155" Column="67" TopLine="138"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="627" Column="35" TopLine="599"/>
       </Position28>
       <Position29>
-        <Filename Value="..\..\..\PascalClassLibrary\Docking\CoolDocking\UCoolDocking.pas"/>
-        <Caret Line="731" Column="17" TopLine="714"/>
+        <Filename Value="Compiler\USourceCode.pas"/>
+        <Caret Line="730" Column="45" TopLine="711"/>
       </Position29>
       <Position30>
-        <Filename Value="..\..\..\PascalClassLibrary\Docking\CoolDocking\UCoolDocking.pas"/>
-        <Caret Line="828" Column="19" TopLine="814"/>
+        <Filename Value="..\..\..\PascalClassLibrary\Generics\TemplateGenerics\Generic\GenericObjectList.inc"/>
+        <Caret Line="13" Column="40" TopLine="1"/>
       </Position30>
     </JumpHistory>
@@ -732 +886 @@
     <PathDelim Value="\"/>
     <SearchPaths>
-      <OtherUnitFiles Value="Forms;Common"/>
+      <OtherUnitFiles Value="Forms\;Common\"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
@@ -765 +919 @@
     <Other>
       <CompilerMessages>
+        <IgnoredMessages idx5023="True" idx5024="True" idx5025="True" idx5028="True" idx5029="True" idx5031="True"/>
         <UseMsgFile Value="True"/>
       </CompilerMessages>

branches/Transpascal/Transpascal.lpr

@@ -7 +7 @@
   cthreads,
   {$ENDIF}{$ENDIF}
-  Forms, CoolDocking, TemplateGenerics, Interfaces, SysUtils,
+  Forms, CoolDocking, Interfaces, SysUtils,
   UMainForm in 'UMainForm.pas' {MainForm},
   UTextSource in 'UTextSource.pas', UProject, UApplicationInfo, URegistry,
   ULastOpenedList, UDebugLog, TranspascalCompiler, UProjectManager, UCodeForm,
-  UMessagesForm, UCompiledForm, UCodeTreeForm;
+  UMessagesForm, UCompiledForm, UCodeTreeForm, TemplateGenerics;
 
 {$R *.res}

branches/Transpascal/UProject.pas

@@ -2 +2 @@
 
 {$mode objfpc}{$H+}
+{$MACRO ON}
 
 interface
 
 uses
-  Classes, SysUtils, ListObject, Dialogs, DOM, XMLWrite, XMLRead, FileUtil;
+  Classes, SysUtils, Dialogs, DOM, XMLWrite, XMLRead, FileUtil;
 
 type
@@ -22 +23 @@
   end;
 
+
+  // TListProjectNode = TGObjectList<Integer, TProjectNode>
+  {$DEFINE TGObjectListIndex := Integer}
+  {$DEFINE TGObjectListItem := TProjectNode}
+  {$DEFINE TGObjectListList := TObjectListProjectNode}
+  {$DEFINE TGObjectList := TListProjectNode}
+  {$DEFINE TGObjectListSortCompare := TObjectListSortCompareProjectNode}
+  {$DEFINE TGObjectListStringConverter := TObjectListStringConverterProjectNode}
+  {$DEFINE INTERFACE}
+  {$I 'GenericObjectList.inc'}
+
   { TProjectFile }
 
@@ -37 +49 @@
 
   TProjectGroup = class(TProjectNode)
-    Items: TListObject;
+    Items: TListProjectNode;
     constructor Create;
     destructor Destroy; override;
@@ -61 +73 @@
 implementation
 
+
+{$DEFINE IMPLEMENTATION_USES}
+{$INCLUDE 'GenericObjectList.inc'}
+
+// TListProjectNode = TGObjectList<Integer, TProjectNode>
+{$DEFINE TGObjectListIndex := Integer}
+{$DEFINE TGObjectListItem := TProjectNode}
+{$DEFINE TGObjectListList := TObjectListProjectNode}
+{$DEFINE TGObjectList := TListProjectNode}
+{$DEFINE TGObjectListSortCompare := TObjectListSortCompareProjectNode}
+{$DEFINE TGObjectListStringConverter := TObjectListStringConverterProjectNode}
+{$DEFINE IMPLEMENTATION}
+{$INCLUDE 'GenericObjectList.inc'}
+
 { TProjectGroup }
 
@@ -66 +92 @@
 begin
   inherited;
-  Items := TListObject.Create;
+  Items := TListProjectNode.Create;
 end;