Changeset 235 for branches/xpascal/Generators/GeneratorPascal.pas

Timestamp:

Jun 27, 2023, 10:09:21 AM (17 months ago)

Author:

chronos

Message:

• Modified: Improved function var parameter handling.
• Modified: Code cleanup.

File:

• branches/xpascal/Generators/GeneratorPascal.pas (modified) (13 diffs)

branches/xpascal/Generators/GeneratorPascal.pas

@@ -102 +102 @@
   Indent := Indent + 1;
   for I := 0 to RepeatUntil.Commands.Count - 1 do begin
-    GenerateCommand(Block, TCommand(RepeatUntil.Commands[I]));
+    GenerateCommand(Block, RepeatUntil.Commands[I]);
     AddTextLine(';');
   end;
@@ -119 +119 @@
     AddText('(');
     for I := 0 to FunctionCall.Params.Count - 1 do
-      GenerateExpression(Block, TExpression(FunctionCall.Params[I]));
+      GenerateExpression(Block, FunctionCall.Params[I]);
     AddText(')');
   end;
@@ -133 +133 @@
     AddText('(');
     for I := 0 to ProcedureCall.Params.Count - 1 do
-      GenerateExpression(Block, TExpression(ProcedureCall.Params[I]));
+      GenerateExpression(Block, ProcedureCall.Params[I]);
     AddText(')');
   end;
@@ -169 +169 @@
       AddText(' ');
     end;
-    GenerateExpression(Block, TExpression(Expression.Items[I]));
+    GenerateExpression(Block, Expression.Items[I]);
   end;
 end;
@@ -217 +217 @@
   if Prog.Name <> '' then AddTextLine('program ' + Prog.Name + ';');
   AddTextLine('{$mode delphi}');
+  AddTextLine('');
   AddTextLine('uses SysUtils;');
   GenerateBlock(Block, Prog.Block);
@@ -231 +232 @@
     AddText('(');
     for I := 0 to FunctionDef.Params.Count - 1 do begin
-      AddText(TFunctionParameter(FunctionDef.Params[I]).Name);
+      AddText(FunctionDef.Params[I].Name);
       AddText(': ');
-      AddText(TFunctionParameter(FunctionDef.Params[I]).TypeRef.Name);
+      AddText(FunctionDef.Params[I].TypeRef.Name);
       if I > 0 then AddText(', ');
     end;
@@ -267 +268 @@
     AddText('(');
     for I := 0 to ProcedureDef.Params.Count - 1 do begin
-      AddText(TFunctionParameter(ProcedureDef.Params[I]).Name);
+      AddText(ProcedureDef.Params[I].Name);
       AddText(': ');
-      AddText(TFunctionParameter(ProcedureDef.Params[I]).TypeRef.Name);
+      AddText(ProcedureDef.Params[I].TypeRef.Name);
       if I > 0 then AddText(', ');
     end;
@@ -307 +308 @@
   VarCount := 0;
   for I := 0 to Block.Variables.Count - 1 do
-    if not TVariable(Block.Variables[I]).Internal then Inc(VarCount);
+    if not Block.Variables[I].Internal then Inc(VarCount);
 
   if VarCount > 0 then begin
@@ -313 +314 @@
     Indent := Indent + 1;
     for I := 0 to Block.Variables.Count - 1 do
-    if not TVariable(Block.Variables[I]).Internal then begin
-      Variable := TVariable(Block.Variables[I]);
+    if not Block.Variables[I].Internal then begin
+      Variable := Block.Variables[I];
       AddTextLine(Variable.Name + ': ' + Variable.TypeRef.Name + ';');
     end;
@@ -331 +332 @@
     Indent := Indent + 1;
     for I := 0 to Block.Constants.Count - 1 do begin
-      Constant := TConstant(Block.Constants[I]);
+      Constant := Block.Constants[I];
       AddText(Constant.Name + ': ' + Constant.TypeRef.Name + ' = ');
       GenerateValue(Constant.Value);
@@ -348 +349 @@
   Indent := Indent + 1;
   for I := 0 to BeginEnd.Commands.Count - 1 do begin
-    GenerateCommand(Block, TCommand(BeginEnd.Commands[I]));
+    GenerateCommand(Block, BeginEnd.Commands[I]);
     AddTextLine(';');
   end;
@@ -361 +362 @@
 begin
   for I := 0 to Block.Functions.Count - 1 do begin
-    GenerateFunction(ParentBlock, TFunction(Block.Functions[I]));
+    GenerateFunction(ParentBlock, Block.Functions[I]);
     AddTextLine;
   end;
@@ -372 +373 @@
 begin
   for I := 0 to Block.Procedures.Count - 1 do begin
-    GenerateProcedure(ParentBlock, TProcedure(Block.Procedures[I]));
+    GenerateProcedure(ParentBlock, Block.Procedures[I]);
     AddTextLine;
   end;