Sync

.idea/.idea.VAR.ExpressionEvaluator/.idea/.gitignore

@@ -0,0 +1,13 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/.idea.VAR.ExpressionEvaluator.iml
+/modules.xml
+/contentModel.xml
+/projectSettingsUpdater.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/.idea.VAR.ExpressionEvaluator/.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>

.idea/.idea.VAR.ExpressionEvaluator/.idea/indexLayout.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>

.idea/.idea.VAR.ExpressionEvaluator/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

VAR.ExpressionEvaluator.Tests/ParserTests.cs

@@ -241,6 +241,19 @@ namespace VAR.ExpressionEvaluator.Tests
             Assert.Equal(4m, result);
         }
 
+        [Fact]
+        public void Functions__ZeroParameters()
+        {
+            EvaluationContext evaluationContex = new EvaluationContext();
+            evaluationContex.SetFunction("constant", (parameters) =>
+            {
+                return 9m;
+            });
+            string expression = "constant()";
+            object result = Parser.EvaluateString(expression, evaluationContex);
+            Assert.Equal(9m, result);
+        }
+
         #endregion Functions
 
         #region Strings
@@ -253,6 +266,14 @@ namespace VAR.ExpressionEvaluator.Tests
             Assert.Equal("Hello World", result);
         }
         
+        [Fact]
+        public void Strings__Contatenate_Hello_World_SimpleQuotes()
+        {
+            string expression = "'Hello' + ' ' +'World'";
+            object result = Parser.EvaluateString(expression);
+            Assert.Equal("Hello World", result);
+        }
+
         [Fact]
         public void Strings__Contatenate_Hello_World_WithVariables()
         {
@@ -664,7 +685,7 @@ namespace VAR.ExpressionEvaluator.Tests
 
         #endregion String coercions
 
-        #region Excepctions
+        #region Exceptions
 
         [Fact]
         public void Exceptions__HelloAtEnd__UnexpectedCharactersAtEndException()
@@ -848,6 +869,33 @@ namespace VAR.ExpressionEvaluator.Tests
         }
 
 
+        #endregion Exceptions
+
+        #region Misc
+
+        [Fact()]
+        public void Misc__MixedExpression_EqualsFalse()
+        {
+            EvaluationContext evaluationContex = new EvaluationContext();
+            evaluationContex.SetVariable("QI_86", null);
+            evaluationContex.SetVariable("QI_87", null);
+            evaluationContex.SetVariable("QI_104", null);
+            string expression = "( QI_86 = 0 Or QI_86 = null ) And ( QI_87 = 0 Or QI_87 = null ) And QI_104 > 0";
+            object result = Parser.EvaluateString(expression, evaluationContex);
+            Assert.False((bool?)result);
+        }
+
+        [Fact()]
+        public void Misc__ProductWithStringDecimals_EqualsFalse()
+        {
+            EvaluationContext evaluationContex = new EvaluationContext();
+            evaluationContex.SetVariable("$1109", "1933");
+            evaluationContex.SetVariable("$1150", "02.00000");
+            string expression = "$1109 * $1150";
+            object result = Parser.EvaluateString(expression, evaluationContex);
+            Assert.Equal(3866.00000M, result);
+        }
+
         #endregion Misc
     }
 }

VAR.ExpressionEvaluator/ExpressionNodes/ExpressionDivisionNode.cs

@@ -18,7 +18,7 @@ namespace VAR.ExpressionEvaluator
 
             if (leftValue is string)
             {
-                if (decimal.TryParse((string)leftValue, out decimal dec) == false)
+                if (decimal.TryParse((string)leftValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                 {
                     throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)leftValue));
                 }
@@ -26,7 +26,7 @@ namespace VAR.ExpressionEvaluator
             }
             if (rightValue is string)
             {
-                if (decimal.TryParse((string)rightValue, out decimal dec) == false)
+                if (decimal.TryParse((string)rightValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                 {
                     throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)rightValue));
                 }

