dart2dart Fix factory for interfaces renames

lib/compiler/implementation/dart_backend/placeholder_collector.dart

 // Copyright (c) 2012, 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.
 
 class LocalPlaceholder implements Hashable {
   final String identifier;
   final Set<Node> nodes;
   LocalPlaceholder(this.identifier) : nodes = new Set<Node>();
   int hashCode() => identifier.hashCode();
   String toString() =>
@@ skipping 104 matching lines @@
       //      1.dart and 2.dart: interface I default C { I(); }
       //    now we have to duplicate our I() constructor in C class with
       //    proper names.
       // 2) (even worse for us):
       //      0.dart: class C { C(); }
       //      1.dart: interface C default p0.C { C(); }
       //    the second case is just a bug now.
       final enclosingClass = element.getEnclosingClass();
       Node nameNode = node.name;
       if (nameNode is Send) nameNode = nameNode.receiver;
-      // For cases like class C implements I { I(); }
+      // Skip cases like class C implements I { I(); }
       if (nameNode.asIdentifier().token.slowToString()

[Anton Muhin, 2012/08/21 09:06:36]

as you're touching this code anyway, maybe make it compare SourceStrings to
unify with the code below?

[Roman, 2012/08/21 09:18:41]

Done.

           == enclosingClass.name.slowToString()) {
         makeTypePlaceholder(nameNode, enclosingClass.type);
       }
+
+      // If we have interface constructor, make sure that we put placeholder
+      // for its default factory implementation.
+      // Example:
+      // interface I { I();}
+      // class C { I() {} }
+      if (element.defaultImplementation !== null
+          && element.defaultImplementation !== element) {
+        FunctionElement implementingFactory = element.defaultImplementation;
+        Node factoryName = implementingFactory.cachedNode.name;
+        if (factoryName is Identifier) {
+          // Plain interface name. Rename it unless it is the default
+          // constructor for enclosing class.
+          // Example:
+          // interface I { I(); }
+          // class C implements I { C(); }  don't rename this case.
+          if (factoryName.token
+              != implementingFactory.getEnclosingClass().name) {
+            makeElementPlaceholder(factoryName, enclosingClass);
+          }
+        } else {
+          // I.named() inside C, rename first part.
+          assert(factoryName is Send);
+          makeElementPlaceholder(factoryName.asSend().receiver, enclosingClass);

[Anton Muhin, 2012/08/21 09:06:36]

it looks like you don't check here if you should remove this part (cf. with if
above and the way the code is structured in ln. 126--128.

I wonder if you should factor out this common logic.

[Roman, 2012/08/21 09:18:41]

I don't understand your comment., what should I remove?

+        }
+      }
+
       // Process Ctor(this._field) correctly.
       for (Node parameter in node.parameters) {
         VariableDefinitions definitions = parameter.asVariableDefinitions();
         if (definitions !== null) {
           for (Node definition in definitions.definitions) {
             Send send = definition.asSend();
             if (send !== null) {
               assert(send.receiver is Identifier);
               assert(send.receiver.asIdentifier().isThis());
               if (send.selector is Identifier) {
@@ skipping 283 matching lines @@
       visit(node.defaultClause.typeArguments);
     }
   }
 
   visitTypedef(Typedef node) {
     assert(currentElement is TypedefElement);
     makeElementPlaceholder(node.name, currentElement);
     node.visitChildren(this);
   }
 }