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

Unified Diff: pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart

Issue 2691523002: Ensure locations are always provided, but don't store them yet. (Closed)
Patch Set: Address comments. Created 3 years, 10 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/kernel/kernel_field_builder.dart
diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart
index 4433963b2bef8889f2f2feb033e5375d404342a3..87af171d088d3044cb91c099284fc3252d68732d 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart
@@ -5,24 +5,31 @@
library fasta.kernel_field_builder;
import 'package:kernel/ast.dart' show
- DynamicType,
Expression,
Field,
Library,
Name;
import 'kernel_builder.dart' show
+ Builder,
FieldBuilder,
KernelTypeBuilder,
MetadataBuilder;
+import '../util/relativize.dart' show
+ relativizeUri;
+
class KernelFieldBuilder extends FieldBuilder<Expression> {
- Field field;
+ final Field field;
final List<MetadataBuilder> metadata;
final KernelTypeBuilder type;
- KernelFieldBuilder(this.metadata, this.type, String name, int modifiers)
- : super(name, modifiers);
+ KernelFieldBuilder(this.metadata, this.type, String name, int modifiers,
+ Builder compilationUnit, int charOffset)
+ : field =
+ new Field(null, fileUri: relativizeUri(compilationUnit?.fileUri))
+ ..fileOffset = charOffset,
+ super(name, modifiers, compilationUnit, charOffset);
void set initializer(Expression value) {
field.initializer = value
@@ -30,9 +37,17 @@ class KernelFieldBuilder extends FieldBuilder<Expression> {
}
Field build(Library library) {
- return field ??= new Field(new Name(name, library),
- type: type?.build() ?? const DynamicType(),
- isFinal: isFinal, isConst: isConst, isStatic: isStatic || isTopLevel);
+ field.name ??= new Name(name, library);
+ if (type != null) {
+ field.type = type.build();
+ }
+ bool isInstanceMember = !isStatic && !isTopLevel;
+ return field
+ ..isFinal = isFinal
+ ..isConst = isConst
+ ..hasImplicitGetter = isInstanceMember
+ ..hasImplicitSetter = isInstanceMember && !isConst && !isFinal
+ ..isStatic = !isInstanceMember;
}
Field get target => field;

Powered by Google App Engine
This is Rietveld 408576698