chained different custom left operand only operators OK

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -2165,14 +2165,41 @@ void Evaluator_PreEvaluateVariable(object sender, VariablePreEvaluationEventArg
                     .SetCategory("inherits ExpressionEvaluator")
                     .SetCategory("Custom operators");
 
-
                 yield return new TestCaseData(xExpressionEvaluator2
                     , "2## + +-+-~+1", null)
                     .Returns(-0.58578643762690485d)
                     .SetCategory("ExpressionEvaluator extend")
                     .SetCategory("inherits ExpressionEvaluator")
                     .SetCategory("Custom operators");
 
+                yield return new TestCaseData(xExpressionEvaluator2
+                    , "2#°", null)
+                    .Returns(0.70710678118654757d)
+                    .SetCategory("ExpressionEvaluator extend")
+                    .SetCategory("inherits ExpressionEvaluator")
+                    .SetCategory("Custom operators");
+
+                yield return new TestCaseData(xExpressionEvaluator2
+                    , "2°#", null)
+                    .Returns(0.00390625d)
+                    .SetCategory("ExpressionEvaluator extend")
+                    .SetCategory("inherits ExpressionEvaluator")
+                    .SetCategory("Custom operators");
+
+                yield return new TestCaseData(xExpressionEvaluator2
+                     , "2#° + +-+-~+1", null)
+                     .Returns(-1.2928932188134525d)
+                     .SetCategory("ExpressionEvaluator extend")
+                     .SetCategory("inherits ExpressionEvaluator")
+                     .SetCategory("Custom operators");
+
+                yield return new TestCaseData(xExpressionEvaluator2
+                     , "2°# + +-+-~+1", null)
+                     .Returns(-1.99609375d)
+                     .SetCategory("ExpressionEvaluator extend")
+                     .SetCategory("inherits ExpressionEvaluator")
+                     .SetCategory("Custom operators");
+
                 yield return new TestCaseData(xExpressionEvaluator2
                     , "1 love 2", null)
                     .Returns(6)

CodingSeb.ExpressionEvaluator.Tests/TestsUtils/XExpressionEvaluator2.cs

@@ -9,7 +9,8 @@ public class XExpressionEvaluator2 : ExpressionEvaluator
         protected new static readonly IList<ExpressionOperator> leftOperandOnlyOperatorsEvaluationDictionary =
             ExpressionEvaluator.leftOperandOnlyOperatorsEvaluationDictionary
                 .ToList()
-                .FluidAdd(XExpressionOperator2.Sharp);
+                .FluidAdd(XExpressionOperator2.Sharp)
+                .FluidAdd(XExpressionOperator2.Degree);
 
         //protected new static readonly IList<ExpressionOperator> rightOperandOnlyOperatorsEvaluationDictionary = 
         //    ExpressionEvaluator.rightOperandOnlyOperatorsEvaluationDictionary
@@ -19,6 +20,7 @@ public class XExpressionEvaluator2 : ExpressionEvaluator
             ExpressionEvaluator.operatorsEvaluations
                 .Copy()
                 .AddOperatorEvaluationAtNewLevelAfter(XExpressionOperator2.Sharp, (left, _) => Math.Pow(left, -left), ExpressionOperator.Cast)
+                .AddOperatorEvaluationAtNewLevelAfter(XExpressionOperator2.Degree, (left, _) => Math.Pow(left, left), ExpressionOperator.Cast)
                 .AddOperatorEvaluationAtLevelOf(XExpressionOperator2.Love, (left, right) => (left | right) << 1, ExpressionOperator.ShiftBitsLeft);
 
         protected override IList<ExpressionOperator> LeftOperandOnlyOperatorsEvaluationDictionary => leftOperandOnlyOperatorsEvaluationDictionary;
@@ -30,6 +32,7 @@ public class XExpressionEvaluator2 : ExpressionEvaluator
         protected override void Init()
         {
             operatorsDictionary.Add("#", XExpressionOperator2.Sharp);
+            operatorsDictionary.Add("°", XExpressionOperator2.Degree);
             operatorsDictionary.Add("love", XExpressionOperator2.Love);
             operatorsDictionary.Add("Not", ExpressionOperator.LogicalNegation);
         }
@@ -38,6 +41,7 @@ protected override void Init()
     public class XExpressionOperator2 : ExpressionOperator
     {
         public static readonly ExpressionOperator Sharp = new XExpressionOperator2();
+        public static readonly ExpressionOperator Degree = new XExpressionOperator2();
         public static readonly ExpressionOperator Love = new XExpressionOperator2();
     }
 }

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -2999,6 +2999,20 @@ void EvaluateFirstNextUnaryOp(int j, ref int parentIndex)
                             {
                                 try
                                 {
+                                    void EvaluateFirstPreviousUnaryOp(int j)
+                                    {
+                                        if (j < list.Count - 1 && list[j] is ExpressionOperator previousOp && LeftOperandOnlyOperatorsEvaluationDictionary.Contains(previousOp))
+                                        {
+                                            EvaluateFirstPreviousUnaryOp(j + 1);
+
+                                            list[j] = OperatorsEvaluations.FirstOrDefault(od => od.ContainsKey(previousOp))?[previousOp]((dynamic)list[j + 1], null);
+
+                                            list.RemoveAt(j + 1);
+                                        }
+                                    }
+
+                                    EvaluateFirstPreviousUnaryOp(i + 1);
+
                                     list[i] = operatorEvalutationsDict[eOp]((dynamic)list[i + 1], null);
                                 }
                                 catch (Exception ex)