Refactor and simplify the dart2dart renamer.

sdk/lib/_internal/compiler/implementation/dart_backend/backend.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.
 
 part of dart_backend;
 
 // TODO(ahe): This class is simply wrong.  This backend should use
 // elements when it can, not AST nodes.  Perhaps a [Map<Element,
 // TreeElements>] is what is needed.
 class ElementAst {
   final Node ast;
   final TreeElements treeElements;
 
   ElementAst(AstElement element)
       : this.internal(element.resolvedAst.node, element.resolvedAst.elements);
 
   ElementAst.internal(this.ast, this.treeElements);
 }
 
 class DartBackend extends Backend {
   final List<CompilerTask> tasks;
   final bool forceStripTypes;
   final bool stripAsserts;
   // TODO(antonm): make available from command-line options.
   final bool outputAst = false;
-  final Map<Node, String> renames;
-  final Map<LibraryElement, String> imports;
   final Map<ClassNode, List<Node>> memberNodes;
   Map<Element, LibraryElement> reexportingLibraries;
 
   // TODO(zarah) Maybe change this to a command-line option.
   // Right now, it is set by the tests.
   bool useMirrorHelperLibrary = false;
 
   /// Initialized if the useMirrorHelperLibrary field is set.
   MirrorRenamer mirrorRenamer;
 
@@ skipping 60 matching lines @@
         if (element.allSupertypes != null) {
           element.allSupertypes.forEach(workQueue.add);
         }
       }
     }
     return true;
   }
 
   DartBackend(Compiler compiler, List<String> strips)
       : tasks = <CompilerTask>[],
-        renames = new Map<Node, String>(),
-        imports = new Map<LibraryElement, String>(),
         memberNodes = new Map<ClassNode, List<Node>>(),
         reexportingLibraries = <Element, LibraryElement>{},
         forceStripTypes = strips.indexOf('types') != -1,
         stripAsserts = strips.indexOf('asserts') != -1,
         constantCompilerTask  = new DartConstantTask(compiler),
         super(compiler) {
     resolutionCallbacks = new DartResolutionCallbacks(this);
   }
 
   bool classNeedsRti(ClassElement cls) => false;
@@ skipping 269 matching lines @@
 
       if (element.isClass) {
         classMembers[element].forEach(makePlaceholders);
       }
     }
     topLevelElements.forEach(makePlaceholders);
     // Create renames.
     bool shouldCutDeclarationTypes = forceStripTypes
         || (compiler.enableMinification
             && isSafeToRemoveTypeDeclarations(classMembers));
-    renamePlaceholders(
-        compiler, collector, renames, imports,
-        fixedMemberNames, reexportingLibraries,
-        shouldCutDeclarationTypes,
-        uniqueGlobalNaming: useMirrorHelperLibrary);
+
+    PlaceholderRenamer placeholderRenamer =
+        new PlaceholderRenamer(compiler, fixedMemberNames, reexportingLibraries,
+            cutDeclarationTypes: shouldCutDeclarationTypes);

[jgruber1, 2014/08/07 15:15:04]

Does cutDeclarationTypes have to be optional?

[sigurdm, 2014/08/14 09:39:16]

No - it is named because named parameters are much easier to read, esp. for
bools.

+
+    placeholderRenamer.computeRenamings(collector);
 
     // Sort elements.
-    final sortedTopLevels = sortElements(topLevelElements);
+    final List<Element> sortedTopLevels = sortElements(topLevelElements);
     final sortedClassMembers = new Map<ClassElement, List<Element>>();
     classMembers.forEach((classElement, members) {
       sortedClassMembers[classElement] = sortElements(members);
     });
 
     if (outputAst) {
       // TODO(antonm): Ideally XML should be a separate backend.
       // TODO(antonm): obey renames and minification, at least as an option.
       StringBuffer sb = new StringBuffer();
       outputElement(element) {
         sb.write(element.parseNode(compiler).toDebugString());
       }
 
       // Emit XML for AST instead of the program.
       for (final topLevel in sortedTopLevels) {
         if (topLevel.isClass && !emitNoMembersFor.contains(topLevel)) {
           // TODO(antonm): add some class info.
           sortedClassMembers[topLevel].forEach(outputElement);
         } else {
           outputElement(topLevel);
         }
       }
       compiler.assembledCode = '<Program>\n$sb</Program>\n';
       return;
     }
 
-    final topLevelNodes = <Node>[];
+    final List<Node> topLevelNodes = <Node>[];
     for (final element in sortedTopLevels) {
       topLevelNodes.add(elementAsts[element].ast);
       if (element.isClass && !element.isMixinApplication) {
         final members = <Node>[];
         for (final member in sortedClassMembers[element]) {
           members.add(elementAsts[member].ast);
         }
         memberNodes[elementAsts[element].ast] = members;
       }
     }
 
     if (useMirrorHelperLibrary) {
-      mirrorRenamer.addRenames(renames, topLevelNodes, collector);
+      mirrorRenamer.addRenames(placeholderRenamer.renames,
+                               topLevelNodes, collector);
     }
 
-    final unparser = new EmitterUnparser(renames, stripTypes: forceStripTypes,
-        minify: compiler.enableMinification);
-    emitCode(unparser, imports, topLevelNodes, memberNodes);
+    final unparser = new EmitterUnparser(placeholderRenamer.renames,
+                                         stripTypes: forceStripTypes,
+                                         minify: compiler.enableMinification);
     String assembledCode = unparser.result;
     compiler.outputProvider('', 'dart')
         ..add(assembledCode)
         ..close();
     compiler.assembledCode = assembledCode;
+    for(LibraryElement library in placeholderRenamer.platformImports) {
+      if (library.isPlatformLibrary && !library.isInternalLibrary) {
+        unparser.unparseImportTag(library.canonicalUri.toString());
+      }
+    }
+    for (int i = 0; i < sortedTopLevels.length; i++) {
+      Element element = sortedTopLevels[i];
+      Node node = topLevelNodes[i];
+      if (node is ClassNode) {
+        // TODO(smok): Filter out default constructors here.
+        unparser.unparseClassWithBody(node, memberNodes[node]);
+      } else {
+        unparser.unparse(node);
+      }
+      unparser.newline();
+    }
 
+    compiler.outputProvider("", "dart")
+         ..add(unparser.result)
+         ..close();
     // Output verbose info about size ratio of resulting bundle to all
     // referenced non-platform sources.
     logResultBundleSizeInfo(topLevelElements);
   }
 
   void logResultBundleSizeInfo(Set<Element> topLevelElements) {
     Iterable<LibraryElement> referencedLibraries =
         compiler.libraryLoader.libraries.where(isUserLibrary);
     // Sum total size of scripts in each referenced library.
     int nonPlatformSize = 0;
@@ skipping 204 matching lines @@
   }
 
   Constant compileMetadata(MetadataAnnotation metadata,
                            Node node,
                            TreeElements elements) {
     return measure(() {
       return constantCompiler.compileMetadata(metadata, node, elements);
     });
   }
 }