Skip to content

Commit b52328e

Browse files
johnniwinthercommit-bot@chromium.org
johnniwinther
authored and
[email protected]
committed
[cfe] Remove unneeded indirect generator construction through Forest
Change-Id: Ic535bfe84395608c9b0764edf8646fd2606429b4 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109708 Reviewed-by: Dan Rubel <[email protected]>
1 parent 2a199f3 commit b52328e

File tree

4 files changed

+62
-492
lines changed

4 files changed

+62
-492
lines changed

‎pkg/front_end/lib/src/fasta/kernel/expression_generator.dart‎

Lines changed: 42 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -447,15 +447,9 @@ class VariableUseGenerator extends Generator {
447447

448448
final DartType promotedType;
449449

450-
factory VariableUseGenerator(ExpressionGeneratorHelper helper, Token token,
451-
VariableDeclaration variable,
452-
[DartType promotedType]) {
453-
return helper.forest
454-
.variableUseGenerator(helper, token, variable, promotedType);
455-
}
456-
457-
VariableUseGenerator.internal(ExpressionGeneratorHelper helper, Token token,
458-
this.variable, this.promotedType)
450+
VariableUseGenerator(
451+
ExpressionGeneratorHelper helper, Token token, this.variable,
452+
[this.promotedType])
459453
: super(helper, token);
460454

461455
@override
@@ -528,14 +522,8 @@ class PropertyAccessGenerator extends Generator {
528522

529523
VariableDeclaration _receiverVariable;
530524

531-
factory PropertyAccessGenerator(ExpressionGeneratorHelper helper, Token token,
532-
Expression receiver, Name name, Member getter, Member setter) {
533-
return helper.forest
534-
.propertyAccessGenerator(helper, token, receiver, name, getter, setter);
535-
}
536-
537-
PropertyAccessGenerator.internal(ExpressionGeneratorHelper helper,
538-
Token token, this.receiver, this.name, this.getter, this.setter)
525+
PropertyAccessGenerator(ExpressionGeneratorHelper helper, Token token,
526+
this.receiver, this.name, this.getter, this.setter)
539527
: super(helper, token);
540528

541529
@override
@@ -647,14 +635,8 @@ class ThisPropertyAccessGenerator extends Generator {
647635

648636
final Member setter;
649637

650-
factory ThisPropertyAccessGenerator(ExpressionGeneratorHelper helper,
651-
Token token, Name name, Member getter, Member setter) {
652-
return helper.forest
653-
.thisPropertyAccessGenerator(helper, token, name, getter, setter);
654-
}
655-
656-
ThisPropertyAccessGenerator.internal(ExpressionGeneratorHelper helper,
657-
Token token, this.name, this.getter, this.setter)
638+
ThisPropertyAccessGenerator(ExpressionGeneratorHelper helper, Token token,
639+
this.name, this.getter, this.setter)
658640
: super(helper, token);
659641

660642
@override
@@ -735,19 +717,7 @@ class NullAwarePropertyAccessGenerator extends Generator {
735717

736718
final DartType type;
737719

738-
factory NullAwarePropertyAccessGenerator(
739-
ExpressionGeneratorHelper helper,
740-
Token token,
741-
Expression receiverExpression,
742-
Name name,
743-
Member getter,
744-
Member setter,
745-
DartType type) {
746-
return helper.forest.nullAwarePropertyAccessGenerator(
747-
helper, token, receiverExpression, name, getter, setter, type);
748-
}
749-
750-
NullAwarePropertyAccessGenerator.internal(
720+
NullAwarePropertyAccessGenerator(
751721
ExpressionGeneratorHelper helper,
752722
Token token,
753723
this.receiverExpression,
@@ -841,14 +811,8 @@ class SuperPropertyAccessGenerator extends Generator {
841811

842812
final Member setter;
843813

844-
factory SuperPropertyAccessGenerator(ExpressionGeneratorHelper helper,
845-
Token token, Name name, Member getter, Member setter) {
846-
return helper.forest
847-
.superPropertyAccessGenerator(helper, token, name, getter, setter);
848-
}
849-
850-
SuperPropertyAccessGenerator.internal(ExpressionGeneratorHelper helper,
851-
Token token, this.name, this.getter, this.setter)
814+
SuperPropertyAccessGenerator(ExpressionGeneratorHelper helper, Token token,
815+
this.name, this.getter, this.setter)
852816
: super(helper, token);
853817

854818
@override
@@ -931,18 +895,7 @@ class IndexedAccessGenerator extends Generator {
931895

932896
VariableDeclaration indexVariable;
933897

934-
factory IndexedAccessGenerator(
935-
ExpressionGeneratorHelper helper,
936-
Token token,
937-
Expression receiver,
938-
Expression index,
939-
Procedure getter,
940-
Procedure setter) {
941-
return helper.forest
942-
.indexedAccessGenerator(helper, token, receiver, index, getter, setter);
943-
}
944-
945-
IndexedAccessGenerator.internal(ExpressionGeneratorHelper helper, Token token,
898+
IndexedAccessGenerator(ExpressionGeneratorHelper helper, Token token,
946899
this.receiver, this.index, this.getter, this.setter)
947900
: super(helper, token);
948901

@@ -1109,14 +1062,8 @@ class ThisIndexedAccessGenerator extends Generator {
11091062

11101063
VariableDeclaration indexVariable;
11111064

1112-
factory ThisIndexedAccessGenerator(ExpressionGeneratorHelper helper,
1113-
Token token, Expression index, Procedure getter, Procedure setter) {
1114-
return helper.forest
1115-
.thisIndexedAccessGenerator(helper, token, index, getter, setter);
1116-
}
1117-
1118-
ThisIndexedAccessGenerator.internal(ExpressionGeneratorHelper helper,
1119-
Token token, this.index, this.getter, this.setter)
1065+
ThisIndexedAccessGenerator(ExpressionGeneratorHelper helper, Token token,
1066+
this.index, this.getter, this.setter)
11201067
: super(helper, token);
11211068

11221069
@override
@@ -1243,14 +1190,8 @@ class SuperIndexedAccessGenerator extends Generator {
12431190

12441191
VariableDeclaration indexVariable;
12451192

1246-
factory SuperIndexedAccessGenerator(ExpressionGeneratorHelper helper,
1247-
Token token, Expression index, Member getter, Member setter) {
1248-
return helper.forest
1249-
.superIndexedAccessGenerator(helper, token, index, getter, setter);
1250-
}
1251-
1252-
SuperIndexedAccessGenerator.internal(ExpressionGeneratorHelper helper,
1253-
Token token, this.index, this.getter, this.setter)
1193+
SuperIndexedAccessGenerator(ExpressionGeneratorHelper helper, Token token,
1194+
this.index, this.getter, this.setter)
12541195
: super(helper, token);
12551196

12561197
String get plainNameForRead => "[]";
@@ -1387,11 +1328,10 @@ class StaticAccessGenerator extends Generator {
13871328

13881329
final Member writeTarget;
13891330

1390-
factory StaticAccessGenerator(ExpressionGeneratorHelper helper, Token token,
1391-
Member readTarget, Member writeTarget) {
1392-
return helper.forest
1393-
.staticAccessGenerator(helper, token, readTarget, writeTarget);
1394-
}
1331+
StaticAccessGenerator(ExpressionGeneratorHelper helper, Token token,
1332+
this.readTarget, this.writeTarget)
1333+
: assert(readTarget != null || writeTarget != null),
1334+
super(helper, token);
13951335

13961336
factory StaticAccessGenerator.fromBuilder(ExpressionGeneratorHelper helper,
13971337
Declaration declaration, Token token, Declaration builderSetter) {
@@ -1418,11 +1358,6 @@ class StaticAccessGenerator extends Generator {
14181358
return new StaticAccessGenerator(helper, token, getter, setter);
14191359
}
14201360

1421-
StaticAccessGenerator.internal(ExpressionGeneratorHelper helper, Token token,
1422-
this.readTarget, this.writeTarget)
1423-
: assert(readTarget != null || writeTarget != null),
1424-
super(helper, token);
1425-
14261361
@override
14271362
String get debugName => "StaticAccessGenerator";
14281363

@@ -1500,12 +1435,7 @@ class StaticAccessGenerator extends Generator {
15001435
class LoadLibraryGenerator extends Generator {
15011436
final LoadLibraryBuilder builder;
15021437

1503-
factory LoadLibraryGenerator(ExpressionGeneratorHelper helper, Token token,
1504-
LoadLibraryBuilder builder) {
1505-
return helper.forest.loadLibraryGenerator(helper, token, builder);
1506-
}
1507-
1508-
LoadLibraryGenerator.internal(
1438+
LoadLibraryGenerator(
15091439
ExpressionGeneratorHelper helper, Token token, this.builder)
15101440
: super(helper, token);
15111441

@@ -1546,14 +1476,8 @@ class DeferredAccessGenerator extends Generator {
15461476

15471477
final Generator suffixGenerator;
15481478

1549-
factory DeferredAccessGenerator(ExpressionGeneratorHelper helper, Token token,
1550-
PrefixUseGenerator prefixGenerator, Generator suffixGenerator) {
1551-
return helper.forest.deferredAccessGenerator(
1552-
helper, token, prefixGenerator, suffixGenerator);
1553-
}
1554-
1555-
DeferredAccessGenerator.internal(ExpressionGeneratorHelper helper,
1556-
Token token, this.prefixGenerator, this.suffixGenerator)
1479+
DeferredAccessGenerator(ExpressionGeneratorHelper helper, Token token,
1480+
this.prefixGenerator, this.suffixGenerator)
15571481
: super(helper, token);
15581482

15591483
@override
@@ -1671,15 +1595,9 @@ class DeferredAccessGenerator extends Generator {
16711595
class TypeUseGenerator extends ReadOnlyAccessGenerator {
16721596
final TypeDeclarationBuilder declaration;
16731597

1674-
factory TypeUseGenerator(ExpressionGeneratorHelper helper, Token token,
1675-
TypeDeclarationBuilder declaration, String plainNameForRead) {
1676-
return helper.forest
1677-
.typeUseGenerator(helper, token, declaration, plainNameForRead);
1678-
}
1679-
1680-
TypeUseGenerator.internal(ExpressionGeneratorHelper helper, Token token,
1598+
TypeUseGenerator(ExpressionGeneratorHelper helper, Token token,
16811599
this.declaration, String plainNameForRead)
1682-
: super.internal(helper, token, null, plainNameForRead);
1600+
: super(helper, token, null, plainNameForRead);
16831601

16841602
@override
16851603
String get debugName => "TypeUseGenerator";
@@ -1863,14 +1781,8 @@ class ReadOnlyAccessGenerator extends Generator {
18631781

18641782
VariableDeclaration value;
18651783

1866-
factory ReadOnlyAccessGenerator(ExpressionGeneratorHelper helper, Token token,
1867-
Expression expression, String plainNameForRead) {
1868-
return helper.forest
1869-
.readOnlyAccessGenerator(helper, token, expression, plainNameForRead);
1870-
}
1871-
1872-
ReadOnlyAccessGenerator.internal(ExpressionGeneratorHelper helper,
1873-
Token token, this.expression, this.plainNameForRead)
1784+
ReadOnlyAccessGenerator(ExpressionGeneratorHelper helper, Token token,
1785+
this.expression, this.plainNameForRead)
18741786
: super(helper, token);
18751787

18761788
@override
@@ -1910,8 +1822,7 @@ class ReadOnlyAccessGenerator extends Generator {
19101822
}
19111823

19121824
abstract class ErroneousExpressionGenerator extends Generator {
1913-
ErroneousExpressionGenerator.internal(
1914-
ExpressionGeneratorHelper helper, Token token)
1825+
ErroneousExpressionGenerator(ExpressionGeneratorHelper helper, Token token)
19151826
: super(helper, token);
19161827

19171828
/// Pass [arguments] that must be evaluated before throwing an error. At
@@ -2038,12 +1949,12 @@ class UnresolvedNameGenerator extends ErroneousExpressionGenerator {
20381949
if (name.name.isEmpty) {
20391950
unhandled("empty", "name", offsetForToken(token), helper.uri);
20401951
}
2041-
return helper.forest.unresolvedNameGenerator(helper, token, name);
1952+
return new UnresolvedNameGenerator.internal(helper, token, name);
20421953
}
20431954

20441955
UnresolvedNameGenerator.internal(
20451956
ExpressionGeneratorHelper helper, Token token, this.name)
2046-
: super.internal(helper, token);
1957+
: super(helper, token);
20471958

20481959
@override
20491960
String get debugName => "UnresolvedNameGenerator";
@@ -2123,12 +2034,7 @@ class UnlinkedGenerator extends Generator {
21232034

21242035
final Name name;
21252036

2126-
factory UnlinkedGenerator(ExpressionGeneratorHelper helper, Token token,
2127-
UnlinkedDeclaration declaration) {
2128-
return helper.forest.unlinkedGenerator(helper, token, declaration);
2129-
}
2130-
2131-
UnlinkedGenerator.internal(
2037+
UnlinkedGenerator(
21322038
ExpressionGeneratorHelper helper, Token token, this.declaration)
21332039
: name = new Name(declaration.name, helper.library.target),
21342040
receiver = new InvalidExpression(declaration.name)
@@ -2167,7 +2073,7 @@ class UnlinkedGenerator extends Generator {
21672073
abstract class ContextAwareGenerator extends Generator {
21682074
final Generator generator;
21692075

2170-
ContextAwareGenerator.internal(
2076+
ContextAwareGenerator(
21712077
ExpressionGeneratorHelper helper, Token token, this.generator)
21722078
: super(helper, token);
21732079

@@ -2232,15 +2138,9 @@ class DelayedAssignment extends ContextAwareGenerator {
22322138

22332139
String assignmentOperator;
22342140

2235-
factory DelayedAssignment(ExpressionGeneratorHelper helper, Token token,
2236-
Generator generator, Expression value, String assignmentOperator) {
2237-
return helper.forest
2238-
.delayedAssignment(helper, token, generator, value, assignmentOperator);
2239-
}
2240-
2241-
DelayedAssignment.internal(ExpressionGeneratorHelper helper, Token token,
2141+
DelayedAssignment(ExpressionGeneratorHelper helper, Token token,
22422142
Generator generator, this.value, this.assignmentOperator)
2243-
: super.internal(helper, token, generator);
2143+
: super(helper, token, generator);
22442144

22452145
@override
22462146
String get debugName => "DelayedAssignment";
@@ -2332,19 +2232,9 @@ class DelayedPostfixIncrement extends ContextAwareGenerator {
23322232

23332233
final Procedure interfaceTarget;
23342234

2335-
factory DelayedPostfixIncrement(ExpressionGeneratorHelper helper, Token token,
2336-
Generator generator, Name binaryOperator, Procedure interfaceTarget) {
2337-
return helper.forest.delayedPostfixIncrement(
2338-
helper, token, generator, binaryOperator, interfaceTarget);
2339-
}
2340-
2341-
DelayedPostfixIncrement.internal(
2342-
ExpressionGeneratorHelper helper,
2343-
Token token,
2344-
Generator generator,
2345-
this.binaryOperator,
2346-
this.interfaceTarget)
2347-
: super.internal(helper, token, generator);
2235+
DelayedPostfixIncrement(ExpressionGeneratorHelper helper, Token token,
2236+
Generator generator, this.binaryOperator, this.interfaceTarget)
2237+
: super(helper, token, generator);
23482238

23492239
@override
23502240
String get debugName => "DelayedPostfixIncrement";
@@ -2376,13 +2266,8 @@ class DelayedPostfixIncrement extends ContextAwareGenerator {
23762266

23772267
class PrefixUseGenerator extends Generator {
23782268
final PrefixBuilder prefix;
2379-
factory PrefixUseGenerator(
2380-
ExpressionGeneratorHelper helper, Token token, PrefixBuilder prefix) {
2381-
return helper.forest.prefixUseGenerator(helper, token, prefix);
2382-
}
23832269

2384-
PrefixUseGenerator.internal(
2385-
ExpressionGeneratorHelper helper, Token token, this.prefix)
2270+
PrefixUseGenerator(ExpressionGeneratorHelper helper, Token token, this.prefix)
23862271
: super(helper, token);
23872272

23882273
@override
@@ -2473,14 +2358,8 @@ class UnexpectedQualifiedUseGenerator extends Generator {
24732358

24742359
final bool isUnresolved;
24752360

2476-
factory UnexpectedQualifiedUseGenerator(ExpressionGeneratorHelper helper,
2477-
Token token, Generator prefixGenerator, bool isUnresolved) {
2478-
return helper.forest.unexpectedQualifiedUseGenerator(
2479-
helper, token, prefixGenerator, isUnresolved);
2480-
}
2481-
2482-
UnexpectedQualifiedUseGenerator.internal(ExpressionGeneratorHelper helper,
2483-
Token token, this.prefixGenerator, this.isUnresolved)
2361+
UnexpectedQualifiedUseGenerator(ExpressionGeneratorHelper helper, Token token,
2362+
this.prefixGenerator, this.isUnresolved)
24842363
: super(helper, token);
24852364

24862365
@override
@@ -2534,12 +2413,7 @@ class UnexpectedQualifiedUseGenerator extends Generator {
25342413
class ParserErrorGenerator extends Generator {
25352414
final Message message;
25362415

2537-
factory ParserErrorGenerator(
2538-
ExpressionGeneratorHelper helper, Token token, Message message) {
2539-
return helper.forest.parserErrorGenerator(helper, token, message);
2540-
}
2541-
2542-
ParserErrorGenerator.internal(
2416+
ParserErrorGenerator(
25432417
ExpressionGeneratorHelper helper, Token token, this.message)
25442418
: super(helper, token);
25452419

@@ -2839,7 +2713,7 @@ class IncompleteErrorGenerator extends ErroneousExpressionGenerator
28392713

28402714
IncompleteErrorGenerator(
28412715
ExpressionGeneratorHelper helper, Token token, this.message)
2842-
: super.internal(helper, token);
2716+
: super(helper, token);
28432717

28442718
Name get name => null;
28452719

@@ -3033,7 +2907,7 @@ class IncompletePropertyAccessGenerator extends Generator
30332907
class ParenthesizedExpressionGenerator extends ReadOnlyAccessGenerator {
30342908
ParenthesizedExpressionGenerator(
30352909
ExpressionGeneratorHelper helper, Token token, Expression expression)
3036-
: super.internal(helper, token, expression, null);
2910+
: super(helper, token, expression, null);
30372911

30382912
String get debugName => "ParenthesizedExpressionGenerator";
30392913

0 commit comments

Comments
 (0)