Manage Delegates as Properties

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -1013,6 +1013,13 @@ public static IEnumerable<TestCaseData> TestCasesForWithCustomVariablesExpressio
                 yield return new TestCaseData("Test(5)", delegatesInVariable, true).SetCategory("Delegate as a variable").Returns(null);
 
                 #endregion
+
+                #region Delegates as Property of object
+                
+                yield return new TestCaseData("customObject.AddAsDelegate(6, 10)", onInstanceVariables, true).SetCategory("Delegate as a instance Property").Returns(16);
+                yield return new TestCaseData("ClassForTest1.AddAsStaticDelegate(6, 10)", onInstanceVariables, true).SetCategory("Delegate as a static Property").Returns(16);
+
+                #endregion
             }
         }
 

CodingSeb.ExpressionEvaluator.Tests/TestsUtils/ClassForTest1.cs

@@ -1,4 +1,6 @@
-namespace CodingSeb.ExpressionEvaluator.Tests
+using System;
+
+namespace CodingSeb.ExpressionEvaluator.Tests
 {
     public class ClassForTest1
     {
@@ -17,5 +19,8 @@ public static string StaticStringMethod(string Name)
         {
             return $"Hello {Name}";
         }
+
+        public Func<int, int, int> AddAsDelegate { get; set; } = (nb1, nb2) => nb1 + nb2;
+        public static Func<int, int, int> AddAsStaticDelegate { get; set; } = (nb1, nb2) => nb1 + nb2;
     }
 }

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -1,8 +1,11 @@
-// -------------------------------------------------------------
-// Title : ExpressionEvaluator (https://github.com/codingseb/ExpressionEvaluator)
-// Author : Coding Seb
-// Licence : MIT (https://github.com/codingseb/ExpressionEvaluator/blob/master/LICENSE.md)
-// -------------------------------------------------------------
+/******************************************************************************************************
+    Title : ExpressionEvaluator (https://github.com/codingseb/ExpressionEvaluator)
+    Version : 1.2.1.3 
+    (if last digit not zero version is an intermediate version and can be unstable)
+
+    Author : Coding Seb
+    Licence : MIT (https://github.com/codingseb/ExpressionEvaluator/blob/master/LICENSE.md)
+*******************************************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -1319,6 +1322,11 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                                             else
                                                 stack.Push((dictionaryObject[varFuncName] as Delegate).DynamicInvoke(oArgs.ToArray()));
                                         }
+                                        else if(objType.GetProperty(varFuncName, InstanceBindingFlag) is PropertyInfo instancePropertyInfo && 
+                                            (instancePropertyInfo.PropertyType.IsSubclassOf(typeof(Delegate)) || instancePropertyInfo.PropertyType == typeof(Delegate)))
+                                        {
+                                            stack.Push((instancePropertyInfo.GetValue(obj) as Delegate).DynamicInvoke(oArgs.ToArray()));
+                                        }
                                         else
                                         {
                                             // if not found try to Find extension methods.
@@ -1338,6 +1346,11 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                                             {
                                                 stack.Push(methodInfo.Invoke(obj, oArgs.ToArray()));
                                             }
+                                            else if (objType.GetProperty(varFuncName, StaticBindingFlag) is PropertyInfo staticPropertyInfo &&
+                                            (staticPropertyInfo.PropertyType.IsSubclassOf(typeof(Delegate)) || staticPropertyInfo.PropertyType == typeof(Delegate)))
+                                            {
+                                                stack.Push((staticPropertyInfo.GetValue(obj) as Delegate).DynamicInvoke(oArgs.ToArray()));
+                                            }
                                             else
                                             {
                                                 throw new ExpressionEvaluatorSyntaxErrorException($"[{objType.ToString()}] object has no Method named \"{varFuncName}\".");