Merge pull request #54 from delegateas/tst/fixes

Tst/fixes

Author: thygesteffensen

ExpressionEngine/ExpressionGrammar.cs

@@ -28,6 +28,11 @@ public ExpressionGrammar(IEnumerable<IFunction> functions)
                         constString => new ConstantRule(new ValueContainer(constString, true))
                     );
 
+            Parser<IRule> decimalInvariant =
+                Parse.DecimalInvariant.Select(x => new ConstantRule(new ValueContainer(x, true)));
+
+            Parser<IRule> number = decimalInvariant.Or(integer);
+
             Parser<string> simpleString =
                 Parse.AnyChar.Except(Parse.Char('@')).AtLeastOnce().Text();
 
@@ -71,7 +76,7 @@ from index in Parse.AnyChar.Except(
                 select new IndexRule(new StringLiteralRule(new ValueContainer(index)), nll);
 
             Parser<IRule> argument =
-                from arg in Parse.Ref(() => _method.Or(stringLiteral).Or(integer).Or(boolean))
+                from arg in Parse.Ref(() => _method.Or(stringLiteral).Or(number).Or(boolean))
                 select arg;
 
             Parser<IOption<IEnumerable<IRule>>> arguments =

ExpressionEngine/FlowRunnerDependencyExtension.cs

@@ -85,7 +85,7 @@ private static void AddLogicalComparisonFunctions(IServiceCollection services)
 
         private static void AddMathFunctions(IServiceCollection services)
         {
-            services.AddTransient<IFunction, AndFunction>();
+            services.AddTransient<IFunction, AddFunction>();
             services.AddTransient<IFunction, DivFunction>();
             services.AddTransient<IFunction, MaxFunction>();
             services.AddTransient<IFunction, MinFunction>();

ExpressionEngine/ValueContainer.cs

@@ -24,16 +24,16 @@ public ValueContainer(string value, bool tryToParse = false)
 
             if (tryToParse)
             {
-                if (int.TryParse(value, out var iValue))
-                {
-                    _value = iValue;
-                    _type = ValueType.Integer;
-                }
-                else if (float.TryParse(value, out var fValue))
+                if (value.Contains('.') && double.TryParse(value, out var fValue))
                 {
                     _value = fValue;
                     _type = ValueType.Float;
                 }
+                else if (int.TryParse(value, out var iValue))
+                {
+                    _value = iValue;
+                    _type = ValueType.Integer;
+                }
                 else if (bool.TryParse(value, out var bValue))
                 {
                     _value = bValue;
@@ -236,37 +236,29 @@ public int CompareTo(object? obj)
                 throw new InvalidOperationException("Cannot compare these two...");
 
             var other = (ValueContainer) obj;
-            if (other.Type() != _type)
-            {
-                // TODO: Fix comparison
 
-                throw new InvalidOperationException("Cannot compare two different ValueContainers");
-            }
-            else
+            switch (_value)
             {
-                switch (_value)
-                {
-                    case bool b:
-                        return b.CompareTo(other._value);
-                    case int i:
-                        return i.CompareTo(other._value);
-                    case float f:
-                        return f.CompareTo(other._value);
-                    case double f:
-                        return f.CompareTo(other._value);
-                    case decimal f:
-                        return f.CompareTo(other._value);
-                    case string s:
-                        return s.CompareTo(other._value);
-                    case Dictionary<string, ValueContainer> d:
-                        var d2 = (Dictionary<string, ValueContainer>) other._value;
-                        return d.Count - d2.Count;
-                    case IEnumerable<ValueContainer> l:
-                        var l2 = (IEnumerable<ValueContainer>) other._value;
-                        return l.Count() - l2.Count();
-                    default:
-                        return -1;
-                }
+                case bool b:
+                    return b.CompareTo(other._value);
+                case int i:
+                    return i.CompareTo(other._value);
+                case float f:
+                    return f.CompareTo(other._value);
+                case double f:
+                    return f.CompareTo(other._value);
+                case decimal f:
+                    return f.CompareTo(other._value);
+                case string s:
+                    return s.CompareTo(other._value);
+                case Dictionary<string, ValueContainer> d:
+                    var d2 = (Dictionary<string, ValueContainer>) other._value;
+                    return d.Count - d2.Count;
+                case IEnumerable<ValueContainer> l:
+                    var l2 = (IEnumerable<ValueContainer>) other._value;
+                    return l.Count() - l2.Count();
+                default:
+                    return -1;
             }
         }
 
@@ -357,7 +349,8 @@ public static async ValueTask<ValueContainer> CreateValueContainerFromJToken(JTo
             return v;
         }
 
-        private static async ValueTask<ValueContainer> JsonToValueContainer(JToken json, IExpressionEngine expressionEngine)
+        private static async ValueTask<ValueContainer> JsonToValueContainer(JToken json,
+            IExpressionEngine expressionEngine)
         {
             switch (json)
             {

Test/ParserTest.cs

@@ -90,6 +90,11 @@ public async Task TestSimpleInput(TestInput testInput)
             new TestInput("@{toLower(\'Hej med dig \')}@{trim(\' Mads \')}", new ValueContainer("hej med dig Mads")),
             new TestInput("@@1", new ValueContainer("@1")),
             new TestInput("aes", new ValueContainer("aes")),
+            new TestInput("@greater(11, 10)", new ValueContainer(true)),
+            new TestInput("@greater(10.1, 10.0)", new ValueContainer(true)),
+            new TestInput("@greater(10.1, 10)", new ValueContainer(true)),
+            new TestInput("@add(10,0.5)", new ValueContainer(10.5)),
+            
         };
 
         #endregion