VAR.ExpressionEvaluator/ExpressionNodes/ExpressionEqualsNode.cs

@@ -44,7 +44,7 @@
             // Decimal
             if (leftValue is string)
             {
-                if (decimal.TryParse((string)leftValue, out decimal dec) == false)
+                if (decimal.TryParse((string)leftValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                 {
                     leftValue = null;
                 }
@@ -55,7 +55,7 @@
             }
             if (rightValue is string)
             {
-                if (decimal.TryParse((string)rightValue, out decimal dec) == false)
+                if (decimal.TryParse((string)rightValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                 {
                     rightValue = null;
                 }
@@ -85,7 +85,7 @@
                     return null;
                 }
                 decimal decValue;
-                if (decimal.TryParse(text, out decValue))
+                if (decimal.TryParse(text, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decValue))
                 {
                     return decValue != 0;
                 }

VAR.ExpressionEvaluator/ExpressionNodes/ExpressionGreaterOrEqualThanNode.cs

@@ -24,7 +24,7 @@ namespace VAR.ExpressionEvaluator
                 }
                 else
                 {
-                    if (decimal.TryParse((string)leftValue, out decimal dec) == false)
+                    if (decimal.TryParse((string)leftValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                     {
                         throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)leftValue));
                     }
@@ -39,7 +39,7 @@ namespace VAR.ExpressionEvaluator
                 }
                 else
                 {
-                    if (decimal.TryParse((string)rightValue, out decimal dec) == false)
+                    if (decimal.TryParse((string)rightValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                     {
                         throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)rightValue));
                     }

VAR.ExpressionEvaluator/ExpressionNodes/ExpressionGreaterThanNode.cs

@@ -24,7 +24,7 @@ namespace VAR.ExpressionEvaluator
                 }
                 else
                 {
-                    if (decimal.TryParse((string)leftValue, out decimal dec) == false)
+                    if (decimal.TryParse((string)leftValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                     {
                         throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)leftValue));
                     }
@@ -39,7 +39,7 @@ namespace VAR.ExpressionEvaluator
                 }
                 else
                 {
-                    if (decimal.TryParse((string)rightValue, out decimal dec) == false)
+                    if (decimal.TryParse((string)rightValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                     {
                         throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)rightValue));
                     }

VAR.ExpressionEvaluator/ExpressionNodes/ExpressionLessOrEqualThanNode.cs

@@ -24,7 +24,7 @@ namespace VAR.ExpressionEvaluator
                 }
                 else
                 {
-                    if (decimal.TryParse((string)leftValue, out decimal dec) == false)
+                    if (decimal.TryParse((string)leftValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                     {
                         throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)leftValue));
                     }
@@ -39,7 +39,7 @@ namespace VAR.ExpressionEvaluator
                 }
                 else
                 {
-                    if (decimal.TryParse((string)rightValue, out decimal dec) == false)
+                    if (decimal.TryParse((string)rightValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                     {
                         throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)rightValue));
                     }

VAR.ExpressionEvaluator/ExpressionNodes/ExpressionLessThanNode.cs

@@ -24,7 +24,7 @@ namespace VAR.ExpressionEvaluator
                 }
                 else
                 {
-                    if (decimal.TryParse((string)leftValue, out decimal dec) == false)
+                    if (decimal.TryParse((string)leftValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                     {
                         throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)leftValue));
                     }
@@ -39,7 +39,7 @@ namespace VAR.ExpressionEvaluator
                 }
                 else
                 {
-                    if (decimal.TryParse((string)rightValue, out decimal dec) == false)
+                    if (decimal.TryParse((string)rightValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                     {
                         throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)rightValue));
                     }

VAR.ExpressionEvaluator/ExpressionNodes/ExpressionMinusNode.cs

