Skip to content

Commit 18000b1

Browse files
inaki-amatriainaki-amatria
committed
Allow identifiers in data_value's repeats
As seen in https://github.com/llvm/llvm-project/blob/llvmorg-20.1.6/flang/lib/Parser/Fortran-parsers.cpp#L913-L915.
1 parent ccc5a25 commit 18000b1

File tree

6 files changed

+102
-9
lines changed

6 files changed

+102
-9
lines changed

‎codee/patches/0019-Allow-identifier-s-in-data_value-s-repeat-s.patch‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?I=C3=B1aki=20Amatria=20Barral?= <inaki.amatria@appentra.com>
3+
Date: Wed, 25 Jun 2025 15:37:31 +0200
4+
Subject: Allow `identifier`s in `data_value`'s `repeat`s
5+
6+
As seen in
7+
https://github.com/llvm/llvm-project/blob/llvmorg-20.1.6/flang/lib/Parser/Fortran-parsers.cpp#L913-L915.
8+
---
9+
grammar.js | 4 +++-
10+
test/corpus/statements.txt | 12 ++++++++++++
11+
2 files changed, 15 insertions(+), 1 deletion(-)
12+
13+
diff --git a/grammar.js b/grammar.js
14+
index 80bc23a..6e79004 100644
15+
--- a/grammar.js
16+
+++ b/grammar.js
17+
@@ -1273,7 +1273,9 @@ module.exports = grammar({
18+
data_value: $ => seq(
19+
'/',
20+
commaSep1(seq(
21+
- optional(prec(1, seq(field('repeat', $.number_literal), '*'))),
22+
+ optional(prec(1,
23+
+ seq(field('repeat', choice($.number_literal, $.identifier)), '*')
24+
+ )),
25+
choice(
26+
$.number_literal,
27+
$.complex_literal,
28+
diff --git a/test/corpus/statements.txt b/test/corpus/statements.txt
29+
index 7948402..41a00f8 100644
30+
--- a/test/corpus/statements.txt
31+
+++ b/test/corpus/statements.txt
32+
@@ -2842,6 +2842,7 @@ program test
33+
DATA array(:, N) / &
34+
54.45_fp, 200.01_fp /
35+
DATA complex_array / ( 0, 1 ), ( 1, 0 ) /
36+
+ DATA foo / 3 * 0.0, 4 * bar, 1.0, 2.0 /
37+
data params/ param1, param2/
38+
39+
! This is awful, but this makes sure the specification part has
40+
@@ -2949,6 +2950,17 @@ end program test
41+
(number_literal)
42+
(number_literal)))))
43+
(end_of_statement)
44+
+ (data_statement
45+
+ (data_set
46+
+ (identifier)
47+
+ (data_value
48+
+ (number_literal)
49+
+ (number_literal)
50+
+ (number_literal)
51+
+ (identifier)
52+
+ (number_literal)
53+
+ (number_literal))))
54+
+ (end_of_statement)
55+
(data_statement
56+
(data_set
57+
(identifier)

‎grammar.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1273,7 +1273,9 @@ module.exports = grammar({
12731273
data_value: $ => seq(
12741274
'/',
12751275
commaSep1(seq(
1276-
optional(prec(1, seq(field('repeat', $.number_literal), '*'))),
1276+
optional(prec(1,
1277+
seq(field('repeat', choice($.number_literal, $.identifier)), '*')
1278+
)),
12771279
choice(
12781280
$.number_literal,
12791281
$.complex_literal,

‎src/grammar.json‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14088,8 +14088,17 @@
1408814088
"type": "FIELD",
1408914089
"name": "repeat",
1409014090
"content": {
14091-
"type": "SYMBOL",
14092-
"name": "number_literal"
14091+
"type": "CHOICE",
14092+
"members": [
14093+
{
14094+
"type": "SYMBOL",
14095+
"name": "number_literal"
14096+
},
14097+
{
14098+
"type": "SYMBOL",
14099+
"name": "identifier"
14100+
}
14101+
]
1409314102
}
1409414103
},
1409514104
{
@@ -14168,8 +14177,17 @@
1416814177
"type": "FIELD",
1416914178
"name": "repeat",
1417014179
"content": {
14171-
"type": "SYMBOL",
14172-
"name": "number_literal"
14180+
"type": "CHOICE",
14181+
"members": [
14182+
{
14183+
"type": "SYMBOL",
14184+
"name": "number_literal"
14185+
},
14186+
{
14187+
"type": "SYMBOL",
14188+
"name": "identifier"
14189+
}
14190+
]
1417314191
}
1417414192
},
1417514193
{

‎src/node-types.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2063,6 +2063,10 @@
20632063
"multiple": true,
20642064
"required": false,
20652065
"types": [
2066+
{
2067+
"type": "identifier",
2068+
"named": true
2069+
},
20662070
{
20672071
"type": "number_literal",
20682072
"named": true

‎src/parser.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -719287,7 +719287,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
719287719287
[sym_string_literal] = STATE(7461),
719288719288
[sym_coarray_expression] = STATE(5978),
719289719289
[sym_conditional_expression] = STATE(5978),
719290-
[sym_identifier] = STATE(7461),
719290+
[sym_identifier] = STATE(7462),
719291719291
[anon_sym_LPAREN2] = ACTIONS(17),
719292719292
[anon_sym_PLUS] = ACTIONS(19),
719293719293
[anon_sym_DASH] = ACTIONS(19),
@@ -726047,7 +726047,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
726047726047
[sym_string_literal] = STATE(7099),
726048726048
[sym_coarray_expression] = STATE(5978),
726049726049
[sym_conditional_expression] = STATE(5978),
726050-
[sym_identifier] = STATE(7099),
726050+
[sym_identifier] = STATE(7100),
726051726051
[anon_sym_LPAREN2] = ACTIONS(17),
726052726052
[anon_sym_PLUS] = ACTIONS(19),
726053726053
[anon_sym_DASH] = ACTIONS(19),
@@ -728023,7 +728023,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
728023728023
[sym_string_literal] = STATE(7426),
728024728024
[sym_coarray_expression] = STATE(5978),
728025728025
[sym_conditional_expression] = STATE(5978),
728026-
[sym_identifier] = STATE(7426),
728026+
[sym_identifier] = STATE(7427),
728027728027
[anon_sym_LPAREN2] = ACTIONS(17),
728028728028
[anon_sym_PLUS] = ACTIONS(19),
728029728029
[anon_sym_DASH] = ACTIONS(19),
@@ -728959,7 +728959,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
728959728959
[sym_string_literal] = STATE(7092),
728960728960
[sym_coarray_expression] = STATE(5978),
728961728961
[sym_conditional_expression] = STATE(5978),
728962-
[sym_identifier] = STATE(7092),
728962+
[sym_identifier] = STATE(7093),
728963728963
[anon_sym_LPAREN2] = ACTIONS(17),
728964728964
[anon_sym_PLUS] = ACTIONS(19),
728965728965
[anon_sym_DASH] = ACTIONS(19),

‎test/corpus/statements.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2842,6 +2842,7 @@ program test
28422842
DATA array(:, N) / &
28432843
54.45_fp, 200.01_fp /
28442844
DATA complex_array / ( 0, 1 ), ( 1, 0 ) /
2845+
DATA foo / 3 * 0.0, 4 * bar, 1.0, 2.0 /
28452846
data params/ param1, param2/
28462847

28472848
! This is awful, but this makes sure the specification part has
@@ -2949,6 +2950,17 @@ end program test
29492950
(number_literal)
29502951
(number_literal)))))
29512952
(end_of_statement)
2953+
(data_statement
2954+
(data_set
2955+
(identifier)
2956+
(data_value
2957+
(number_literal)
2958+
(number_literal)
2959+
(number_literal)
2960+
(identifier)
2961+
(number_literal)
2962+
(number_literal))))
2963+
(end_of_statement)
29522964
(data_statement
29532965
(data_set
29542966
(identifier)

0 commit comments

Comments
 (0)