Use ExceptionDispatchInfo

Author: jl0pd

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -17,6 +17,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Runtime.ExceptionServices;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -287,15 +288,17 @@ protected enum TryBlockEvaluatedState
                 {ExpressionOperator.ConditionalAnd, (dynamic left, dynamic right) => {
                     if ( left is BubbleExceptionContainer leftExceptionContainer)
                     {
-                        throw leftExceptionContainer.Exception;
+                        leftExceptionContainer.Throw();
+                        return null; // this line is never reached
                     }
                     else if (!left)
                     {
                         return false;
                     }
                     else if (right is BubbleExceptionContainer rightExceptionContainer)
                     {
-                        throw rightExceptionContainer.Exception;
+                        rightExceptionContainer.Throw();
+                        return null; // this line is never reached
                     }
                     else
                     {
@@ -308,15 +311,17 @@ protected enum TryBlockEvaluatedState
                 {ExpressionOperator.ConditionalOr, (dynamic left, dynamic right) => {
                     if ( left is BubbleExceptionContainer leftExceptionContainer)
                     {
-                        throw leftExceptionContainer.Exception;
+                        leftExceptionContainer.Throw();
+                        return null; // this line is never reached
                     }
                     else if (left)
                     {
                         return true;
                     }
                     else if (right is BubbleExceptionContainer rightExceptionContainer)
                     {
-                        throw rightExceptionContainer.Exception;
+                        rightExceptionContainer.Throw();
+                        return null; // this line is never reached
                     }
                     else
                     {
@@ -2147,20 +2152,15 @@ where method.GetParameters()[0].ParameterType == objType // static extMethod(thi
                         }
                         catch (NullReferenceException nullException)
                         {
-                            stack.Push(new BubbleExceptionContainer()
-                            {
-                                Exception = nullException
-                            });
+                            stack.Push(new BubbleExceptionContainer(nullException));
 
                             return true;
                         }
                         catch (Exception ex)
                         {
                             //Transport the exception in stack.
-                            stack.Push(new BubbleExceptionContainer()
-                            {
-                                Exception = new ExpressionEvaluatorSyntaxErrorException($"The call of the method \"{varFuncName}\" on type [{objType}] generate this error : {ex.InnerException?.Message ?? ex.Message}", ex)
-                            });
+                            var nestedException = new ExpressionEvaluatorSyntaxErrorException($"The call of the method \"{varFuncName}\" on type [{objType}] generate this error : {ex.InnerException?.Message ?? ex.Message}", ex);
+                            stack.Push(new BubbleExceptionContainer(nestedException));
                             return true;  //Signals an error to the parsing method array call                          
                         }
                     }
@@ -2410,10 +2410,8 @@ where method.GetParameters()[0].ParameterType == objType // static extMethod(thi
                         catch (Exception ex)
                         {
                             //Transport the exception in stack.
-                            stack.Push(new BubbleExceptionContainer()
-                            {
-                                Exception = new ExpressionEvaluatorSyntaxErrorException($"[{objType}] object has no public Property or Member named \"{varFuncName}\".", ex)
-                            });
+                            var nestedException = new ExpressionEvaluatorSyntaxErrorException($"[{objType}] object has no public Property or Member named \"{varFuncName}\".", ex);
+                            stack.Push(new BubbleExceptionContainer(nestedException));
                             i--;
                             return true;  //Signals an error to the parsing method array call
                         }
@@ -3082,7 +3080,7 @@ protected virtual bool EvaluateString(string expression, Stack<object> stack, re
                             object obj = Evaluate(innerExp.ToString());
 
                             if (obj is BubbleExceptionContainer bubbleExceptionContainer)
-                                throw bubbleExceptionContainer.Exception;
+                                bubbleExceptionContainer.Throw();
 
                             resultString.Append(obj);
                         }
@@ -3181,7 +3179,7 @@ void EvaluateFirstNextUnaryOp(int j, ref int parentIndex)
                                     }
                                     else
                                     {
-                                        list[i] = new BubbleExceptionContainer() { Exception = ex }; //Transport the processing error
+                                        list[i] = new BubbleExceptionContainer(ex); //Transport the processing error
                                     }
                                 }
                                 list.RemoveAt(i - 1);
@@ -3216,7 +3214,7 @@ void EvaluateFirstPreviousUnaryOp(int j)
                                     }
                                     else
                                     {
-                                        list[i] = new BubbleExceptionContainer() { Exception = ex }; //Transport the processing error
+                                        list[i] = new BubbleExceptionContainer(ex); //Transport the processing error
                                     }
                                 }
                                 list.RemoveAt(i + 1);
@@ -3252,7 +3250,7 @@ void EvaluateFirstPreviousUnaryOp(int j)
                                     }
                                     else
                                     {
-                                        list[i] = new BubbleExceptionContainer() { Exception = ex }; //Transport the processing error
+                                        list[i] = new BubbleExceptionContainer(ex); //Transport the processing error
                                     }
                                 }
                                 list.RemoveAt(i + 1);
@@ -3277,15 +3275,15 @@ void EvaluateFirstPreviousUnaryOp(int j)
                 {
                     if (item is BubbleExceptionContainer bubbleExceptionContainer)
                     {
-                        throw bubbleExceptionContainer.Exception; //Throw the first occuring error
+                        bubbleExceptionContainer.Throw(); //Throw the first occuring error
                     }
                 }
                 throw new ExpressionEvaluatorSyntaxErrorException("Syntax error. Check that no operator is missing");
             }
             else if (evaluationStackCount == 1 && stack.Peek() is BubbleExceptionContainer bubbleExceptionContainer)
             {
                 //We reached the top level of the evaluation. So we want to throw the resulting exception.
-                throw bubbleExceptionContainer.Exception;
+                bubbleExceptionContainer.Throw();
             }
 
             return stack.Pop();
@@ -3358,7 +3356,7 @@ protected virtual object ManageKindOfAssignation(string expression, ref int inde
             }
 
             if (result is BubbleExceptionContainer exceptionContainer)
-                throw exceptionContainer.Exception;
+                exceptionContainer.Throw();
 
             if (stack != null)
             {
@@ -4692,7 +4690,14 @@ public partial class MethodsGroupEncaps
 
     public partial class BubbleExceptionContainer
     {
-        public Exception Exception { get; set; }
+        public BubbleExceptionContainer(Exception exception)
+        {
+            _dispatchInfo = ExceptionDispatchInfo.Capture(exception);
+        }
+
+        private readonly ExceptionDispatchInfo _dispatchInfo;
+
+        public void Throw() => _dispatchInfo.Throw();
     }
 
     public partial class ExpressionEvaluatorSyntaxErrorException : Exception