Allow identifiers in data_value's repeats

Author: inaki-amatria

grammar.js

@@ -1240,7 +1240,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,

src/grammar.json

@@ -13933,8 +13933,17 @@
                             "type": "FIELD",
                             "name": "repeat",
                             "content": {
-                              "type": "SYMBOL",
-                              "name": "number_literal"
+                              "type": "CHOICE",
+                              "members": [
+                                {
+                                  "type": "SYMBOL",
+                                  "name": "number_literal"
+                                },
+                                {
+                                  "type": "SYMBOL",
+                                  "name": "identifier"
+                                }
+                              ]
                             }
                           },
                           {
@@ -14018,8 +14027,17 @@
                                   "type": "FIELD",
                                   "name": "repeat",
                                   "content": {
-                                    "type": "SYMBOL",
-                                    "name": "number_literal"
+                                    "type": "CHOICE",
+                                    "members": [
+                                      {
+                                        "type": "SYMBOL",
+                                        "name": "number_literal"
+                                      },
+                                      {
+                                        "type": "SYMBOL",
+                                        "name": "identifier"
+                                      }
+                                    ]
                                   }
                                 },
                                 {

src/node-types.json

@@ -1826,6 +1826,10 @@
         "multiple": true,
         "required": false,
         "types": [
+          {
+            "type": "identifier",
+            "named": true
+          },
           {
             "type": "number_literal",
             "named": true

src/parser.c

@@ -546329,7 +546329,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_string_literal] = STATE(5676),
     [sym_coarray_expression] = STATE(4543),
     [sym_conditional_expression] = STATE(4543),
-    [sym_identifier] = STATE(5676),
+    [sym_identifier] = STATE(5679),
     [anon_sym_LPAREN2] = ACTIONS(17),
     [anon_sym_PLUS] = ACTIONS(5865),
     [anon_sym_DASH] = ACTIONS(5865),
@@ -547185,7 +547185,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_string_literal] = STATE(5386),
     [sym_coarray_expression] = STATE(4543),
     [sym_conditional_expression] = STATE(4543),
-    [sym_identifier] = STATE(5386),
+    [sym_identifier] = STATE(5387),
     [anon_sym_LPAREN2] = ACTIONS(17),
     [anon_sym_PLUS] = ACTIONS(5865),
     [anon_sym_DASH] = ACTIONS(5865),
@@ -547506,7 +547506,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_string_literal] = STATE(5428),
     [sym_coarray_expression] = STATE(4543),
     [sym_conditional_expression] = STATE(4543),
-    [sym_identifier] = STATE(5428),
+    [sym_identifier] = STATE(5429),
     [anon_sym_LPAREN2] = ACTIONS(17),
     [anon_sym_PLUS] = ACTIONS(5865),
     [anon_sym_DASH] = ACTIONS(5865),
@@ -547613,7 +547613,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_string_literal] = STATE(5484),
     [sym_coarray_expression] = STATE(4543),
     [sym_conditional_expression] = STATE(4543),
-    [sym_identifier] = STATE(5484),
+    [sym_identifier] = STATE(5485),
     [anon_sym_LPAREN2] = ACTIONS(17),
     [anon_sym_PLUS] = ACTIONS(5865),
     [anon_sym_DASH] = ACTIONS(5865),

test/corpus/statements.txt

@@ -2471,6 +2471,7 @@ program test
   DATA array(:, N) / &
     54.45_fp, 200.01_fp /
   DATA complex_array / ( 0, 1 ), ( 1, 0 ) /
+  DATA foo / 3 * 0.0, 4 * bar, 1.0, 2.0 /
   data params/ param1, param2/
 
   ! This is awful, but this makes sure the specification part has
@@ -2569,6 +2570,16 @@ end program test
           (complex_literal
             (number_literal)
             (number_literal)))))
+    (data_statement
+      (data_set
+        (identifier)
+        (data_value
+          (number_literal)
+          (number_literal)
+          (number_literal)
+          (identifier)
+          (number_literal)
+          (number_literal))))
     (data_statement
       (data_set
         (identifier)