Generalize DeclarationBuilder.resolveTypes.

pkg/front_end/lib/src/fasta/kernel/kernel_enum_builder.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library fasta.kernel_enum_builder;
 
 import 'package:kernel/ast.dart' show
     Arguments,
     AsyncMarker,
     Class,
@@ skipping 47 matching lines @@
     implements EnumBuilder<KernelTypeBuilder, InterfaceType> {
   final List<String> constants;
 
   final MapLiteral toStringMap;
 
   final KernelTypeBuilder intType;
 
   final KernelTypeBuilder stringType;
 
   KernelEnumBuilder.internal(List<MetadataBuilder> metadata, String name,
-      Map<String, Builder> members, List<KernelTypeBuilder> types, Class cls,
-      this.constants, this.toStringMap, this.intType, this.stringType,
-      LibraryBuilder parent, int charOffset)
-      : super(metadata, 0, name, null, null, null, members, types, parent, null,
+      Map<String, Builder> members, Class cls, this.constants, this.toStringMap,
+      this.intType, this.stringType, LibraryBuilder parent, int charOffset)
+      : super(metadata, 0, name, null, null, null, members, parent, null,
           charOffset, cls);
 
   factory KernelEnumBuilder(List<MetadataBuilder> metadata, String name,
-      List<String> constants, LibraryBuilder parent, int charOffset) {
+      List<String> constants, KernelLibraryBuilder parent, int charOffset) {
     constants ??= const <String>[];
     // TODO(ahe): These types shouldn't be looked up in scope, they come
     // directly from dart:core.
-    KernelTypeBuilder objectType =
-        new KernelNamedTypeBuilder("Object", null, charOffset, parent.fileUri);
-    KernelTypeBuilder intType =
-        new KernelNamedTypeBuilder("int", null, charOffset, parent.fileUri);
-    KernelTypeBuilder stringType =
-        new KernelNamedTypeBuilder("String", null, charOffset, parent.fileUri);
-    List<KernelTypeBuilder> types = <KernelTypeBuilder>[
-        objectType,
-        intType,
-        stringType];
+    KernelTypeBuilder intType = parent.addType(
+        new KernelNamedTypeBuilder("int", null, charOffset, parent.fileUri));
+    KernelTypeBuilder stringType = parent.addType(
+        new KernelNamedTypeBuilder("String", null, charOffset, parent.fileUri));
     Class cls = new Class(name: name);
     Map<String, Builder> members = <String, Builder>{};
     KernelNamedTypeBuilder selfType = new KernelNamedTypeBuilder(
         name, null, charOffset, parent.fileUri);
-    KernelTypeBuilder listType =
+    KernelTypeBuilder listType = parent.addType(
         new KernelNamedTypeBuilder(
-            "List", <KernelTypeBuilder>[selfType], charOffset, parent.fileUri);
-    types.add(listType);
+            "List", <KernelTypeBuilder>[selfType], charOffset, parent.fileUri));
 
     /// From Dart Programming Language Specification 4th Edition/December 2015:
     ///     metadata class E {
     ///       final int index;
     ///       const E(this.index);
     ///       static const E id0 = const E(0);
     ///       ...
     ///       static const E idn-1 = const E(n - 1);
     ///       static const List<E> values = const <E>[id0, ..., idn-1];
     ///       String toString() => { 0: ‘E.id0’, . . ., n-1: ‘E.idn-1’}[index]
@@ skipping 23 matching lines @@
       KernelFieldBuilder fieldBuilder =
           new KernelFieldBuilder(null, selfType, name, constMask | staticMask,
               parent, charOffset); // TODO(ahe): Get charOffset from [name].
       members[name] = fieldBuilder;
       toStringEntries.add(new MapEntry(
               new IntLiteral(index), new StringLiteral("$className.$name")));
       index++;
     }
     MapLiteral toStringMap = new MapLiteral(toStringEntries, isConst: true);
     KernelEnumBuilder enumBuilder = new KernelEnumBuilder.internal(metadata,
-        name, members, types, cls, constants, toStringMap, intType, stringType,
+        name, members, cls, constants, toStringMap, intType, stringType,
         parent, charOffset);
     members.forEach((String name, MemberBuilder builder) {
       builder.parent = enumBuilder;
     });
     selfType.builder = enumBuilder;
     return enumBuilder;
   }
 
   InterfaceType buildType(List<KernelTypeBuilder> arguments) {
     return cls.rawType;
@@ skipping 34 matching lines @@
       Arguments arguments =
           new Arguments(<Expression>[new IntLiteral(index++)]);
       field.initializer =
           new ConstructorInvocation(constructor, arguments, isConst: true);
     }
     return super.build(libraryBuilder);
   }
 
   Builder findConstructorOrFactory(String name) => null;
 }