Merge pull request #119 from stg609/master

codingseb · web-flow · commit d9e4baa4a84b · 2021-09-21T16:49:54.000+02:00
Fix  return null when return within Foreach
diff --git a/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs b/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs
@@ -1447,7 +1447,7 @@ void forAction(int index)
 
                                     lastResult = ScriptEvaluate(subScript, ref isReturn, ref isBreak, ref isContinue);
 
-                                    if (isBreak)
+                                    if (isBreak || isReturn)
                                     {
                                         isBreak = false;
                                         break;

Original file line number	Diff line number	Diff line change
`@@ -1447,7 +1447,7 @@ void forAction(int index)`
`1447`	`1447`
`1448`	`1448`	`lastResult = ScriptEvaluate(subScript, ref isReturn, ref isBreak, ref isContinue);`
`1449`	`1449`
`1450`		`- if (isBreak)`
	`1450`	`+ if (isBreak \|\| isReturn)`
`1451`	`1451`	`{`
`1452`	`1452`	`isBreak = false;`
`1453`	`1453`	`break;`