dart2dart: Introduce Renamer that is used by renaming unparser

lib/compiler/implementation/dart_backend/emitter.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.
 
 /**
  * Dart backend helper for converting program IR back to source code.
  */
 class Emitter {
 
   final Compiler compiler;
   final StringBuffer sb;
+  final Renamer renamer;
 
-  Emitter(this.compiler) : sb = new StringBuffer();
+  Emitter(Compiler compiler) :
+      this.compiler = compiler,
+      sb = new StringBuffer(),
+      renamer = new ConflictingRenamer(compiler);
 
   /**
    * Outputs given class element with selected inner elements.
    */
   void outputClass(ClassElement classElement, Set<Element> innerElements) {
+    Unparser unparser = new Unparser(renamer);
+    renamer.setContext(classElement.getCompilationUnit());
     ClassNode classNode = classElement.parseNode(compiler);
     sb.add(classElement.beginToken.slowToString());  // 'class' or 'interface'.
     sb.add(' ');
-    sb.add(classNode.name.unparse());
+    sb.add(renamer.renameType(classElement.type));
     if (classNode.typeParameters !== null) {
-      sb.add(classNode.typeParameters.unparse());
+      sb.add(unparser.unparse(classNode.typeParameters));
     }
     if (classNode.extendsKeyword !== null) {
       sb.add(' ');
       classNode.extendsKeyword.value.printOn(sb);
       sb.add(' ');
-      sb.add(classNode.superclass.unparse());
+      sb.add(renamer.renameType(classElement.supertype));
     }
     if (!classNode.interfaces.isEmpty()) {
       sb.add(classElement.isInterface() ? ' extends ' : ' implements ');
-      classNode.interfaces.nodes.printOn(sb, classNode.interfaces.delimiter);
+      Link<Node> interfaceNodes = classNode.interfaces.nodes;
+      sb.add(interfaceNodes.head);

[Anton Muhin, 2012/07/23 17:01:27]

shouldn't you rename those types?

[Roman, 2012/07/23 17:38:33]

Done.

+      for (Link link = interfaceNodes.tail; !link.isEmpty(); link = link.tail) {
+        sb.add(classNode.interfaces.delimiter);
+        sb.add(link.head);
+      }
     }
     if (classNode.defaultClause !== null) {
       sb.add(' default ');
-      sb.add(classNode.defaultClause.unparse());
+      sb.add(unparser.unparse(classNode.defaultClause));
     }
     sb.add('{');
     innerElements.forEach((element) {
       // TODO(smok): Filter out default constructors here.
       outputElement(element);
     });
     sb.add('}');
   }
 
   void outputElement(Element element) {
+    Unparser unparser = new Unparser(renamer);
+    renamer.setContext(element);
     // TODO(smok): Figure out why AbstractFieldElement appears here,
     // we have used getters/setters resolved instead of it.
     if (element is SynthesizedConstructorElement
         || element is AbstractFieldElement) return;
     if (element.isField()) {
       assert(element is VariableElement);
-      sb.add(element.variables.parseNode(compiler).unparse());
+      sb.add(unparser.unparse(element.variables.parseNode(compiler)));
     } else {
-      sb.add(element.parseNode(compiler).unparse());
+      sb.add(unparser.unparse(element.parseNode(compiler)));
     }
   }
 
   String toString() => sb.toString();
 }