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

Timestamp:

Jun 29, 2023, 1:47:58 AM (17 months ago)

Author:

chronos

Message:

• Fixed: Var function parameters processed correctly for both user defined and internal functions.

File:

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

branches/xpascal/Generators/GeneratorPascal.pas

@@ -14 +14 @@
     procedure GenerateProgram(Block: TBlock;  Prog:TProgram);
     procedure GenerateFunction(ParentBlock: TBlock; FunctionDef: TFunction);
+    procedure GenerateFunctionParams(ParentBlock: TBlock; Params: TFunctionParameters);
     procedure GenerateProcedure(ParentBlock: TBlock; ProcedureDef: TProcedure);
     procedure GenerateBlock(ParentBlock: TBlock; Block: TBlock);
@@ -218 +219 @@
   AddTextLine('{$mode delphi}');
   AddTextLine('');
-  AddTextLine('uses SysUtils;');
+  AddTextLine('uses');
+  AddTextLine('  SysUtils;');
+  AddTextLine('');
   GenerateBlock(Block, Prog.Block);
   AddTextLine('.');
@@ -225 +228 @@
 procedure TGeneratorPascal.GenerateFunction(ParentBlock: TBlock;
   FunctionDef: TFunction);
-var
-  I: Integer;
 begin
   AddText('function ' + FunctionDef.Name);
-  if FunctionDef.Params.Count > 0 then begin
-    AddText('(');
-    for I := 0 to FunctionDef.Params.Count - 1 do begin
-      AddText(FunctionDef.Params[I].Name);
-      AddText(': ');
-      AddText(FunctionDef.Params[I].TypeRef.Name);
-      if I > 0 then AddText(', ');
-    end;
-    AddText(')');
-  end;
+  GenerateFunctionParams(ParentBlock, FunctionDef.Params);
   if Assigned(FunctionDef.ResultType) then begin
     AddText(': ');
@@ -259 +251 @@
 end;
 
-procedure TGeneratorPascal.GenerateProcedure(ParentBlock: TBlock;
-  ProcedureDef: TProcedure);
-var
-  I: Integer;
-begin
-  AddText('procedure ' + ProcedureDef.Name);
-  if ProcedureDef.Params.Count > 0 then begin
+procedure TGeneratorPascal.GenerateFunctionParams(ParentBlock: TBlock;
+  Params: TFunctionParameters);
+var
+  I: Integer;
+begin
+  if Params.Count > 0 then begin
     AddText('(');
-    for I := 0 to ProcedureDef.Params.Count - 1 do begin
-      AddText(ProcedureDef.Params[I].Name);
+    for I := 0 to Params.Count - 1 do begin
+      if Params[I].Kind = pkVar then AddText('var ');
+      if Params[I].Kind = pkConst then AddText('const ');
+      AddText(Params[I].Name);
       AddText(': ');
-      AddText(ProcedureDef.Params[I].TypeRef.Name);
+      AddText(Params[I].TypeRef.Name);
       if I > 0 then AddText(', ');
     end;
     AddText(')');
   end;
+end;
+
+procedure TGeneratorPascal.GenerateProcedure(ParentBlock: TBlock;
+  ProcedureDef: TProcedure);
+begin
+  AddText('procedure ' + ProcedureDef.Name);
+  GenerateFunctionParams(ParentBlock, ProcedureDef.Params);
   AddTextLine(';');
   if ProcedureDef.InternalName <> '' then begin