Skip to content

Commit 614162a

Browse files
committed
Add _argument_item as a supertype
1 parent 8ae4aa9 commit 614162a

File tree

4 files changed

+493276
-493305
lines changed

4 files changed

+493276
-493305
lines changed

grammar.js

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ module.exports = grammar({
106106
supertypes: $ => [
107107
$._expression,
108108
$._statements,
109+
$._argument_item,
109110
],
110111

111112
rules: {
@@ -1984,21 +1985,16 @@ module.exports = grammar({
19841985
// Unnamed node so we can reuse it for e.g. kind
19851986
_argument_list: $ => prec.dynamic(
19861987
1,
1987-
seq(
1988-
'(',
1989-
commaSep(choice(
1990-
$.keyword_argument,
1991-
$.extent_specifier,
1992-
$.assumed_size,
1993-
$.assumed_rank,
1994-
$._expression,
1995-
$.multiple_subscript,
1996-
$.multiple_subscript_triplet,
1997-
)),
1998-
')'
1999-
)
1988+
seq('(', commaSep(choice($._expression, $._argument_item)), ')')
1989+
),
1990+
_argument_item: $ => choice(
1991+
$.keyword_argument,
1992+
$.extent_specifier,
1993+
$.assumed_size,
1994+
$.assumed_rank,
1995+
$.multiple_subscript,
1996+
$.multiple_subscript_triplet,
20001997
),
2001-
20021998
argument_list: $ => $._argument_list,
20031999

20042000
// precedence is used to prevent conflict with assignment expression

src/grammar.json

Lines changed: 33 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -19369,33 +19369,13 @@
1936919369
{
1937019370
"type": "CHOICE",
1937119371
"members": [
19372-
{
19373-
"type": "SYMBOL",
19374-
"name": "keyword_argument"
19375-
},
19376-
{
19377-
"type": "SYMBOL",
19378-
"name": "extent_specifier"
19379-
},
19380-
{
19381-
"type": "SYMBOL",
19382-
"name": "assumed_size"
19383-
},
19384-
{
19385-
"type": "SYMBOL",
19386-
"name": "assumed_rank"
19387-
},
1938819372
{
1938919373
"type": "SYMBOL",
1939019374
"name": "_expression"
1939119375
},
1939219376
{
1939319377
"type": "SYMBOL",
19394-
"name": "multiple_subscript"
19395-
},
19396-
{
19397-
"type": "SYMBOL",
19398-
"name": "multiple_subscript_triplet"
19378+
"name": "_argument_item"
1939919379
}
1940019380
]
1940119381
},
@@ -19411,33 +19391,13 @@
1941119391
{
1941219392
"type": "CHOICE",
1941319393
"members": [
19414-
{
19415-
"type": "SYMBOL",
19416-
"name": "keyword_argument"
19417-
},
19418-
{
19419-
"type": "SYMBOL",
19420-
"name": "extent_specifier"
19421-
},
19422-
{
19423-
"type": "SYMBOL",
19424-
"name": "assumed_size"
19425-
},
19426-
{
19427-
"type": "SYMBOL",
19428-
"name": "assumed_rank"
19429-
},
1943019394
{
1943119395
"type": "SYMBOL",
1943219396
"name": "_expression"
1943319397
},
1943419398
{
1943519399
"type": "SYMBOL",
19436-
"name": "multiple_subscript"
19437-
},
19438-
{
19439-
"type": "SYMBOL",
19440-
"name": "multiple_subscript_triplet"
19400+
"name": "_argument_item"
1944119401
}
1944219402
]
1944319403
}
@@ -19458,6 +19418,35 @@
1945819418
]
1945919419
}
1946019420
},
19421+
"_argument_item": {
19422+
"type": "CHOICE",
19423+
"members": [
19424+
{
19425+
"type": "SYMBOL",
19426+
"name": "keyword_argument"
19427+
},
19428+
{
19429+
"type": "SYMBOL",
19430+
"name": "extent_specifier"
19431+
},
19432+
{
19433+
"type": "SYMBOL",
19434+
"name": "assumed_size"
19435+
},
19436+
{
19437+
"type": "SYMBOL",
19438+
"name": "assumed_rank"
19439+
},
19440+
{
19441+
"type": "SYMBOL",
19442+
"name": "multiple_subscript"
19443+
},
19444+
{
19445+
"type": "SYMBOL",
19446+
"name": "multiple_subscript_triplet"
19447+
}
19448+
]
19449+
},
1946119450
"argument_list": {
1946219451
"type": "SYMBOL",
1946319452
"name": "_argument_list"
@@ -21571,7 +21560,8 @@
2157121560
],
2157221561
"supertypes": [
2157321562
"_expression",
21574-
"_statements"
21563+
"_statements",
21564+
"_argument_item"
2157521565
],
2157621566
"reserved": {}
2157721567
}

0 commit comments

Comments
 (0)