More virtual and partial for extensibility

+ Cleaning and Refactoring
+ a bug correction

Author: Sébastien Geiser

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -36,7 +36,7 @@ public partial class ExpressionEvaluator
         protected static readonly Regex varOrFunctionRegEx = new Regex($@"^((?<sign>[+-])|(?<prefixOperator>[+][+]|--)|(?<varKeyword>var)\s+|(?<dynamicKeyword>dynamic)\s+|(?<inObject>(?<nullConditional>[?])?\.)?)(?<name>[{ diactiticsKeywordsRegexPattern }](?>[{ diactiticsKeywordsRegexPattern }0-9]*))(?>\s*)((?<assignationOperator>(?<assignmentPrefix>[+\-*/%&|^]|<<|>>)?=(?![=>]))|(?<postfixOperator>([+][+]|--)(?![{ diactiticsKeywordsRegexPattern}0-9]))|((?<isgeneric>[<](?>([{ diactiticsKeywordsRegexPattern }](?>[{ diactiticsKeywordsRegexPattern }0-9]*)|(?>\s+)|[,\.])+|(?<gentag>[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?<isfunction>[(])?))", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
         protected const string numberRegexOrigPattern = @"^(?<sign>[+-])?([0-9][0-9_{1}]*[0-9]|\d)(?<hasdecimal>{0}?([0-9][0-9_]*[0-9]|\d)(e[+-]?([0-9][0-9_]*[0-9]|\d))?)?(?<type>ul|[fdulm])?";
-        protected string numberRegexPattern = null;
+        protected string numberRegexPattern;
 
         protected static readonly Regex otherBasesNumberRegex = new Regex("^(?<sign>[+-])?(?<value>0(?<type>x)([0-9a-f][0-9a-f_]*[0-9a-f]|[0-9a-f])|0(?<type>b)([01][01_]*[01]|[01]))", RegexOptions.IgnoreCase | RegexOptions.Compiled);
         protected static readonly Regex stringBeginningRegex = new Regex("^(?<interpolated>[$])?(?<escaped>[@])?[\"]", RegexOptions.Compiled);
@@ -773,7 +773,7 @@ public bool OptionNewFunctionEvaluationActive
         /// If <c>ThrowSyntaxException</c> a exception is throw if no return keyword is met.
         /// By default : ReturnAutomaticallyLastEvaluatedExpression;
         /// </summary>
-        public OptionOnNoReturnKeywordFoundInScriptAction OptionOnNoReturnKeywordFoundInScriptAction { get; set; } = OptionOnNoReturnKeywordFoundInScriptAction.ReturnAutomaticallyLastEvaluatedExpression;
+        public OptionOnNoReturnKeywordFoundInScriptAction OptionOnNoReturnKeywordFoundInScriptAction { get; set; }
 
         /// <summary>
         /// If <c>true</c> ScriptEvaluate need to have a semicolon [;] after each expression.
@@ -939,7 +939,7 @@ protected virtual void Init()
         /// <typeparam name="T">The type in which to cast the result of the expression</typeparam>
         /// <param name="script">the script to evaluate</param>
         /// <returns>The result of the last evaluated expression</returns>
-        public T ScriptEvaluate<T>(string script)
+        public virtual T ScriptEvaluate<T>(string script)
         {
             return (T)ScriptEvaluate(script);
         }
@@ -1546,8 +1546,8 @@ protected virtual bool EvaluateNumber(string expression, Stack<object> stack, re
             }
             else if (numberMatch.Success
                 && (!numberMatch.Groups["sign"].Success
-            || stack.Count == 0
-            || stack.Peek() is ExpressionOperator))
+                || stack.Count == 0
+                || stack.Peek() is ExpressionOperator))
             {
                 i += numberMatch.Length;
                 i--;
@@ -1562,16 +1562,13 @@ protected virtual bool EvaluateNumber(string expression, Stack<object> stack, re
                         stack.Push(parseFunc(numberNoType, CultureInfoForNumberParsing));
                     }
                 }
