Changeset 75 for trunk/Compiler/Modules/Pascal/SourceCodePascal.pas

Timestamp:

Jun 4, 2024, 12:22:49 AM (5 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.
• Modified: Updated Common package.

File:

• trunk/Compiler/Modules/Pascal/SourceCodePascal.pas (moved) (moved from trunk/Compiler/Modules/Pascal/USourceCodePascal.pas ) (53 diffs)

trunk/Compiler/Modules/Pascal/SourceCodePascal.pas

@@ -1 @@
-unit USourceCodePascal;
-
-{$MODE Delphi}
-{$MACRO ON}
+unit SourceCodePascal;
 
 interface
 
 uses
-  SysUtils, Variants, Classes, Dialogs, SpecializedList, USourceConvertor;
+  SysUtils, Variants, Classes, Dialogs, Generics.Collections, SourceConvertor;
 
 type
@@ -22 +19 @@
 
   TCommonBlock = class;
-  TTypeList = class;
-  TConstantList = class;
-  TVariableList = class;
-  TFunctionList = class;
-  TListExpression = class;
+  TTypes = class;
+  TConstants = class;
+  TVariables = class;
+  TFunctions = class;
+  TExpressions = class;
   TExpression = class;
   TFunction = class;
@@ -40 +37 @@
 
   TContext = class
-
-  end;
-
-  TCommandList = class;
+  end;
+
+  TCommands = class;
 
   TCommand = class
@@ -57 +53 @@
   end;
 
-  // TListExpression = TGObjectList<Integer, TExpression>
-  TListExpression = class(TListObject);
+  { TExpressions }
+
+  TExpressions = class(TObjectList<TExpression>)
+    procedure Assign(Source: TExpressions);
+  end;
 
   { TFunctionCall }
@@ -64 +63 @@
   TFunctionCall = class(TCommand)
     FunctionRef: TFunction;
-    ParameterExpression: TListExpression;
+    ParameterExpression: TExpressions;
     constructor Create;
     destructor Destroy; override;
@@ -70 +69 @@
 
   TBeginEnd = class(TCommand)
-    Commands: TCommandList;
+    Commands: TCommands;
     CommonBlock: TCommonBlock;
     procedure Clear;
@@ -90 +89 @@
 
   TRepeatUntil = class(TCommand)
-    Block: TCommandList;
+    Block: TCommands;
     Condition: TExpression;
   end;
@@ -120 +119 @@
   end;
 
-  // TListCaseOfEndBranche = TGObjectList<Integer, TCaseOfEndBranche>
-  TListCaseOfEndBranche = class(TListObject);
+  TListCaseOfEndBranche = class(TObjectList<TCaseOfEndBranche>);
 
   TCaseOfEnd = class(TCommand)
@@ -132 +130 @@
 
   TTryFinally = class(TCommand)
-    Block: TCommandList;
-    FinallyBlock: TCommandList;
+    Block: TCommands;
+    FinallyBlock: TCommands;
   end;
 
   TTryExcept = class(TCommand)
-    Block: TCommandList;
-    ExceptBlock: TCommandList;
-  end;
-
-  // TCommandList = TGObjectList<Integer, TCommand>
-  TCommandList = class(TListObject);
+    Block: TCommands;
+    ExceptBlock: TCommands;
+  end;
+
+  TCommands = class(TObjectList<TCommand>);
 
   TCommonBlockSection = (cbsVariable, cbsType, cbsConstant);
@@ -150 +147 @@
     Parent: TCommonBlock;
     ParentModule: TSourceModule;
-    Constants: TConstantList;
-    Types: TTypeList;
-    Variables: TVariableList;
-    Functions: TFunctionList;
-    Order: TListObject;
+    Constants: TConstants;
+    Types: TTypes;
+    Variables: TVariables;
+    Functions: TFunctions;
+    Order: TObjectList<TObject>;
     Code: TBeginEnd;
     constructor Create; virtual;
@@ -166 +163 @@
     ForwardDeclared: Boolean;
     Internal: Boolean;
-    Parent: TTypeList;
+    Parent: TTypes;
     Name: string;
     Size: Integer;
@@ -172 +169 @@
     Exported: Boolean;
     Visibility: TTypeVisibility;
-    Parameters: TTypeList;
+    Parameters: TTypes;
     procedure Assign(Source: TType);
     constructor Create;
@@ -178 +175 @@
   end;
 
-  // TListType = TGObjectList<Integer, TType>
-  TListType = class(TListObject);
-
-  TTypeList = class(TListType)
+  { TTypes }
+
+  TTypes = class(TObjectList<TType>)
     Parent: TCommonBlock;
     function Search(Name: string; Exported: Boolean = False): TType;
     destructor Destroy; override;
+    function AddNew: TType;
   end;
 
@@ -214 +211 @@
   end;
 
-  // TListEnumItem = TGObjectList<Integer, TEnumItem>
-  TListEnumItem = class(TListObject);
+  TEnumItems = class(TObjectList<TEnumItem>);
 
   TTypeEnumeration = class(TType)
-    Items: TListEnumItem;
+    Items: TEnumItems;
     constructor Create;
     destructor Destroy; override;
@@ -239 +235 @@
   end;
 
-  // TListConstant = TGObjectList<Integer, TConstant>
-  TListConstant = class(TListObject);
-
-  TConstantList = class(TListConstant)
+  TConstants = class(TObjectList<TConstant>)
     Parent: TCommonBlock;
     function Search(Name: string): TConstant;
@@ -256 +249 @@
   end;
 
-  // TListVariable = TGObjectList<Integer, TVariable>
-  TListVariable = class(TListObject);
-
-  TVariableList = class(TListVariable)
+  TVariables = class(TObjectList<TVariable>)
     Parent: TCommonBlock;
     function Search(Name: string; Exported: Boolean = False): TVariable;
@@ -268 +258 @@
   end;
 
-  // TListParameter = TGObjectList<Integer, TParameter>
-  TListParameter = class(TListObject);
-
-  TParameterList = class(TListParameter)
+  TParameters = class(TObjectList<TParameter>)
     Parent: TFunction;
     function Search(Name: string): TParameter;
@@ -288 +275 @@
     Value: TValue;
     OperatorName: string;
-    SubItems: TListExpression;
+    SubItems: TExpressions;
     Associated: Boolean;
     Braces: Boolean;
@@ -302 +289 @@
     Internal: Boolean;
     FunctionType: TFunctionType;
-    Parameters: TParameterList;
+    Parameters: TParameters;
     ResultType: TType;
     Exported: Boolean;
@@ -310 +297 @@
   end;
 
-  // TListFunction = TGObjectList<Integer, TFunction>
-  TListFunction = class(TListObject);
-
-  TFunctionList = class(TListFunction)
+  { TFunctions }
+
+  TFunctions = class(TObjectList<TFunction>)
     Parent: TCommonBlock;
     function Search(Name: string; Exported: Boolean = False): TFunction;
     destructor Destroy; override;
+    function AddNew: TFunction;
   end;
 
@@ -326 +313 @@
   end;
 
-  // TListUsedModule = TGObjectList<Integer, TUsedModule>
-  TListUsedModule = class(TListObject);
-
-  TUsedModuleList = class(TListUsedModule)
+  TUsedModules = class(TObjectList<TUsedModule>)
     ParentModule: TSourceModule;
   end;
@@ -340 +324 @@
     Name: string;
     TargetFile: string;
-    UsedModules: TUsedModuleList;
+    UsedModules: TUsedModules;
     Body: TCommonBlock;
     Internal: Boolean;
@@ -374 +358 @@
   end;
 
-  // TListModule = TGObjectList<Integer, TModule>
-  TListModule = class(TListObject);
-
-  { TModuleList }
-
-  TModuleList = class(TListModule)
+  { TModules }
+
+  TModules = class(TObjectList<TSourceModule>)
     function Search(Name: string): TSourceModule;
   end;
@@ -387 +368 @@
   TProgram = class(TSource)
     Device: TDevice;
-    Modules: TModuleList;
+    Modules: TModules;
     MainModule: TSourceModule;
     procedure Clear;
@@ -408 +389 @@
   SAssignmentError = 'Assignment error';
 
+
 implementation
 
@@ -415 +397 @@
 begin
   inherited;
-  Parameters := TParameterList.Create;
+  Parameters := TParameters.Create;
   Parameters.Parent := Self;
   //ResultType := TType.Create;
@@ -422 +404 @@
 destructor TFunction.Destroy;
 begin
-  Parameters.Free;
-//  ResultType.Free;
+  FreeAndNil(Parameters);
+//  FreeAndNil(ResultType);
   inherited;
 end;
@@ -438 +420 @@
 begin
   Device := TDevice.Create;
-  Modules := TModuleList.Create;
+  Modules := TModules.Create;
 end;
 
 destructor TProgram.Destroy;
 begin
-  Modules.Free;
-  Device.Free;
-end;
-
-{ TConstant }
-
-
-{ TConstantList }
-
-destructor TConstantList.Destroy;
-begin
-  inherited;
-end;
-
-function TConstantList.Search(Name: string): TConstant;
+  FreeAndNil(Modules);
+  FreeAndNil(Device);
+end;
+
+{ TConstants }
+
+destructor TConstants.Destroy;
+begin
+  inherited;
+end;
+
+function TConstants.Search(Name: string): TConstant;
 var
   I: Integer;
@@ -476 +455 @@
 begin
   inherited;
-  UsedModules := TUsedModuleList.Create;
+  UsedModules := TUsedModules.Create;
   UsedModules.ParentModule := Self;
   Body := TCommonBlock.Create;
@@ -484 +463 @@
 destructor TSourceModule.Destroy;
 begin
-  Body.Free;
-  UsedModules.Free;
+  FreeAndNil(Body);
+  FreeAndNil(UsedModules);
   inherited;
 end;
@@ -504 +483 @@
 constructor TCommonBlock.Create;
 begin
-  Constants := TConstantList.Create;
+  Constants := TConstants.Create;
   Constants.Parent := Self;
-  Types := TTypeList.Create;
+  Types := TTypes.Create;
   Types.Parent := Self;
-  Variables := TVariableList.Create;
+  Variables := TVariables.Create;
   Variables.Parent := Self;
-  Functions := TFunctionList.Create;
+  Functions := TFunctions.Create;
   Functions.Parent := Self;
   Code := TBeginEnd.Create;
   Code.Parent := Self;
   Code.CommonBlock := Self;
-  Order := TListObject.Create;
+  Order := TObjectList<TObject>.Create;
   Order.OwnsObjects := False;
 end;
@@ -521 +500 @@
 destructor TCommonBlock.Destroy;
 begin
-  Constants.Free;
-  Types.Free;
-  Variables.Free;
-  Functions.Free;
-  Code.Free;
-  Order.Free;
-  inherited;
-end;
-
-{ TTypeList }
-
-destructor TTypeList.Destroy;
-begin
-  inherited;
-end;
-
-function TTypeList.Search(Name: string; Exported: Boolean = False): TType;
+  FreeAndNil(Constants);
+  FreeAndNil(Types);
+  FreeAndNil(Variables);
+  FreeAndNil(Functions);
+  FreeAndNil(Code);
+  FreeAndNil(Order);
+  inherited;
+end;
+
+{ TTypes }
+
+destructor TTypes.Destroy;
+begin
+  inherited;
+end;
+
+function TTypes.AddNew: TType;
+begin
+  Result := TType.Create;
+  Add(Result);
+end;
+
+function TTypes.Search(Name: string; Exported: Boolean = False): TType;
 var
   I: Integer;
@@ -557 +542 @@
 end;
 
-{ TVariableList }
-
-destructor TVariableList.Destroy;
-begin
-  inherited;
-end;
-
-function TVariableList.Search(Name: string; Exported: Boolean = False): TVariable;
+{ TVariables }
+
+destructor TVariables.Destroy;
+begin
+  inherited;
+end;
+
+function TVariables.Search(Name: string; Exported: Boolean = False): TVariable;
 var
   I: Integer;
@@ -602 +587 @@
 end;
 
-{ TFunctionList }
-
-destructor TFunctionList.Destroy;
-begin
-  inherited;
-end;
-
-function TFunctionList.Search(Name: string; Exported: Boolean): TFunction;
+{ TFunctions }
+
+destructor TFunctions.Destroy;
+begin
+  inherited;
+end;
+
+function TFunctions.AddNew: TFunction;
+begin
+  Result := TFunction.Create;
+  Add(Result);
+end;
+
+function TFunctions.Search(Name: string; Exported: Boolean): TFunction;
 var
   I: Integer;
@@ -631 +622 @@
 constructor TExpression.Create;
 begin
-  SubItems := TListExpression.Create;
+  SubItems := TExpressions.Create;
   SubItems.Count := 2;
   SubItems.OwnsObjects := False;
@@ -638 +629 @@
 destructor TExpression.Destroy;
 begin
-  SubItems.Free;
+  FreeAndNil(SubItems);
   inherited;
 end;
@@ -654 +645 @@
 end;
 
-{ TParameterList }
-
-destructor TParameterList.Destroy;
-begin
-  inherited;
-end;
-
-function TParameterList.Search(Name: string): TParameter;
+{ TParameters }
+
+destructor TParameters.Destroy;
+begin
+  inherited;
+end;
+
+function TParameters.Search(Name: string): TParameter;
 var
   I: Integer;
@@ -675 +666 @@
 procedure TBeginEnd.Clear;
 begin
-
 end;
 
@@ -681 +671 @@
 begin
   inherited;
-  Commands := TCommandList.Create;
+  Commands := TCommands.Create;
 end;
 
 destructor TBeginEnd.Destroy;
 begin
-  Commands.Free;
+  FreeAndNil(Commands);
   inherited;
 end;
@@ -699 +689 @@
 destructor TAssignment.Destroy;
 begin
-  Source.Free;
-  inherited;
+  FreeAndNil(Source);
+  inherited;
+end;
+
+{ TExpressions }
+
+procedure TExpressions.Assign(Source: TExpressions);
+var
+  I: Integer;
+begin
+  while Count > Source.Count do Delete(Count - 1);
+  while Count < Source.Count do Add(TExpression.Create);
+  for I := 0 to Count - 1 do
+    Items[I].Assign(Source[I]);
 end;
 
@@ -713 +715 @@
 destructor TWhileDo.Destroy;
 begin
-  Condition.Free;
-  Command.Free;
+  FreeAndNil(Condition);
+  FreeAndNil(Command);
   inherited;
 end;
@@ -728 +730 @@
 destructor TCaseOfEnd.Destroy;
 begin
-  Branches.Free;
+  FreeAndNil(Branches);
   inherited;
 end;
@@ -741 +743 @@
 destructor TIfThenElse.Destroy;
 begin
-  Condition.Free;
-  inherited Destroy;
+  FreeAndNil(Condition);
+  inherited;
 end;
 
@@ -750 +752 @@
 begin
   inherited;
-  ParameterExpression := TListExpression.Create;
+  ParameterExpression := TExpressions.Create;
 end;
 
 destructor TFunctionCall.Destroy;
 begin
-  ParameterExpression.Free;
-  inherited Destroy;
+  FreeAndNil(ParameterExpression);
+  inherited;
 end;
 
@@ -770 +772 @@
 destructor TForToDo.Destroy;
 begin
-  Start.Free;
-  Stop.Free;;
-  inherited Destroy;
+  FreeAndNil(Start);
+  FreeAndNil(Stop);
+  inherited;
 end;
 
@@ -785 +787 @@
 destructor TTypeRecord.Destroy;
 begin
-  CommonBlock.Free;
-  inherited Destroy;
-end;
-
-{ TModuleList }
-
-function TModuleList.Search(Name: string): TSourceModule;
+  FreeAndNil(CommonBlock);
+  inherited;
+end;
+
+{ TModules }
+
+function TModules.Search(Name: string): TSourceModule;
 var
   I: Integer;
@@ -820 +822 @@
 function TSourceModule.SearchConstant(Name: string; Outside: Boolean): TConstant;
 begin
-
 end;
 
@@ -864 +865 @@
 destructor TModuleProgram.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 
@@ -881 +882 @@
 destructor TModuleUnit.Destroy;
 begin
-  InititializeSection.Free;
-  FinalalizeSection.Free;
-  inherited Destroy;
+  FreeAndNil(InititializeSection);
+  FreeAndNil(FinalalizeSection);
+  inherited;
 end;
 
@@ -891 +892 @@
 begin
   inherited;
-  Items := TListEnumItem.Create;
+  Items := TEnumItems.Create;
 end;
 
 destructor TTypeEnumeration.Destroy;
 begin
-  Items.Free;
-  inherited Destroy;
+  FreeAndNil(Items);
+  inherited;
 end;
 
@@ -910 +911 @@
 destructor TTypeClass.Destroy;
 begin
-  CommonBlock.Free;
-  inherited Destroy;
+  FreeAndNil(CommonBlock);
+  inherited;
 end;
 
@@ -942 +943 @@
 constructor TType.Create;
 begin
-  Parameters := TTypeList.Create;
+  Parameters := TTypes.Create;
   //Parameters.Parent := Parent.Parent;
 end;
@@ -948 +949 @@
 destructor TType.Destroy;
 begin
-  Parameters.Free;
-  inherited Destroy;
+  FreeAndNil(Parameters);
+  inherited;
 end;