issue #11

Author: StefH

src/System.Linq.Dynamic.Core/ExpressionParser.cs

@@ -483,7 +483,9 @@ Expression ParseIn()
                     while (_token.id != TokenId.CloseParen)
                     {
                         NextToken();
-                        Expression right = ParsePrimary();
+
+                        //we need to parse unary expressions because otherwise 'in' clause will fail in use cases like 'in (-1, -1)' or 'in (!true)'
+                        Expression right = ParseUnary();
 
                         //check for direct type match
                         if (identifier.Type != right.Type)
@@ -752,13 +754,11 @@ Expression ParseMultiplicative()
         // -, !, not unary operators
         Expression ParseUnary()
         {
-            if (_token.id == TokenId.Minus || _token.id == TokenId.Exclamation ||
-                TokenIdentifierIs("not"))
+            if (_token.id == TokenId.Minus || _token.id == TokenId.Exclamation || TokenIdentifierIs("not"))
             {
                 Token op = _token;
                 NextToken();
-                if (op.id == TokenId.Minus && (_token.id == TokenId.IntegerLiteral ||
-                    _token.id == TokenId.RealLiteral))
+                if (op.id == TokenId.Minus && (_token.id == TokenId.IntegerLiteral || _token.id == TokenId.RealLiteral))
                 {
                     _token.text = "-" + _token.text;
                     _token.pos = op.pos;
@@ -870,12 +870,14 @@ Expression ParseIntegerLiteral()
                 ulong value;
                 if (!ulong.TryParse(text, out value))
                     throw ParseError(Res.InvalidIntegerLiteral, text);
+
                 NextToken();
                 if (!string.IsNullOrEmpty(qualifier))
                 {
                     if (qualifier == "U") return CreateLiteral((uint)value, text);
                     if (qualifier == "L") return CreateLiteral((long)value, text);
-                    else if (qualifier == "UL") return CreateLiteral(value, text);
+
+                    return CreateLiteral(value, text);
                 }
                 if (value <= int.MaxValue) return CreateLiteral((int)value, text);
                 if (value <= uint.MaxValue) return CreateLiteral((uint)value, text);
@@ -887,13 +889,14 @@ Expression ParseIntegerLiteral()
                 long value;
                 if (!long.TryParse(text, out value))
                     throw ParseError(Res.InvalidIntegerLiteral, text);
+
                 NextToken();
                 if (!string.IsNullOrEmpty(qualifier))
                 {
                     if (qualifier == "L")
                         return CreateLiteral(value, text);
-                    else
-                        throw ParseError(Res.InvalidIntegerLiteral, qualifier);
+
+                    throw ParseError(Res.MinusCannotBeAppliedToUnsignedInteger);
                 }
 
                 if (value <= int.MaxValue) return CreateLiteral((int)value, text);

src/System.Linq.Dynamic.Core/Res.cs

@@ -8,6 +8,7 @@ internal static class Res
         public const string InvalidCharacterLiteral = "Character literal must contain exactly one character";
         public const string InvalidIntegerLiteral = "Invalid integer literal '{0}'";
         public const string InvalidIntegerQualifier = "Invalid integer literal qualifier '{0}'";
+        public const string MinusCannotBeAppliedToUnsignedInteger = "'-' cannot be applied to unsigned integers.";
         public const string InvalidRealLiteral = "Invalid real literal '{0}'";
         public const string UnknownIdentifier = "Unknown identifier '{0}'";
         public const string NoItInScope = "No 'it' is in scope";

test/System.Linq.Dynamic.Core.Tests/ExpressionTests.cs

@@ -97,11 +97,11 @@ public void ExpressionTests_IntegerQualifiers_Negative()
 
             //Act
             var resultL = valuesL.Where("it <= -2L").ToDynamicArray<long>();
-            //var resultIn = valuesL.Where("it in (-2L, -3L)").ToDynamicArray<long>();
+            var resultIn = valuesL.Where("it in (-2L, -3L)").ToDynamicArray<long>();
 
             //Assert
             Assert.Equal(resultValuesL.ToArray(), resultL);
-            // Assert.Equal(resultValuesL.ToArray(), resultIn);
+            Assert.Equal(resultValuesL.ToArray(), resultIn);
         }
 
         [Fact]