Skip to content

Commit 82abe50

Browse files
d-alonsoinaki-amatria
authored andcommitted
Unhide end_of_statement
1 parent 590688e commit 82abe50

File tree

11 files changed

+516713
-511387
lines changed

11 files changed

+516713
-511387
lines changed

grammar.js

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ module.exports = grammar({
294294
program_statement: $ => seq(
295295
caseInsensitive('program'),
296296
field('name', $._name),
297-
$._end_of_statement
297+
$.end_of_statement
298298
),
299299
end_program_statement: $ => blockStructureEnding($, 'program'),
300300

@@ -314,7 +314,7 @@ module.exports = grammar({
314314
module_statement: $ => seq(
315315
caseInsensitive('module'),
316316
field('name', $._name),
317-
$._end_of_statement
317+
$.end_of_statement
318318
),
319319
end_module_statement: $ => blockStructureEnding($, 'module'),
320320

@@ -340,7 +340,7 @@ module.exports = grammar({
340340
)),
341341
')',
342342
field('name', $._name),
343-
$._end_of_statement,
343+
$.end_of_statement,
344344
),
345345
end_submodule_statement: $ => blockStructureEnding($, 'submodule'),
346346
module_name: $ => $._name,
@@ -372,13 +372,13 @@ module.exports = grammar({
372372
optional($.abstract_specifier),
373373
caseInsensitive('interface'),
374374
optional(choice(field('name', $._name), $._generic_procedure)),
375-
$._end_of_statement,
375+
$.end_of_statement,
376376
),
377377

378378
end_interface_statement: $ => prec.right(seq(
379379
whiteSpacedKeyword('end', 'interface'),
380380
optional(choice($._name, $._generic_procedure)),
381-
$._end_of_statement
381+
$.end_of_statement
382382
)),
383383

384384
// Obsolescent feature
@@ -397,7 +397,7 @@ module.exports = grammar({
397397
block_data_statement: $ => seq(
398398
whiteSpacedKeyword('block', 'data'),
399399
optional($._name),
400-
$._end_of_statement
400+
$.end_of_statement
401401
),
402402

403403
// Can't use `blockStructureEnding` because it's two keywords
@@ -411,7 +411,7 @@ module.exports = grammar({
411411
caseInsensitive('end' + structType, false)),
412412
'end' + structType),
413413
optional($._name),
414-
$._end_of_statement))
414+
$.end_of_statement))
415415
},
416416

417417
assignment: $ => seq(caseInsensitive('assignment'), '(', '=', ')'),
@@ -436,7 +436,7 @@ module.exports = grammar({
436436
field('name', $._name),
437437
optional(field('parameters',$._parameters)),
438438
optional($.language_binding),
439-
$._end_of_statement,
439+
$.end_of_statement,
440440
),
441441

442442
end_subroutine_statement: $ => blockStructureEnding($, 'subroutine'),
@@ -447,7 +447,7 @@ module.exports = grammar({
447447
optional($._callable_interface_qualifers),
448448
seq(caseInsensitive('module'), caseInsensitive('procedure')),
449449
field('name', $._name),
450-
$._end_of_statement,
450+
$.end_of_statement,
451451
),
452452

453453
end_module_procedure_statement: $ => blockStructureEnding($, 'procedure'),
@@ -463,7 +463,7 @@ module.exports = grammar({
463463
$.language_binding,
464464
$.function_result
465465
))),
466-
$._end_of_statement,
466+
$.end_of_statement,
467467
),
468468

469469
language_binding: $ => seq(
@@ -517,7 +517,7 @@ module.exports = grammar({
517517

518518
internal_procedures: $ => seq(
519519
$.contains_statement,
520-
$._end_of_statement,
520+
$.end_of_statement,
521521
repeat($._internal_procedures)
522522
),
523523

@@ -540,25 +540,25 @@ module.exports = grammar({
540540

541541
_specification_part: $ => prec(1, choice(
542542
$.include_statement,
543-
seq($.use_statement, $._end_of_statement),
544-
seq($.implicit_statement, $._end_of_statement),
545-
seq($.save_statement, $._end_of_statement),
546-
seq($.import_statement, $._end_of_statement),
543+
seq($.use_statement, $.end_of_statement),
544+
seq($.implicit_statement, $.end_of_statement),
545+
seq($.save_statement, $.end_of_statement),
546+
seq($.import_statement, $.end_of_statement),
547547
$.public_statement,
548548
$.private_statement,
549549
$.enum,
550550
$.enumeration_type,
551551
$.interface,
552552
$.derived_type_definition,
553-
seq($.namelist_statement, $._end_of_statement),
554-
seq($.common_statement, $._end_of_statement),
555-
seq($.variable_declaration, $._end_of_statement),
556-
seq($.variable_modification, $._end_of_statement),
557-
seq($.parameter_statement, $._end_of_statement),
558-
seq($.equivalence_statement, $._end_of_statement),
559-
seq($.data_statement, $._end_of_statement),
560-
seq($.assignment_statement, $._end_of_statement),
561-
prec(1, seq($.statement_label, $.format_statement, $._end_of_statement)),
553+
seq($.namelist_statement, $.end_of_statement),
554+
seq($.common_statement, $.end_of_statement),
555+
seq($.variable_declaration, $.end_of_statement),
556+
seq($.variable_modification, $.end_of_statement),
557+
seq($.parameter_statement, $.end_of_statement),
558+
seq($.equivalence_statement, $.end_of_statement),
559+
seq($.data_statement, $.end_of_statement),
560+
seq($.assignment_statement, $.end_of_statement),
561+
prec(1, seq($.statement_label, $.format_statement, $.end_of_statement)),
562562
$.preproc_include,
563563
$.preproc_def,
564564
$.preproc_function_def,
@@ -643,7 +643,7 @@ module.exports = grammar({
643643
optional('::'),
644644
commaSep1(choice($.identifier, $._generic_procedure))
645645
)),
646-
$._end_of_statement,
646+
$.end_of_statement,
647647
)),
648648

649649
public_statement: $ => prec.right(1, seq(
@@ -652,7 +652,7 @@ module.exports = grammar({
652652
optional('::'),
653653
commaSep1(choice($.identifier, $._generic_procedure))
654654
)),
655-
$._end_of_statement,
655+
$.end_of_statement,
656656
)),
657657

658658
namelist_statement: $ => seq(
@@ -702,10 +702,10 @@ module.exports = grammar({
702702
$.private_statement,
703703
seq(
704704
alias(caseInsensitive('sequence'), $.sequence_statement),
705-
$._end_of_statement
705+
$.end_of_statement
706706
),
707707
$.include_statement,
708-
seq($.variable_declaration, $._end_of_statement),
708+
seq($.variable_declaration, $.end_of_statement),
709709
$.preproc_include,
710710
$.preproc_def,
711711
$.preproc_function_def,
@@ -751,7 +751,7 @@ module.exports = grammar({
751751
)
752752
),
753753
optional(alias($.argument_list, $.derived_type_parameter_list)),
754-
$._end_of_statement
754+
$.end_of_statement
755755
),
756756

757757
end_type_statement: $ => blockStructureEnding($, 'type'),
@@ -784,7 +784,7 @@ module.exports = grammar({
784784
$.method_name,
785785
$.binding,
786786
))),
787-
$._end_of_statement,
787+
$.end_of_statement,
788788
),
789789
binding: $ => seq($.binding_name, '=>', $.method_name),
790790
binding_name: $ => choice(
@@ -1063,7 +1063,7 @@ module.exports = grammar({
10631063
seq(
10641064
optional($.statement_label),
10651065
$._statements,
1066-
$._end_of_statement
1066+
$.end_of_statement
10671067
),
10681068
$.include_statement,
10691069
';'
@@ -1177,7 +1177,7 @@ module.exports = grammar({
11771177
include_statement: $ => prec(1, seq(
11781178
caseInsensitive('include'),
11791179
field("path", alias($.string_literal, $.filename)),
1180-
$._end_of_statement,
1180+
$.end_of_statement,
11811181
)),
11821182

11831183
data_statement: $ => seq(
@@ -1222,7 +1222,7 @@ module.exports = grammar({
12221222
$.loop_control_expression,
12231223
$.concurrent_statement
12241224
)),
1225-
$._end_of_statement,
1225+
$.end_of_statement,
12261226
repeat($._statement),
12271227
optional($.statement_label),
12281228
$.end_do_loop_statement
@@ -1331,7 +1331,7 @@ module.exports = grammar({
13311331
$.parenthesized_expression,
13321332
caseInsensitive('then'),
13331333
optional($._block_label),
1334-
$._end_of_statement,
1334+
$.end_of_statement,
13351335
repeat($._statement),
13361336
repeat($.elseif_clause),
13371337
optional($.else_clause),
@@ -1349,14 +1349,14 @@ module.exports = grammar({
13491349
$.parenthesized_expression,
13501350
caseInsensitive('then'),
13511351
optional($._block_label),
1352-
$._end_of_statement,
1352+
$.end_of_statement,
13531353
repeat($._statement)
13541354
),
13551355

13561356
else_clause: $ => seq(
13571357
caseInsensitive('else'),
13581358
optional($._block_label),
1359-
$._end_of_statement,
1359+
$.end_of_statement,
13601360
repeat($._statement)
13611361
),
13621362

@@ -1375,7 +1375,7 @@ module.exports = grammar({
13751375
optional($.block_label_start_expression),
13761376
caseInsensitive('where'),
13771377
$.parenthesized_expression,
1378-
$._end_of_statement,
1378+
$.end_of_statement,
13791379
repeat($._statement),
13801380
repeat($.elsewhere_clause),
13811381
$.end_where_statement
@@ -1390,7 +1390,7 @@ module.exports = grammar({
13901390
whiteSpacedKeyword('else', 'where'),
13911391
optional($.parenthesized_expression),
13921392
optional($._block_label),
1393-
$._end_of_statement,
1393+
$.end_of_statement,
13941394
repeat($._statement)
13951395
),
13961396

@@ -1427,7 +1427,7 @@ module.exports = grammar({
14271427
_block_forall_statement: $ => seq(
14281428
optional($.block_label_start_expression),
14291429
$._forall_control_expression,
1430-
$._end_of_statement,
1430+
$.end_of_statement,
14311431
repeat($._statement),
14321432
optional($.statement_label),
14331433
$.end_forall_statement
@@ -1442,7 +1442,7 @@ module.exports = grammar({
14421442
optional($.block_label_start_expression),
14431443
whiteSpacedKeyword('select', 'case'),
14441444
$.selector,
1445-
$._end_of_statement,
1445+
$.end_of_statement,
14461446
repeat(choice(
14471447
$.case_statement,
14481448
$.preproc_include,
@@ -1460,7 +1460,7 @@ module.exports = grammar({
14601460
optional($.block_label_start_expression),
14611461
whiteSpacedKeyword('select', 'type'),
14621462
$.selector,
1463-
$._end_of_statement,
1463+
$.end_of_statement,
14641464
repeat1(choice(
14651465
$.type_statement,
14661466
$.preproc_include,
@@ -1478,7 +1478,7 @@ module.exports = grammar({
14781478
optional($.block_label_start_expression),
14791479
whiteSpacedKeyword('select', 'rank'),
14801480
$.selector,
1481-
$._end_of_statement,
1481+
$.end_of_statement,
14821482
repeat1(choice(
14831483
$.rank_statement,
14841484
$.preproc_include,
@@ -1508,7 +1508,7 @@ module.exports = grammar({
15081508
alias(caseInsensitive('default'), $.default)
15091509
),
15101510
optional($._block_label),
1511-
$._end_of_statement,
1511+
$.end_of_statement,
15121512
repeat($._statement)
15131513
),
15141514

@@ -1526,7 +1526,7 @@ module.exports = grammar({
15261526
alias($._class_default, $.default)
15271527
),
15281528
optional($._block_label),
1529-
$._end_of_statement,
1529+
$.end_of_statement,
15301530
repeat($._statement)
15311531
),
15321532

@@ -1545,14 +1545,14 @@ module.exports = grammar({
15451545
alias(caseInsensitive('default'), $.default)
15461546
),
15471547
optional($._block_label),
1548-
$._end_of_statement,
1548+
$.end_of_statement,
15491549
repeat($._statement)
15501550
)),
15511551

15521552
block_construct: $ => seq(
15531553
optional($.block_label_start_expression),
15541554
caseInsensitive('block'),
1555-
$._end_of_statement,
1555+
$.end_of_statement,
15561556
repeat($._specification_part),
15571557
repeat($._statement),
15581558
$.end_block_construct_statement
@@ -1569,7 +1569,7 @@ module.exports = grammar({
15691569
'(',
15701570
commaSep1($.association),
15711571
')',
1572-
$._end_of_statement,
1572+
$.end_of_statement,
15731573
repeat($._statement),
15741574
$.end_associate_statement
15751575
),
@@ -1677,21 +1677,21 @@ module.exports = grammar({
16771677
$.enum_statement,
16781678
repeat($.enumerator_statement),
16791679
$.end_enum_statement,
1680-
$._end_of_statement
1680+
$.end_of_statement
16811681
),
16821682

16831683
enum_statement: $ => seq(
16841684
caseInsensitive('enum'),
16851685
',',
16861686
$.language_binding,
1687-
$._end_of_statement,
1687+
$.end_of_statement,
16881688
),
16891689

16901690
enumeration_type: $ => seq(
16911691
$.enumeration_type_statement,
16921692
repeat($.enumerator_statement),
16931693
$.end_enumeration_type_statement,
1694-
$._end_of_statement
1694+
$.end_of_statement
16951695
),
16961696

16971697
enumeration_type_statement: $ => seq(
@@ -2154,7 +2154,7 @@ module.exports = grammar({
21542154
caseInsensitive('change'),
21552155
caseInsensitive('team'),
21562156
$.argument_list,
2157-
$._end_of_statement,
2157+
$.end_of_statement,
21582158
repeat($._statement),
21592159
$.end_coarray_team_statement,
21602160
),
@@ -2169,7 +2169,7 @@ module.exports = grammar({
21692169
optional($.block_label_start_expression),
21702170
caseInsensitive('critical'),
21712171
optional($.argument_list),
2172-
$._end_of_statement,
2172+
$.end_of_statement,
21732173
repeat($._statement),
21742174
$.end_coarray_critical_statement,
21752175
),
@@ -2259,7 +2259,7 @@ module.exports = grammar({
22592259

22602260
comment: $ => token(seq('!', /.*/)),
22612261

2262-
_end_of_statement: $ => choice(';', $._external_end_of_statement),
2262+
end_of_statement: $ => choice(';', $._external_end_of_statement),
22632263

22642264
_newline: $ => '\n',
22652265
}
@@ -2307,7 +2307,7 @@ function blockStructureEnding ($, structType) {
23072307
caseInsensitive('end' + structType, false)),
23082308
'end' + structType),
23092309
optional($._name),
2310-
$._end_of_statement
2310+
$.end_of_statement
23112311
))
23122312
return obj
23132313
}

0 commit comments

Comments
 (0)