0.2.8

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2020 Valeriano Alfonso Rodriguez
+Copyright (c) 2019-2021 Valeriano Alfonso Rodriguez
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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()
         {
@@ -547,6 +568,11 @@ namespace VAR.ExpressionEvaluator.Tests
             Assert.False((bool?)Parser.EvaluateString("true and false"));
             Assert.True((bool?)Parser.EvaluateString("true and true"));
 
+            Assert.False((bool?)Parser.EvaluateString("False And False"));
+            Assert.False((bool?)Parser.EvaluateString("False And True"));
+            Assert.False((bool?)Parser.EvaluateString("True And False"));
+            Assert.True((bool?)Parser.EvaluateString("True And True"));
+
             Assert.False((bool?)Parser.EvaluateString("false && false"));
             Assert.False((bool?)Parser.EvaluateString("false && true"));
             Assert.False((bool?)Parser.EvaluateString("true && false"));
@@ -561,6 +587,11 @@ namespace VAR.ExpressionEvaluator.Tests
             Assert.True((bool?)Parser.EvaluateString("true or false"));
             Assert.True((bool?)Parser.EvaluateString("true or true"));
 
+            Assert.False((bool?)Parser.EvaluateString("False Or False"));
+            Assert.True((bool?)Parser.EvaluateString("False Or True"));
+            Assert.True((bool?)Parser.EvaluateString("True Or False"));
+            Assert.True((bool?)Parser.EvaluateString("True Or True"));
+
             Assert.False((bool?)Parser.EvaluateString("false || false"));
             Assert.True((bool?)Parser.EvaluateString("false || true"));
             Assert.True((bool?)Parser.EvaluateString("true || false"));
@@ -577,7 +608,6 @@ namespace VAR.ExpressionEvaluator.Tests
             Assert.False((bool?)Parser.EvaluateString("not true"));
         }
 
-
         #endregion BooleanOps
 
         #region Null value
@@ -621,7 +651,41 @@ namespace VAR.ExpressionEvaluator.Tests
 
         #endregion
 
-        #region Excepctions
+        #region String coercions
+
+        [Fact()]
+        public void StringCoercions__Var1NullEqualsStringEmpty_EqualsTrue()
+        {
+            EvaluationContext evaluationContex = new EvaluationContext();
+            evaluationContex.SetVariable("v1", null);
+            string expression = "v1 = \"\"";
+            object result = Parser.EvaluateString(expression, evaluationContex);
+            Assert.True((bool?)result);
+        }
+
+        [Fact()]
+        public void StringCoercions__Var1TrueStringEqualsTrue_EqualsTrue()
+        {
+            EvaluationContext evaluationContex = new EvaluationContext();
+            evaluationContex.SetVariable("v1", "True");
+            string expression = "v1 = true";
+            object result = Parser.EvaluateString(expression, evaluationContex);
+            Assert.True((bool?)result);
+        }
+
+        [Fact()]
+        public void StringCoercions__Var1FalseStringEqualsFalse_EqualsTrue()
+        {
+            EvaluationContext evaluationContex = new EvaluationContext();
+            evaluationContex.SetVariable("v1", "False");
+            string expression = "v1 = false";
+            object result = Parser.EvaluateString(expression, evaluationContex);
+            Assert.True((bool?)result);
+        }
+
+        #endregion String coercions
+
+        #region Exceptions
 
         [Fact]
         public void Exceptions__HelloAtEnd__UnexpectedCharactersAtEndException()
@@ -805,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

@@ -1,6 +1,4 @@
-using System;
-
-namespace VAR.ExpressionEvaluator
+namespace VAR.ExpressionEvaluator
 {
     public class ExpressionEqualsNode : ExpressionBinaryNode
     {
@@ -9,49 +7,17 @@ namespace VAR.ExpressionEvaluator
         {
         }
 
-        private static object EqualsOp(object leftValue, object rightValue)
+        public static object EqualsOp(object leftValue, object rightValue)
         {
-            if (leftValue is string && rightValue is string)
-            {
-                return string.Compare((string)leftValue, (string)rightValue) == 0;
-            }
-
-            if ((leftValue is string && rightValue == null) || (leftValue == null && rightValue is string))
-            {
-                return false;
-            }
-
-            if (leftValue is string)
-            {
-                if (string.IsNullOrEmpty((string)leftValue))
+            // Null
+            if (leftValue is string && string.IsNullOrEmpty(leftValue as string))
             {
                 leftValue = null;
             }
-                else
+            if (rightValue is string && string.IsNullOrEmpty(rightValue as string))
             {
-                    if (decimal.TryParse((string)leftValue, out decimal dec) == false)
-                    {
-                        throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)leftValue));
+                rightValue = null;
             }
-                    leftValue = dec;
-                }
-            }
-            if (rightValue is string)
-            {
-                if (string.IsNullOrEmpty((string)rightValue))
-                {
-                    leftValue = null;
-                }
-                else
-                {
-                    if (decimal.TryParse((string)rightValue, out decimal dec) == false)
-                    {
-                        throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)rightValue));
-                    }
-                    rightValue = dec;
-                }
-            }
-
             if (leftValue == null && rightValue == null)
             {
                 return true;
@@ -61,11 +27,85 @@ namespace VAR.ExpressionEvaluator
                 return false;
             }
 
