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

Unified Diff: pkg/front_end/lib/src/fasta/source/source_library_builder.dart

Issue 2941093002: Only attempt to do type inference on fields that lack a declared type. (Closed)
Patch Set: Created 3 years, 6 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/source/source_library_builder.dart
diff --git a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
index f7d8952145b1a345389ff01b5fdb6bed288945e4..7e992bc12896353594a1b4d4e1cbf094316fb94b 100644
--- a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
+++ b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
@@ -188,20 +188,29 @@ abstract class SourceLibraryBuilder<T extends TypeBuilder, R>
List<T> interfaces,
int charOffset);
- void addField(List<MetadataBuilder> metadata, int modifiers, T type,
- String name, int charOffset, Token initializer);
+ void addField(
+ List<MetadataBuilder> metadata,
+ int modifiers,
+ T type,
+ String name,
+ int charOffset,
+ Token initializerTokenForInference,
+ bool hasInitializer);
void addFields(List<MetadataBuilder> metadata, int modifiers, T type,
List<Object> fieldsInfo) {
for (int i = 0; i < fieldsInfo.length; i += 4) {
String name = fieldsInfo[i];
int charOffset = fieldsInfo[i + 1];
- Token initializer = fieldsInfo[i + 2];
- if (initializer != null) {
+ bool hasInitializer = fieldsInfo[i + 2] != null;
+ Token initializerTokenForInference =
+ type == null ? fieldsInfo[i + 2] : null;
+ if (initializerTokenForInference != null) {
Token beforeLast = fieldsInfo[i + 3];
beforeLast.setNext(new Token.eof(beforeLast.next.offset));
}
- addField(metadata, modifiers, type, name, charOffset, initializer);
+ addField(metadata, modifiers, type, name, charOffset,
+ initializerTokenForInference, hasInitializer);
}
}

Powered by Google App Engine
This is Rietveld 408576698