Changeset 212 for branches/interpreter2/UGeneratorCSharp.pas

Timestamp:

Apr 22, 2020, 12:04:22 PM (5 years ago)

Author:

chronos

Message:

• Added: Support for custom functions.

File:

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

branches/interpreter2/UGeneratorCSharp.pas

@@ -15 +15 @@
   private
     procedure GenerateProgram(Block: TBlock;  Prog:TProgram);
+    procedure GenerateFunction(ParentBlock: TBlock; FunctionDef: TFunction);
     procedure GenerateBlock(ParentBlock: TBlock; Block: TBlock);
     procedure GenerateBlockConst(ParentBlock: TBlock; Block: TBlock);
@@ -209 +210 @@
   Indent := Indent + 1;
   GenerateBlock(nil, Prog.SystemBlock);
+  AddTextLine('public static void Main()');
+  AddTextLine('{');
+  AddTextLine('  ' + Prog.Name + ' app = new ' + Prog.Name + '();');
+  AddTextLine('  app.Entry();');
+  AddTextLine('}');
+  AddTextLine();
+  AddTextLine('public void Entry()');
   GenerateBlock(Block, Prog.Block);
   Indent := Indent - 1;
@@ -216 +224 @@
 procedure TGeneratorCSharp.GenerateBlock(ParentBlock: TBlock; Block: TBlock);
 begin
-  GenerateBlockVar(ParentBlock, Block);
-  GenerateBlockConst(ParentBlock, Block);
-  GenerateBlockFunctions(ParentBlock, Block);
-  if ParentBlock = Prog.SystemBlock then
-    AddTextLine('public static void Main()');
+  GenerateBlockVar(Block, Block);
+  GenerateBlockConst(Block, Block);
+  GenerateBlockFunctions(Block, Block);
   if Block.BeginEnd.Commands.Count > 0 then begin
     GenerateBeginEnd(ParentBlock, Block.BeginEnd);
@@ -234 +240 @@
   for I := 0 to Block.Constants.Count - 1 do begin
     Constant := TConstant(Block.Constants[I]);
-    AddText('static ');
     GenerateTypeRef(Constant.TypeRef);
     AddText(' ' + Constant.Name + ' = ');
@@ -248 +253 @@
 begin
   if Block.Variables.Count > 0 then begin
-    for I := 0 to Block.Variables.Count - 1 do begin
+    for I := 0 to Block.Variables.Count - 1 do
+    if not TVariable(Block.Variables[I]).Internal then begin
       Variable := TVariable(Block.Variables[I]);
-      AddText('static ');
       GenerateTypeRef(Variable.TypeRef);
       AddTextLine(' ' + Variable.Name + ';');
@@ -258 +263 @@
 end;
 
+procedure TGeneratorCSharp.GenerateFunction(ParentBlock: TBlock;
+  FunctionDef: TFunction);
+var
+  I: Integer;
+begin
+  GenerateTypeRef(FunctionDef.ResultType);
+  AddText(' ' + FunctionDef.Name + '(');
+  for I := 0 to FunctionDef.Params.Count - 1 do begin
+    GenerateTypeRef(TFunctionParameter(FunctionDef.Params[I]).TypeRef);
+    AddText(' ');
+    AddText(TFunctionParameter(FunctionDef.Params[I]).Name);
+    if I > 0 then AddText(', ');
+  end;
+  AddTextLine(')');
+  if FunctionDef.InternalName <> '' then begin
+    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 = 'IntToStr' then AddTextLine('return Value.ToString();')
+    else if FunctionDef.InternalName = 'StrToInt' then begin
+      AddTextLine('int x = 0;');
+      AddTextLine('if (int.TryParse(Value, out x))');
+      AddTextLine('{');
+      AddTextLine('  return x;');
+      AddTextLine('} else return 0;');
+    end;
+
+    Indent := Indent - 1;
+    AddTextLine('}');
+  end else begin
+    GenerateBlock(ParentBlock, FunctionDef.Block);
+    AddTextLine;
+  end;
+end;
+
 procedure TGeneratorCSharp.GenerateBlockFunctions(ParentBlock: TBlock;
   Block: TBlock);
 var
   I: Integer;
-  J: Integer;
-  FunctionDef: TFunction;
 begin
   for I := 0 to Block.Functions.Count - 1 do begin
-    FunctionDef := TFunction(Block.Functions[I]);
-    AddText('static ');
-    GenerateTypeRef(FunctionDef.ResultType);
-    AddText(' ' + FunctionDef.Name + '(');
-    for J := 0 to FunctionDef.Params.Count - 1 do begin
-      GenerateTypeRef(TFunctionParameter(FunctionDef.Params[J]).TypeRef);
-      AddText(' ');
-      AddText(TFunctionParameter(FunctionDef.Params[J]).Name);
-      if J > 0 then AddText(', ');
-    end;
-    AddTextLine(')');
-    if FunctionDef.InternalName <> '' then begin
-      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 = 'IntToStr' then AddTextLine('return Value.ToString();')
-      else if FunctionDef.InternalName = 'StrToInt' then begin
-        AddTextLine('int x = 0;');
-        AddTextLine('if (int.TryParse(Value, out x))');
-        AddTextLine('{');
-        AddTextLine('  return x;');
-        AddTextLine('} else return 0;');
-      end;
-
-      Indent := Indent - 1;
-      AddTextLine('}');
-    end else begin
-      GenerateBeginEnd(ParentBlock, FunctionDef.BeginEnd);
-      AddTextLine;
-    end;
+    GenerateFunction(ParentBlock, TFunction(Block.Functions[I]));
     AddTextLine;
   end;