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

Compare commits

base: VAR:0.2.0
Branches Tags
VAR:Main
VAR:0.2.8 VAR:0.2.7 VAR:0.2.6 VAR:0.2.5 VAR:0.2.4 VAR:0_2_3 VAR:0.2.3 VAR:0_2_2 VAR:0.2.2 VAR:0_2_1 VAR:0.2.1 VAR:0_2_0 VAR:0.2.0 VAR:0_1_1 VAR:0.1.1 VAR:0_1_0 VAR:0.1.0
..
compare: VAR:0.2.1
Branches Tags
VAR:Main
VAR:0.2.8 VAR:0.2.7 VAR:0.2.6 VAR:0.2.5 VAR:0.2.4 VAR:0_2_3 VAR:0.2.3 VAR:0_2_2 VAR:0.2.2 VAR:0_2_1 VAR:0.2.1 VAR:0_2_0 VAR:0.2.0 VAR:0_1_1 VAR:0.1.1 VAR:0_1_0 VAR:0.1.0

3 Commits
0.2.0 ... 0.2.1

Author SHA1 Message Date
Valeriano A.R
101ec64e95 0.2.1 2019-12-03 10:02:55 +01:00
Valeriano A.R
4eca26daca Tokenizer: Accept "<>" as NotEqual token. 2019-12-03 10:02:20 +01:00
Valeriano A.R
6e9b8c9826 Fix Build.Nuget.cmd for Visual Studio 2017 Enterprise. 2019-12-03 09:59:36 +01:00
4 changed files with 17 additions and 3 deletions
Expand all files Collapse all files

4
SharedAssemblyInfo.cs
View File

@@ -4,5 +4,5 @@
[assembly: AssemblyCopyright("Copyright © VAR 2019")] [assembly: AssemblyCopyright("Copyright © VAR 2019")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("0.2.0.0")] [assembly: AssemblyVersion("0.2.1.0")]
[assembly: AssemblyFileVersion("0.2.0.0")] [assembly: AssemblyFileVersion("0.2.1.0")]

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
} }
} }

1
VAR.ExpressionEvaluator/Build.NuGet.cmd
View File

@@ -5,6 +5,7 @@ if exist "%windir%\Microsoft.Net\Framework\v4.0.30319" set MsBuildPath=%windir%\
if exist "%windir%\Microsoft.Net\Framework64\v4.0.30319" set MsBuildPath=%windir%\Microsoft.NET\Framework64\v4.0.30319 if exist "%windir%\Microsoft.Net\Framework64\v4.0.30319" set MsBuildPath=%windir%\Microsoft.NET\Framework64\v4.0.30319
if exist "C:\Program Files (x86)\MSBuild\14.0\Bin" set MsBuildPath=C:\Program Files (x86)\MSBuild\14.0\Bin if exist "C:\Program Files (x86)\MSBuild\14.0\Bin" set MsBuildPath=C:\Program Files (x86)\MSBuild\14.0\Bin
if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin" set MsBuildPath=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin" set MsBuildPath=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin
if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin" set MsBuildPath=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin
set PATH=%MsBuildPath%;%PATH% set PATH=%MsBuildPath%;%PATH%
echo %MsBuildPath% echo %MsBuildPath%

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 '&':