Changeset 75 for trunk/Compiler/Modules/Pascal/AnalyzerPascal.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/AnalyzerPascal.pas (moved) (moved from trunk/Compiler/Modules/Pascal/UAnalyzerPascal.pas ) (21 diffs)

trunk/Compiler/Modules/Pascal/AnalyzerPascal.pas

@@ -1 @@
-unit UAnalyzerPascal;
-
-{$mode delphi}
+unit AnalyzerPascal;
 
 interface
 
 uses
-  Classes, SysUtils, UAnalyzer, USourceCodePascal, Dialogs, USourceConvertor;
+  Classes, SysUtils, Analyzer, SourceCodePascal, Dialogs, SourceConvertor;
 
 type
@@ -16 +14 @@
   public
     Parser: TAnalyzer;
-    function DebugExpressions(List: TListExpression): string;
+    function DebugExpressions(List: TExpressions): string;
     function ParseFile(Name: string): Boolean;
     function ParseWhileDo(var WhileDo: TWhileDo; SourceCode: TCommonBlock): Boolean;
     function ParseExpression(SourceCode: TExpression): Boolean;
     function ParseExpressionParenthases(SourceCode: TExpression;
-      Expressions: TListExpression): Boolean;
+      Expressions: TExpressions): Boolean;
     function ParseExpressionOperator(SourceCode: TExpression;
-      Expressions: TListExpression): Boolean;
+      Expressions: TExpressions): Boolean;
     function ParseExpressionRightValue(SourceCode: TExpression;
-      Expressions: TListExpression): Boolean;
+      Expressions: TExpressions): Boolean;
     function ParseExpressionFunctionCall(SourceCode: TExpression;
-      Expressions: TListExpression; var Func: TFunctionCall): Boolean;
-    function ParseUses(SourceCode: TUsedModuleList; AExported: Boolean): Boolean;
-    function ParseUsesItem(SourceCode: TUsedModuleList; AExported: Boolean): Boolean;
+      Expressions: TExpressions; var Func: TFunctionCall): Boolean;
+    function ParseUses(SourceCode: TUsedModules; AExported: Boolean): Boolean;
+    function ParseUsesItem(SourceCode: TUsedModules; AExported: Boolean): Boolean;
     function ParseModule(ProgramCode: TProgram): TSourceModule;
     function ParseUnit(var SourceCode: TModuleUnit; ProgramCode: TProgram): Boolean;
@@ -40 +38 @@
     function ParseCommand(SourceCode: TCommonBlock): TCommand;
     function ParseBeginEnd(var BeginEnd: TBeginEnd; SourceCode: TCommonBlock): Boolean;
-    function ParseFunction(SourceCode: TFunctionList; Exported: Boolean = False): Boolean;
+    function ParseFunction(SourceCode: TFunctions; Exported: Boolean = False): Boolean;
     procedure ParseFunctionParameters(SourceCode: TFunction; ValidateParams: Boolean = False);
     function ParseIfThenElse(var IfThenElse: TIfThenElse; SourceCode: TCommonBlock): Boolean;
@@ -46 +44 @@
     function ParseAssigment(var Assignment: TAssignment; SourceCode: TCommonBlock): Boolean;
     function ParseFunctionCall(var Call: TFunctionCall; SourceCode: TCommonBlock): Boolean;
-    function ParseVariableList(SourceCode: TVariableList; Exported: Boolean = False): Boolean;
-    procedure ParseVariable(SourceCode: TVariableList; Exported: Boolean = False);
-    function ParseConstantList(SourceCode: TConstantList; Exported: Boolean = False): Boolean;
-    function ParseConstant(SourceCode: TConstantList; Exported: Boolean = False): Boolean;
-    function ParseType(TypeList: TTypeList; var NewType: TType; ExpectName: Boolean = True;
+    function ParseVariableList(SourceCode: TVariables; Exported: Boolean = False): Boolean;
+    procedure ParseVariable(SourceCode: TVariables; Exported: Boolean = False);
+    function ParseConstantList(SourceCode: TConstants; Exported: Boolean = False): Boolean;
+    function ParseConstant(SourceCode: TConstants; Exported: Boolean = False): Boolean;
+    function ParseType(TypeList: TTypes; var NewType: TType; ExpectName: Boolean = True;
       AssignSymbol: string = '='; ForwardDeclaration: Boolean = False): Boolean;
     function ParseTypeParameters(var NewType: TType): Boolean;
@@ -86 +84 @@
   SNotRecordOrClass = '"%s" not record or class';
 
+
 implementation
 
 { TAnalyzerPascal }
 
-function TAnalyzerPascal.DebugExpressions(List: TListExpression): string;
+function TAnalyzerPascal.DebugExpressions(List: TExpressions): string;
 var
   I: Integer;
@@ -152 +151 @@
 function TAnalyzerPascal.ParseExpression(SourceCode: TExpression): Boolean;
 var
-  Expressions: TListExpression;
+  Expressions: TExpressions;
   I: Integer;
   II: Integer;
@@ -158 +157 @@
 (*  with Parser do
   try
-    Expressions := TListExpression.Create;
+    Expressions := TExpressions.Create;
     Expressions.Add(TExpression.Create);
     with SourceCode do begin
@@ -206 +205 @@
 
 function TAnalyzerPascal.ParseExpressionParenthases(SourceCode: TExpression;
-  Expressions: TListExpression): Boolean;
+  Expressions: TExpressions): Boolean;
 var
   NewExpression: TExpression;
@@ -230 +229 @@
 
 function TAnalyzerPascal.ParseExpressionOperator(SourceCode: TExpression;
-  Expressions: TListExpression): Boolean;
+  Expressions: TExpressions): Boolean;
 begin
   (*if IsOperator(NextToken) then begin
@@ -241 +240 @@
 
 function TAnalyzerPascal.ParseExpressionRightValue(SourceCode: TExpression;
-  Expressions: TListExpression): Boolean;
+  Expressions: TExpressions): Boolean;
 var
   UseType: TType;
