Skip to content

Commit 146f362

Browse files
scheglovCommit Queue
authored andcommitted
CodeGen. Generate AST resolveExpression()
Change-Id: Idc36c6c5b3b1b0791ab76b1b8bccb4da3bd74bb1 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/428920 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Paul Berry <[email protected]>
1 parent 07fe695 commit 146f362

File tree

3 files changed

+118
-25
lines changed

3 files changed

+118
-25
lines changed

pkg/analyzer/lib/src/dart/ast/ast.dart

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ final class AdjacentStringsImpl extends StringLiteralImpl
9898
@override
9999
E? accept<E>(AstVisitor<E> visitor) => visitor.visitAdjacentStrings(this);
100100

101+
@generated
101102
@override
102103
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
103104
resolver.visitAdjacentStrings(this, contextType: contextType);
@@ -683,6 +684,7 @@ final class AsExpressionImpl extends ExpressionImpl implements AsExpression {
683684
@override
684685
E? accept<E>(AstVisitor<E> visitor) => visitor.visitAsExpression(this);
685686

687+
@generated
686688
@override
687689
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
688690
resolver.visitAsExpression(this, contextType: contextType);
@@ -1201,6 +1203,7 @@ final class AssignmentExpressionImpl extends ExpressionImpl
12011203
E? accept<E>(AstVisitor<E> visitor) =>
12021204
visitor.visitAssignmentExpression(this);
12031205

1206+
@generated
12041207
@override
12051208
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
12061209
resolver.visitAssignmentExpression(this, contextType: contextType);
@@ -1926,6 +1929,7 @@ final class AugmentedExpressionImpl extends ExpressionImpl
19261929
@override
19271930
E? accept<E>(AstVisitor<E> visitor) => visitor.visitAugmentedExpression(this);
19281931

1932+
@generated
19291933
@override
19301934
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
19311935
resolver.visitAugmentedExpression(this, contextType: contextType);
@@ -2045,6 +2049,7 @@ final class AugmentedInvocationImpl extends ExpressionImpl
20452049
@override
20462050
E? accept<E>(AstVisitor<E> visitor) => visitor.visitAugmentedInvocation(this);
20472051

2052+
@generated
20482053
@override
20492054
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
20502055
resolver.visitAugmentedInvocation(this, contextType: contextType);
@@ -2143,6 +2148,7 @@ final class AwaitExpressionImpl extends ExpressionImpl
21432148
@override
21442149
E? accept<E>(AstVisitor<E> visitor) => visitor.visitAwaitExpression(this);
21452150

2151+
@generated
21462152
@override
21472153
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
21482154
resolver.visitAwaitExpression(this, contextType: contextType);
@@ -2266,6 +2272,7 @@ final class BinaryExpressionImpl extends ExpressionImpl
22662272
@override
22672273
E? accept<E>(AstVisitor<E> visitor) => visitor.visitBinaryExpression(this);
22682274

2275+
@generated
22692276
@override
22702277
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
22712278
resolver.visitBinaryExpression(this, contextType: contextType);
@@ -2541,6 +2548,7 @@ final class BooleanLiteralImpl extends LiteralImpl implements BooleanLiteral {
25412548
@override
25422549
E? accept<E>(AstVisitor<E> visitor) => visitor.visitBooleanLiteral(this);
25432550

2551+
@generated
25442552
@override
25452553
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
25462554
resolver.visitBooleanLiteral(this, contextType: contextType);
@@ -2768,6 +2776,7 @@ final class CascadeExpressionImpl extends ExpressionImpl
27682776
@override
27692777
E? accept<E>(AstVisitor<E> visitor) => visitor.visitCascadeExpression(this);
27702778

2779+
@generated
27712780
@override
27722781
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
27732782
resolver.visitCascadeExpression(this, contextType: contextType);
@@ -4785,6 +4794,7 @@ final class ConditionalExpressionImpl extends ExpressionImpl
47854794
E? accept<E>(AstVisitor<E> visitor) =>
47864795
visitor.visitConditionalExpression(this);
47874796

4797+
@generated
47884798
@override
47894799
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
47904800
resolver.visitConditionalExpression(this, contextType: contextType);
@@ -5761,6 +5771,7 @@ final class ConstructorReferenceImpl extends CommentReferableExpressionImpl
57615771
E? accept<E>(AstVisitor<E> visitor) =>
57625772
visitor.visitConstructorReference(this);
57635773

5774+
@generated
57645775
@override
57655776
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
57665777
resolver.visitConstructorReference(this, contextType: contextType);
@@ -6850,6 +6861,7 @@ final class DotShorthandConstructorInvocationImpl
68506861
E? accept<E>(AstVisitor<E> visitor) =>
68516862
visitor.visitDotShorthandConstructorInvocation(this);
68526863

6864+
@generated
68536865
@override
68546866
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
68556867
resolver.visitDotShorthandConstructorInvocation(
@@ -6970,6 +6982,7 @@ final class DotShorthandInvocationImpl extends InvocationExpressionImpl
69706982
E? accept<E>(AstVisitor<E> visitor) =>
69716983
visitor.visitDotShorthandInvocation(this);
69726984

6985+
@generated
69736986
@override
69746987
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
69756988
resolver.visitDotShorthandInvocation(this, contextType: contextType);
@@ -7084,6 +7097,7 @@ final class DotShorthandPropertyAccessImpl extends ExpressionImpl
70847097
E? accept<E>(AstVisitor<E> visitor) =>
70857098
visitor.visitDotShorthandPropertyAccess(this);
70867099

7100+
@generated
70877101
@override
70887102
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
70897103
resolver.visitDotShorthandPropertyAccess(this, contextType: contextType);
@@ -7226,6 +7240,7 @@ final class DoubleLiteralImpl extends LiteralImpl implements DoubleLiteral {
72267240
@override
72277241
E? accept<E>(AstVisitor<E> visitor) => visitor.visitDoubleLiteral(this);
72287242

7243+
@generated
72297244
@override
72307245
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
72317246
resolver.visitDoubleLiteral(this, contextType: contextType);
@@ -8945,6 +8960,7 @@ final class ExtensionOverrideImpl extends ExpressionImpl
89458960
@override
89468961
E? accept<E>(AstVisitor<E> visitor) => visitor.visitExtensionOverride(this);
89478962

8963+
@generated
89488964
@override
89498965
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
89508966
resolver.visitExtensionOverride(this, contextType: contextType);
@@ -11407,6 +11423,7 @@ final class FunctionExpressionImpl extends ExpressionImpl
1140711423
@override
1140811424
E? accept<E>(AstVisitor<E> visitor) => visitor.visitFunctionExpression(this);
1140911425

11426+
@generated
1141011427
@override
1141111428
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1141211429
resolver.visitFunctionExpression(this, contextType: contextType);
@@ -11529,6 +11546,7 @@ final class FunctionExpressionInvocationImpl extends InvocationExpressionImpl
1152911546
E? accept<E>(AstVisitor<E> visitor) =>
1153011547
visitor.visitFunctionExpressionInvocation(this);
1153111548

11549+
@generated
1153211550
@override
1153311551
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1153411552
resolver.visitFunctionExpressionInvocation(this, contextType: contextType);
@@ -11671,6 +11689,7 @@ final class FunctionReferenceImpl extends CommentReferableExpressionImpl
1167111689
@override
1167211690
E? accept<E>(AstVisitor<E> visitor) => visitor.visitFunctionReference(this);
1167311691

11692+
@generated
1167411693
@override
1167511694
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1167611695
resolver.visitFunctionReference(this, contextType: contextType);
@@ -13254,9 +13273,10 @@ final class ImplicitCallReferenceImpl extends ExpressionImpl
1325413273
E? accept<E>(AstVisitor<E> visitor) =>
1325513274
visitor.visitImplicitCallReference(this);
1325613275

13276+
@generated
1325713277
@override
1325813278
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
13259-
resolver.visitImplicitCallReference(this);
13279+
resolver.visitImplicitCallReference(this, contextType: contextType);
1326013280
}
1326113281

1326213282
@generated
@@ -13834,6 +13854,7 @@ final class IndexExpressionImpl extends ExpressionImpl
1383413854
return false;
1383513855
}
1383613856

13857+
@generated
1383713858
@override
1383813859
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1383913860
resolver.visitIndexExpression(this, contextType: contextType);
@@ -14002,6 +14023,7 @@ final class InstanceCreationExpressionImpl extends ExpressionImpl
1400214023
E? accept<E>(AstVisitor<E> visitor) =>
1400314024
visitor.visitInstanceCreationExpression(this);
1400414025

14026+
@generated
1400514027
@override
1400614028
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1400714029
resolver.visitInstanceCreationExpression(this, contextType: contextType);
@@ -14105,6 +14127,7 @@ final class IntegerLiteralImpl extends LiteralImpl implements IntegerLiteral {
1410514127
@override
1410614128
E? accept<E>(AstVisitor<E> visitor) => visitor.visitIntegerLiteral(this);
1410714129

14130+
@generated
1410814131
@override
1410914132
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1411014133
resolver.visitIntegerLiteral(this, contextType: contextType);
@@ -14560,6 +14583,7 @@ final class IsExpressionImpl extends ExpressionImpl implements IsExpression {
1456014583
@override
1456114584
E? accept<E>(AstVisitor<E> visitor) => visitor.visitIsExpression(this);
1456214585

14586+
@generated
1456314587
@override
1456414588
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1456514589
resolver.visitIsExpression(this, contextType: contextType);
@@ -14955,9 +14979,10 @@ final class LibraryIdentifierImpl extends IdentifierImpl
1495514979
@override
1495614980
E? accept<E>(AstVisitor<E> visitor) => visitor.visitLibraryIdentifier(this);
1495714981

14982+
@generated
1495814983
@override
1495914984
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
14960-
resolver.visitLibraryIdentifier(this);
14985+
resolver.visitLibraryIdentifier(this, contextType: contextType);
1496114986
}
1496214987

1496314988
@generated
@@ -15061,6 +15086,7 @@ final class ListLiteralImpl extends TypedLiteralImpl implements ListLiteral {
1506115086
@override
1506215087
E? accept<E>(AstVisitor<E> visitor) => visitor.visitListLiteral(this);
1506315088

15089+
@generated
1506415090
@override
1506515091
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1506615092
resolver.visitListLiteral(this, contextType: contextType);
@@ -16442,6 +16468,7 @@ final class MethodInvocationImpl extends InvocationExpressionImpl
1644216468
@override
1644316469
E? accept<E>(AstVisitor<E> visitor) => visitor.visitMethodInvocation(this);
1644416470

16471+
@generated
1644516472
@override
1644616473
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1644716474
resolver.visitMethodInvocation(this, contextType: contextType);
@@ -16916,6 +16943,7 @@ final class NamedExpressionImpl extends ExpressionImpl
1691616943
@override
1691716944
E? accept<E>(AstVisitor<E> visitor) => visitor.visitNamedExpression(this);
1691816945

16946+
@generated
1691916947
@override
1692016948
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1692116949
resolver.visitNamedExpression(this, contextType: contextType);
@@ -17974,6 +18002,7 @@ final class NullLiteralImpl extends LiteralImpl implements NullLiteral {
1797418002
@override
1797518003
E? accept<E>(AstVisitor<E> visitor) => visitor.visitNullLiteral(this);
1797618004

18005+
@generated
1797718006
@override
1797818007
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1797918008
resolver.visitNullLiteral(this, contextType: contextType);
@@ -18276,6 +18305,7 @@ final class ParenthesizedExpressionImpl extends ExpressionImpl
1827618305
E? accept<E>(AstVisitor<E> visitor) =>
1827718306
visitor.visitParenthesizedExpression(this);
1827818307

18308+
@generated
1827918309
@override
1828018310
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1828118311
resolver.visitParenthesizedExpression(this, contextType: contextType);
@@ -18772,6 +18802,7 @@ final class PatternAssignmentImpl extends ExpressionImpl
1877218802
@override
1877318803
E? accept<E>(AstVisitor<E> visitor) => visitor.visitPatternAssignment(this);
1877418804

18805+
@generated
1877518806
@override
1877618807
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1877718808
resolver.visitPatternAssignment(this, contextType: contextType);
@@ -19330,6 +19361,7 @@ final class PostfixExpressionImpl extends ExpressionImpl
1933019361
@override
1933119362
E? accept<E>(AstVisitor<E> visitor) => visitor.visitPostfixExpression(this);
1933219363

19364+
@generated
1933319365
@override
1933419366
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1933519367
resolver.visitPostfixExpression(this, contextType: contextType);
@@ -19472,6 +19504,7 @@ final class PrefixedIdentifierImpl extends IdentifierImpl
1947219504
@override
1947319505
E? accept<E>(AstVisitor<E> visitor) => visitor.visitPrefixedIdentifier(this);
1947419506

19507+
@generated
1947519508
@override
1947619509
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1947719510
resolver.visitPrefixedIdentifier(this, contextType: contextType);
@@ -19602,6 +19635,7 @@ final class PrefixExpressionImpl extends ExpressionImpl
1960219635
@override
1960319636
E? accept<E>(AstVisitor<E> visitor) => visitor.visitPrefixExpression(this);
1960419637

19638+
@generated
1960519639
@override
1960619640
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1960719641
resolver.visitPrefixExpression(this, contextType: contextType);
@@ -19787,6 +19821,7 @@ final class PropertyAccessImpl extends CommentReferableExpressionImpl
1978719821
@override
1978819822
E? accept<E>(AstVisitor<E> visitor) => visitor.visitPropertyAccess(this);
1978919823

19824+
@generated
1979019825
@override
1979119826
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1979219827
resolver.visitPropertyAccess(this, contextType: contextType);
@@ -19912,6 +19947,7 @@ final class RecordLiteralImpl extends LiteralImpl implements RecordLiteral {
1991219947
@override
1991319948
E? accept<E>(AstVisitor<E> visitor) => visitor.visitRecordLiteral(this);
1991419949

19950+
@generated
1991519951
@override
1991619952
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
1991719953
resolver.visitRecordLiteral(this, contextType: contextType);
@@ -21121,6 +21157,7 @@ final class RethrowExpressionImpl extends ExpressionImpl
2112121157
@override
2112221158
E? accept<E>(AstVisitor<E> visitor) => visitor.visitRethrowExpression(this);
2112321159

21160+
@generated
2112421161
@override
2112521162
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
2112621163
resolver.visitRethrowExpression(this, contextType: contextType);
@@ -21452,6 +21489,7 @@ final class SetOrMapLiteralImpl extends TypedLiteralImpl
2145221489
_resolvedKind = _SetOrMapKind.unresolved;
2145321490
}
2145421491

21492+
@generated
2145521493
@override
2145621494
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
2145721495
resolver.visitSetOrMapLiteral(this, contextType: contextType);
@@ -21917,6 +21955,7 @@ final class SimpleIdentifierImpl extends IdentifierImpl
2191721955
return false;
2191821956
}
2191921957

21958+
@generated
2192021959
@override
2192121960
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
2192221961
resolver.visitSimpleIdentifier(this, contextType: contextType);
@@ -22024,6 +22063,7 @@ final class SimpleStringLiteralImpl extends SingleStringLiteralImpl
2202422063
@override
2202522064
E? accept<E>(AstVisitor<E> visitor) => visitor.visitSimpleStringLiteral(this);
2202622065

22066+
@generated
2202722067
@override
2202822068
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
2202922069
resolver.visitSimpleStringLiteral(this, contextType: contextType);
@@ -22621,6 +22661,7 @@ final class SuperExpressionImpl extends ExpressionImpl
2262122661
@override
2262222662
E? accept<E>(AstVisitor<E> visitor) => visitor.visitSuperExpression(this);
2262322663

22664+
@generated
2262422665
@override
2262522666
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
2262622667
resolver.visitSuperExpression(this, contextType: contextType);
@@ -23288,6 +23329,7 @@ final class SwitchExpressionImpl extends ExpressionImpl
2328823329
@override
2328923330
E? accept<E>(AstVisitor<E> visitor) => visitor.visitSwitchExpression(this);
2329023331

23332+
@generated
2329123333
@override
2329223334
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
2329323335
resolver.visitSwitchExpression(this, contextType: contextType);
@@ -23725,6 +23767,7 @@ final class SymbolLiteralImpl extends LiteralImpl implements SymbolLiteral {
2372523767
@override
2372623768
E? accept<E>(AstVisitor<E> visitor) => visitor.visitSymbolLiteral(this);
2372723769

23770+
@generated
2372823771
@override
2372923772
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
2373023773
resolver.visitSymbolLiteral(this, contextType: contextType);
@@ -23801,6 +23844,7 @@ final class ThisExpressionImpl extends ExpressionImpl
2380123844
@override
2380223845
E? accept<E>(AstVisitor<E> visitor) => visitor.visitThisExpression(this);
2380323846

23847+
@generated
2380423848
@override
2380523849
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
2380623850
resolver.visitThisExpression(this, contextType: contextType);
@@ -23888,6 +23932,7 @@ final class ThrowExpressionImpl extends ExpressionImpl
2388823932
@override
2388923933
E? accept<E>(AstVisitor<E> visitor) => visitor.visitThrowExpression(this);
2389023934

23935+
@generated
2389123936
@override
2389223937
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
2389323938
resolver.visitThrowExpression(this, contextType: contextType);
@@ -24489,6 +24534,7 @@ final class TypeLiteralImpl extends CommentReferableExpressionImpl
2448924534
@override
2449024535
E? accept<E>(AstVisitor<E> visitor) => visitor.visitTypeLiteral(this);
2449124536

24537+
@generated
2449224538
@override
2449324539
void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {
2449424540
resolver.visitTypeLiteral(this, contextType: contextType);

pkg/analyzer/lib/src/generated/resolver.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3105,7 +3105,10 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
31053105
}
31063106

31073107
@override
3108-
void visitImplicitCallReference(covariant ImplicitCallReferenceImpl node) {
3108+
void visitImplicitCallReference(
3109+
covariant ImplicitCallReferenceImpl node, {
3110+
TypeImpl contextType = UnknownInferredType.instance,
3111+
}) {
31093112
checkUnreachableNode(node);
31103113
analyzeExpression(
31113114
node.expression,
@@ -3285,7 +3288,10 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
32853288
}
32863289

32873290
@override
3288-
void visitLibraryIdentifier(LibraryIdentifier node) {}
3291+
void visitLibraryIdentifier(
3292+
LibraryIdentifier node, {
3293+
TypeImpl contextType = UnknownInferredType.instance,
3294+
}) {}
32893295

32903296
@override
32913297
void visitListLiteral(

0 commit comments

Comments
 (0)