VAR/VAR.ExpressionEvaluator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tokenizer: Accept "<>" as NotEqual token.

Browse Source
This commit is contained in:
Valeriano A.R.
2019-12-03 10:02:20 +01:00
parent 6e9b8c9826
commit 4eca26daca
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
VAR.ExpressionEvaluator.Tests/ParserTests.cs
View File

@@ -316,6 +316,14 @@ namespace VAR.ExpressionEvaluator.Tests
Assert.AreEqual(true, result); Assert.AreEqual(true, result);
} }
[TestMethod()]
public void Relations_10Different1_EqualsTrue()
{
string expression = "10<>1";
object result = Parser.EvaluateString(expression);
Assert.AreEqual(true, result);
}
[TestMethod()] [TestMethod()]
public void Relations_10LessThan1_EqualsFalse() public void Relations_10LessThan1_EqualsFalse()
{ {
@@ -439,7 +447,7 @@ namespace VAR.ExpressionEvaluator.Tests
Assert.AreEqual(null, Parser.EvaluateString("100 / null")); Assert.AreEqual(null, Parser.EvaluateString("100 / null"));
Assert.AreEqual(null, Parser.EvaluateString("null / null")); Assert.AreEqual(null, Parser.EvaluateString("null / null"));
} }
#endregion #endregion
} }
} }

5
VAR.ExpressionEvaluator/Tokenizer.cs
View File

@@ -144,6 +144,11 @@ namespace VAR.ExpressionEvaluator
NextChar(); NextChar();
_currentToken = Token.LessOrEqualThan; _currentToken = Token.LessOrEqualThan;
} }
if (_currentChar == '>')
{
NextChar();
_currentToken = Token.NotEquals;
}
return; return;
case '&': case '&':