26 Use logical and/or operations (#27)

and/or operations now use logical rather than bitwise logic

Co-authored-by: Alex Davies <[email protected]>

Author: alex-davies

src/StringToExpression/Languages/ODataFilterLanguage.cs

@@ -297,12 +297,12 @@ protected virtual IEnumerable<GrammerDefinition> LogicalOperatorDefinitions()
                     name:"AND",
                     regex: @"\b(and)\b",
                     orderOfPrecedence:17,
-                    expressionBuilder: (left,right) => Expression.And(left, right)),
+                    expressionBuilder: (left,right) => Expression.AndAlso(left, right)),
                 new BinaryOperatorDefinition(
                     name:"OR",
                     regex: @"\b(or)\b",
                     orderOfPrecedence:18,
-                    expressionBuilder: (left,right) => Expression.Or(left, right)),
+                    expressionBuilder: (left,right) => Expression.OrElse(left, right)),
 
                 new UnaryOperatorDefinition(
                     name:"NOT",

tests/StringToExpression.Test/Languages/ODataFilter/ODataTests.cs

@@ -1,4 +1,6 @@
-using StringToExpression.LanguageDefinitions;
+using StringToExpression.Exceptions;
+using StringToExpression.LanguageDefinitions;
+using StringToExpression.Test.Fixtures;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -70,5 +72,17 @@ public void When_functions_should_evaluate(string query, bool expectedMatch)
             Assert.Equal(expectedMatch, compiled(null));
 
         }
+
+        [Theory]
+        [InlineData("(6 and 5) eq 4")]
+        [InlineData("(6 or 5) eq 7")]
+        [InlineData("'leet' eq 1337")]
+        public void When_invalid_operations_should_throw(string query)
+        {
+            Assert.Throws<OperationInvalidException>(() =>
+            {
+                new ODataFilterLanguage().Parse<LinqToQuerystringTestDataFixture.ConcreteClass>(query);
+            });
+        }
     }
 }