inscript only multi line lambda + try to interprete property set assignation (work in progress)

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using Should;
 
 namespace CodingSeb.ExpressionEvaluator.Tests
 {
@@ -439,6 +440,45 @@ public void ExceptionThrowingScriptEvaluation(ExpressionEvaluator evaluator, str
 
         #endregion
 
+        #region properties set assignation
+
+        [Test]
+        public static void InstancePropertySet()
+        {
+            ClassForTest1 obj = new ClassForTest1();
+
+            ExpressionEvaluator evaluator = new ExpressionEvaluator()
+            {
+                Variables = new Dictionary<string, object>()
+                {
+                    {"obj", obj }
+                }
+            };
+
+            obj.IntProperty.ShouldEqual(25);
+
+            evaluator.ScriptEvaluate("obj.IntProperty = 3;");
+
+            obj.IntProperty.ShouldEqual(3);
+        }
+
+        [Test]
+        public static void StaticPropertySet()
+        {
+
+            ExpressionEvaluator evaluator = new ExpressionEvaluator();
+
+            ClassForTest1.StaticIntProperty.ShouldEqual(67);
+
+            evaluator.ScriptEvaluate("ClassForTest1.StaticIntProperty = 18;");
+
+            ClassForTest1.StaticIntProperty.ShouldEqual(18);
+
+            ClassForTest1.StaticIntProperty = 67;
+        }
+
+        #endregion
+
         #region Remove Comments
 
         public static IEnumerable<TestCaseData> TestCasesForRemoveCommentsTests

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -48,6 +48,8 @@ public class ExpressionEvaluator
         private static readonly Regex blockBeginningRegex = new Regex(@"^\s*[{]");
         private static readonly Regex returnKeywordRegex = new Regex(@"^return(\s+|\()", RegexOptions.IgnoreCase | RegexOptions.Singleline);
 
+        private static readonly string tryToMatchSetPropertyRegexPattern = @"^(?<toEvaluate>([a-zA-Z_][a-zA-Z0-9_]*\s*(?<isgeneric>[(](?>[^()""]+|(?<parenthis>[(])|(?<-parenthis>[)]))*(?(parenthis) (?!))[)])*\.)+)(?<propertyToSet>[a-zA-Z_] [a-zA-Z0-9_]*)";
+
         #endregion
 
         #region enums (Operators, if else blocks states)
@@ -632,6 +634,8 @@ public ExpressionEvaluator(Dictionary<string, object> variables) : this()
 
         #region Main evaluate methods (Expressions and scripts ==> public)
 
+        private bool inScript = false;
+
         /// <summary>
         /// Evaluate a script (multiple expressions separated by semicolon)
         /// Support Assignation with [=] (for simple variable write in the Variables dictionary)
@@ -654,18 +658,26 @@ public T ScriptEvaluate<T>(string script)
         /// <returns>The result of the last evaluated expression</returns>
         public object ScriptEvaluate(string script)
         {
-            bool isReturn = false;
-            bool isBreak = false;
-            bool isContinue = false;
+            inScript = true;
+            try
+            {
+                bool isReturn = false;
+                bool isBreak = false;
+                bool isContinue = false;
 
-            object result = ScriptEvaluate(script, ref isReturn, ref isBreak, ref isContinue);
+                object result = ScriptEvaluate(script, ref isReturn, ref isBreak, ref isContinue);
 
-            if (isBreak)
-                throw new ExpressionEvaluatorSyntaxErrorException("[break] keyword executed outside a loop");
-            else if (isContinue)
-                throw new ExpressionEvaluatorSyntaxErrorException("[continue] keyword executed outside a loop");
-            else
-                return result;
+                if (isBreak)
+                    throw new ExpressionEvaluatorSyntaxErrorException("[break] keyword executed outside a loop");
+                else if (isContinue)
+                    throw new ExpressionEvaluatorSyntaxErrorException("[continue] keyword executed outside a loop");
+                else
+                    return result;
+            }
+            finally
+            {
+                inScript = false;
+            }
         }
 
         private object ScriptEvaluate(string script, ref bool valueReturned, ref bool breakCalled, ref bool continueCalled)
@@ -948,6 +960,8 @@ void forAction(int index)
             breakCalled = isBreak;
             continueCalled = isContinue;
 
+            inScript = false;
+
             if (isReturn || OptionOnNoReturnKeywordFoundInScriptAction == OptionOnNoReturnKeywordFoundInScriptAction.ReturnAutomaticallyLastEvaluatedExpression)
                 return lastResult;
             else if (OptionOnNoReturnKeywordFoundInScriptAction == OptionOnNoReturnKeywordFoundInScriptAction.ReturnNull)
@@ -1813,7 +1827,7 @@ private bool GetLambdaExpression(string expr, Stack<object> stack)
 
                     string lambdaBody = lambdaExpressionMatch.Groups["expression"].Value.Trim();
 
-                    if (lambdaBody.StartsWith("{") && lambdaBody.EndsWith("}"))
+                    if (inScript && lambdaBody.StartsWith("{") && lambdaBody.EndsWith("}"))
                         return expressionEvaluator.ScriptEvaluate(lambdaBody.Substring(1, lambdaBody.Length - 2));
                     else
                         return expressionEvaluator.Evaluate(lambdaExpressionMatch.Groups["expression"].Value);