Skip to content

Commit 2ca720e

Browse files
ruifminaki-amatria
authored andcommitted
Hide parenthesized_expression
This commit must be removed now that we have semantic access to parent nodes!!
1 parent abc635f commit 2ca720e

File tree

8 files changed

+19463
-18488
lines changed

8 files changed

+19463
-18488
lines changed

grammar.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ module.exports = grammar({
8484

8585
conflicts: $ => [
8686
[$._expression, $.complex_literal],
87-
[$._argument_list, $.parenthesized_expression],
87+
[$._argument_list, $._parenthesized_expression],
8888
[$.case_statement],
8989
[$.data_set, $._expression],
9090
[$.data_statement, $.identifier],
@@ -203,7 +203,7 @@ module.exports = grammar({
203203
$.preproc_defined,
204204
alias($.preproc_unary_expression, $.unary_expression),
205205
alias($.preproc_binary_expression, $.binary_expression),
206-
alias($.preproc_parenthesized_expression, $.parenthesized_expression),
206+
alias($.preproc_parenthesized_expression, $._parenthesized_expression),
207207
),
208208

209209
preproc_parenthesized_expression: $ => seq(
@@ -952,7 +952,7 @@ module.exports = grammar({
952952

953953
kind: $ => choice(
954954
seq(optional(alias('*', $.assumed_size)), $._argument_list),
955-
seq('*', choice(alias(/\d+/, $.number_literal), $.parenthesized_expression))
955+
seq('*', choice(alias(/\d+/, $.number_literal), $._parenthesized_expression))
956956
),
957957

958958
character_length: $ => seq(
@@ -1252,7 +1252,7 @@ module.exports = grammar({
12521252
)),
12531253

12541254
while_statement: $ => seq(caseInsensitive('while'),
1255-
$.parenthesized_expression),
1255+
$._parenthesized_expression),
12561256

12571257
concurrent_statement: $ => seq(
12581258
$.concurrent_header,
@@ -1311,13 +1311,13 @@ module.exports = grammar({
13111311

13121312
inline_if_statement: $ => prec.right(2, seq(
13131313
caseInsensitive('if'),
1314-
$.parenthesized_expression,
1314+
$._parenthesized_expression,
13151315
$._statements
13161316
)),
13171317

13181318
arithmetic_if_statement: $ => prec.right(seq(
13191319
caseInsensitive('if'),
1320-
$.parenthesized_expression,
1320+
$._parenthesized_expression,
13211321
$.statement_label_reference,
13221322
',',
13231323
$.statement_label_reference,
@@ -1328,7 +1328,7 @@ module.exports = grammar({
13281328
block_if_statement: $ => seq(
13291329
optional($.block_label_start_expression),
13301330
caseInsensitive('if'),
1331-
$.parenthesized_expression,
1331+
$._parenthesized_expression,
13321332
caseInsensitive('then'),
13331333
optional($._block_label),
13341334
$.end_of_statement,
@@ -1346,7 +1346,7 @@ module.exports = grammar({
13461346

13471347
elseif_clause: $ => seq(
13481348
whiteSpacedKeyword('else', 'if'),
1349-
$.parenthesized_expression,
1349+
$._parenthesized_expression,
13501350
caseInsensitive('then'),
13511351
optional($._block_label),
13521352
$.end_of_statement,
@@ -1367,14 +1367,14 @@ module.exports = grammar({
13671367

13681368
inline_where_statement: $ => prec.right(seq(
13691369
caseInsensitive('where'),
1370-
$.parenthesized_expression,
1370+
$._parenthesized_expression,
13711371
$._statements
13721372
)),
13731373

13741374
block_where_statement: $ => seq(
13751375
optional($.block_label_start_expression),
13761376
caseInsensitive('where'),
1377-
$.parenthesized_expression,
1377+
$._parenthesized_expression,
13781378
$.end_of_statement,
13791379
repeat($._statement),
13801380
repeat($.elsewhere_clause),
@@ -1388,7 +1388,7 @@ module.exports = grammar({
13881388

13891389
elsewhere_clause: $ => seq(
13901390
whiteSpacedKeyword('else', 'where'),
1391-
optional($.parenthesized_expression),
1391+
optional($._parenthesized_expression),
13921392
optional($._block_label),
13931393
$.end_of_statement,
13941394
repeat($._statement)
@@ -1753,7 +1753,7 @@ module.exports = grammar({
17531753
$.derived_type_member_expression,
17541754
$.concatenation_expression,
17551755
$.math_expression,
1756-
$.parenthesized_expression,
1756+
$._parenthesized_expression,
17571757
$.call_expression
17581758
)),
17591759

@@ -1830,14 +1830,14 @@ module.exports = grammar({
18301830
$.concatenation_expression,
18311831
$.math_expression,
18321832
$.unary_expression,
1833-
$.parenthesized_expression,
1833+
$._parenthesized_expression,
18341834
$.call_expression,
18351835
$.implied_do_loop_expression,
18361836
$.coarray_expression,
18371837
$.conditional_expression,
18381838
),
18391839

1840-
parenthesized_expression: $ => seq(
1840+
_parenthesized_expression: $ => seq(
18411841
'(',
18421842
$._expression,
18431843
')'

src/grammar.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6330,7 +6330,7 @@
63306330
"name": "preproc_parenthesized_expression"
63316331
},
63326332
"named": true,
6333-
"value": "parenthesized_expression"
6333+
"value": "_parenthesized_expression"
63346334
}
63356335
]
63366336
},
@@ -12144,7 +12144,7 @@
1214412144
},
1214512145
{
1214612146
"type": "SYMBOL",
12147-
"name": "parenthesized_expression"
12147+
"name": "_parenthesized_expression"
1214812148
}
1214912149
]
1215012150
}
@@ -14080,7 +14080,7 @@
1408014080
},
1408114081
{
1408214082
"type": "SYMBOL",
14083-
"name": "parenthesized_expression"
14083+
"name": "_parenthesized_expression"
1408414084
}
1408514085
]
1408614086
},
@@ -14439,15 +14439,15 @@
1443914439
"members": [
1444014440
{
1444114441
"type": "SYMBOL",
14442-
"name": "_inline_if_statement"
14442+
"name": "inline_if_statement"
1444314443
},
1444414444
{
1444514445
"type": "SYMBOL",
14446-
"name": "_block_if_statement"
14446+
"name": "block_if_statement"
1444714447
}
1444814448
]
1444914449
},
14450-
"_inline_if_statement": {
14450+
"inline_if_statement": {
1445114451
"type": "PREC_RIGHT",
1445214452
"value": 2,
1445314453
"content": {
@@ -14464,7 +14464,7 @@
1446414464
},
1446514465
{
1446614466
"type": "SYMBOL",
14467-
"name": "parenthesized_expression"
14467+
"name": "_parenthesized_expression"
1446814468
},
1446914469
{
1447014470
"type": "SYMBOL",
@@ -14490,7 +14490,7 @@
1449014490
},
1449114491
{
1449214492
"type": "SYMBOL",
14493-
"name": "parenthesized_expression"
14493+
"name": "_parenthesized_expression"
1449414494
},
1449514495
{
1449614496
"type": "SYMBOL",
@@ -14515,7 +14515,7 @@
1451514515
]
1451614516
}
1451714517
},
14518-
"_block_if_statement": {
14518+
"block_if_statement": {
1451914519
"type": "SEQ",
1452014520
"members": [
1452114521
{
@@ -14541,7 +14541,7 @@
1454114541
},
1454214542
{
1454314543
"type": "SYMBOL",
14544-
"name": "parenthesized_expression"
14544+
"name": "_parenthesized_expression"
1454514545
},
1454614546
{
1454714547
"type": "ALIAS",
@@ -14688,7 +14688,7 @@
1468814688
},
1468914689
{
1469014690
"type": "SYMBOL",
14691-
"name": "parenthesized_expression"
14691+
"name": "_parenthesized_expression"
1469214692
},
1469314693
{
1469414694
"type": "ALIAS",
@@ -14766,15 +14766,15 @@
1476614766
"members": [
1476714767
{
1476814768
"type": "SYMBOL",
14769-
"name": "_inline_where_statement"
14769+
"name": "inline_where_statement"
1477014770
},
1477114771
{
1477214772
"type": "SYMBOL",
14773-
"name": "_block_where_statement"
14773+
"name": "block_where_statement"
1477414774
}
1477514775
]
1477614776
},
14777-
"_inline_where_statement": {
14777+
"inline_where_statement": {
1477814778
"type": "PREC_RIGHT",
1477914779
"value": 0,
1478014780
"content": {
@@ -14791,7 +14791,7 @@
1479114791
},
1479214792
{
1479314793
"type": "SYMBOL",
14794-
"name": "parenthesized_expression"
14794+
"name": "_parenthesized_expression"
1479514795
},
1479614796
{
1479714797
"type": "SYMBOL",
@@ -14800,7 +14800,7 @@
1480014800
]
1480114801
}
1480214802
},
14803-
"_block_where_statement": {
14803+
"block_where_statement": {
1480414804
"type": "SEQ",
1480514805
"members": [
1480614806
{
@@ -14826,7 +14826,7 @@
1482614826
},
1482714827
{
1482814828
"type": "SYMBOL",
14829-
"name": "parenthesized_expression"
14829+
"name": "_parenthesized_expression"
1483014830
},
1483114831
{
1483214832
"type": "SYMBOL",
@@ -14931,7 +14931,7 @@
1493114931
"members": [
1493214932
{
1493314933
"type": "SYMBOL",
14934-
"name": "parenthesized_expression"
14934+
"name": "_parenthesized_expression"
1493514935
},
1493614936
{
1493714937
"type": "BLANK"
@@ -14968,11 +14968,11 @@
1496814968
"members": [
1496914969
{
1497014970
"type": "SYMBOL",
14971-
"name": "_inline_forall_statement"
14971+
"name": "inline_forall_statement"
1497214972
},
1497314973
{
1497414974
"type": "SYMBOL",
14975-
"name": "_block_forall_statement"
14975+
"name": "block_forall_statement"
1497614976
}
1497714977
]
1497814978
},
@@ -15099,7 +15099,7 @@
1509915099
}
1510015100
]
1510115101
},
15102-
"_inline_forall_statement": {
15102+
"inline_forall_statement": {
1510315103
"type": "SEQ",
1510415104
"members": [
1510515105
{
@@ -15112,7 +15112,7 @@
1511215112
}
1511315113
]
1511415114
},
15115-
"_block_forall_statement": {
15115+
"block_forall_statement": {
1511615116
"type": "SEQ",
1511715117
"members": [
1511815118
{
@@ -17343,7 +17343,7 @@
1734317343
},
1734417344
{
1734517345
"type": "SYMBOL",
17346-
"name": "parenthesized_expression"
17346+
"name": "_parenthesized_expression"
1734717347
},
1734817348
{
1734917349
"type": "SYMBOL",
@@ -17774,7 +17774,7 @@
1777417774
},
1777517775
{
1777617776
"type": "SYMBOL",
17777-
"name": "parenthesized_expression"
17777+
"name": "_parenthesized_expression"
1777817778
},
1777917779
{
1778017780
"type": "SYMBOL",
@@ -17794,7 +17794,7 @@
1779417794
}
1779517795
]
1779617796
},
17797-
"parenthesized_expression": {
17797+
"_parenthesized_expression": {
1779817798
"type": "SEQ",
1779917799
"members": [
1780017800
{
@@ -20566,7 +20566,7 @@
2056620566
],
2056720567
[
2056820568
"_argument_list",
20569-
"parenthesized_expression"
20569+
"_parenthesized_expression"
2057020570
],
2057120571
[
2057220572
"case_statement"

0 commit comments

Comments
 (0)