Allow 1C-style comments

.gitignore

@@ -9,4 +9,5 @@ packages/
 *.nupkg
 *.designer.cs
 *.Designer.cs
-.idea/
+*.orig
+*.rej

Simple1C/Impl/Sql/SqlAccess/Parsing/QueryGrammar.cs

@@ -30,10 +30,9 @@ public QueryGrammar()
             : base(false)
         {
             LanguageFlags = LanguageFlags.CreateAst;
-            var comment = new CommentTerminal("comment", "/*", "*/");
-            var lineComment = new CommentTerminal("line_comment", "--", "\n", "\r\n");
-            NonGrammarTerminals.Add(comment);
-            NonGrammarTerminals.Add(lineComment);
+            NonGrammarTerminals.Add(new CommentTerminal("sql_style_comment", "/*", "*/"));
+            NonGrammarTerminals.Add(new CommentTerminal("sql_style_line_comment", "--", "\n", "\r\n"));
+            NonGrammarTerminals.Add(new CommentTerminal("1c_commene", "//", "\n", "\r\n"));
 
             not = Transient("not", ToTerm("NOT") | "НЕ");
             by = NonTerminal("by", ToTerm("by") | "ПО", TermFlags.NoAstNode);
@@ -102,11 +101,9 @@ public QueryGrammar()
             MarkPunctuation(asOpt);
             AddOperatorReportGroup("operator");
             AddToNoReportGroup("as", "КАК");
-
             Root = root;
         }
 
-
         private static SelectFieldExpression ToSelectFieldExpression(ParseTreeNode n)
         {
             return new SelectFieldExpression

Tests/Sql/ParserTest.cs

@@ -47,8 +47,9 @@ public void CanSelectFieldWithAggregateFunctionName()
         [Test]
         public void IgnoreComments()
         {
-            var selectClause = ParseSelect("select a/*,b*/ from testTable --where b > 10");
+            var selectClause = ParseSelect("select a/*,b*/ from testTable --where b > 10\r\n //group by a");
             Assert.That(selectClause.WhereExpression, Is.Null);
+            Assert.That(selectClause.GroupBy, Is.Null);
             Assert.That(selectClause.Fields.Count, Is.EqualTo(1));
             var columnReference = selectClause.Fields[0].Expression as ColumnReferenceExpression;
             Assert.IsNotNull(columnReference);