Changeset 205 for branches/interpreter2/UGeneratorPhp.pas

Timestamp:

Apr 20, 2020, 1:10:44 AM (5 years ago)

Author:

chronos

Message:

• Added: Support for repeat-until.

Location:

branches/interpreter2

Files:

• . (modified) (1 prop)
• UGeneratorPhp.pas (modified) (11 diffs)

branches/interpreter2

@@ -4 +4 @@
 interpreter.res
 heaptrclog.trc
+Generated

@@ -4 +4 @@
 interpreter.res
 heaptrclog.trc
+Generated

branches/interpreter2/UGeneratorPhp.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, strutils, USource;
+  Classes, SysUtils, strutils, USource, UGenerator;
 
 type
@@ -12 +12 @@
   { TGeneratorPhp }
 
-  TGeneratorPhp = class
+  TGeneratorPhp = class(TGenerator)
   private
-    Indent: Integer;
-    procedure AddText(Text: string);
-    procedure AddTextLine(Text: string = '');
     procedure GenerateProgram(Block: TBlock;  Prog:TProgram);
     procedure GenerateBlock(ParentBlock: TBlock; Block: TBlock);
-    procedure GenerateBlockVar(ParentBlock: TBlock; Block: TBlock);
     procedure GenerateBlockConst(ParentBlock: TBlock; Block: TBlock);
     procedure GenerateBlockFunctions(ParentBlock: TBlock; Block: TBlock);
@@ -26 +22 @@
     procedure GenerateIfThenElse(Block: TBlock; IfThenElse: TIfThenElse);
     procedure GenerateWhileDo(Block: TBlock; WhileDo: TWhileDo);
+    procedure GenerateRepeatUntil(Block: TBlock; RepeatUntil: TRepeatUntil);
     procedure GenerateForToDo(Block: TBlock; ForToDo: TForToDo);
     procedure GenerateFunctionCall(Block: TBlock; FunctionCall: TFunctionCall);
@@ -35 +32 @@
   public
     Prog: TProgram;
-    Output: string;
     procedure Generate;
   end;
@@ -50 +46 @@
   else if Command is TIfThenElse then GenerateIfThenElse(Block, TIfThenElse(Command))
   else if Command is TWhileDo then GenerateWhileDo(Block, TWhileDo(Command))
+  else if Command is TRepeatUntil then GenerateRepeatUntil(Block, TRepeatUntil(Command))
   else if Command is TForToDo then GenerateForToDo(Block, TForToDo(Command))
   else raise Exception.Create('Unsupported command type');
@@ -73 +70 @@
   AddText(' ) ');
   GenerateCommand(Block, WhileDo.Command);
+end;
+
+procedure TGeneratorPhp.GenerateRepeatUntil(Block: TBlock;
+  RepeatUntil: TRepeatUntil);
+var
+  I: Integer;
+begin
+  AddTextLine('while (true)');
+  AddTextLine('{');
+  Indent := Indent + 1;
+  for I := 0 to RepeatUntil.Commands.Count - 1 do begin
+    GenerateCommand(Block, TCommand(RepeatUntil.Commands[I]));
+    AddTextLine(';');
+  end;
+  AddText('if (');
+  GenerateExpression(Block, RepeatUntil.Expression);
+  AddTextLine(') break;');
+  Indent := Indent - 1;
+  AddTextLine('}');
 end;
 
@@ -128 +144 @@
   for I := 0 to Expression.Items.Count - 1 do begin
     if I > 0 then begin
-      AddText(' ');
       if Expression.Operation = eoAdd then begin
         if Expression.TypeRef.Name = 'string' then AddText('.')
-        else AddText('+');
+        else AddText(' + ');
       end
-      else if Expression.Operation = eoSub then AddText('-')
-      else if Expression.Operation = eoEqual then AddText('==')
-      else if Expression.Operation = eoNotEqual then AddText('!=');
-      AddText(' ');
+      else if Expression.Operation = eoSub then AddText(' - ')
+      else if Expression.Operation = eoEqual then AddText(' == ')
+      else if Expression.Operation = eoNotEqual then AddText(' != ');
     end;
     GenerateExpression(Block, TExpression(Expression.Items[I]));
@@ -163 +177 @@
 end;
 
-procedure TGeneratorPhp.AddText(Text: string);
-begin
-  Output := Output + Text;
-end;
-
-procedure TGeneratorPhp.AddTextLine(Text: string);
-begin
-  AddText(Text + LineEnding + DupeString('  ', Indent));
-end;
-
 procedure TGeneratorPhp.GenerateProgram(Block: TBlock; Prog: TProgram);
 begin
@@ -185 +189 @@
 begin
   GenerateBlockConst(ParentBlock, Block);
-  //GenerateBlockVar(ParentBlock, Block);
   GenerateBlockFunctions(ParentBlock, Block);
   if Block.BeginEnd.Commands.Count > 0 then
     GenerateBeginEnd(ParentBlock, Block.BeginEnd);
-end;
-
-procedure TGeneratorPhp.GenerateBlockVar(ParentBlock: TBlock; Block: TBlock);
-var
-  I: Integer;
-  Variable: TVariable;
-begin
-  if Block.Variables.Count > 0 then begin
-    AddText('var');
-    Inc(Indent);
-    AddTextLine;
-    for I := 0 to Block.Variables.Count - 1 do begin
-      Variable := TVariable(Block.Variables[I]);
-      AddTextLine(Variable.Name + ': ' + Variable.TypeRef.Name + ';');
-    end;
-    Dec(Indent);
-    AddTextLine;
-  end;
 end;
 
@@ -239 +224 @@
     if FunctionDef.InternalName <> '' then begin
       AddTextLine('{');
+      Indent := Indent + 1;
       if FunctionDef.InternalName = 'WriteLn' then AddTextLine('echo($Text."\n");')
       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;');
-      Dec(Indent);
+      Indent := Indent - 1;
       AddTextLine('}');
     end else begin
@@ -257 +243 @@
   I: Integer;
 begin
-  AddText('{');
-  Inc(Indent);
-  AddTextLine('');
+  AddTextLine('{');
+  Indent := Indent + 1;
   for I := 0 to BeginEnd.Commands.Count - 1 do begin
     GenerateCommand(Block, TCommand(BeginEnd.Commands[I]));
-    AddText(';');
-    if I < BeginEnd.Commands.Count - 1 then AddTextLine('');
-  end;
-  Dec(Indent);
-  AddTextLine('');
+    AddTextLine(';');
+  end;
+  Indent := Indent - 1;
   AddText('}');
 end;

@@ -4 +4 @@
 interpreter.res
 heaptrclog.trc
+Generated