Remove convertConstructors.

pkg/front_end/lib/src/fasta/source/source_library_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.source_library_builder;
 
 import 'package:kernel/ast.dart' show
     AsyncMarker,
     ProcedureKind;
 
@@ skipping 13 matching lines @@
     Scope;
 
 import '../builder/builder.dart' show
     Builder,
     ConstructorReferenceBuilder,
     FormalParameterBuilder,
     LibraryBuilder,
     MemberBuilder,
     MetadataBuilder,
     PrefixBuilder,
+    ProcedureBuilder,
     TypeBuilder,
     TypeDeclarationBuilder,
     TypeVariableBuilder,
     Unhandled;
 
 abstract class SourceLibraryBuilder<T extends TypeBuilder, R>
     extends LibraryBuilder<T, R> {
   final SourceLoader loader;
 
   final DeclarationBuilder<T> libraryDeclaration =
@@ skipping 145 matching lines @@
       AsyncMarker asyncModifier, ConstructorReferenceBuilder redirectionTarget,
       int charOffset);
 
   FormalParameterBuilder addFormalParameter(
       List<MetadataBuilder> metadata, int modifiers,
       T type, String name, bool hasThis, int charOffset);
 
   TypeVariableBuilder addTypeVariable(String name, T bound, int charOffset);
 
   Builder addBuilder(String name, Builder builder, int charOffset) {
+    if (name.indexOf(".") != -1) {
+      addCompileTimeError(charOffset, "Only constructors and factories can have"
+          " names containing a period ('.'): $name");
+    }
     // TODO(ahe): Set the parent correctly here. Could then change the
     // implementation of MemberBuilder.isTopLevel to test explicitly for a
     // LibraryBuilder.
     if (currentDeclaration == libraryDeclaration) {
       if (builder is MemberBuilder) {
         builder.parent = this;
       } else if (builder is TypeDeclarationBuilder) {
         builder.parent = this;
       } else if (builder is PrefixBuilder) {
         assert(builder.parent == this);
@@ skipping 123 matching lines @@
     int typeCount = types.length;
     for (T t in types) {
       t.resolveIn(scope);
     }
     members.forEach((String name, Builder member) {
       typeCount += member.resolveTypes(this);
     });
     return typeCount;
   }
 
-  int convertConstructors(_) {
-    int count = 0;
-    members.forEach((String name, Builder member) {
-      count += member.convertConstructors(this);
-    });
-    return count;
-  }
-
   int resolveConstructors(_) {
     int count = 0;
     members.forEach((String name, Builder member) {
       count += member.resolveConstructors(this);
     });
     return count;
   }
+
+  List<TypeVariableBuilder> copyTypeVariables(
+      List<TypeVariableBuilder> original);
 }
 
 /// Unlike [Scope], this scope is used during construction of builders to
 /// ensure types and members are added to and resolved in the correct location.
 class DeclarationBuilder<T extends TypeBuilder> {
   final DeclarationBuilder<T> parent;
 
   final Map<String, Builder> members;
 
   final List<T> types = <T>[];
 
   final String name;
 
+  final Map<ProcedureBuilder, DeclarationBuilder<T>> factoryDeclarations =
+      <ProcedureBuilder, DeclarationBuilder<T>>{};
+
   DeclarationBuilder(this.members, this.name, [this.parent]);
 
   void addMember(String name, MemberBuilder builder) {
     if (members == null) {
       parent.addMember(name, builder);
     } else {
       members[name] = builder;
     }
   }
 
   MemberBuilder lookupMember(String name) {
     return members == null ? parent.lookupMember(name) : members[name];
   }
 
   void addType(T type) {
     types.add(type);
   }
 
   /// Resolves type variables in [types] and propagate other types to [parent].
-  void resolveTypes(List<TypeVariableBuilder> typeVariables) {
+  void resolveTypes(List<TypeVariableBuilder> typeVariables,
+      SourceLibraryBuilder library) {
     // TODO(ahe): The input to this method, [typeVariables], shouldn't be just
     // type variables. It should be everything that's in scope, for example,
     // members (of a class) or formal parameters (of a method).
     if (typeVariables == null) {
       // If there are no type variables in the scope, propagate our types to be
       // resolved in the parent declaration.
+      factoryDeclarations.forEach((_, DeclarationBuilder<T> declaration) {
+        parent.types.addAll(declaration.types);
+      });
       parent.types.addAll(types);
     } else {
+      factoryDeclarations.forEach(
+          (ProcedureBuilder procedure, DeclarationBuilder<T> declaration) {
+        assert(procedure.typeVariables.isEmpty);
+        procedure.typeVariables.addAll(
+            library.copyTypeVariables(typeVariables));
+        declaration.resolveTypes(procedure.typeVariables, library);
+      });
       Map<String, TypeVariableBuilder> map = <String, TypeVariableBuilder>{};
       for (TypeVariableBuilder builder in typeVariables) {
         map[builder.name] = builder;
       }
       for (T type in types) {
         String name = type.name;
         TypeVariableBuilder builder;
         if (name != null) {
           builder = map[name];
         }
         if (builder == null) {
           // Since name didn't resolve in this scope, propagate it to the
           // parent declaration.
           parent.addType(type);
         } else {
           type.bind(builder);
         }
       }
     }
     types.clear();
   }
+
+  /// Called to register [procedure] as a factory whose types are collected in
+  /// [factoryDeclaration]. Later, once the class has been built, we can
+  /// synthesize type variables on the factory matching the class'.
+  void addFactoryDeclaration(
+      ProcedureBuilder procedure, DeclarationBuilder<T> factoryDeclaration) {
+    factoryDeclarations[procedure] = factoryDeclaration;
+  }
 }