[cfe] Rename operator[] to getLocalMember on Library/ClassBuilder

johnniwinther · commit-bot@chromium.org · commit 610183d5f966 · 2019-07-22T16:00:28.000Z
Change-Id: I8d03cf939e15de53b3768ee946815cf31e3a1124 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109700 Reviewed-by: Dan Rubel <danrubel@google.com>
diff --git a/pkg/front_end/lib/src/fasta/builder/class_builder.dart b/pkg/front_end/lib/src/fasta/builder/class_builder.dart
@@ -142,8 +142,7 @@ abstract class ClassBuilder<T extends TypeBuilder, R>
 
   /// Don't use for scope lookup. Only use when an element is known to exist
   /// (and isn't a setter).
-  MemberBuilder operator [](String name) {
-    // TODO(ahe): Rename this to getLocalMember.
+  MemberBuilder getLocalMember(String name) {
     return scope.local[name] ??
         internalProblem(
             templateInternalProblemNotFoundIn.withArguments(
@@ -167,7 +166,7 @@ abstract class ClassBuilder<T extends TypeBuilder, R>
   /// For example, this method is convenient for use when building synthetic
   /// members, such as those of an enum.
   MemberBuilder firstMemberNamed(String name) {
-    Declaration declaration = this[name];
+    Declaration declaration = getLocalMember(name);
     while (declaration.next != null) {
       declaration = declaration.next;
     }
diff --git a/pkg/front_end/lib/src/fasta/builder/library_builder.dart b/pkg/front_end/lib/src/fasta/builder/library_builder.dart
@@ -217,7 +217,7 @@ abstract class LibraryBuilder<T extends TypeBuilder, R>
 
   /// Don't use for scope lookup. Only use when an element is known to exist
   /// (and not a setter).
-  Declaration operator [](String name) {
+  Declaration getLocalMember(String name) {
     return scope.local[name] ??
         internalProblem(
             templateInternalProblemNotFoundIn.withArguments(name, "$fileUri"),
diff --git a/pkg/front_end/lib/src/fasta/dill/dill_loader.dart b/pkg/front_end/lib/src/fasta/dill/dill_loader.dart
@@ -79,7 +79,7 @@ class DillLoader extends Loader<Library> {
   KernelClassBuilder computeClassBuilderFromTargetClass(Class cls) {
     Library kernelLibrary = cls.enclosingLibrary;
     LibraryBuilder library = builders[kernelLibrary.importUri];
-    return library[cls.name];
+    return library.getLocalMember(cls.name);
   }
 
   @override
diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -568,9 +568,9 @@ abstract class BodyBuilder extends ScopeListener<JumpTarget>
       String name = identifier.name;
       Declaration declaration;
       if (classBuilder != null) {
-        declaration = classBuilder[name];
+        declaration = classBuilder.getLocalMember(name);
       } else {
-        declaration = library[name];
+        declaration = library.getLocalMember(name);
       }
       KernelFieldBuilder field;
       if (declaration.isField && declaration.next == null) {
diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart
@@ -245,11 +245,11 @@ class KernelTarget extends TargetImplementation {
       loader.createTypeInferenceEngine();
       await loader.buildOutlines();
       loader.coreLibrary.becomeCoreLibrary();
-      dynamicType.bind(loader.coreLibrary["dynamic"]);
+      dynamicType.bind(loader.coreLibrary.getLocalMember("dynamic"));
       loader.resolveParts();
       loader.computeLibraryScopes();
-      objectType.bind(loader.coreLibrary["Object"]);
-      bottomType.bind(loader.coreLibrary["Null"]);
+      objectType.bind(loader.coreLibrary.getLocalMember("Object"));
+      bottomType.bind(loader.coreLibrary.getLocalMember("Null"));
       loader.resolveTypes();
       loader.computeDefaultTypes(dynamicType, bottomType, objectClassBuilder);
       List<SourceClassBuilder> myClasses =
diff --git a/pkg/front_end/lib/src/fasta/source/source_loader.dart b/pkg/front_end/lib/src/fasta/source/source_loader.dart
@@ -585,7 +585,8 @@ class SourceLoader extends Loader<Library> {
 
     Set<ClassBuilder> blackListedClasses = new Set<ClassBuilder>();
     for (int i = 0; i < blacklistedCoreClasses.length; i++) {
-      blackListedClasses.add(coreLibrary[blacklistedCoreClasses[i]]);
+      blackListedClasses
+          .add(coreLibrary.getLocalMember(blacklistedCoreClasses[i]));
     }
 
     // Sort the classes topologically.
@@ -1100,7 +1101,7 @@ class SourceLoader extends Loader<Library> {
     if (library == null) {
       return target.dillTarget.loader.computeClassBuilderFromTargetClass(cls);
     }
-    return library[cls.name];
+    return library.getLocalMember(cls.name);
   }
 
   @override
diff --git a/pkg/front_end/test/fasta/types/dill_hierachy_test.dart b/pkg/front_end/test/fasta/types/dill_hierachy_test.dart
@@ -119,7 +119,8 @@ class F implements D<int, bool>;""",
         final DillLoader loader = target.loader;
         loader.appendLibraries(component);
         await target.buildOutlines();
-        KernelClassBuilder objectClass = loader.coreLibrary["Object"];
+        KernelClassBuilder objectClass =
+            loader.coreLibrary.getLocalMember("Object");
         ClassHierarchyBuilder hierarchy = new ClassHierarchyBuilder(
             objectClass, loader, new CoreTypes(component));
         Library library = component.libraries.last;
diff --git a/pkg/front_end/test/fasta/types/fasta_legacy_upper_bound_test.dart b/pkg/front_end/test/fasta/types/fasta_legacy_upper_bound_test.dart
@@ -46,7 +46,8 @@ class FastaLegacyUpperBoundTest extends LegacyUpperBoundTest {
     final DillLoader loader = target.loader;
     loader.appendLibraries(component);
     await target.buildOutlines();
-    KernelClassBuilder objectClass = loader.coreLibrary["Object"];
+    KernelClassBuilder objectClass =
+        loader.coreLibrary.getLocalMember("Object");
     hierarchy = new ClassHierarchyBuilder(
         objectClass, loader, new CoreTypes(component));
   }
diff --git a/pkg/front_end/test/fasta/types/fasta_types_test.dart b/pkg/front_end/test/fasta/types/fasta_types_test.dart
@@ -51,7 +51,8 @@ main() {
     final DillLoader loader = target.loader;
     loader.appendLibraries(sdk);
     await target.buildOutlines();
-    KernelClassBuilder objectClass = loader.coreLibrary["Object"];
+    KernelClassBuilder objectClass =
+        loader.coreLibrary.getLocalMember("Object");
     ClassHierarchyBuilder hierarchy =
         new ClassHierarchyBuilder(objectClass, loader, new CoreTypes(sdk));
     new FastaTypesTest(hierarchy, environment).run();
diff --git a/pkg/front_end/test/fasta/types/subtypes_benchmark.dart b/pkg/front_end/test/fasta/types/subtypes_benchmark.dart
@@ -149,7 +149,8 @@ Future<void> run(Uri benchmarkInput, String name) async {
     final DillLoader loader = target.loader;
     loader.appendLibraries(c);
     await target.buildOutlines();
-    KernelClassBuilder objectClass = loader.coreLibrary["Object"];
+    KernelClassBuilder objectClass =
+        loader.coreLibrary.getLocalMember("Object");
     ClassHierarchyBuilder hierarchy =
         new ClassHierarchyBuilder(objectClass, loader, coreTypes);
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class DillLoader extends Loader<Library> {`
`79`	`79`	`KernelClassBuilder computeClassBuilderFromTargetClass(Class cls) {`
`80`	`80`	`Library kernelLibrary = cls.enclosingLibrary;`
`81`	`81`	`LibraryBuilder library = builders[kernelLibrary.importUri];`
`82`		`- return library[cls.name];`
	`82`	`+ return library.getLocalMember(cls.name);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`@override`
Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,8 @@ class SourceLoader extends Loader<Library> {`
`585`	`585`
`586`	`586`	`Set<ClassBuilder> blackListedClasses = new Set<ClassBuilder>();`
`587`	`587`	`for (int i = 0; i < blacklistedCoreClasses.length; i++) {`
`588`		`- blackListedClasses.add(coreLibrary[blacklistedCoreClasses[i]]);`
	`588`	`+ blackListedClasses`
	`589`	`+ .add(coreLibrary.getLocalMember(blacklistedCoreClasses[i]));`
`589`	`590`	`}`
`590`	`591`
`591`	`592`	`// Sort the classes topologically.`
`@@ -1100,7 +1101,7 @@ class SourceLoader extends Loader<Library> {`
`1100`	`1101`	`if (library == null) {`
`1101`	`1102`	`return target.dillTarget.loader.computeClassBuilderFromTargetClass(cls);`
`1102`	`1103`	`}`
`1103`		`- return library[cls.name];`
	`1104`	`+ return library.getLocalMember(cls.name);`
`1104`	`1105`	`}`
`1105`	`1106`
`1106`	`1107`	`@override`