Assignation in progress

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

@@ -465,9 +465,10 @@ public static void InstancePropertySet()
         [Test]
         public static void StaticPropertySet()
         {
-
             ExpressionEvaluator evaluator = new ExpressionEvaluator();
 
+            evaluator.Namespaces.Add("CodingSeb.ExpressionEvaluator.Tests");
+
             ClassForTest1.StaticIntProperty.ShouldEqual(67);
 
             evaluator.ScriptEvaluate("ClassForTest1.StaticIntProperty = 18;");

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -974,6 +974,8 @@ public static IEnumerable<TestCaseData> TestCasesForWithCustomVariablesExpressio
 
                 yield return new TestCaseData("customObject.IntProperty", onInstanceVariables, true).SetCategory("Instance Property").Returns(25);
                 yield return new TestCaseData("customObject?.IntProperty", onInstanceVariables, true).SetCategory("Instance Property").Returns(25);
+                yield return new TestCaseData("customObject.intField", onInstanceVariables, true).SetCategory("Instance Field").Returns(12);
+                yield return new TestCaseData("customObject?.intField", onInstanceVariables, true).SetCategory("Instance Field").Returns(12);
                 yield return new TestCaseData("customObject.Add3To(9)", onInstanceVariables, true).SetCategory("Instance Method").Returns(12);
                 yield return new TestCaseData("customObject?.Add3To(5)", onInstanceVariables, true).SetCategory("Instance Method").Returns(8);
 
@@ -990,6 +992,7 @@ public static IEnumerable<TestCaseData> TestCasesForWithCustomVariablesExpressio
                 yield return new TestCaseData("List(simpleArray[1], simpleList?[0], nullVar?[4] ?? \"Bye\", \"How are you ?\").Find(t => t.Length < 4)", onInstanceVariables, true).SetCategory("Complex expression,Lambda function,Instance method,Instance Property,Null Conditional indexing, Null Coalescing Operator").Returns("Bye");
                 yield return new TestCaseData("int.Parse(Regex.Match(\"Test 34 Hello / -World\", @\"\\d+\").Value) + simpleArray.ToList().Find(val => val is int)", onInstanceVariables, true).SetCategory("Complex expression,Static Method,Lambda function").Returns(36);
                 yield return new TestCaseData("otherArray[3].IntProperty", onInstanceVariables, true).SetCategory("Indexing,Instance Property").Returns(18);
+                yield return new TestCaseData("otherArray[3].intField", onInstanceVariables, true).SetCategory("Indexing,Instance Field").Returns(12);
                 yield return new TestCaseData("(() => simpleInt + 1)()", onInstanceVariables, true).SetCategory("Complex expression").Returns(43);
 
                 yield return new TestCaseData("simpleInt++", onInstanceVariables, true).SetCategory("Postfix operator, ++").Returns(42);

CodingSeb.ExpressionEvaluator.Tests/TestsUtils/ClassForTest1.cs

@@ -2,6 +2,8 @@
 {
     public class ClassForTest1
     {
+        public int intField = 12;
+
         public int IntProperty { get; set; } = 25;
 
         public static int StaticIntProperty { get; set; } = 67;

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -15,7 +15,7 @@ public class ExpressionEvaluator
     {
         #region Regex declarations
 
-        private static Regex varOrFunctionRegEx = new Regex(@"^((?<sign>[+-])|(?<inObject>(?<nullConditional>[?])?\.)?)(?<name>[a-zA-Z_][a-zA-Z0-9_]*)\s*((?<postfixOperator>([+][+]|--)(?![a-zA-Z0-9_]))|((?<isgeneric>[<](?>[^<>]+|(?<gentag>[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?<isfunction>[(])?))", RegexOptions.IgnoreCase);
+        private static Regex varOrFunctionRegEx = new Regex(@"^((?<sign>[+-])|(?<inObject>(?<nullConditional>[?])?\.)?)(?<name>[a-zA-Z_][a-zA-Z0-9_]*)\s*((?<assignationOperator>(?<assignmentPrefix>[+\-*/%&|^]|<<|>>)?=(?![=>]))|(?<postfixOperator>([+][+]|--)(?![a-zA-Z0-9_]))|((?<isgeneric>[<](?>[^<>]+|(?<gentag>[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?<isfunction>[(])?))", RegexOptions.IgnoreCase);
         private static Regex numberRegex = new Regex(@"^(?<sign>[+-])?\d+(?<hasdecimal>\.?\d+(e[+-]?\d+)?)?(?<type>ul|[fdulm])?", RegexOptions.IgnoreCase);
         private static Regex stringBeginningRegex = new Regex("^(?<interpolated>[$])?(?<escaped>[@])?[\"]");
         private static Regex internalCharRegex = new Regex(@"^['](\\[']|[^'])*[']");
@@ -48,7 +48,7 @@ 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_]*)";
+        //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
 
@@ -1179,6 +1179,11 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
 
                 if (varFuncMatch.Groups["isfunction"].Success)
                 {
+                    //if (varFuncMatch.Groups["assignationOperator"].Success)
+                    //{
+                    //    throw new ExpressionEvaluatorSyntaxErrorException("The left part of an assignation must be a variable, a property or an indexer");
+                    //}
+
                     List<string> funcArgs = GetExpressionsBetweenParenthis(expr, ref i, true);
                     if (varFuncMatch.Groups["inObject"].Success)
                     {
@@ -1337,25 +1342,48 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                                         BindingFlags flag = DetermineInstanceOrStatic(ref objType, ref obj);
 
                                         if (!OptionStaticProperiesGetActive && flag.HasFlag(BindingFlags.Static))
-                                            throw new ExpressionEvaluatorSyntaxErrorException($"[{objType.ToString()}] object has no public Property or Member named \"{varFuncName}\".");
+                                            throw new ExpressionEvaluatorSyntaxErrorException($"[{objType.ToString()}] object has no public Property or Field named \"{varFuncName}\".");
                                         if (!OptionInstanceProperiesGetActive && flag.HasFlag(BindingFlags.Instance))
-                                            throw new ExpressionEvaluatorSyntaxErrorException($"[{objType.ToString()}] object has no public Property or Member named \"{varFuncName}\".");
+                                            throw new ExpressionEvaluatorSyntaxErrorException($"[{objType.ToString()}] object has no public Property or Field named \"{varFuncName}\".");
+
+                                        dynamic member = objType?.GetProperty(varFuncName, flag);
+                                        dynamic varValue = null;
+                                        bool assign = true;
+                                        
 
-                                        PropertyInfo property = objType?.GetProperty(varFuncName, flag);
+                                        if(member == null)
+                                            member = objType.GetField(varFuncName, flag);
+                                            
+                                        varValue = member.GetValue(obj);
+
+                                        stack.Push(varValue);
 
-                                        dynamic varValue = property?.GetValue(obj);
-                                        if (varValue == null)
+                                        if (inScript && varFuncMatch.Groups["assignationOperator"].Success)
                                         {
-                                            FieldInfo field = objType.GetField(varFuncName, flag);
-                                            varValue = field.GetValue(obj);
-                                            if(varFuncMatch.Groups["postfixOperator"].Success)
-                                                field.SetValue(obj, varFuncMatch.Groups["postfixOperator"].Value.Equals("++") ? varValue + 1 : varValue - 1);
+                                            if (stack.Count > 1)
+                                                throw new ExpressionEvaluatorSyntaxErrorException();
+
+                                            if(!varFuncMatch.Groups["assignmentPrefix"].Success)
+                                            {
+                                                string rightExpression = expr.Substring(i);
+                                                i = expr.Length;
+
+                                                if (rightExpression.Trim().Equals(string.Empty))
+                                                    throw new ExpressionEvaluatorSyntaxErrorException();
+
+                                                varValue = Evaluate(rightExpression);
+                                            }
+
+                                            stack.Clear();
+                                            stack.Push(varValue);
                                         }
                                         else if (varFuncMatch.Groups["postfixOperator"].Success)
-                                            property.SetValue(obj, varFuncMatch.Groups["postfixOperator"].Value.Equals("++") ? varValue + 1 : varValue - 1);
-
+                                            varValue = varFuncMatch.Groups["postfixOperator"].Value.Equals("++") ? varValue + 1 : varValue - 1;
+                                        else
+                                            assign = false;
 
-                                        stack.Push(varValue);
+                                        if(assign)
+                                            member.SetValue(obj, varValue);
                                     }
                                 }
                             }