OK for unary left operand. But test failed when right operator is in the place :(

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -1022,6 +1022,7 @@ public static IEnumerable<TestCaseData> TestCasesForWithCustomVariablesExpressio
                 Dictionary<string, object> variablesForSimpleVariablesInjection = new Dictionary<string, object>()
                 {
                     { "hello", "Test" },
+                    { "a", 0 },
                     { "x", 5 },
                     { "y", 20 },
                     { "isThisReal", true },
@@ -1056,6 +1057,10 @@ public static IEnumerable<TestCaseData> TestCasesForWithCustomVariablesExpressio
                 yield return new TestCaseData("-x + +y", variablesForSimpleVariablesInjection, true).SetCategory("SimpleVariablesInjection,Unary both +-").Returns(15);
                 yield return new TestCaseData("(-x + +y)", variablesForSimpleVariablesInjection, true).SetCategory("SimpleVariablesInjection,Unary both +-,Parenthis").Returns(15);
 
+                yield return new TestCaseData("-~a", variablesForSimpleVariablesInjection, true).SetCategory("SimpleVariablesInjection,MultipleUnary").Returns(1);
+                yield return new TestCaseData("+-+-+-+-+a", variablesForSimpleVariablesInjection, true).SetCategory("SimpleVariablesInjection,MultipleUnary").Returns(0);
+                yield return new TestCaseData("a >> +-+-+-+2 << +-+-+-+-2 >> +-+-+-+-+2 << +-+-+-+-+2", variablesForSimpleVariablesInjection, true).SetCategory("SimpleVariablesInjection,MultipleUnary").Returns(0);
+
                 yield return new TestCaseData("ISTHISREAL", variablesForSimpleVariablesInjection, false).SetCategory("SimpleVariablesInjection,IgnoreCase").Returns(true).SetCategory("Options, OptionCaseSensitiveEvaluationActive");
                 yield return new TestCaseData("isthisreal", variablesForSimpleVariablesInjection, false).SetCategory("SimpleVariablesInjection,IgnoreCase").Returns(true).SetCategory("Options, OptionCaseSensitiveEvaluationActive");
                 yield return new TestCaseData("iStHISrEAL", variablesForSimpleVariablesInjection, false).SetCategory("SimpleVariablesInjection,IgnoreCase").Returns(true).SetCategory("Options, OptionCaseSensitiveEvaluationActive");

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -2577,7 +2577,13 @@ protected virtual bool EvaluateOperators(string expression, Stack<object> stack,
             if (match.Success)
             {
                 string op = match.Value;
-                stack.Push(operatorsDictionary[op]);
+
+                if (op.Equals("+") && (stack.Count == 0 || stack.Peek() is ExpressionOperator))
+                    stack.Push(ExpressionOperator.UnaryPlus);
+                else if (op.Equals("-") && (stack.Count == 0 || stack.Peek() is ExpressionOperator))
+                    stack.Push(ExpressionOperator.UnaryMinus);
+                else
+                    stack.Push(operatorsDictionary[op]);
                 i += op.Length - 1;
                 return true;
             }
@@ -2957,6 +2963,21 @@ protected virtual object ProcessStack(Stack<object> stack)
                             {
                                 try
                                 {
+                                    void EvaluateFirstNextUnaryOp(int j, ref int parentIndex)
+                                    {
+                                        if (j > 0 && list[j] is ExpressionOperator nextOp && RightOperandOnlyOperatorsEvaluationDictionary.Contains(nextOp))
+                                        {
+                                            EvaluateFirstNextUnaryOp(j - 1, ref j);
+
+                                            list[j] = OperatorsEvaluations.FirstOrDefault(od => od.ContainsKey(nextOp))?[nextOp](null, (dynamic)list[j - 1]);
+
+                                            list.RemoveAt(j - 1);
+                                            parentIndex=j;
+                                        }
+                                    }
+
+                                    EvaluateFirstNextUnaryOp(i - 1, ref i);
+
                                     list[i] = operatorEvalutationsDict[eOp](null, (dynamic)list[i - 1]);
                                 }
                                 catch (Exception ex)

TryWindow/MainWindow.xaml.cs

@@ -19,7 +19,7 @@ public partial class MainWindow : Window
         private readonly string persistCodeFileName = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "code.cs");
         private readonly string persistIterationFileName = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "iterations");
 
-        private CancellationTokenSource cancellationTokenSource = null;
+        private CancellationTokenSource cancellationTokenSource;
 
         public MainWindow()
         {