Map <> (order matters)

datchung · May 27, 2020 · 7461f2b · 7461f2b
1 parent ace06e5
commit 7461f2b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -71,8 +71,8 @@ ExpressionEvaluator.SetOperatorMap(new Dictionary<string, string>
 {
     {"and", "&&"},
     {"or", "||"},
-    {"not", "!" },
     {"<>", "!=" },
+    {"not", "!" },
     {"true", "1" },
     {"false", "0" }
 });

diff --git a/src/ExpressionEvaluator.Test/ExpressionEvaluatorTEst.cs b/src/ExpressionEvaluator.Test/ExpressionEvaluatorTEst.cs
@@ -53,6 +53,7 @@ public void Evaluate_Double(string expression, double expectedResult)
         [TestCase("0 && !1", false, "false and not true")]
         [TestCase("(!0 && 1) || 1", true, "( not false  and true ) or true ")]
         [TestCase("(!0 && 1) || 1", false, "( not false and true ) or true")]
+        [TestCase("(!0 != 1) || 1", true, "( not false  <> true ) or true ")]
         [TestCase("!0", false, "not false")]
         [TestCase(" !0", false, "not false")]
         [TestCase("!0 ", false, "not false")]
@@ -63,8 +64,8 @@ public void ReplaceOperators(string expression, bool allowExtraSpaces, string ex
             {
                 {"and", "&&"},
                 {"or", "||"},
-                {"not", "!" },
                 {"<>", "!=" },
+                {"not", "!" },
                 {"true", "1" },
                 {"false", "0" }
             });