Changeset 205 for branches/interpreter2/UExecutor.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)
• UExecutor.pas (modified) (3 diffs)

branches/interpreter2

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

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

branches/interpreter2/UExecutor.pas

@@ -102 +102 @@
     procedure ExecuteIfThenElse(Block: TExecutorBlock; IfThenElse: TIfThenElse);
     procedure ExecuteWhileDo(Block: TExecutorBlock; WhileDo: TWhileDo);
+    procedure ExecuteRepeatUntil(Block: TExecutorBlock; RepeatUntil: TRepeatUntil);
     procedure ExecuteForToDo(Block: TExecutorBlock; ForToDo: TForToDo);
     procedure ExecuteBlock(ParentBlock: TExecutorBlock; Block: TBlock);
@@ -432 +433 @@
   else if Command is TIfThenElse then ExecuteIfThenElse(Block, TIfThenElse(Command))
   else if Command is TWhileDo then ExecuteWhileDo(Block, TWhileDo(Command))
+  else if Command is TRepeatUntil then ExecuteRepeatUntil(Block, TRepeatUntil(Command))
   else if Command is TForToDo then ExecuteForToDo(Block, TForToDo(Command))
   else raise Exception.Create('Unsupported command type');
@@ -458 +460 @@
       if not TValueBoolean(Value).Value then Break;
       ExecuteCommand(Block, WhileDo.Command);
+    end else raise Exception.Create('Expected boolean value.');
+    Value.Free;
+  end;
+end;
+
+procedure TExecutor.ExecuteRepeatUntil(Block: TExecutorBlock;
+  RepeatUntil: TRepeatUntil);
+var
+  Value: TValue;
+  I: Integer;
+begin
+  while True do begin
+    for I := 0 to RepeatUntil.Commands.Count - 1 do
+      ExecuteCommand(Block, TCommand(RepeatUntil.Commands[I]));
+    Value := ExecuteExpression(Block, RepeatUntil.Expression);
+    if Value is TValueBoolean then begin
+      if TValueBoolean(Value).Value then Break;
     end else raise Exception.Create('Expected boolean value.');
     Value.Free;

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