(#37) Correction of lettered operators before parentheses

Author: Sébastien Geiser

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -1875,6 +1875,27 @@ void Evaluator_PreEvaluateVariable(object sender, VariablePreEvaluationEventArg
                     .SetCategory("inherits ExpressionEvaluator")
                     .SetCategory("Custom operators");
 
+                yield return new TestCaseData(xExpressionEvaluator2
+                    , "Not true", null)
+                    .Returns(false)
+                    .SetCategory("ExpressionEvaluator extend")
+                    .SetCategory("inherits ExpressionEvaluator")
+                    .SetCategory("Custom operators");
+
+                yield return new TestCaseData(xExpressionEvaluator2
+                    , "Not(true)", null)
+                    .Returns(false)
+                    .SetCategory("ExpressionEvaluator extend")
+                    .SetCategory("inherits ExpressionEvaluator")
+                    .SetCategory("Custom operators");
+
+                yield return new TestCaseData(xExpressionEvaluator2
+                    , "Not(1 == 1)", null)
+                    .Returns(false)
+                    .SetCategory("ExpressionEvaluator extend")
+                    .SetCategory("inherits ExpressionEvaluator")
+                    .SetCategory("Custom operators");
+
                 #endregion
 
                 #region Add a complex operator or change the parsing process

CodingSeb.ExpressionEvaluator.Tests/TestsUtils/XExpressionEvaluator2.cs

@@ -31,6 +31,7 @@ protected override void Init()
         {
             operatorsDictionary.Add("#", XExpressionOperator2.Sharp);
             operatorsDictionary.Add("love", XExpressionOperator2.Love);
+            operatorsDictionary.Add("Not", ExpressionOperator.LogicalNegation);
         }
     }
 

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -1713,7 +1713,8 @@ protected virtual bool EvaluateVarOrFunc(string expression, Stack<object> stack,
             && (!varFuncMatch.Groups["sign"].Success
                 || stack.Count == 0
                 || stack.Peek() is ExpressionOperator)
-            && !operatorsDictionary.ContainsKey(varFuncMatch.Value.Trim()))
+            && !operatorsDictionary.ContainsKey(varFuncMatch.Value.Trim())
+            && (!operatorsDictionary.ContainsKey(varFuncMatch.Groups["name"].Value) || varFuncMatch.Groups["inObject"].Success))
             {
                 string varFuncName = varFuncMatch.Groups["name"].Value;
                 string genericsTypes = varFuncMatch.Groups["isgeneric"].Value;

TryWindow/MainWindow.xaml.cs

@@ -45,6 +45,7 @@ private async void CalculateButton_Click(object sender, RoutedEventArgs e)
             evaluator.Namespaces.Add("System.Diagnostics");
 
             evaluator.EvaluateVariable += Evaluator_EvaluateVariable;
+            evaluator.EvaluateFunction += Evaluator_EvaluateFunction;
 
             Stopwatch stopWatch = new Stopwatch();
 
@@ -55,7 +56,7 @@ private async void CalculateButton_Click(object sender, RoutedEventArgs e)
                 Exception exception = null;
                 cancellationTokenSource = new CancellationTokenSource();
                 cancellationTokenSource.Token.ThrowIfCancellationRequested();
-                string result = await Task.Run<string>(() =>
+                string result = await Task.Run(() =>
                 {
                     if (!int.TryParse(sIteration, out int iterations))
                         iterations = 1;
@@ -104,6 +105,11 @@ private async void CalculateButton_Click(object sender, RoutedEventArgs e)
             CancelButton.IsEnabled = false;
         }
 
+        private void Evaluator_EvaluateFunction(object sender, FunctionEvaluationEventArg e)
+        {
+            
+        }
+
         private void Evaluator_EvaluateVariable(object sender, VariableEvaluationEventArg e)
         {
             if (e.This != null)