Changeset 213 for branches/interpreter2/UGeneratorCSharp.pas

Timestamp:

Apr 22, 2020, 10:23:31 PM (5 years ago)

Author:

chronos

Message:

• Added: Transformation of Result variable assignment into Return statement.

File:

• branches/interpreter2/UGeneratorCSharp.pas (modified) (11 diffs)

branches/interpreter2/UGeneratorCSharp.pas

@@ -20 +20 @@
     procedure GenerateBlockVar(ParentBlock: TBlock; Block: TBlock);
     procedure GenerateBlockFunctions(ParentBlock: TBlock; Block: TBlock);
-    procedure GenerateBeginEnd(Block: TBlock; BeginEnd: TBeginEnd);
+    procedure GenerateBeginEnd(Block: TBlock; BeginEnd: TBeginEnd; Enclosed: Boolean = True);
     procedure GenerateCommand(Block: TBlock; Command: TCommand);
     procedure GenerateIfThenElse(Block: TBlock; IfThenElse: TIfThenElse);
@@ -33 +33 @@
     procedure GenerateBreak(Block: TBlock; BreakCmd: TBreak);
     procedure GenerateContinue(Block: TBlock; ContinueCmd: TContinue);
+    procedure GenerateReturn(Block: TBlock; Return: TReturn);
     procedure GenerateTypeRef(TypeRef: TType);
     procedure GenerateValue(Value: TValue);
@@ -55 +56 @@
   else if Command is TBreak then GenerateBreak(Block, TBreak(Command))
   else if Command is TContinue then GenerateContinue(Block, TContinue(Command))
+  else if Command is TReturn then GenerateReturn(Block, TReturn(Command))
   else if Command is TEmptyCommand then
   else raise Exception.Create('Unsupported command type');
@@ -184 +186 @@
 end;
 
+procedure TGeneratorCSharp.GenerateReturn(Block: TBlock; Return: TReturn);
+begin
+  AddText('return ');
+  GenerateExpression(Block, Return.Expression);
+end;
+
 procedure TGeneratorCSharp.GenerateTypeRef(TypeRef: TType);
 begin
@@ -209 +217 @@
   AddTextLine('{');
   Indent := Indent + 1;
+  GenerateBlockFunctions(nil, Prog.SystemBlock);
   GenerateBlock(nil, Prog.SystemBlock);
   AddTextLine('public static void Main()');
@@ -216 +225 @@
   AddTextLine('}');
   AddTextLine();
+  GenerateBlockFunctions(Prog.Block, Prog.Block);
   AddTextLine('public void Entry()');
   GenerateBlock(Block, Prog.Block);
@@ -223 +233 @@
 
 procedure TGeneratorCSharp.GenerateBlock(ParentBlock: TBlock; Block: TBlock);
-begin
-  GenerateBlockVar(Block, Block);
-  GenerateBlockConst(Block, Block);
-  GenerateBlockFunctions(Block, Block);
+var
+  I: Integer;
+begin
   if Block.BeginEnd.Commands.Count > 0 then begin
-    GenerateBeginEnd(ParentBlock, Block.BeginEnd);
-    AddTextLine;
+    AddTextLine('{');
+    Indent := Indent + 1;
+    GenerateBlockVar(Block, Block);
+    GenerateBlockConst(Block, Block);
+    GenerateBeginEnd(ParentBlock, Block.BeginEnd, False);
+    Indent := Indent - 1;
+    AddTextLine('}');
   end;
 end;
@@ -245 +259 @@
     AddTextLine(';');
   end;
+  if Block.Constants.Count > 0 then AddTextLine;
 end;
 
@@ -251 +266 @@
   I: Integer;
   Variable: TVariable;
-begin
-  if Block.Variables.Count > 0 then begin
+  VarCount: Integer;
+begin
+  VarCount := 0;
+  for I := 0 to Block.Variables.Count - 1 do
+    if not TVariable(Block.Variables[I]).Internal then Inc(VarCount);
+  if VarCount > 0 then begin
     for I := 0 to Block.Variables.Count - 1 do
     if not TVariable(Block.Variables[I]).Internal then begin
@@ -259 +278 @@
       AddTextLine(' ' + Variable.Name + ';');
     end;
-    AddTextLine;
-  end;
+  end;
+  if VarCount > 0 then AddTextLine;
 end;
 
@@ -310 +329 @@
 end;
 
-procedure TGeneratorCSharp.GenerateBeginEnd(Block: TBlock; BeginEnd: TBeginEnd);
-var
-  I: Integer;
-begin
-  AddTextLine('{');
-  Indent := Indent + 1;
+procedure TGeneratorCSharp.GenerateBeginEnd(Block: TBlock; BeginEnd: TBeginEnd; Enclosed: Boolean = True);
+var
+  I: Integer;
+begin
+  if Enclosed then begin
+    AddTextLine('{');
+    Indent := Indent + 1;
+  end;
   for I := 0 to BeginEnd.Commands.Count - 1 do begin
     GenerateCommand(Block, TCommand(BeginEnd.Commands[I]));
     AddTextLine(';');
   end;
-  Indent := Indent - 1;
-  AddText('}');
+  if Enclosed then begin
+    Indent := Indent - 1;
+    AddText('}');
+  end;
 end;