diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart index f4a9d05af29..20d7be3188a 100644 --- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart +++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart @@ -3911,14 +3911,14 @@ abstract class BodyBuilder kernel.Statement deprecated_buildCompileTimeErrorStatement(error, [int charOffset = -1]) { - return new ShadowExpressionStatement(toKernelExpression( + return new ExpressionStatementJudgment(toKernelExpression( deprecated_buildCompileTimeError(error, charOffset))); } kernel.Statement buildCompileTimeErrorStatement( Message message, int charOffset, {List context}) { - return new ShadowExpressionStatement(toKernelExpression( + return new ExpressionStatementJudgment(toKernelExpression( buildCompileTimeError(message, charOffset, noLength, context: context))); } diff --git a/pkg/front_end/lib/src/fasta/kernel/fangorn.dart b/pkg/front_end/lib/src/fasta/kernel/fangorn.dart index ee066cd2c05..97a5ef7a924 100644 --- a/pkg/front_end/lib/src/fasta/kernel/fangorn.dart +++ b/pkg/front_end/lib/src/fasta/kernel/fangorn.dart @@ -86,7 +86,7 @@ import 'kernel_shadow_ast.dart' LabeledStatementJudgment, LoadLibraryJudgment, NullJudgment, - ShadowExpressionStatement, + ExpressionStatementJudgment, ShadowForStatement, IfJudgment, ShadowListLiteral, @@ -378,7 +378,7 @@ class Fangorn extends Forest { } Statement expressionStatement(Expression expression, Token semicolon) { - return new ShadowExpressionStatement(expression); + return new ExpressionStatementJudgment(expression); } @override @@ -450,7 +450,7 @@ class Fangorn extends Forest { @override Statement rethrowStatement(Token rethrowKeyword, Token semicolon) { - return new ShadowExpressionStatement( + return new ExpressionStatementJudgment( new ShadowRethrow()..fileOffset = offsetForToken(rethrowKeyword)); } diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_ast_api.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_ast_api.dart index c331eb7dd63..f29b769af3b 100644 --- a/pkg/front_end/lib/src/fasta/kernel/kernel_ast_api.dart +++ b/pkg/front_end/lib/src/fasta/kernel/kernel_ast_api.dart @@ -72,7 +72,7 @@ export 'kernel_shadow_ast.dart' ShadowConstructorInvocation, ContinueSwitchJudgment, ShadowDeferredCheck, - ShadowExpressionStatement, + ExpressionStatementJudgment, ShadowFactoryConstructorInvocation, ShadowFieldInitializer, ShadowForInStatement, diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart index 73dee2adfa4..624a8875498 100644 --- a/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart +++ b/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart @@ -916,16 +916,18 @@ class EmptyStatementJudgment extends EmptyStatement } /// Concrete shadow object representing an expression statement in kernel form. -class ShadowExpressionStatement extends ExpressionStatement +class ExpressionStatementJudgment extends ExpressionStatement implements StatementJudgment { - ShadowExpressionStatement(Expression expression) : super(expression); + ExpressionStatementJudgment(Expression expression) : super(expression); + + Expression get judgment => expression; @override void infer( ShadowTypeInferrer inferrer, Factory factory) { inferrer.listener.expressionStatementEnter(fileOffset); - inferrer.inferExpression(factory, expression, const UnknownType(), false); + inferrer.inferExpression(factory, judgment, const UnknownType(), false); inferrer.listener.expressionStatementExit(fileOffset); } }