Add blocks for lambda bodies + tests

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/CodingSeb.ExpressionEvaluator.Tests.csproj

@@ -92,6 +92,9 @@
   <ItemGroup>
     <None Include="Resources\Script0005.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Script0006.txt" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

@@ -66,6 +66,13 @@ public static IEnumerable<TestCaseData> TestCasesForScriptEvaluateTests
                 yield return new TestCaseData(removeAllWhiteSpacesRegex.Replace(Resources.Script0005.Replace("[valx]", "1").Replace("[valy]", "0"), "").Replace("else", "else "), null, true).SetCategory("Script").SetCategory("if").SetCategory("variable assignation").Returns(4);
 
                 #endregion
+
+                #region block for lambda body
+
+                yield return new TestCaseData(Resources.Script0006, null, true).SetCategory("Script").SetCategory("lambda").SetCategory("variable assignation").SetCategory("block for lambda body").Returns(3);
+                yield return new TestCaseData(removeAllWhiteSpacesRegex.Replace(Resources.Script0006, ""), null, true).SetCategory("Script").SetCategory("lambda").SetCategory("variable assignation").SetCategory("block for lambda body").Returns(3);
+                
+                #endregion
             }
         }
 

CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs

@@ -133,4 +133,7 @@
   <data name="Script0005" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>resources\script0005.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="Script0006" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\script0006.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
 </root>

CodingSeb.ExpressionEvaluator.Tests/Resources.resx

@@ -0,0 +1,7 @@
+/* Script0006 */
+List(1,2,3,4)
+    .Find((element) => 
+    {
+        x = 2 + 2;
+        element == 3;
+    });

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0006.txt

@@ -25,7 +25,7 @@ public class ExpressionEvaluator
         private static Regex endOfStringWithoutDollar = new Regex("^[^\"]*[\"]");
         private static Regex endOfStringInterpolationRegex = new Regex("^[^}\"]*[}\"]");
         private static Regex stringBeginningForEndBlockRegex = new Regex("[$]?[@]?[\"]$");
-        private static Regex lambdaExpressionRegex = new Regex(@"^\s*(?<args>(\s*[(]\s*([a-zA-Z_][a-zA-Z0-9_]*\s*([,]\s*[a-zA-Z_][a-zA-Z0-9_]*\s*)*)?[)])|[a-zA-Z_][a-zA-Z0-9_]*)\s*=>(?<expression>.*)$");
+        private static Regex lambdaExpressionRegex = new Regex(@"^\s*(?<args>(\s*[(]\s*([a-zA-Z_][a-zA-Z0-9_]*\s*([,]\s*[a-zA-Z_][a-zA-Z0-9_]*\s*)*)?[)])|[a-zA-Z_][a-zA-Z0-9_]*)\s*=>(?<expression>.*)$", RegexOptions.Singleline);
         private static Regex lambdaArgRegex = new Regex(@"[a-zA-Z_][a-zA-Z0-9_]*");
 
         private static readonly string instanceCreationWithNewKeywordRegexPattern = @"^new\s+(?<name>[a-zA-Z_][a-zA-Z0-9_.]*)\s*(?<isgeneric>[<](?>[^<>]+|(?<gentag>[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?<isfunction>[(])?";
@@ -707,53 +707,6 @@ bool TryParseStringAndParenthis(ref int index)
                 return parsed;
             }
 
-            string GetScriptBetweenCurlyBrackets(string parentScript, ref int index)
-            {
-                string s;
-                string currentScript = string.Empty;
-                int bracketCount = 1;
-                for (; index < parentScript.Length; index++)
-                {
-                    Match internalStringMatch = stringBeginningRegex.Match(parentScript.Substring(index));
-                    Match internalCharMatch = internalCharRegex.Match(parentScript.Substring(index));
-
-                    if (internalStringMatch.Success)
-                    {
-                        string innerString = internalStringMatch.Value + GetCodeUntilEndOfString(parentScript.Substring(index + internalStringMatch.Length), internalStringMatch);
-                        currentScript += innerString;
-                        index += innerString.Length - 1;
-                    }
-                    else if (internalCharMatch.Success)
-                    {
-                        currentScript += internalCharMatch.Value;
-                        index += internalCharMatch.Length - 1;
-                    }
-                    else
-                    {
-                        s = parentScript.Substring(index, 1);
-
-                        if (s.Equals("{")) bracketCount++;
-
-                        if (s.Equals("}"))
-                        {
-                            bracketCount--;
-                            if (bracketCount == 0)
-                                break;
-                        }
-
-                        currentScript += s;
-                    }
-                }
-
-                if (bracketCount > 0)
-                {
-                    string beVerb = bracketCount == 1 ? "is" : "are";
-                    throw new Exception($"{bracketCount} '"+ "}" + $"' character {beVerb} missing in script at : [{index}]");
-                }
-
-                return currentScript;
-            }
-
             void ExecuteIfList()
             {
                 if (ifElseStatementsList.Count > 0)
@@ -1758,7 +1711,12 @@ private bool GetLambdaExpression(string expr, Stack<object> stack)
 
                     ExpressionEvaluator expressionEvaluator = new ExpressionEvaluator(vars);
 
-                    return expressionEvaluator.Evaluate(lambdaExpressionMatch.Groups["expression"].Value);
+                    string lambdaBody = lambdaExpressionMatch.Groups["expression"].Value.Trim();
+
+                    if (lambdaBody.StartsWith("{") && lambdaBody.EndsWith("}"))
+                        return expressionEvaluator.ScriptEvaluate(lambdaBody.Substring(1, lambdaBody.Length - 2));
+                    else
+                        return expressionEvaluator.Evaluate(lambdaExpressionMatch.Groups["expression"].Value);
                 }));
 
                 return true;
@@ -1904,6 +1862,53 @@ private BindingFlags DetermineInstanceOrStatic(ref Type objType, ref object obj)
             }
         }
 
+        string GetScriptBetweenCurlyBrackets(string parentScript, ref int index)
+        {
+            string s;
+            string currentScript = string.Empty;
+            int bracketCount = 1;
+            for (; index < parentScript.Length; index++)
+            {
+                Match internalStringMatch = stringBeginningRegex.Match(parentScript.Substring(index));
+                Match internalCharMatch = internalCharRegex.Match(parentScript.Substring(index));
+
+                if (internalStringMatch.Success)
+                {
+                    string innerString = internalStringMatch.Value + GetCodeUntilEndOfString(parentScript.Substring(index + internalStringMatch.Length), internalStringMatch);
+                    currentScript += innerString;
+                    index += innerString.Length - 1;
+                }
+                else if (internalCharMatch.Success)
+                {
+                    currentScript += internalCharMatch.Value;
+                    index += internalCharMatch.Length - 1;
+                }
+                else
+                {
+                    s = parentScript.Substring(index, 1);
+
+                    if (s.Equals("{")) bracketCount++;
+
+                    if (s.Equals("}"))
+                    {
+                        bracketCount--;
+                        if (bracketCount == 0)
+                            break;
+                    }
+
+                    currentScript += s;
+                }
+            }
+
+            if (bracketCount > 0)
+            {
+                string beVerb = bracketCount == 1 ? "is" : "are";
+                throw new Exception($"{bracketCount} '" + "}" + $"' character {beVerb} missing in script at : [{index}]");
+            }
+
+            return currentScript;
+        }
+
         private List<string> GetExpressionsBetweenParenthis(string expr, ref int i, bool checkSeparator, string separator = ",")
         {
             List<string> expressionsList = new List<string>();