Support for break and continue added to for and foreach. (ZeraGmbH#57)

JMS-1 · Oct 11, 2024 · 2ed8b6c · 2ed8b6c
1 parent 4e3022a
commit 2ed8b6c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Library/Core/Blocks/Controls/ControlsFor.cs b/Library/Core/Blocks/Controls/ControlsFor.cs
@@ -28,9 +28,15 @@ public class ControlsFor : Block
 
       await statement!.EvaluateAsync(context);
 
+      if (context.EscapeMode == EscapeMode.Break) break;
+
+      context.EscapeMode = EscapeMode.None;
+
       context.Variables[variableName] = (double)context.Variables[variableName]! + byValue;
     }
 
+    context.EscapeMode = EscapeMode.None;
+
     return await base.EvaluateAsync(context);
   }
 }
diff --git a/Library/Core/Blocks/Controls/ControlsForEach.cs b/Library/Core/Blocks/Controls/ControlsForEach.cs
@@ -24,14 +24,17 @@ public class ControlsForEach : Block
     {
       context.Cancellation.ThrowIfCancellationRequested();
 
-      if (context.Variables.ContainsKey(variableName))
-        context.Variables[variableName] = item;
-      else
-        context.Variables.Add(variableName, item);
+      context.Variables[variableName] = item;
 
       await statement.EvaluateAsync(context);
+
+      if (context.EscapeMode == EscapeMode.Break) break;
+
+      context.EscapeMode = EscapeMode.None;
     }
 
+    context.EscapeMode = EscapeMode.None;
+
     return await base.EvaluateAsync(context);
   }
 }