Skip to content

Commit 9a71c99

Browse files
johnniwinthercommit-bot@chromium.org
johnniwinther
authored and
[email protected]
committed
[cfe] Rename Declaration and DeclarationBuilder
Rename Declaration to Builder and DeclarationBuilder to TypeParameterScopeBuilder. This prepares for the introduciton of a DeclarationBuilder superclass of ClassBuilder, MixinDeclarationBuilder and ExtensionDeclarationBuilder. Change-Id: I2d392372f458f39ebaea87ec10f365b822ee3841 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112088 Reviewed-by: Dmitry Stefantsov <[email protected]> Commit-Queue: Johnni Winther <[email protected]>
1 parent e9a9d94 commit 9a71c99

39 files changed

+622
-616
lines changed

‎pkg/front_end/lib/src/fasta/builder/builder.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export 'class_builder.dart' show ClassBuilder;
2020

2121
export 'constructor_reference_builder.dart' show ConstructorReferenceBuilder;
2222

23-
export 'declaration.dart' show Declaration;
23+
export 'declaration.dart' show Builder;
2424

2525
export 'dynamic_type_builder.dart' show DynamicTypeBuilder;
2626

‎pkg/front_end/lib/src/fasta/builder/class_builder.dart‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import '../dill/dill_member_builder.dart' show DillMemberBuilder;
5656
import 'builder.dart'
5757
show
5858
ConstructorReferenceBuilder,
59-
Declaration,
59+
Builder,
6060
LibraryBuilder,
6161
MemberBuilder,
6262
MetadataBuilder,
@@ -107,7 +107,7 @@ import '../fasta_codes.dart'
107107
import '../kernel/kernel_builder.dart'
108108
show
109109
ConstructorReferenceBuilder,
110-
Declaration,
110+
Builder,
111111
FunctionBuilder,
112112
NamedTypeBuilder,
113113
LibraryBuilder,
@@ -204,7 +204,7 @@ abstract class ClassBuilder extends TypeDeclarationBuilder {
204204
}
205205