+                else if (OptionForceIntegerNumbersEvaluationsAsDoubleByDefault || numberMatch.Groups["hasdecimal"].Success)
+                {
+                    stack.Push(double.Parse(numberMatch.Value.Replace("_", ""), NumberStyles.Any, CultureInfoForNumberParsing));
+                }
                 else
                 {
-                    if (OptionForceIntegerNumbersEvaluationsAsDoubleByDefault || numberMatch.Groups["hasdecimal"].Success)
-                    {
-                        stack.Push(double.Parse(numberMatch.Value.Replace("_", ""), NumberStyles.Any, CultureInfoForNumberParsing));
-                    }
-                    else
-                    {
-                        stack.Push(int.Parse(numberMatch.Value.Replace("_", ""), NumberStyles.Any, CultureInfoForNumberParsing));
-                    }
+                    stack.Push(int.Parse(numberMatch.Value.Replace("_", ""), NumberStyles.Any, CultureInfoForNumberParsing));
                 }
 
                 return true;
@@ -2984,7 +2981,7 @@ protected virtual MethodInfo GetRealMethod(ref Type type, ref object obj, string
                             && modifiedArgs[a] is InternalDelegate)
                         {
                             InternalDelegate led = modifiedArgs[a] as InternalDelegate;
-                            modifiedArgs[a] = new Converter<object, object>(o => (led(new object[] { o })));
+                            modifiedArgs[a] = new Converter<object, object>(o => led(new object[] { o }));
                         }
                         else
                         {
@@ -3118,7 +3115,7 @@ protected virtual string GetScriptBetweenCurlyBrackets(string parentScript, ref
             return currentScript;
         }
 
-        protected List<string> GetExpressionsBetweenParenthesesOrOtherImbricableBrackets(string expression, ref int i, bool checkSeparator, string separator = ",", string startChar = "(", string endChar = ")")
+        protected virtual List<string> GetExpressionsBetweenParenthesesOrOtherImbricableBrackets(string expression, ref int i, bool checkSeparator, string separator = ",", string startChar = "(", string endChar = ")")
         {
             List<string> expressionsList = new List<string>();
 
@@ -3223,7 +3220,9 @@ protected virtual bool DefaultFunctions(string name, List<string> args, out obje
             }
             else if (OptionScriptEvaluateFunctionActive && name.Equals("ScriptEvaluate", StringComparisonForCasing))
             {
+                bool oldInScript = inScript;
                 result = ScriptEvaluate((string)Evaluate(args[0]));
+                inScript = oldInScript;
             }
             else
             {
@@ -3700,7 +3699,7 @@ public static partial class OperatorsEvaluationsExtensions
     {
         public static IList<IDictionary<ExpressionOperator, Func<dynamic, dynamic, object>>> Copy(this IList<IDictionary<ExpressionOperator, Func<dynamic, dynamic, object>>> operatorsEvaluations)
         {
-            return (IList<IDictionary<ExpressionOperator, Func<dynamic, dynamic, object>>>)operatorsEvaluations
+            return operatorsEvaluations
                 .Select(dic => (IDictionary<ExpressionOperator, Func<dynamic, dynamic, object>>)new Dictionary<ExpressionOperator, Func<dynamic, dynamic, object>>(dic))
                 .ToList();
         }
@@ -3790,7 +3789,7 @@ public partial class StronglyTypedVariable
 
     public partial class ExpressionEvaluatorSyntaxErrorException : Exception
     {
-        public ExpressionEvaluatorSyntaxErrorException() : base()
+        public ExpressionEvaluatorSyntaxErrorException()
         { }
 
         public ExpressionEvaluatorSyntaxErrorException(string message) : base(message)
@@ -3802,7 +3801,7 @@ public ExpressionEvaluatorSyntaxErrorException(string message, Exception innerEx
 
     public partial class ExpressionEvaluatorSecurityException : Exception
     {
-        public ExpressionEvaluatorSecurityException() : base()
+        public ExpressionEvaluatorSecurityException()
         { }
 
         public ExpressionEvaluatorSecurityException(string message) : base(message)
@@ -3814,8 +3813,8 @@ public ExpressionEvaluatorSecurityException(string message, Exception innerExcep
 
     public partial class VariableEvaluationEventArg : EventArgs
     {
-        private readonly Func<string, Type[]> evaluateGenericTypes = null;
-        private readonly string genericTypes = null;
+        private readonly Func<string, Type[]> evaluateGenericTypes;
+        private readonly string genericTypes;
 
         /// <summary>
         /// Constructor of the VariableEvaluationEventArg
@@ -3853,13 +3852,13 @@ public object Value
         /// <summary>
         /// if <c>true</c> the variable is affected, if <c>false</c> it means that the variable does not exist.
         /// </summary>
-        public bool HasValue { get; set; } = false;
+        public bool HasValue { get; set; }
 
         /// <summary>
         /// In the case of on the fly instance property definition the instance of the object on which this Property is called.
         /// Otherwise is set to null.
         /// </summary>
-        public object This { get; } = null;
+        public object This { get; }
 
         /// <summary>
         /// A reference on the current expression evaluator.
@@ -3888,7 +3887,7 @@ public Type[] EvaluateGenericTypes()
         }
     }
 
-    public class VariablePreEvaluationEventArg : VariableEvaluationEventArg
+    public partial class VariablePreEvaluationEventArg : VariableEvaluationEventArg
     {
         public VariablePreEvaluationEventArg(string name, ExpressionEvaluator evaluator = null, object onInstance = null, string genericTypes = null, Func<string, Type[]> evaluateGenericTypes = null)
             : base(name, evaluator, onInstance, genericTypes, evaluateGenericTypes)
@@ -3897,14 +3896,14 @@ public VariablePreEvaluationEventArg(string name, ExpressionEvaluator evaluator
         /// <summary>
         /// If set to true cancel the evaluation of the current variable, field or property and throw an exception it does not exists
         /// </summary>
-        public bool CancelEvaluation { get; set; } = false;
+        public bool CancelEvaluation { get; set; }
     }
 
     public partial class FunctionEvaluationEventArg : EventArgs
     {
-        private readonly Func<string, object> evaluateFunc = null;
-        private readonly Func<string, Type[]> evaluateGenericTypes = null;
-        private readonly string genericTypes = null;
+        private readonly Func<string, object> evaluateFunc;
+        private readonly Func<string, Type[]> evaluateGenericTypes;
+        private readonly string genericTypes;
 
         public FunctionEvaluationEventArg(string name, Func<string, object> evaluateFunc, List<string> args = null, ExpressionEvaluator evaluator = null, object onInstance = null, string genericTypes = null, Func<string, Type[]> evaluateGenericTypes = null)
         {
@@ -3957,7 +3956,7 @@ public T EvaluateArg<T>(int index)
         /// </summary>
         public string Name { get; }
 
-        private object returnValue = null;
+        private object returnValue;
 
         /// <summary>
         /// To set the return value of the function
@@ -3975,13 +3974,13 @@ public object Value
         /// <summary>
         /// if <c>true</c> the function evaluation has been done, if <c>false</c> it means that the function does not exist.
         /// </summary>
-        public bool FunctionReturnedValue { get; set; } = false;
+        public bool FunctionReturnedValue { get; set; }
 
         /// <summary>
         /// In the case of on the fly instance method definition the instance of the object on which this method (function) is called.
         /// Otherwise is set to null.
         /// </summary>
-        public object This { get; } = null;
+        public object This { get; }
 
         /// <summary>
         /// A reference on the current expression evaluator.
@@ -4010,7 +4009,7 @@ public Type[] EvaluateGenericTypes()
         }
     }
 
-    public class FunctionPreEvaluationEventArg : FunctionEvaluationEventArg
+    public partial class FunctionPreEvaluationEventArg : FunctionEvaluationEventArg
     {
         public FunctionPreEvaluationEventArg(string name, Func<string, object> evaluateFunc, List<string> args = null, ExpressionEvaluator evaluator = null, object onInstance = null, string genericTypes = null, Func<string, Type[]> evaluateGenericTypes = null)
             : base(name, evaluateFunc, args, evaluator, onInstance, genericTypes, evaluateGenericTypes)
@@ -4019,7 +4018,7 @@ public FunctionPreEvaluationEventArg(string name, Func<string, object> evaluateF
         /// <summary>
         /// If set to true cancel the evaluation of the current function or method and throw an exception that the function does not exists
         /// </summary>
-        public bool CancelEvaluation { get; set; } = false;
+        public bool CancelEvaluation { get; set; }
     }
 
     #endregion