Merge pull request stadelmanma#154 from codee-com/upstream-grammar-improvements

Improve parsing of preprocessor comments and data statements

Author: stadelmanma

grammar.js

@@ -68,6 +68,7 @@ module.exports = grammar({
     // preprocessor statements
     /\s|\\\r?\n/,
     $.comment,
+    $.multiline_preproc_comment,
     '&',
   ],
 
@@ -241,7 +242,8 @@ module.exports = grammar({
       ')',
     ),
 
-    preproc_comment: $ => /\/\*.*\*\//,
+    inline_preproc_comment: $ => /\/\/.*/,
+    multiline_preproc_comment: $ => /\/\*([^*]|\*+[^*/])*\*+\//,
 
     preproc_binary_expression: $ => {
       const table = [
@@ -1240,7 +1242,9 @@ module.exports = grammar({
     data_value: $ => seq(
       '/',
       commaSep1(seq(
-        optional(prec(1, seq(field('repeat', $.number_literal), '*'))),
+        optional(prec(1,
+          seq(field('repeat', choice($.number_literal, $.identifier)), '*')
+        )),
         choice(
           $.number_literal,
           $.complex_literal,
@@ -2436,37 +2440,51 @@ function preprocIf(suffix, content, precedence = 0) {
     );
   }
 
+  /**
+    *
+    * @param {GrammarSymbols<string>} $
+    *
+    * @return {ChoiceRule}
+    *
+    */
+  function preprocComment($) {
+    return choice(
+      $.inline_preproc_comment,
+      $.multiline_preproc_comment,
+    );
+  }
+
   return {
     ['preproc_if' + suffix]: $ => prec(precedence, seq(
       preprocessor('if'),
       field('condition', $._preproc_expression),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
       '\n',
       content($),
       field('alternative', optional(alternativeBlock($))),
       preprocessor('endif'),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
     )),
 
     ['preproc_ifdef' + suffix]: $ => prec(precedence, seq(
       choice(preprocessor('ifdef'), preprocessor('ifndef')),
       field('name', $.identifier),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
       content($),
       field('alternative', optional(alternativeBlock($))),
       preprocessor('endif'),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
     )),
 
     ['preproc_else' + suffix]: $ => prec(precedence, seq(
       preprocessor('else'),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
       content($),
     )),
 
     ['preproc_elif' + suffix]: $ => prec(precedence, seq(
       preprocessor('elif'),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
       field('condition', $._preproc_expression),
       '\n',
       content($),
@@ -2476,7 +2494,7 @@ function preprocIf(suffix, content, precedence = 0) {
     ['preproc_elifdef' + suffix]: $ => prec(precedence, seq(
       choice(preprocessor('elifdef'), preprocessor('elifndef')),
       field('name', $.identifier),
-      optional($.preproc_comment),
+      optional(preprocComment($)),
       content($),
       field('alternative', optional(alternativeBlock($))),
     )),