More validations and tests.

Author: DavidCizek

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

@@ -1213,17 +1213,9 @@ Expression ParseNew()
             if (_textParser.CurrentToken.Id == TokenId.OpenBracket)
             {
                 _textParser.NextToken();
-                if (_textParser.CurrentToken.Id != TokenId.CloseBracket)
-                {
-                    throw ParseError(Res.CloseBracketExpected);
-                }
-
+                _textParser.ValidateToken(TokenId.CloseBracket, Res.CloseBracketExpected);
                 _textParser.NextToken();
-                if (_textParser.CurrentToken.Id != TokenId.OpenCurlyParen)
-                {
-                    throw ParseError(Res.OpenCurlyParenExpected);
-                }
-
+                _textParser.ValidateToken(TokenId.OpenCurlyParen, Res.OpenCurlyParenExpected);
                 arrayInitializer = true;
             }
 

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

@@ -42,6 +42,7 @@ internal static class Res
         public const string UnterminatedStringLiteral = "Unterminated string literal";
         public const string InvalidCharacter = "Syntax error '{0}'";
         public const string DigitExpected = "Digit expected";
+        public const string HexCharExpected = "Hexadecimal character expected";
         public const string SyntaxError = "Syntax error";
         public const string TokenExpected = "{0} expected";
         public const string ParseExceptionFormat = "{0} (at index {1})";

src/System.Linq.Dynamic.Core/Tokenizer/TextParser.cs

@@ -293,6 +293,8 @@ public void NextToken()
                         bool hexInteger = false;
                         if (_ch == 'X' || _ch == 'x')
                         {
+                            NextChar();
+                            ValidateHexChar();
                             do
                             {
                                 NextChar();
@@ -381,6 +383,11 @@ private void ValidateDigit()
             if (!char.IsDigit(_ch)) throw ParseError(_textPos, Res.DigitExpected);
         }
 
+        private void ValidateHexChar()
+        {
+            if (!IsHexChar(_ch)) throw ParseError(_textPos, Res.HexCharExpected);
+        }
+
         private Exception ParseError(string format, params object[] args)
         {
             return ParseError(CurrentToken.Pos, format, args);

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

@@ -30,6 +30,9 @@ public void ExpressionTests_ArrayInitializer()
             Assert.Equal(result2.Cast<int>(), list.SelectMany(item => new[] { item + 1, item + 2 }));
             Assert.Equal(result3.Cast<long>(), list.SelectMany(item => new long[] { item + 1, (byte)(item + 2), (short)(item + 3) }));
             Assert.Equal(result4.SelectMany("it").Cast<int>(), list.SelectMany(item => new[] { new[] { item + 1, item + 2 }, new[] { item + 3, item + 4 } }).SelectMany(item => item));
+
+            Assert.Throws<ParseException>(() => list.AsQueryable().SelectMany("new[ {}"));
+            Assert.Throws<ParseException>(() => list.AsQueryable().SelectMany("new] {}"));
         }
 
         [Fact]
@@ -510,6 +513,9 @@ public void ExpressionTests_HexadecimalInteger()
             Assert.Equal(values.Select(it => it * 0x1234567890abcdefL), resultL);
             Assert.Equal(values.Select(it => it * -0x0ABCDEF987654321L), resultLNeg);
             Assert.Equal(values.Select(it => (ulong)it * 0x1000abEFUL), resultUL);
+
+            Assert.Throws<ParseException>(() => values.AsQueryable().Where("it < 0x 11a"));
+            Assert.Throws<ParseException>(() => values.AsQueryable().Where("it < 11a"));
         }
 
         [Fact]

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

@@ -41,6 +41,8 @@ public void TextParser_Parse_RealLiteral()
             Check.That(textParser.CurrentToken.Id).Equals(TokenId.RealLiteral);
             Check.That(textParser.CurrentToken.Pos).Equals(1);
             Check.That(textParser.CurrentToken.Text).Equals("1.0E25");
+
+            Check.ThatCode(() => new TextParser("1.e25")).Throws<ParseException>();
         }
 
         [Fact]
@@ -113,6 +115,8 @@ public void TextParser_Parse_HexadecimalIntegerLiteral()
             Check.That(textParser.CurrentToken.Id).Equals(TokenId.IntegerLiteral);
             Check.That(textParser.CurrentToken.Pos).Equals(1);
             Check.That(textParser.CurrentToken.Text).Equals("0x1234567890AbCdEfL");
+
+            Check.ThatCode(() => new TextParser("0xz1234")).Throws<ParseException>();
         }
 
         [Fact]
@@ -151,11 +155,12 @@ public void TextParser_Parse_Slash()
             Check.That(textParser.CurrentToken.Text).Equals("/");
         }
 
-        // [Fact]
+        [Fact]
         public void TextParser_Parse_ThrowsException()
         {
             // Assign + Act + Assert
-            Check.ThatCode(() => { new TextParser("ಬಾ"); }).Throws<ParseException>();
+            //Check.ThatCode(() => { new TextParser("ಬಾ"); }).Throws<ParseException>();
+            Check.ThatCode(() => { new TextParser(";"); }).Throws<ParseException>();
         }
     }
 }