Clean up operator names.

dart/lib/compiler/implementation/closure.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.
 
 #library("closureToClassMapper");
 
 #import("elements/elements.dart");
 #import("leg.dart");
 #import("scanner/scannerlib.dart");
 #import("tree/tree.dart");
@@ skipping 465 matching lines @@
       Element element = elements[definition];
       if (capturedVariableMapping.containsKey(element)) {
         result.add(element);
       };
     }
     scopeData.boxedLoopVariables = result;
   }
 
   /** Returns a non-unique name for the given closure element. */
   String closureName(Element element) {
-    List<String> parts = <String>[];
+    String safeElementName(Element element) {
+      SourceString name = element.name;
+      if (name == null) return "";
+      String value = name.stringValue;

[floitsch, 2012/10/17 12:13:47]

I would just ask if the element is an operator, and if yes, return "". It's not
as if "5", would help that much.
Otherwise I would use names that are more telling ("add", "subtract", ...).
These are only used when operators create closures which shouldn't be a common
case.

[ahe, 2012/11/12 13:22:09]

I'm using more telling names now.

+      // A valid Dart identifier cannot start with a digit.
+      // Fortunately, operators are always enclosed in a class which
+      // means that the resulting closure name will not start with a
+      // digit.
+      if (value === '==') {
+        return '0';
+      } else if (value === '~') {
+        return '1';
+      } else if (value === '[]') {
+        return '2';
+      } else if (value === '[]=') {
+        return '3';
+      } else if (value === '*') {
+        return '4';
+      } else if (value === '/') {
+        return '5';
+      } else if (value === '%') {
+        return '6';
+      } else if (value === '~/') {
+        return '7';
+      } else if (value === '+') {
+        return '8';
+      } else if (value === '<<') {
+        return '9';
+      } else if (value === '>>>') {
+        return '10';
+      } else if (value === '>>') {
+        return '11';
+      } else if (value === '>=') {
+        return '12';
+      } else if (value === '>') {
+        return '13';
+      } else if (value === '<=') {
+        return '14';
+      } else if (value === '<') {
+        return '15';
+      } else if (value === '&') {
+        return '16';
+      } else if (value === '^') {
+        return '17';
+      } else if (value === '|') {
+        return '18';
+      } else if (value === '-') {
+        return '19';
+      } else if (value === 'unary -') {
+        return '20';
+      } else {
+        return name.slowToString();
+      }
+    }
+
+    Link<String> parts = const Link<String>();
     SourceString ownName = element.name;
     if (ownName == null || ownName.stringValue == "") {
-      parts.add("anon");
+      parts = parts.prepend("anon");
     } else {
-      parts.add(ownName.slowToString());
+      parts = parts.prepend(ownName.slowToString());
     }
     for (Element enclosingElement = element.enclosingElement;
          enclosingElement != null &&
              (enclosingElement.kind === ElementKind.GENERATIVE_CONSTRUCTOR_BODY
               || enclosingElement.kind === ElementKind.CLASS
               || enclosingElement.kind === ElementKind.FUNCTION
               || enclosingElement.kind === ElementKind.GETTER
               || enclosingElement.kind === ElementKind.SETTER);
          enclosingElement = enclosingElement.enclosingElement) {
-      SourceString surroundingName = enclosingElement.name;
-      if (surroundingName != null) {
-        String surroundingNameString = surroundingName.slowToString();
-        if (surroundingNameString != "") parts.add(surroundingNameString);
-      }
+      String surroundingName = safeElementName(enclosingElement);
+      if (surroundingName != "") parts = parts.prepend(surroundingName);

[floitsch, 2012/10/17 12:13:47]

NYC: no need to do this test.

[ahe, 2012/11/12 13:22:09]

Done.

     }
-    // Invert the parts.
-    for (int i = 0, j = parts.length - 1; i < j; i++, j--) {
-      var tmp = parts[i];
-      parts[i] = parts[j];
-      parts[j] = tmp;
-    }
-    return Strings.join(parts, "_");
+    StringBuffer sb = new StringBuffer();
+    parts.printOn(sb, '_');
+    return sb.toString();
   }
 
   ClosureClassMap globalizeClosure(FunctionExpression node, Element element) {
     SourceString closureName = new SourceString(closureName(element));
     ClassElement globalizedElement = new ClosureClassElement(
         closureName, compiler, element, element.getCompilationUnit());
     FunctionElement callElement =
         new FunctionElement.from(Compiler.CALL_OPERATOR_NAME,
                                  element,
                                  globalizedElement);
@@ skipping 101 matching lines @@
   }
 
   visitTryStatement(TryStatement node) {
     // TODO(ngeoffray): implement finer grain state.
     bool oldInTryStatement = inTryStatement;
     inTryStatement = true;
     node.visitChildren(this);
     inTryStatement = oldInTryStatement;
   }
 }