@@ -18,7 +18,7 @@ namespace VAR.ExpressionEvaluator
 
             if (leftValue is string)
             {
-                if (decimal.TryParse((string)leftValue, out decimal dec) == false)
+                if (decimal.TryParse((string)leftValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                 {
                     throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)leftValue));
                 }
@@ -26,7 +26,7 @@ namespace VAR.ExpressionEvaluator
             }
             if (rightValue is string)
             {
-                if (decimal.TryParse((string)rightValue, out decimal dec) == false)
+                if (decimal.TryParse((string)rightValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                 {
                     throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)rightValue));
                 }

VAR.ExpressionEvaluator/ExpressionNodes/ExpressionMultiplyNode.cs

@@ -18,7 +18,7 @@ namespace VAR.ExpressionEvaluator
 
             if (leftValue is string)
             {
-                if (decimal.TryParse((string)leftValue, out decimal dec) == false)
+                if (decimal.TryParse((string)leftValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                 {
                     throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)leftValue));
                 }
@@ -26,7 +26,7 @@ namespace VAR.ExpressionEvaluator
             }
             if (rightValue is string)
             {
-                if (decimal.TryParse((string)rightValue, out decimal dec) == false)
+                if (decimal.TryParse((string)rightValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                 {
                     throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)rightValue));
                 }

VAR.ExpressionEvaluator/ExpressionNodes/ExpressionNumberNegateNode.cs

@@ -18,7 +18,7 @@ namespace VAR.ExpressionEvaluator
 
             if (value is string)
             {
-                if (decimal.TryParse((string)value, out decimal dec) == false)
+                if (decimal.TryParse((string)value, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
                 {
                     throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)value));
                 }

VAR.ExpressionEvaluator/Parser.cs

@@ -32,7 +32,7 @@ namespace VAR.ExpressionEvaluator
 
         #region Creator
 
-        private ITokenizer _tokenizer;
+        private readonly ITokenizer _tokenizer;
 
         public Parser(ITokenizer tokenizer)
         {
@@ -60,7 +60,7 @@ namespace VAR.ExpressionEvaluator
                     IExpressionNode rightNode = ParseRelations();
                     leftNode = new ExpressionBooleanAndNode(leftNode, rightNode);
                 }
-                if (_tokenizer.Token == Token.Or)
+                else if (_tokenizer.Token == Token.Or)
                 {
                     _tokenizer.NextToken();
                     IExpressionNode rightNode = ParseRelations();
@@ -84,7 +84,7 @@ namespace VAR.ExpressionEvaluator
                     IExpressionNode rightNode = ParsePlusAndMinus();
                     leftNode = new ExpressionEqualsNode(leftNode, rightNode);
                 }
-                if (_tokenizer.Token == Token.ExclusiveEquals)
+                else if (_tokenizer.Token == Token.ExclusiveEquals)
                 {
                     // TODO: Implement ExpressionExclusiveEqualsNode
                     _tokenizer.NextToken();
@@ -239,6 +239,8 @@ namespace VAR.ExpressionEvaluator
                 {
                     _tokenizer.NextToken();
                     var parameters = new List<IExpressionNode>();
+                    if (_tokenizer.Token != Token.ParenthesisEnd)
+                    {
                         while (true)
                         {
                             parameters.Add(ParseBooleanOp());
@@ -249,6 +251,7 @@ namespace VAR.ExpressionEvaluator
                             }
                             break;
                         }
+                    }
                     if (_tokenizer.Token != Token.ParenthesisEnd)
                     {
                         throw new MissingCloseParenthesisException();

VAR.ExpressionEvaluator/VAR.ExpressionEvaluator.csproj

@@ -8,7 +8,7 @@
   <PropertyGroup>
     <PackageId>VAR.ExpressionEvaluator</PackageId>
     <Title>VAR.ExpressionEvaluator</Title>
-    <Version>0.2.5</Version>
+    <Version>0.2.8</Version>
     <Description>Expression Evaluation Library</Description>
     <Authors>VAR</Authors>
     <Company>VAR</Company>