#105 OK + Correction same error in String interpolation

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -1662,20 +1662,38 @@ public void Evaluate_ExtensionMethodOnContext()
         }
 
         /// <summary>
-        /// To correct #105 Exception should be thrown and not set in the stack
+        /// To correct #105 Exception were not thrown when concat with string
         /// </summary>
         [Test]
         [Category("Bug")]
         [Category("#105")]
-        public void Evaluate_Exceptions_NotThrown()
+        public void Evaluate_ExceptionsNotThrownWhenConcatWithString()
         {
             var evaluator = new ExpressionEvaluator
             {
                 Context = new { Person = new Person2 { Name = null, Number = 1.11m } }
             };
 
-            Should.Throw<Exception>(() => Console.WriteLine(evaluator.Evaluate("\"Test one \" + Person.Name.Trim()")));
-            Should.Throw<Exception>(() => Console.WriteLine(evaluator.Evaluate("\"Test two \" + Person.AnotherName.Trim()")));
+            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()}\"")));
         }
 
         #endregion

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -2092,6 +2092,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.
@@ -2979,7 +2988,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 +3134,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