Skip to content

Commit 7352e9c

Browse files
johnniwintherCommit Queue
johnniwinther
authored and
Commit Queue
committed
[parser] Remove getOrSet token from endXConstructor methods
These were never used and just confused implementations about what to handle. Change-Id: I1fa4868e043a716b60bec107e4ba57018eee63be Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/460460 Reviewed-by: Jens Johansen <[email protected]> Commit-Queue: Johnni Winther <[email protected]>
1 parent 3a9553d commit 7352e9c

File tree

119 files changed

+353
-482
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+353
-482
lines changed

‎pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -726,14 +726,12 @@ class ForwardingListener implements Listener {
726726

727727
@override
728728
void endClassConstructor(
729-
Token? getOrSet,
730729
Token beginToken,
731730
Token beginParam,
732731
Token? beginInitializers,
733732
Token endToken,
734733
) {
735734
listener?.endClassConstructor(
736-
getOrSet,
737735
beginToken,
738736
beginParam,
739737
beginInitializers,
@@ -902,14 +900,12 @@ class ForwardingListener implements Listener {
902900

903901
@override
904902
void endEnumConstructor(
905-
Token? getOrSet,
906903
Token beginToken,
907904
Token beginParam,
908905
Token? beginInitializers,
909906
Token endToken,
910907
) {
911908
listener?.endEnumConstructor(
912-
getOrSet,
913909
beginToken,
914910
beginParam,
915911
beginInitializers,
@@ -1006,14 +1002,12 @@ class ForwardingListener implements Listener {
10061002

10071003
@override
10081004
void endExtensionConstructor(
1009-
Token? getOrSet,
10101005
Token beginToken,
10111006
Token beginParam,
10121007
Token? beginInitializers,
10131008
Token endToken,
10141009
) {
10151010
listener?.endExtensionConstructor(
1016-
getOrSet,
10171011
beginToken,
10181012
beginParam,
10191013
beginInitializers,
@@ -1319,14 +1313,12 @@ class ForwardingListener implements Listener {
13191313

13201314
@override
13211315
void endMixinConstructor(
1322-
Token? getOrSet,
13231316
Token beginToken,
13241317
Token beginParam,
13251318
Token? beginInitializers,
13261319
Token endToken,
13271320
) {
13281321
listener?.endMixinConstructor(
1329-
getOrSet,
13301322
beginToken,
13311323
beginParam,
13321324
beginInitializers,
@@ -2532,14 +2524,12 @@ class ForwardingListener implements Listener {
25322524

25332525
@override
25342526
void endExtensionTypeConstructor(
2535-
Token? getOrSet,
25362527
Token beginToken,
25372528
Token beginParam,
25382529
Token? beginInitializers,
25392530
Token endToken,
25402531
) {
25412532
listener?.endExtensionTypeConstructor(
2542-
getOrSet,
25432533
beginToken,
25442534
beginParam,
25452535
beginInitializers,

‎pkg/_fe_analyzer_shared/lib/src/parser/listener.dart‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,6 @@ abstract class Listener implements UnescapeErrorListener {
478478
/// - async marker
479479
/// - body
480480
void endEnumConstructor(
481-
Token? getOrSet,
482481
Token beginToken,
483482
Token beginParam,
484483
Token? beginInitializers,
@@ -1423,7 +1422,6 @@ abstract class Listener implements UnescapeErrorListener {
14231422
/// - async marker
14241423
/// - body
14251424
void endClassConstructor(
1426-
Token? getOrSet,
14271425
Token beginToken,
14281426
Token beginParam,
14291427
Token? beginInitializers,
@@ -1442,7 +1440,6 @@ abstract class Listener implements UnescapeErrorListener {
14421440
/// - async marker
14431441
/// - body
14441442
void endMixinConstructor(
1445-
Token? getOrSet,
14461443
Token beginToken,
14471444
Token beginParam,
14481445
Token? beginInitializers,
@@ -1461,7 +1458,6 @@ abstract class Listener implements UnescapeErrorListener {
14611458
/// - async marker
14621459
/// - body
14631460
void endExtensionConstructor(
1464-
Token? getOrSet,
14651461
Token beginToken,
14661462
Token beginParam,
14671463
Token? beginInitializers,
@@ -1481,7 +1477,6 @@ abstract class Listener implements UnescapeErrorListener {
14811477
/// - async marker
14821478
/// - body
14831479
void endExtensionTypeConstructor(
1484-
Token? getOrSet,
14851480
Token beginToken,
14861481
Token beginParam,
14871482
Token? beginInitializers,

‎pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5757,9 +5757,7 @@ class Parser {
57575757

57585758
switch (kind) {
57595759
case DeclarationKind.Class:
5760-
// TODO(danrubel): Remove getOrSet from constructor events
57615760
listener.endClassConstructor(
5762-
getOrSet,
57635761
beforeStart.next!,
57645762
beforeParam.next!,
57655763
beforeInitializers?.next,
@@ -5769,7 +5767,6 @@ class Parser {
57695767
case DeclarationKind.Mixin:
57705768
reportRecoverableError(name, codes.codeMixinDeclaresConstructor);
57715769
listener.endMixinConstructor(
5772-
getOrSet,
57735770
beforeStart.next!,
57745771
beforeParam.next!,
57755772
beforeInitializers?.next,
@@ -5779,7 +5776,6 @@ class Parser {
57795776
case DeclarationKind.Extension:
57805777
reportRecoverableError(name, codes.codeExtensionDeclaresConstructor);
57815778
listener.endExtensionConstructor(
5782-
getOrSet,
57835779
beforeStart.next!,
57845780
beforeParam.next!,
57855781
beforeInitializers?.next,
@@ -5788,7 +5784,6 @@ class Parser {
57885784
break;
57895785
case DeclarationKind.ExtensionType:
57905786
listener.endExtensionTypeConstructor(
5791-
getOrSet,
57925787
beforeStart.next!,
57935788
beforeParam.next!,
57945789
beforeInitializers?.next,
@@ -5799,7 +5794,6 @@ class Parser {
57995794
throw "Internal error: TopLevel constructor.";
58005795
case DeclarationKind.Enum:
58015796
listener.endEnumConstructor(
5802-
getOrSet,
58035797
beforeStart.next!,
58045798
beforeParam.next!,
58055799
beforeInitializers?.next,

‎pkg/analyzer/lib/src/fasta/ast_builder.dart‎

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,20 +1229,13 @@ class AstBuilder extends StackListener {
12291229

12301230
@override
12311231
void endClassConstructor(
1232-
Token? getOrSet,
12331232
Token beginToken,
12341233
Token beginParam,
12351234
Token? beginInitializers,
12361235
Token endToken,
12371236
) {
12381237
debugEvent("endClassConstructor");
1239-
_endClassConstructor(
1240-
getOrSet,
1241-
beginToken,
1242-
beginParam,
1243-
beginInitializers,
1244-
endToken,
1245-
);
1238+
_endClassConstructor(beginToken, beginParam, beginInitializers, endToken);
12461239
}
12471240

12481241
@override
@@ -1544,20 +1537,13 @@ class AstBuilder extends StackListener {
15441537

15451538
@override
15461539
void endEnumConstructor(
1547-
Token? getOrSet,
15481540
Token beginToken,
15491541
Token beginParam,
15501542
Token? beginInitializers,
15511543
Token endToken,
15521544
) {
15531545
debugEvent("endEnumConstructor");
1554-
_endClassConstructor(
1555-
getOrSet,
1556-
beginToken,
1557-
beginParam,
1558-
beginInitializers,
1559-
endToken,
1560-
);
1546+
_endClassConstructor(beginToken, beginParam, beginInitializers, endToken);
15611547
}
15621548

15631549
@override
@@ -1659,7 +1645,6 @@ class AstBuilder extends StackListener {
16591645

16601646
@override
16611647
void endExtensionConstructor(
1662-
Token? getOrSet,
16631648
Token beginToken,
16641649
Token beginParam,
16651650
Token? beginInitializers,
@@ -1768,20 +1753,13 @@ class AstBuilder extends StackListener {
17681753

17691754
@override
17701755
void endExtensionTypeConstructor(
1771-
Token? getOrSet,
17721756
Token beginToken,
17731757
Token beginParam,
17741758
Token? beginInitializers,
17751759
Token endToken,
17761760
) {
17771761
debugEvent("endExtensionTypeConstructor");
1778-
_endClassConstructor(
1779-
getOrSet,
1780-
beginToken,
1781-
beginParam,
1782-
beginInitializers,
1783-
endToken,
1784-
);
1762+
_endClassConstructor(beginToken, beginParam, beginInitializers, endToken);
17851763
}
17861764

17871765
@override
@@ -2720,7 +2698,6 @@ class AstBuilder extends StackListener {
27202698

27212699
@override
27222700
void endMixinConstructor(
2723-
Token? getOrSet,
27242701
Token beginToken,
27252702
Token beginParam,
27262703
Token? beginInitializers,
@@ -6347,18 +6324,11 @@ class AstBuilder extends StackListener {
63476324
}
63486325

63496326
void _endClassConstructor(
6350-
Token? getOrSet,
63516327
Token beginToken,
63526328
Token beginParam,
63536329
Token? beginInitializers,
63546330
Token endToken,
63556331
) {
6356-
assert(
6357-
getOrSet == null ||
6358-
optional('get', getOrSet) ||
6359-
optional('set', getOrSet),
6360-
);
6361-
63626332
_classLikeBuilder?.members.add(
63636333
_buildConstructorDeclaration(beginToken: beginToken, endToken: endToken),
63646334
);

‎pkg/analyzer/test/generated/parser_fasta_listener.dart‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -709,15 +709,13 @@ class ForwardingTestListener extends ForwardingListener {
709709

710710
@override
711711
void endClassConstructor(
712-
Token? getOrSet,
713712
Token beginToken,
714713
Token beginParam,
715714
Token? beginInitializers,
716715
Token endToken,
717716
) {
718717
end('Method');
719718
super.endClassConstructor(
720-
getOrSet,
721719
beginToken,
722720
beginParam,
723721
beginInitializers,
@@ -882,15 +880,13 @@ class ForwardingTestListener extends ForwardingListener {
882880

883881
@override
884882
void endEnumConstructor(
885-
Token? getOrSet,
886883
Token beginToken,
887884
Token beginParam,
888885
Token? beginInitializers,
889886
Token endToken,
890887
) {
891888
end('Method');
892889
super.endEnumConstructor(
893-
getOrSet,
894890
beginToken,
895891
beginParam,
896892
beginInitializers,
@@ -980,15 +976,13 @@ class ForwardingTestListener extends ForwardingListener {
980976

981977
@override
982978
void endExtensionConstructor(
983-
Token? getOrSet,
984979
Token beginToken,
985980
Token beginParam,
986981
Token? beginInitializers,
987982
Token endToken,
988983
) {
989984
end('Method');
990985
super.endExtensionConstructor(
991-
getOrSet,
992986
beginToken,
993987
beginParam,
994988
beginInitializers,
@@ -1302,15 +1296,13 @@ class ForwardingTestListener extends ForwardingListener {
13021296

13031297
@override
13041298
void endMixinConstructor(
1305-
Token? getOrSet,
13061299
Token beginToken,
13071300
Token beginParam,
13081301
Token? beginInitializers,
13091302
Token endToken,
13101303
) {
13111304
end('Method');
13121305
super.endMixinConstructor(
1313-
getOrSet,
13141306
beginToken,
13151307
beginParam,
13161308
beginInitializers,

‎pkg/front_end/lib/src/source/diet_listener.dart‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,6 @@ class DietListener extends StackListenerImpl {
799799

800800
@override
801801
void endExtensionConstructor(
802-
Token? getOrSet,
803802
Token beginToken,
804803
Token beginParam,
805804
Token? beginInitializers,
@@ -861,7 +860,6 @@ class DietListener extends StackListenerImpl {
861860

862861
@override
863862
void endClassConstructor(
864-
Token? getOrSet,
865863
Token beginToken,
866864
Token beginParam,
867865
Token? beginInitializers,
@@ -904,7 +902,6 @@ class DietListener extends StackListenerImpl {
904902

905903
@override
906904
void endMixinConstructor(
907-
Token? getOrSet,
908905
Token beginToken,
909906
Token beginParam,
910907
Token? beginInitializers,
@@ -1295,7 +1292,6 @@ class DietListener extends StackListenerImpl {
12951292

12961293
@override
12971294
void endExtensionTypeConstructor(
1298-
Token? getOrSet,
12991295
Token beginToken,
13001296
Token beginParam,
13011297
Token? beginInitializers,
@@ -1383,7 +1379,6 @@ class DietListener extends StackListenerImpl {
13831379

13841380
@override
13851381
void endEnumConstructor(
1386-
Token? getOrSet,
13871382
Token beginToken,
13881383
Token beginParam,
13891384
Token? beginInitializers,

0 commit comments

Comments
 (0)