Rename elements after sorting.

lib/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.
 
 class DartBackend extends Backend {
   final List<CompilerTask> tasks;
 
   Map<Element, TreeElements> get resolvedElements() =>
       compiler.enqueuer.resolution.resolvedElements;
 
@@ skipping 86 matching lines @@
       }
     }
     topLevelElements.forEach(makePlaceholders);
 
     // Create renames.
     Map<Node, String> renames = new Map<Node, String>();
     Map<LibraryElement, String> imports = new Map<LibraryElement, String>();
     renamePlaceholders(compiler, collector, renames, imports);
 
     // Sort elements.
-    compareElements(e0, e1) {
-      compareBy(x, y, f) => f(x).compareTo(f(y));
-      int result = compareBy(e0, e1, (e) => e.getLibrary().uri.toString());
-      if (result != 0) return result;
-      return compareBy(e0, e1, (e) => e.position().charOffset);
-    }
-
-    final sortedTopLevels = new List<Element>.from(topLevelElements);
-    sortedTopLevels.sort(compareElements);
-
+    final sortedTopLevels = sortElements(topLevelElements);
     final sortedClassMembers = new Map<ClassElement, List<Element>>();
     classMembers.forEach((classElement, members) {
-      final sortedMembers = new List<Element>.from(members);
-      sortedMembers.sort(compareElements);
-      sortedClassMembers[classElement] = sortedMembers;
+      sortedClassMembers[classElement] = sortElements(members);
     });
 
     final unparser = new Unparser.withRenamer((Node node) => renames[node]);
     compiler.assembledCode = emitCode(
         compiler, unparser, imports, sortedTopLevels, sortedClassMembers);
   }
 
   log(String message) => compiler.log('[DartBackend] $message');
 }
 
@@ skipping 52 matching lines @@
     if (typeElement.isClass()) newClassElementCallback(typeElement);
     typeAnnotation.visitChildren(this);
   }
 
   void collect() {
     compiler.withCurrentElement(rootElement, () {
       rootElement.parseNode(compiler).accept(this);
     });
   }
 }
+
+compareBy(f) => (x, y) => f(x).compareTo(f(y));
+
+List sorted(List l, comparison) {

[Roman, 2012/08/21 12:37:39]

'sortList'? 

[Anton Muhin, 2012/08/21 12:57:42]

sorted matches nicely Python, mind if I keep it this way?

+  final result = new List.from(l);
+  result.sort(comparison);
+  return result;
+}
+
+List<Element> sortElements(Collection<Element> elements) {
+  compareElements(e0, e1) {
+    int result = compareBy((e) => e.getLibrary().uri.toString())(e0, e1);
+    if (result != 0) return result;
+    return compareBy((e) => e.position().charOffset)(e0, e1);
+  }
+
+  return sorted(elements, compareElements);
+}