+            // String
+            if (leftValue is string && rightValue is string)
+            {
+                return string.Compare((string)leftValue, (string)rightValue) == 0;
+            }
+
+            // Bool
+            if (leftValue is bool || rightValue is bool)
+            {
+                bool? leftBool = ConvertToNullableBool(leftValue);
+                bool? rightBool = ConvertToNullableBool(rightValue);
+                return leftBool == rightBool;
+            }
+
+            // Decimal
+            if (leftValue is string)
+            {
+                if (decimal.TryParse((string)leftValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
+                {
+                    leftValue = null;
+                }
+                else
+                {
+                    leftValue = dec;
+                }
+            }
+            if (rightValue is string)
+            {
+                if (decimal.TryParse((string)rightValue, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decimal dec) == false)
+                {
+                    rightValue = null;
+                }
+                else
+                {
+                    rightValue = dec;
+                }
+            }
             if ((leftValue is decimal) == false || (rightValue is decimal) == false)
             {
-                throw new Exception("Can't compare non decimal values");
+                return false;
             }
             return (decimal)leftValue == (decimal)rightValue;
         }
+
+        private static bool? ConvertToNullableBool(object value)
+        {
+            if (value is bool)
+            {
+                return (bool)value;
+            }
+            if (value is string)
+            {
+                string text = value as string;
+                if (string.IsNullOrEmpty(text))
+                {
+                    return null;
+                }
+                decimal decValue;
+                if (decimal.TryParse(text, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out decValue))
+                {
+                    return decValue != 0;
+                }
+                string textLower = text.ToLower();
+                if (textLower == "false" || textLower == "no" || textLower == "ez" || textLower == "non" || textLower == "nein")
+                {
+                    return false;
+                }
+                if (textLower == "true" || textLower == "si" || textLower == "sí" || textLower == "yes" || textLower == "bai" || textLower == "oui" || textLower == "ja")
+                {
+                    return true;
+                }
+
+                return null;
+            }
+            if (value is decimal)
+            {
+                return ((decimal)value) != 0;
+            }
+            return false;
+        }
     }
 }

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/ExpressionNotEqualsNode.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace VAR.ExpressionEvaluator
+namespace VAR.ExpressionEvaluator
 {
     public class ExpressionNotEqualsNode : ExpressionBinaryNode
     {
@@ -11,56 +9,8 @@ namespace VAR.ExpressionEvaluator
 
         private static object NotEqualsOp(object leftValue, object rightValue)
         {
-            if (leftValue is string && rightValue is string)
-            {
-                return string.Compare((string)leftValue, (string)rightValue) != 0;
-            }
-
-            if (leftValue is string)
-            {
-                if (string.IsNullOrEmpty((string)leftValue))
-                {
-                    leftValue = null;
-                }
-                else
-                {
-                    if (decimal.TryParse((string)leftValue, out decimal dec) == false)
-                    {
-                        throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)leftValue));
-                    }
-                    leftValue = dec;
-                }
-            }
-            if (rightValue is string)
-            {
-                if (string.IsNullOrEmpty((string)rightValue))
-                {
-                    leftValue = null;
-                }
-                else
-                {
-                    if (decimal.TryParse((string)rightValue, out decimal dec) == false)
-                    {
-                        throw new Exception(string.Format("Can't convert to decimal string value \"{0}\"", (string)rightValue));
-                    }
-                    rightValue = dec;
-                }
-            }
-
-            if (leftValue == null && rightValue == null)
-            {
-                return false;
-            }
-            if (leftValue == null || rightValue == null)
-            {
-                return true;
-            }
-
-            if ((leftValue is decimal) == false || (rightValue is decimal) == false)
-            {
-                throw new Exception("Can't compare non decimal values");
-            }
-            return (decimal)leftValue != (decimal)rightValue;
+            bool result = (bool)ExpressionEqualsNode.EqualsOp(leftValue, rightValue);
+            return !result;
         }
     }
 }

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,6 +84,13 @@ namespace VAR.ExpressionEvaluator
                     IExpressionNode rightNode = ParsePlusAndMinus();
                     leftNode = new ExpressionEqualsNode(leftNode, rightNode);
                 }
+                else if (_tokenizer.Token == Token.ExclusiveEquals)
+                {
+                    // TODO: Implement ExpressionExclusiveEqualsNode
+                    _tokenizer.NextToken();
+                    IExpressionNode rightNode = ParsePlusAndMinus();
+                    leftNode = new ExpressionEqualsNode(leftNode, rightNode);
+                }
                 else if (_tokenizer.Token == Token.NotEquals)
                 {
                     _tokenizer.NextToken();
@@ -232,6 +239,8 @@ namespace VAR.ExpressionEvaluator
                 {
                     _tokenizer.NextToken();
                     var parameters = new List<IExpressionNode>();
+                    if (_tokenizer.Token != Token.ParenthesisEnd)
+                    {
                         while (true)
                         {
                             parameters.Add(ParseBooleanOp());
@@ -242,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.4</Version>
+    <Version>0.2.8</Version>
     <Description>Expression Evaluation Library</Description>
     <Authors>VAR</Authors>
     <Company>VAR</Company>