Skip to content

Commit a86dce3

Browse files
authored
Merge pull request stadelmanma#127 from stadelmanma/data-statement-fix
Fix `data` statement clash with array subscripting
2 parents a8ccbe4 + 4df3a8e commit a86dce3

File tree

4 files changed

+90970
-90939
lines changed

4 files changed

+90970
-90939
lines changed

grammar.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ module.exports = grammar({
8080
[$._argument_list, $.parenthesized_expression],
8181
[$.case_statement],
8282
[$.data_set, $._expression],
83+
[$.data_statement, $.identifier],
8384
[$.data_value, $._expression],
8485
[$.else_clause],
8586
[$.elseif_clause, $.identifier],
@@ -1081,10 +1082,10 @@ module.exports = grammar({
10811082
field("path", alias($.string_literal, $.filename))
10821083
),
10831084

1084-
data_statement: $ => prec(1, seq(
1085+
data_statement: $ => seq(
10851086
caseInsensitive('data'),
10861087
commaSep1($.data_set)
1087-
)),
1088+
),
10881089
data_set: $ => prec(1, seq(
10891090
commaSep1(
10901091
choice(

src/grammar.json

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -13168,47 +13168,43 @@
1316813168
]
1316913169
},
1317013170
"data_statement": {
13171-
"type": "PREC",
13172-
"value": 1,
13173-
"content": {
13174-
"type": "SEQ",
13175-
"members": [
13176-
{
13177-
"type": "ALIAS",
13178-
"content": {
13179-
"type": "PATTERN",
13180-
"value": "[dD][aA][tT][aA]"
13181-
},
13182-
"named": false,
13183-
"value": "data"
13171+
"type": "SEQ",
13172+
"members": [
13173+
{
13174+
"type": "ALIAS",
13175+
"content": {
13176+
"type": "PATTERN",
13177+
"value": "[dD][aA][tT][aA]"
1318413178
},
13185-
{
13186-
"type": "SEQ",
13187-
"members": [
13188-
{
13189-
"type": "SYMBOL",
13190-
"name": "data_set"
13191-
},
13192-
{
13193-
"type": "REPEAT",
13194-
"content": {
13195-
"type": "SEQ",
13196-
"members": [
13197-
{
13198-
"type": "STRING",
13199-
"value": ","
13200-
},
13201-
{
13202-
"type": "SYMBOL",
13203-
"name": "data_set"
13204-
}
13205-
]
13206-
}
13179+
"named": false,
13180+
"value": "data"
13181+
},
13182+
{
13183+
"type": "SEQ",
13184+
"members": [
13185+
{
13186+
"type": "SYMBOL",
13187+
"name": "data_set"
13188+
},
13189+
{
13190+
"type": "REPEAT",
13191+
"content": {
13192+
"type": "SEQ",
13193+
"members": [
13194+
{
13195+
"type": "STRING",
13196+
"value": ","
13197+
},
13198+
{
13199+
"type": "SYMBOL",
13200+
"name": "data_set"
13201+
}
13202+
]
1320713203
}
13208-
]
13209-
}
13210-
]
13211-
}
13204+
}
13205+
]
13206+
}
13207+
]
1321213208
},
1321313209
"data_set": {
1321413210
"type": "PREC",
@@ -20036,6 +20032,10 @@
2003620032
"data_set",
2003720033
"_expression"
2003820034
],
20035+
[
20036+
"data_statement",
20037+
"identifier"
20038+
],
2003920039
[
2004020040
"data_value",
2004120041
"_expression"

0 commit comments

Comments
 (0)