Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(386)

Unified Diff: pkg/front_end/lib/src/fasta/analyzer/ast_builder.dart

Issue 2751913002: Parse constructor field initializers with Fasta. (Closed)
Patch Set: Fix for DietListener test failure. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/front_end/lib/src/fasta/analyzer/ast_builder.dart
diff --git a/pkg/front_end/lib/src/fasta/analyzer/ast_builder.dart b/pkg/front_end/lib/src/fasta/analyzer/ast_builder.dart
index fcc7bd58161686f211e8717a4f3cfe1eee283041..a934954445371eb8f7b3bde7c614775dc4726bd2 100644
--- a/pkg/front_end/lib/src/fasta/analyzer/ast_builder.dart
+++ b/pkg/front_end/lib/src/fasta/analyzer/ast_builder.dart
@@ -392,11 +392,12 @@ class AstBuilder extends ScopeListener {
void handleNoInitializers() {
debugEvent("NoInitializers");
+ push(NullValue.ConstructorInitializers);
}
void endInitializers(int count, Token beginToken, Token endToken) {
debugEvent("Initializers");
- popList(count);
+ push(popList(count));
}
void endVariableInitializer(Token assignmentOperator) {
@@ -1407,7 +1408,7 @@ class AstBuilder extends ScopeListener {
debugEvent("Method");
FunctionBody body = pop();
ConstructorName redirectedConstructor = null; // TODO(paulberry)
- List<ConstructorInitializer> initializers = null; // TODO(paulberry)
+ List<Object> initializerObjects = pop() ?? const [];
Token separator = null; // TODO(paulberry)
FormalParameterList parameters = pop();
TypeParameterList typeParameters = pop(); // TODO(paulberry)
@@ -1417,6 +1418,30 @@ class AstBuilder extends ScopeListener {
List<Annotation> metadata = pop();
Comment comment = pop();
+ var initializers = <ConstructorInitializer>[];
+ for (Object initializerObject in initializerObjects) {
+ if (initializerObject is AssignmentExpression) {
+ analyzer.Token thisKeyword;
+ analyzer.Token period;
+ SimpleIdentifier fieldName;
+ Expression left = initializerObject.leftHandSide;
+ if (left is PropertyAccess) {
+ var thisExpression = left.target as ThisExpression;
+ thisKeyword = thisExpression.thisKeyword;
+ period = left.operator;
+ fieldName = left.propertyName;
+ } else {
+ fieldName = left as SimpleIdentifier;
+ }
+ initializers.add(ast.constructorFieldInitializer(
+ thisKeyword,
+ period,
+ fieldName,
+ initializerObject.operator,
+ initializerObject.rightHandSide));
+ }
+ }
+
void constructor(SimpleIdentifier returnType, analyzer.Token period,
SimpleIdentifier name) {
push(ast.constructorDeclaration(

Powered by Google App Engine
This is Rietveld 408576698