Changeset 230 for branches/xpascal/Generators

Timestamp:

Jun 26, 2023, 12:08:45 PM (17 months ago)

Author:

chronos

Message:

• Added: Var function parameters support.
• Added: Read and ReadLn procedures support.
• Added: Interpreter now prints into console form.

Location:

branches/xpascal/Generators

Files:

• GeneratorCSharp.pas (modified) (4 diffs)
• GeneratorPascal.pas (modified) (1 diff)
• GeneratorPhp.pas (modified) (1 diff)
• GeneratorXml.pas (modified) (5 diffs)

branches/xpascal/Generators/GeneratorCSharp.pas

@@ -129 +129 @@
   if FunctionCall.Params.Count > 0 then begin
     AddText('(');
-    for I := 0 to FunctionCall.Params.Count - 1 do
+    for I := 0 to FunctionCall.Params.Count - 1 do begin
+      if FunctionCall.FunctionDef.Params[I].Kind = pkVar then
+        AddText('ref ');
       GenerateExpression(Block, TExpression(FunctionCall.Params[I]));
+    end;
     AddText(')');
   end;
@@ -297 +300 @@
 var
   I: Integer;
+  Param: TFunctionParameter;
 begin
   GenerateTypeRef(FunctionDef.ResultType);
   AddText(' ' + FunctionDef.Name + '(');
   for I := 0 to FunctionDef.Params.Count - 1 do begin
-    GenerateTypeRef(TFunctionParameter(FunctionDef.Params[I]).TypeRef);
+    Param := TFunctionParameter(FunctionDef.Params[I]);
+    if Param.Kind = pkVar then AddText('ref ');
+    GenerateTypeRef(Param.TypeRef);
     AddText(' ');
-    AddText(TFunctionParameter(FunctionDef.Params[I]).Name);
+    AddText(Param.Name);
     if I > 0 then AddText(', ');
   end;
@@ -312 +318 @@
     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();')
     else if FunctionDef.InternalName = 'StrToInt' then begin
@@ -319 +327 @@
       AddTextLine('  return x;');
       AddTextLine('} else return 0;');
+    end
+    else if FunctionDef.InternalName = 'BoolToStr' then AddTextLine('return Value.ToString();')
+    else if FunctionDef.InternalName = 'StrToBool' then begin
+      AddTextLine('bool x = false;');
+      AddTextLine('if (bool.TryParse(Value, out x))');
+      AddTextLine('{');
+      AddTextLine('  return x;');
+      AddTextLine('} else return false;');
     end;
 

branches/xpascal/Generators/GeneratorPascal.pas

@@ -231 +231 @@
     else if FunctionDef.InternalName = 'Write' then AddTextLine('System.Write(Text);')
     else if FunctionDef.InternalName = 'IntToStr' then AddTextLine('return SysUtils.IntToStr(Value);')
-    else if FunctionDef.InternalName = 'StrToInt' then AddTextLine('return SysUtils.StrToInt(Value);');
+    else if FunctionDef.InternalName = 'StrToInt' then AddTextLine('return SysUtils.StrToInt(Value);')
+    else if FunctionDef.InternalName = 'BoolToStr' then AddTextLine('return SysUtils.BoolToStr(Value);')
+    else if FunctionDef.InternalName = 'StrToBool' then AddTextLine('return SysUtils.StrToBool(Value);');
     Indent := Indent - 1;
     AddTextLine('end;');

branches/xpascal/Generators/GeneratorPhp.pas

@@ -241 +241 @@
     else if FunctionDef.InternalName = 'Write' then AddTextLine('echo($Text);')
     else if FunctionDef.InternalName = 'IntToStr' then AddTextLine('return $Value;')
-    else if FunctionDef.InternalName = 'StrToInt' then AddTextLine('return $Value;');
+    else if FunctionDef.InternalName = 'StrToInt' then AddTextLine('return $Value;')
+    else if FunctionDef.InternalName = 'BoolToStr' then AddTextLine('return $Value;')
+    else if FunctionDef.InternalName = 'StrToBool' then AddTextLine('return $Value;');
     Indent := Indent - 1;
     AddTextLine('}');

branches/xpascal/Generators/GeneratorXml.pas

@@ -11 +11 @@
   TGeneratorXml = class(TGenerator)
   private
-    procedure GenerateNodes(SourceNodes: TSourceNodes);
+    procedure GenerateNodes(SourceNodes: TSourceNodeList<TSourceNode>);
     procedure GenerateNode(SourceNode: TSourceNode);
   public
@@ -21 +21 @@
 implementation
 
+resourcestring
+  SUnsupportedNodeType = 'Unsupported node type';
+
 { TGeneratorXml }
 
-procedure TGeneratorXml.GenerateNodes(SourceNodes: TSourceNodes);
+procedure TGeneratorXml.GenerateNodes(SourceNodes: TSourceNodeList<TSourceNode>);
 var
   I: Integer;
@@ -30 +33 @@
     if SourceNodes[I] is TSourceNode then begin
       GenerateNode(TSourceNode(SourceNodes[I]));
-    end else raise Exception.Create('Unsupported node type');
+    end else raise Exception.Create(SUnsupportedNodeType);
   end;
 end;
@@ -42 +45 @@
   if SourceNode = nil then begin
   end else
-  if SourceNode is TSourceNodes then begin
-    GenerateNodes(TSourceNodes(SourceNode))
+  if SourceNode is TSourceNodeList<TSourceNode> then begin
+    GenerateNodes(TSourceNodeList<TSourceNode>(SourceNode))
   end else
   if SourceNode is TSourceNode then begin
@@ -63 +66 @@
     AddTextLine('</' + SourceNode.ClassName + '>');
   end else
-    raise Exception.Create('Unsupported node type');
+    raise Exception.Create(SUnsupportedNodeType);
 end;