@@ -348 +347 @@
     end;
     if Assigned(NewExpression) then begin
-      TExpression(Expressions.Last).SubItems.Last := NewExpression;
+      TExpression(Expressions.Last).SubItems[TExpression(Expressions.Last).SubItems.Count - 1] := NewExpression;
       with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do
       begin
         CommonBlock := SourceCode.CommonBlock;
-        SubItems.First := NewExpression;
+        SubItems[0] := NewExpression;
       end;
       Result := True;
@@ -364 +363 @@
 
 function TAnalyzerPascal.ParseExpressionFunctionCall(SourceCode: TExpression;
-  Expressions: TListExpression; var Func: TFunctionCall): Boolean;
+  Expressions: TExpressions; var Func: TFunctionCall): Boolean;
 var
   UseFunction: TFunction;
@@ -666 +665 @@
 { TParserParseFunctionList }
 
-function TAnalyzerPascal.ParseFunction(SourceCode: TFunctionList;
+function TAnalyzerPascal.ParseFunction(SourceCode: TFunctions;
   Exported: Boolean = False): Boolean;
 var
@@ -796 +795 @@
         while (NextToken <> ')') and (NextTokenType <> ttEndOfFile) do begin
           // while IsIdentificator(NextCode) do begin
-          with TParameterList(Parameters) do begin
+          with TParameters(Parameters) do begin
             VariableName := ReadToken;
             if VariableName = 'var' then begin
@@ -948 +947 @@
 { TParserVariableList }
 
-function TAnalyzerPascal.ParseVariableList(SourceCode: TVariableList; Exported: Boolean = False): Boolean;
+function TAnalyzerPascal.ParseVariableList(SourceCode: TVariables; Exported: Boolean = False): Boolean;
 var
   NewValueType: TType;
@@ -968 +967 @@
 { TParserVariable }
 
-procedure TAnalyzerPascal.ParseVariable(SourceCode: TVariableList; Exported: Boolean = False);
+procedure TAnalyzerPascal.ParseVariable(SourceCode: TVariables; Exported: Boolean = False);
 var
   VariableName: string;
@@ -1016 +1015 @@
 { TParserConstantList }
 
-function TAnalyzerPascal.ParseConstantList(SourceCode: TConstantList; Exported: Boolean = False): Boolean;
+function TAnalyzerPascal.ParseConstantList(SourceCode: TConstants; Exported: Boolean = False): Boolean;
 begin
   with Parser do
@@ -1030 +1029 @@
 end;
 
-function TAnalyzerPascal.ParseConstant(SourceCode: TConstantList;
+function TAnalyzerPascal.ParseConstant(SourceCode: TConstants;
   Exported: Boolean): Boolean;
 var
@@ -1082 +1081 @@
 { TParserType }
 
-function TAnalyzerPascal.ParseType(TypeList: TTypeList; var NewType: TType; ExpectName: Boolean = True;
+function TAnalyzerPascal.ParseType(TypeList: TTypes; var NewType: TType; ExpectName: Boolean = True;
   AssignSymbol: string = '='; ForwardDeclaration: Boolean = False): Boolean;
 begin
@@ -1471 +1470 @@
 { TParserUsedModuleList }
 
-function TAnalyzerPascal.ParseUses(SourceCode: TUsedModuleList; AExported: Boolean): Boolean;
+function TAnalyzerPascal.ParseUses(SourceCode: TUsedModules; AExported: Boolean): Boolean;
 var
   NewUsedModule: TUsedModule;
@@ -1488 +1487 @@
 end;
 
-function TAnalyzerPascal.ParseUsesItem(SourceCode: TUsedModuleList;
+function TAnalyzerPascal.ParseUsesItem(SourceCode: TUsedModules;
   AExported: Boolean): Boolean;
 begin