Merge pull request #108 from codingseb/dev

Dev

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -1641,6 +1641,91 @@ public void Evaluate_ParameterTypeMismatchAutoAdapt()
                 .ShouldBeOfType<DateTime>();
         }
 
+        /// <summary>
+        /// To correct #104 Extension methods do not work on context
+        /// work now with this keyword like in C#
+        /// </summary>
+        [Test]
+        [Category("Bug")]
+        [Category("#104")]
+        public void Evaluate_ExtensionMethodOnContext()
+        {
+            var evaluator = new ExpressionEvaluator
+            {
+                Context = new List<int>()
+                {
+                    1,2,3,4,5
+                }
+            };
+
+            evaluator.Evaluate("this.Sum()")
+                .ShouldBe(15);
+        }
+
+        /// <summary>
+        /// To correct #104 Indexing do not work on context
+        /// work now with this keyword like in C#
+        /// </summary>
+        [Test]
+        [Category("Bug")]
+        [Category("#104")]
+        public void Evaluate_IndexingOnContext()
+        {
+            var evaluator = new ExpressionEvaluator
+            {
+                Context = new ClassForIndexing()
+            };
+
+            evaluator.Evaluate("this[\"Test\"]")
+                .ShouldBe("TestTest");
+        }
+
+        /// <summary>
+        /// To correct #105 Exception were not thrown when concat with string
+        /// </summary>
+        [Test]
+        [Category("Bug")]
+        [Category("#105")]
+        public void Evaluate_ExceptionsNotThrownWhenConcatWithString()
+        {
+            var evaluator = new ExpressionEvaluator
+            {
+                Context = new { Person = new Person2 { Name = null, Number = 1.11m } }
+            };
+
+            Should.Throw<NullReferenceException>(() => Console.WriteLine(evaluator.Evaluate("Person.Name.Trim() + \"Test one \"")));
+            Should.Throw<NullReferenceException>(() => Console.WriteLine(evaluator.Evaluate("\"Test one \" + Person.Name.Trim()")));
+            Should.Throw<ExpressionEvaluatorSyntaxErrorException>(() => Console.WriteLine(evaluator.Evaluate("\"Test two \" + Person.AnotherName.Trim()")));
+        }
+
+        /// <summary>
+        /// #105 Exception were not thrown when in string interpolation
+        /// </summary>
+        [Test]
+        [Category("Bug")]
+        [Category("#105")]
+        public void Evaluate_ExceptionsNotThrownWhenInStringInterpolation()
+        {
+            var evaluator = new ExpressionEvaluator
+            {
+                Context = new { Person = new Person2 { Name = null, Number = 1.11m } }
+            };
+
+            Should.Throw<NullReferenceException>(() => Console.WriteLine(evaluator.Evaluate("$\"Test one {Person.Name.Trim()}\"")));
+            Should.Throw<ExpressionEvaluatorSyntaxErrorException>(() => Console.WriteLine(evaluator.Evaluate("$\"Test two {Person.AnotherName.Trim()}\"")));
+        }
+
+        [Test]
+        [Category("Bug")]
+        [Category("MergeRequest")]
+        [Category("#107")]
+        public void Evaluate_DoubleDoubleQuotesInEscapedStringThrowException()
+        {
+            var evaluator = new ExpressionEvaluator();
+
+            evaluator.Evaluate("@\"Hello \"\" Joe\"").ShouldBe(@"Hello "" Joe");
+        }
+
         #endregion
 
         #region EvaluateWithSpecificEvaluator
