Changeset 211 for branches/interpreter2/UExecutor.pas

Timestamp:

Apr 22, 2020, 9:00:02 AM (5 years ago)

Author:

chronos

Message:

• Added: Executor support for Break and Continue statements.

File:

• branches/interpreter2/UExecutor.pas (modified) (5 diffs)

branches/interpreter2/UExecutor.pas

@@ -57 +57 @@
   end;
 
-    { TExecutorBlock }
+  { TExecutorBlock }
 
   TExecutorBlock = class
@@ -468 +468 @@
       if not TValueBoolean(Value).Value then Break;
       ExecuteCommand(Block, WhileDo.Command);
+      if WhileDo.DoContinue then begin
+        WhileDo.DoContinue := False;
+        Continue;
+      end;
+      if WhileDo.DoBreak then begin
+        WhileDo.DoBreak := False;
+        Break;
+      end;
     end else raise Exception.Create('Expected boolean value.');
     Value.Free;
@@ -480 +488 @@
 begin
   while True do begin
-    for I := 0 to RepeatUntil.Commands.Count - 1 do
+    for I := 0 to RepeatUntil.Commands.Count - 1 do begin
       ExecuteCommand(Block, TCommand(RepeatUntil.Commands[I]));
+      if RepeatUntil.DoContinue then begin
+        RepeatUntil.DoContinue := False;
+        Continue;
+      end;
+      if RepeatUntil.DoBreak then begin
+        RepeatUntil.DoBreak := False;
+        Break;
+      end;
+    end;
     Value := ExecuteExpression(Block, RepeatUntil.Expression);
     if Value is TValueBoolean then begin
@@ -501 +518 @@
   while True do begin
     ExecuteCommand(Block, ForToDo.Command);
+    if ForToDo.DoContinue then begin
+      ForToDo.DoContinue := False;
+      Continue;
+    end;
+    if ForToDo.DoBreak then begin
+      ForToDo.DoBreak := False;
+      Break;
+    end;
     TValueInteger(Variable.Value).Value := TValueInteger(Variable.Value).Value + 1;
     if TValueInteger(Variable.Value).Value > TValueInteger(Limit).Value then Break;
@@ -509 +534 @@
 procedure TExecutor.ExecuteContinue(Block: TExecutorBlock;
   ContinueCmd: TContinue);
-begin
-
+var
+  Node: TSourceNode;
+begin
+  Node := ContinueCmd.Parent;
+  while Assigned(Node) and not (Node is TLoop) and Assigned(Node.Parent) do
+    Node := Node.Parent;
+
+  if Node is TLoop then TLoop(Node).DoContinue := True
+  else raise Exception.Create('Break used outside of loop.');
 end;
 
 procedure TExecutor.ExecuteBreak(Block: TExecutorBlock; BreakCmd: TBreak);
-begin
-
+var
+  Node: TSourceNode;
+begin
+  Node := BreakCmd.Parent;
+  while Assigned(Node) and not (Node is TLoop) and Assigned(Node.Parent) do
+    Node := Node.Parent;
+
+  if Node is TLoop then TLoop(Node).DoBreak := True
+  else raise Exception.Create('Break used outside of loop.');
 end;