Changeset 234 for branches/xpascal/Generators/GeneratorCSharp.pas

Timestamp:

Jun 27, 2023, 12:50:09 AM (17 months ago)

Author:

chronos

Message:

• Fixed: Procedures generation.
• Fixed: Splitters between panels.

File:

• branches/xpascal/Generators/GeneratorCSharp.pas (modified) (9 diffs)

branches/xpascal/Generators/GeneratorCSharp.pas

@@ -14 +14 @@
     procedure GenerateProgram(Block: TBlock;  Prog:TProgram);
     procedure GenerateFunction(ParentBlock: TBlock; FunctionDef: TFunction);
+    procedure GenerateProcedure(ParentBlock: TBlock; ProcedureDef: TProcedure);
     procedure GenerateBlock(ParentBlock: TBlock; Block: TBlock);
     procedure GenerateBlockConst(ParentBlock: TBlock; Block: TBlock);
     procedure GenerateBlockVar(ParentBlock: TBlock; Block: TBlock);
     procedure GenerateBlockFunctions(ParentBlock: TBlock; Block: TBlock);
+    procedure GenerateBlockProcedures(ParentBlock: TBlock; Block: TBlock);
     procedure GenerateBeginEnd(Block: TBlock; BeginEnd: TBeginEnd; Enclosed: Boolean = True);
     procedure GenerateCommand(Block: TBlock; Command: TCommand);
@@ -25 +27 @@
     procedure GenerateForToDo(Block: TBlock; ForToDo: TForToDo);
     procedure GenerateFunctionCall(Block: TBlock; FunctionCall: TFunctionCall);
+    procedure GenerateProcedureCall(Block: TBlock; ProcedureCall: TProcedureCall);
     procedure GenerateAssignment(Block: TBlock; Assignment: TAssignment);
     procedure GenerateExpression(Block: TBlock; Expression: TExpression);
@@ -54 +57 @@
   if Command is TBeginEnd then GenerateBeginEnd(Block, TBeginEnd(Command))
   else if Command is TFunctionCall then GenerateFunctionCall(Block, TFunctionCall(Command))
+  else if Command is TProcedureCall then GenerateProcedureCall(Block, TProcedureCall(Command))
   else if Command is TAssignment then GenerateAssignment(Block, TAssignment(Command))
   else if Command is TIfThenElse then GenerateIfThenElse(Block, TIfThenElse(Command))
@@ -138 +142 @@
 end;
 
+procedure TGeneratorCSharp.GenerateProcedureCall(Block: TBlock;
+  ProcedureCall: TProcedureCall);
+var
+  I: Integer;
+begin
+  AddText(ProcedureCall.ProcedureDef.Name);
+  if ProcedureCall.Params.Count > 0 then begin
+    AddText('(');
+    for I := 0 to ProcedureCall.Params.Count - 1 do begin
+      if ProcedureCall.ProcedureDef.Params[I].Kind = pkVar then
+        AddText('ref ');
+      GenerateExpression(Block, TExpression(ProcedureCall.Params[I]));
+    end;
+    AddText(')');
+  end;
+end;
+
 procedure TGeneratorCSharp.GenerateAssignment(Block: TBlock; Assignment: TAssignment);
 begin
@@ -238 +259 @@
   Indent := Indent + 1;
   GenerateBlockFunctions(nil, Prog.SystemBlock);
+  GenerateBlockProcedures(nil, Prog.SystemBlock);
   GenerateBlock(nil, Prog.SystemBlock);
   AddTextLine('public static void Main()');
@@ -246 +268 @@
   AddTextLine();
   GenerateBlockFunctions(Prog.Block, Prog.Block);
+  GenerateBlockProcedures(Prog.Block, Prog.Block);
   AddTextLine('public void Entry()');
   GenerateBlock(Block, Prog.Block);
@@ -320 +343 @@
     AddTextLine('{');
     Indent := Indent + 1;
-    if FunctionDef.InternalName = 'WriteLn' then AddTextLine('Console.Write(Text + "\n");')
-    else if FunctionDef.InternalName = 'Write' then AddTextLine('Console.Write(Text);')
-    else if FunctionDef.InternalName = 'ReadLn' then AddTextLine('Text = Console.ReadLine();')
-    else if FunctionDef.InternalName = 'Read' then AddTextLine('Text = Console.ReadLine();')
-    else if FunctionDef.InternalName = 'IntToStr' then AddTextLine('return Value.ToString();')
+    if FunctionDef.InternalName = 'IntToStr' then AddTextLine('return Value.ToString();')
     else if FunctionDef.InternalName = 'StrToInt' then begin
       AddTextLine('int x = 0;');
@@ -349 +368 @@
 end;
 
+procedure TGeneratorCSharp.GenerateProcedure(ParentBlock: TBlock;
+  ProcedureDef: TProcedure);
+var
+  I: Integer;
+  Param: TFunctionParameter;
+begin
+  AddText('void ' + ProcedureDef.Name + '(');
+  for I := 0 to ProcedureDef.Params.Count - 1 do begin
+    Param := TFunctionParameter(ProcedureDef.Params[I]);
+    if Param.Kind = pkVar then AddText('ref ');
+    GenerateTypeRef(Param.TypeRef);
+    AddText(' ');
+    AddText(Param.Name);
+    if I > 0 then AddText(', ');
+  end;
+  AddTextLine(')');
+  if ProcedureDef.InternalName <> '' then begin
+    AddTextLine('{');
+    Indent := Indent + 1;
+    if ProcedureDef.InternalName = 'WriteLn' then AddTextLine('Console.Write(Text + "\n");')
+    else if ProcedureDef.InternalName = 'Write' then AddTextLine('Console.Write(Text);')
+    else if ProcedureDef.InternalName = 'ReadLn' then AddTextLine('Text = Console.ReadLine();')
+    else if ProcedureDef.InternalName = 'Read' then AddTextLine('Text = Console.ReadLine();');
+
+    Indent := Indent - 1;
+    AddTextLine('}');
+  end else begin
+    GenerateBlock(ParentBlock, ProcedureDef.Block);
+    AddTextLine;
+  end;
+end;
+
 procedure TGeneratorCSharp.GenerateBlockFunctions(ParentBlock: TBlock;
   Block: TBlock);
@@ -360 +411 @@
 end;
 
+procedure TGeneratorCSharp.GenerateBlockProcedures(ParentBlock: TBlock;
+  Block: TBlock);
+var
+  I: Integer;
+begin
+  for I := 0 to Block.Procedures.Count - 1 do begin
+    GenerateProcedure(ParentBlock, TProcedure(Block.Procedures[I]));
+    AddTextLine;
+  end;
+end;
+
 procedure TGeneratorCSharp.GenerateBeginEnd(Block: TBlock; BeginEnd: TBeginEnd; Enclosed: Boolean = True);
 var