@@ -1939,6 +2024,27 @@ void Evaluator_PreEvaluateVariable(object sender, VariablePreEvaluationEventArg
                         .SetCategory("On the fly var")
                         .SetCategory("Static Onthefly");
 
+                // MR #106
+                ExpressionEvaluator nullForceEvaluator = new ExpressionEvaluator
+                {
+                    Variables = new Dictionary<string, object>()
+                {
+                    { "obj", new { }}
+                }
+                };
+
+                nullForceEvaluator.EvaluateVariable += (sender, e) =>
+                {
+                    e.HasValue = true;
+                    e.Value = null;
+                };
+
+                yield return new TestCaseData(nullForceEvaluator
+                    , "obj.x"
+                    , null)
+                    .Returns(null)
+                    .SetCategory("On the fly var");
+
                 #endregion
 
                 #region With Context object

CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj

@@ -5,9 +5,9 @@
     <Product>CodingSeb.ExpressionEvaluator</Product>
     <Description>A Simple Math and Pseudo C# Expression Evaluator in One C# File. Can also execute small C# like scripts</Description>
     <Copyright>Copyright © Coding Seb 2017</Copyright>
-    <Version>1.4.29.0</Version>
-    <AssemblyVersion>1.4.29.0</AssemblyVersion>
-    <FileVersion>1.4.29.0</FileVersion>
+    <Version>1.4.30.0</Version>
+    <AssemblyVersion>1.4.30.0</AssemblyVersion>
+    <FileVersion>1.4.30.0</FileVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <Authors>Coding Seb</Authors>
     <PackageId>CodingSeb.ExpressionEvaluator</PackageId>
@@ -19,7 +19,10 @@
     <PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
     <PackageIcon>Icon.png</PackageIcon>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>* Add Multidimensional indexing management like myStuffToIndex[1,4]</PackageReleaseNotes>
+    <PackageReleaseNotes>* BubbleExceptionContainer now throw their exceptions when necessary and are no more concatenate in string.
+* The default keyword this is introduce and is automatically set on the Context object (This allow to do indexing and call extentions methods on the context object)
+* We can now set a variable to null in PreEvaluateVariable events
+* Double double quotes are now supported in escaped string to escape double quotes @""""</PackageReleaseNotes>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <RepositoryUrl>https://github.com/codingseb/ExpressionEvaluator</RepositoryUrl>
   </PropertyGroup>

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -1,6 +1,6 @@
 /******************************************************************************************************
     Title : ExpressionEvaluator (https://github.com/codingseb/ExpressionEvaluator)
-    Version : 1.4.29.0 
+    Version : 1.4.30.0 
     (if last digit (the forth) is not a zero, the version is an intermediate version and can be unstable)
 
     Author : Coding Seb
@@ -336,6 +336,7 @@ protected enum TryBlockEvaluatedState
             { "null", null},
             { "true", true },
             { "false", false },
+            { "this", null }
         };
 
         protected IDictionary<string, Func<double, double>> simpleDoubleMathFuncsDictionary = new Dictionary<string, Func<double, double>>(StringComparer.Ordinal)
@@ -872,10 +873,20 @@ protected virtual BindingFlags StaticBindingFlag
 
         #region Custom and on the fly evaluation
 
+        private object context;
+
         /// <summary>
         /// If set, this object is used to use it's fields, properties and methods as global variables and functions
         /// </summary>
-        public object Context { get; set; }
+        public object Context
+        {
+            get { return context; }
+            set
+            {
+                context = value;
+                defaultVariables["this"] = context;
+            }
+        }
 
         private IDictionary<string, object> variables = new Dictionary<string, object>(StringComparer.Ordinal);
 
@@ -2092,6 +2103,15 @@ where method.GetParameters()[0].ParameterType == objType // static extMethod(thi
                         {
                             throw;
                         }
+                        catch (NullReferenceException nullException)
+                        {
+                            stack.Push(new BubbleExceptionContainer()
+                            {
+                                Exception = nullException
+                            });
+
+                            return true;
+                        }
                         catch (Exception ex)
                         {
                             //Transport the exception in stack.
@@ -2787,7 +2807,7 @@ protected virtual bool EvaluateIndexing(string expression, Stack<object> stack,
 
                         if(type.IsArray && OptionForceIntegerNumbersEvaluationsAsDoubleByDefault)
                         {
-                            oIndexingArgs = oIndexingArgs.Select(o => o is double ? (int)o : o).ToList();
+                            oIndexingArgs = oIndexingArgs.ConvertAll(o => o is double ? (int)o : o);
                         }
                         else
                         {
@@ -2924,8 +2944,16 @@ protected virtual bool EvaluateString(string expression, Stack<object> stack, re
 
                     if (expression.Substring(i)[0] == '"')
                     {
-                        endOfString = true;
-                        stack.Push(resultString.ToString());
+                        if (expression.Substring(i).Length > 1 && expression.Substring(i)[1] == '"')
+                        {
+                            i += 2;
+                            resultString.Append(@"""");
+                        }
+                        else
+                        {
+                            endOfString = true;
+                            stack.Push(resultString.ToString());
+                        }
                     }
                     else if (expression.Substring(i)[0] == '{')
                     {
@@ -2979,7 +3007,13 @@ protected virtual bool EvaluateString(string expression, Stack<object> stack, re
                                 string beVerb = bracketCount == 1 ? "is" : "are";
                                 throw new Exception($"{bracketCount} '}}' character {beVerb} missing in expression : [{expression}]");
                             }
-                            resultString.Append(Evaluate(innerExp.ToString()));
+
+                            object obj = Evaluate(innerExp.ToString());
+
+                            if (obj is BubbleExceptionContainer bubbleExceptionContainer)
+                                throw bubbleExceptionContainer.Exception;
+
+                            resultString.Append(obj);
                         }
                     }
                     else if (expression.Substring(i, expression.Length - i)[0] == '}')
@@ -3119,14 +3153,24 @@ void EvaluateFirstPreviousUnaryOp(int j)
                             }
                             else
                             {
+                                var left = (dynamic)list[i + 1];
+                                var right = (dynamic)list[i - 1];
+
                                 try
                                 {
-                                    list[i] = operatorEvalutationsDict[eOp]((dynamic)list[i + 1], (dynamic)list[i - 1]);
+                                    list[i] = operatorEvalutationsDict[eOp](left, right);
+
+                                    if (left is BubbleExceptionContainer && right is string)
+                                    {
+                                        list[i] = left; //Bubble up the causing error
+                                    }
+                                    else if (right is BubbleExceptionContainer && left is string)
+                                    {
+                                        list[i] = right; //Bubble up the causing error
+                                    }
                                 }
                                 catch (Exception ex)
                                 {
-                                    var left = (dynamic)list[i + 1];
-                                    var right = (dynamic)list[i - 1];
                                     if (left is BubbleExceptionContainer)
                                     {
                                         list[i] = left; //Bubble up the causing error