Rename members and named constructors.

lib/compiler/implementation/dart_backend/renamer.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.
 
 /**
  * Renames only top-level elements that would let to ambiguity if not renamed.
  * TODO(smok): Make sure that top-level fields are correctly renamed.
  */
 void renamePlaceholders(
     Compiler compiler,
     PlaceholderCollector placeholderCollector,
     Map<Node, String> renames,
     Map<LibraryElement, String> imports,
+    Set<String> fixedMemberNames,

[Roman, 2012/08/29 08:40:09]

I think in this context it's more like 'forbiddenMemberNames' rather than
'fixed'.

[Anton Muhin, 2012/08/29 09:43:46]

I've started with forbidden as well, but actually they are rather fixed: the
idea is you cannot rename something to toString, but you rather have to keep any
member named toString with original name, the rest just follows from the fact
that we don't want to create collisions.

But I agree with you the name is not the best, any suggestions are appreciated.

On 2012/08/29 08:40:09, Roman wrote:

     bool minify,
     bool cutDeclarationTypes) {
   final Map<LibraryElement, Map<String, String>> renamed
       = new Map<LibraryElement, Map<String, String>>();
-  final Set<String> usedTopLevelIdentifiers = new Set<String>();
+  Generator topLevelGenerator =

[Roman, 2012/08/29 08:40:09]

This can be inlined into makeGenerator

[Anton Muhin, 2012/08/29 09:43:46]

But why?  I'd rather use the same generator.

+      minify ? new MinifyingGenerator('ABCDEFGHIJKLMNOPQRSTUVWXYZ').generate
+          : conservativeGenerator;
+  makeGenerator(usedIdentifierSet) => (name) {
+    String newName = topLevelGenerator(name, usedIdentifierSet.contains);
+    usedIdentifierSet.add(newName);
+    return newName;
+  };
+
+  final usedTopLevelIdentifiers = new Set<String>();
   // TODO(antonm): we should also populate this set with top-level
   // names from core library.
   usedTopLevelIdentifiers.add('main'); // Never rename anything to 'main'.
-
-  Generator topLevelGenerator =
-      minify ? new MinifyingGenerator('ABCDEFGHIJKLMNOPQRSTUVWXYZ').generate
-          : conservativeGenerator;
-  String generateUniqueName(name) {
-    String newName = topLevelGenerator(
-        name, usedTopLevelIdentifiers.contains);
-    usedTopLevelIdentifiers.add(newName);
-    return newName;
-  }
+  final generateUniqueName = makeGenerator(usedTopLevelIdentifiers);
 
   rename(library, originalName) =>
       renamed.putIfAbsent(library, () => <String>{})
           .putIfAbsent(originalName, () => generateUniqueName(originalName));
 
   String renameElement(Element element) {
     assert(Elements.isStaticOrTopLevel(element)
            || element is TypeVariableElement);
     // TODO(smok): Make sure that the new name does not conflict with existing
     // local identifiers.
@@ skipping 58 matching lines @@
   });
   sortedForEach(placeholderCollector.privateNodes, (library, nodes) {
     renameNodes(nodes, (node) => rename(library, node.source.slowToString()));
   });
   if (cutDeclarationTypes) {
     for (DeclarationTypePlaceholder placeholder in
          placeholderCollector.declarationTypePlaceholders) {
       renames[placeholder.typeNode] = placeholder.requiresVar ? 'var' : '';
     }
   }
+
+  final usedMemberIdentifiers = new Set<String>.from(fixedMemberNames);
+  // Do not rename members to top-levels, that allows to avoid renaming
+  // members to constructors.
+  usedMemberIdentifiers.addAll(usedTopLevelIdentifiers);
+  final generateMemberIdentifier = makeGenerator(usedMemberIdentifiers);
+  placeholderCollector.memberPlaceholders.forEach((identifier, nodes) {
+    final newIdentifier = generateMemberIdentifier(identifier);
+    renameNodes(nodes, (_) => newIdentifier);
+  });
 }
 
 typedef String Generator(String originalName, bool isForbidden(String name));
 
 /** Always tries to return original identifier name unless it is forbidden. */
 String conservativeGenerator(
     String originalName, bool isForbidden(String name)) {
   String newName = originalName;
   while (isForbidden(newName)) {
     newName = 'p_$newName';
@@ skipping 28 matching lines @@
     int length = alphabet.length;
     StringBuffer resultBuilder = new StringBuffer();
     while (index >= length) {
       resultBuilder.add(alphabet[index % length]);
       index ~/= length;
     }
     resultBuilder.add(alphabet[index]);
     return resultBuilder.toString();
   }
 }