Improved support for block comments.

Author: RyanLamansky

SqlServerSimulator.Tests/SimpleCommandTests.cs

@@ -107,8 +107,23 @@ public void SingleLineCommentWithCarriageReturnCommand()
     }
 
     [TestMethod]
-    public void BlockComment()
+    [DataRow("/* */")]
+    [DataRow("/**/")]
+    [DataRow("/***/")]
+    [DataRow("/** **/")]
+    [DataRow("/*\r*/")]
+    [DataRow("/*\n*/")]
+    [DataRow("/*\r\n*/")]
+    public void BlockComment(string comment)
     {
-        AreEqual(-1, new Simulation().ExecuteNonQuery("/* */"));
+        IsNull(new Simulation().ExecuteScalar($"{comment}"));
+        AreEqual(1, new Simulation().ExecuteScalar<int>($"select 1 {comment}"));
+        AreEqual(2, new Simulation().ExecuteScalar<int>($"select 2{comment}"));
+        AreEqual(3, new Simulation().ExecuteScalar<int>($"{comment}select 3"));
+        AreEqual(4, new Simulation().ExecuteScalar<int>($"{comment} select 4"));
+        AreEqual(5, new Simulation().ExecuteScalar<int>($"select{comment}5"));
+        AreEqual(6, new Simulation().ExecuteScalar<int>($"select {comment}6"));
+        AreEqual(7, new Simulation().ExecuteScalar<int>($"select{comment} 7"));
+        AreEqual(8, new Simulation().ExecuteScalar<int>($"select {comment} 8"));
     }
 }

SqlServerSimulator/Parser/ParserContext.cs

@@ -121,12 +121,22 @@ public void MoveNextRequired()
             throw SimulatedSqlException.SyntaxErrorNear(previous);
     }
 
+    /// <summary>
+    /// Updates <see cref="Token"/> with the next usable token in <see cref="commandText"/>.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="Whitespace"/> and <see cref="Comment"/> tokens are skipped.
+    /// <see cref="index"/> is updated to the position of the next token.
+    /// </remarks>
+    /// <returns>True if another token was found, otherwise false.</returns>
     private bool MoveNext()
     {
         while (Tokenizer.NextToken(commandText, ref index) is Token token)
         {
             if (token is Whitespace)
                 continue;
+            if (token is Comment)
+                continue;
 
 #if DEBUG
             tokens.Add(token);

SqlServerSimulator/Parser/Tokenizer.cs

@@ -149,7 +149,7 @@ private static Token ParseForwardSlashOrComment(string command, ref int index)
         while (++index < command.Length)
         {
             if (command[index] == '*' && command.Length >= index + 2 && command[index + 1] == '/')
-                return new Comment(command, start, index += 2);
+                return new Comment(command, start, index++ - start);
         }
 
         throw SimulatedSqlException.MissingEndCommentMark();

SqlServerSimulator/Simulation.cs

@@ -36,9 +36,6 @@ internal IEnumerable<SimulatedStatementOutcome> CreateResultSetsForCommand(Simul
         {
             switch (context.Token)
             {
-                case Comment:
-                    continue;
-
                 case Operator { Character: ';' }:
                     continue;