206206
void buildOutlineExpressions(LibraryBuilder library) {
207-
void build(String ignore, Declaration declaration) {
207+
void build(String ignore, Builder declaration) {
208208
MemberBuilder member = declaration;
209209
member.buildOutlineExpressions(library);
210210
}
@@ -244,7 +244,7 @@ abstract class ClassBuilder extends TypeDeclarationBuilder {
244244
// Copy keys to avoid concurrent modification error.
245245
List<String> names = constructors.keys.toList();
246246
for (String name in names) {
247-
Declaration declaration = constructors[name];
247+
Builder declaration = constructors[name];
248248
do {
249249
if (declaration.parent != this) {
250250
unexpected("$fileUri", "${declaration.parent.fileUri}", charOffset,
@@ -255,7 +255,7 @@ abstract class ClassBuilder extends TypeDeclarationBuilder {
255255
ConstructorReferenceBuilder redirectionTarget =
256256
declaration.redirectionTarget;
257257
if (redirectionTarget != null) {
258-
Declaration targetBuilder = redirectionTarget.target;
258+
Builder targetBuilder = redirectionTarget.target;
259259
if (declaration.next == null) {
260260
// Only the first one (that is, the last on in the linked list)
261261
// is actually in the kernel tree. This call creates a StaticGet
@@ -324,13 +324,13 @@ abstract class ClassBuilder extends TypeDeclarationBuilder {
324324
}
325325

326326
/// Used to lookup a static member of this class.
327-
Declaration findStaticBuilder(
327+
Builder findStaticBuilder(
328328
String name, int charOffset, Uri fileUri, LibraryBuilder accessingLibrary,
329329
{bool isSetter: false}) {
330330
if (accessingLibrary.origin != library.origin && name.startsWith("_")) {
331331
return null;
332332
}
333-
Declaration declaration = isSetter
333+
Builder declaration = isSetter
334334
? scope.lookupSetter(name, charOffset, fileUri, isInstanceScope: false)
335335
: scope.lookup(name, charOffset, fileUri, isInstanceScope: false);
336336
if (declaration == null && isPatch) {
@@ -341,20 +341,20 @@ abstract class ClassBuilder extends TypeDeclarationBuilder {
341341
return declaration;
342342
}
343343

344-
Declaration findConstructorOrFactory(
344+
Builder findConstructorOrFactory(
345345
String name, int charOffset, Uri uri, LibraryBuilder accessingLibrary) {
346346
if (accessingLibrary.origin != library.origin && name.startsWith("_")) {
347347
return null;
348348
}
349-
Declaration declaration = constructors.lookup(name, charOffset, uri);
349+
Builder declaration = constructors.lookup(name, charOffset, uri);
350350
if (declaration == null && isPatch) {
351351
return origin.findConstructorOrFactory(
352352
name, charOffset, uri, accessingLibrary);
353353
}
354354
return declaration;
355355
}
356356

357-
void forEach(void f(String name, Declaration builder)) {
357+
void forEach(void f(String name, Builder builder)) {
358358
scope.forEach(f);
359359
}
360360

@@ -384,7 +384,7 @@ abstract class ClassBuilder extends TypeDeclarationBuilder {
384384
/// For example, this method is convenient for use when building synthetic
385385
/// members, such as those of an enum.
386386
MemberBuilder firstMemberNamed(String name) {
387-
Declaration declaration = getLocalMember(name);
387+
Builder declaration = getLocalMember(name);
388388
while (declaration.next != null) {
389389
declaration = declaration.next;
390390
}
@@ -484,7 +484,7 @@ abstract class ClassBuilder extends TypeDeclarationBuilder {
484484
ClassBuilder superClass;
485485
TypeBuilder superClassType = supertype;
486486
if (superClassType is NamedTypeBuilder) {
487-
Declaration decl = superClassType.declaration;
487+
Builder decl = superClassType.declaration;
488488
if (decl is ClassBuilder) {
489489
superClass = decl;
490490
}
@@ -497,7 +497,7 @@ abstract class ClassBuilder extends TypeDeclarationBuilder {
497497
for (TypeBuilder type in interfaces) {
498498
if (type is NamedTypeBuilder) {
499499
int charOffset = -1; // TODO(ahe): Get offset from type.
500-
Declaration decl = type.declaration;
500+
Builder decl = type.declaration;
501501
if (decl is ClassBuilder) {
502502
ClassBuilder interface = decl;
503503
if (superClass == interface) {
@@ -1424,7 +1424,7 @@ abstract class ClassBuilder extends TypeDeclarationBuilder {
14241424

14251425
void checkMixinDeclaration() {
14261426
assert(cls.isMixinDeclaration);
1427-
for (Declaration constructory in constructors.local.values) {
1427+
for (Builder constructory in constructors.local.values) {
14281428
if (!constructory.isSynthetic &&
14291429
(constructory.isFactory || constructory.isConstructor)) {
14301430
addProblem(
@@ -1463,24 +1463,24 @@ abstract class ClassBuilder extends TypeDeclarationBuilder {
14631463
}
14641464

14651465
@override
1466-
void applyPatch(Declaration patch) {
1466+
void applyPatch(Builder patch) {
14671467
if (patch is ClassBuilder) {
14681468
patch.actualOrigin = this;
14691469
// TODO(ahe): Complain if `patch.supertype` isn't null.
1470-
scope.local.forEach((String name, Declaration member) {
1471-
Declaration memberPatch = patch.scope.local[name];
1470+
scope.local.forEach((String name, Builder member) {
1471+
Builder memberPatch = patch.scope.local[name];
14721472
if (memberPatch != null) {
14731473
member.applyPatch(memberPatch);
14741474
}
14751475
});
1476-
scope.setters.forEach((String name, Declaration member) {
1477-
Declaration memberPatch = patch.scope.setters[name];
1476+
scope.setters.forEach((String name, Builder member) {
1477+
Builder memberPatch = patch.scope.setters[name];
14781478
if (memberPatch != null) {
14791479
member.applyPatch(memberPatch);
14801480
}
14811481
});
1482-
constructors.local.forEach((String name, Declaration member) {
1483-
Declaration memberPatch = patch.constructors.local[name];
1482+
constructors.local.forEach((String name, Builder member) {
1483+
Builder memberPatch = patch.constructors.local[name];
14841484
if (memberPatch != null) {
14851485
member.applyPatch(memberPatch);
14861486
}
@@ -1640,7 +1640,7 @@ abstract class ClassBuilder extends TypeDeclarationBuilder {
16401640
Map<String, MemberBuilder> constructors = this.constructors.local;
16411641
Iterable<String> names = constructors.keys;
16421642
for (String name in names) {
1643-
Declaration constructor = constructors[name];
1643+
Builder constructor = constructors[name];
16441644
do {
16451645
if (constructor is RedirectingFactoryBuilder) {
16461646
checkRedirectingFactory(constructor, typeEnvironment);

‎pkg/front_end/lib/src/fasta/builder/constructor_reference_builder.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import '../messages.dart' show noLength, templateConstructorNotFound;
99
import 'builder.dart'
1010
show
1111
ClassBuilder,
12-
Declaration,
12+
Builder,
1313
LibraryBuilder,
1414
PrefixBuilder,
1515
QualifiedName,
@@ -29,10 +29,10 @@ class ConstructorReferenceBuilder {
2929
/// This is the name of a named constructor. As `bar` in `new Foo<T>.bar()`.
3030
final String suffix;
3131

32-
Declaration target;
32+
Builder target;
3333

3434
ConstructorReferenceBuilder(this.name, this.typeArguments, this.suffix,
35-
Declaration parent, this.charOffset)
35+
Builder parent, this.charOffset)
3636
: fileUri = parent.fileUri;
3737

3838
String get fullNameForErrors {
@@ -42,7 +42,7 @@ class ConstructorReferenceBuilder {
4242

4343
void resolveIn(Scope scope, LibraryBuilder accessingLibrary) {
4444
final name = this.name;
45-
Declaration declaration;
45+
Builder declaration;
4646
if (name is QualifiedName) {
4747
String prefix = name.qualifier;
4848
String middle = name.name;

‎pkg/front_end/lib/src/fasta/builder/declaration.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ library fasta.declaration;
66

77
import '../problems.dart' show unsupported;
88

9-
abstract class Declaration {
9+
abstract class Builder {
1010
/// Used when multiple things with the same name are declared within the same
1111
/// parent. Only used for top-level and class-member declarations, not for
1212
/// block scopes.
13-
Declaration next;
13+
Builder next;
1414

15-
Declaration();
15+
Builder();
1616

17-
Declaration get parent;
17+
Builder get parent;
1818

1919
Uri get fileUri;
2020

2121
int get charOffset;
2222

2323
get target => unsupported("${runtimeType}.target", charOffset, fileUri);
2424

25-
Declaration get origin => this;
25+
Builder get origin => this;
2626

2727
String get fullNameForErrors;
2828

@@ -69,7 +69,7 @@ abstract class Declaration {
6969
}
7070

7171
/// Applies [patch] to this declaration.
72-
void applyPatch(Declaration patch) {
72+
void applyPatch(Builder patch) {
7373
unsupported("${runtimeType}.applyPatch", charOffset, fileUri);
7474
}
7575

@@ -82,5 +82,5 @@ abstract class Declaration {
8282

8383
/// Resolve constructors (lookup names in scope) recorded in this builder and
8484
/// return the number of constructors resolved.
85-
int resolveConstructors(covariant Declaration parent) => 0;
85+
int resolveConstructors(covariant Builder parent) => 0;
8686
}

‎pkg/front_end/lib/src/fasta/builder/enum_builder.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import '../source/source_class_builder.dart' show SourceClassBuilder;
4848

4949
import '../kernel/kernel_builder.dart'
5050
show
51-
Declaration,
51+
Builder,
5252
FormalParameterBuilder,
5353
ClassBuilder,
5454
ConstructorBuilder,
@@ -280,7 +280,7 @@ class EnumBuilder extends SourceClassBuilder {
280280
if (enumConstantInfos != null) {
281281
for (EnumConstantInfo enumConstantInfo in enumConstantInfos) {
282282
if (enumConstantInfo != null) {
283-
Declaration declaration = firstMemberNamed(enumConstantInfo.name);
283+
Builder declaration = firstMemberNamed(enumConstantInfo.name);
284284
if (declaration.isField) {
285285
FieldBuilder field = declaration;
286286
values.add(new StaticGet(field.build(libraryBuilder)));
@@ -324,7 +324,7 @@ class EnumBuilder extends SourceClassBuilder {
324324
for (EnumConstantInfo enumConstantInfo in enumConstantInfos) {
325325
if (enumConstantInfo != null) {
326326
String constant = enumConstantInfo.name;
327-
Declaration declaration = firstMemberNamed(constant);
327+
Builder declaration = firstMemberNamed(constant);
328328
FieldBuilder field;
329329
if (declaration.isField) {
330330
field = declaration;
@@ -344,7 +344,7 @@ class EnumBuilder extends SourceClassBuilder {
344344
}
345345

346346
@override
347-
Declaration findConstructorOrFactory(
347+
Builder findConstructorOrFactory(
348348
String name, int charOffset, Uri uri, LibraryBuilder library) {
349349
return null;
350350
}

‎pkg/front_end/lib/src/fasta/builder/field_builder.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import '../kernel/body_builder.dart' show BodyBuilder;
2323
import '../kernel/kernel_builder.dart'
2424
show
2525
ClassBuilder,
26-
Declaration,
26+
Builder,
2727
ImplicitFieldType,
2828
TypeBuilder,
2929
LibraryBuilder,
@@ -59,7 +59,7 @@ class FieldBuilder extends MemberBuilder {
5959
bool hadTypesInferred = false;
6060

6161
FieldBuilder(this.metadata, this.type, this.name, this.modifiers,
62-
Declaration compilationUnit, int charOffset, int charEndOffset)
62+
Builder compilationUnit, int charOffset, int charEndOffset)
6363
: field = new Field(null, fileUri: compilationUnit?.fileUri)
6464
..fileOffset = charOffset
6565
..fileEndOffset = charEndOffset,

‎pkg/front_end/lib/src/fasta/builder/formal_parameter_builder.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import '../kernel/body_builder.dart' show BodyBuilder;
3434
import '../kernel/kernel_builder.dart'
3535
show
3636
ClassBuilder,
37-
Declaration,
37+
Builder,
3838
ConstructorBuilder,
3939
FieldBuilder,
4040
LibraryBuilder,
@@ -132,7 +132,7 @@ class FormalParameterBuilder extends ModifierBuilder {
132132
void finalizeInitializingFormal() {
133133
Object cls = parent.parent;
134134
if (cls is ClassBuilder) {
135-
Declaration field = cls.scope.lookup(name, charOffset, fileUri);
135+
Builder field = cls.scope.lookup(name, charOffset, fileUri);
136136
if (field is FieldBuilder) {
137137
target.type = field.target.type;
138138
}

0 commit comments

Comments
 (0)