Revert "Support unary - operator."

dart/lib/compiler/implementation/elements/elements.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('elements');
 
 #import('dart:uri');
 
 #import('../tree/tree.dart');
 #import('../scanner/scannerlib.dart');
@@ skipping 1445 matching lines @@
   static SourceString constructConstructorName(SourceString receiver,
                                                SourceString selector) {
     String r = receiver.slowToString();
     String s = selector.slowToString();
     return new SourceString('$r\$$s');
   }
 
   static const SourceString OPERATOR_EQUALS =
       const SourceString(@'operator$eq');
 
-  static SourceString constructOperatorName(SourceString selector,
-                                            bool isUnary) {
+  static SourceString constructOperatorName(SourceString receiver,
+                                            SourceString selector,
+                                            [bool isUnary = false]) {
     String str = selector.stringValue;
     if (str === '==' || str === '!=') return OPERATOR_EQUALS;
 
-    if (str === '~') {
-      str = 'not';
-    } else if (str === '-' && isUnary) {
-      // TODO(ahe): Return something like 'unary -'.
-      return const SourceString('negate');
-    } else if (str === '[]') {
-      str = 'index';
-    } else if (str === '[]=') {
-      str = 'indexSet';
-    } else if (str === '*' || str === '*=') {
-      str = 'mul';
-    } else if (str === '/' || str === '/=') {
-      str = 'div';
-    } else if (str === '%' || str === '%=') {
-      str = 'mod';
-    } else if (str === '~/' || str === '~/=') {
-      str = 'tdiv';
-    } else if (str === '+' || str === '+=') {
-      str = 'add';
-    } else if (str === '-' || str === '-=') {
-      str = 'sub';
-    } else if (str === '<<' || str === '<<=') {
-      str = 'shl';
-    } else if (str === '>>' || str === '>>=') {
-      str = 'shr';
-    } else if (str === '>=') {
-      str = 'ge';
-    } else if (str === '>') {
-      str = 'gt';
-    } else if (str === '<=') {
-      str = 'le';
-    } else if (str === '<') {
-      str = 'lt';
-    } else if (str === '&' || str === '&=') {
-      str = 'and';
-    } else if (str === '^' || str === '^=') {
-      str = 'xor';
-    } else if (str === '|' || str === '|=') {
-      str = 'or';
-    } else if (selector == const SourceString('negate')) {
-      // TODO(ahe): Remove this case: Legacy support for pre-0.11 spec.
-      return selector;
-    } else {
+    if (str === '~') str = 'not';
+    else if (str === 'negate' || (str === '-' && isUnary)) str = 'negate';
+    else if (str === '[]') str = 'index';
+    else if (str === '[]=') str = 'indexSet';
+    else if (str === '*' || str === '*=') str = 'mul';
+    else if (str === '/' || str === '/=') str = 'div';
+    else if (str === '%' || str === '%=') str = 'mod';
+    else if (str === '~/' || str === '~/=') str = 'tdiv';
+    else if (str === '+' || str === '+=') str = 'add';
+    else if (str === '-' || str === '-=') str = 'sub';
+    else if (str === '<<' || str === '<<=') str = 'shl';
+    else if (str === '>>' || str === '>>=') str = 'shr';
+    else if (str === '>=') str = 'ge';
+    else if (str === '>') str = 'gt';
+    else if (str === '<=') str = 'le';
+    else if (str === '<') str = 'lt';
+    else if (str === '&' || str === '&=') str = 'and';
+    else if (str === '^' || str === '^=') str = 'xor';
+    else if (str === '|' || str === '|=') str = 'or';
+    else {
       throw new Exception('Unhandled selector: ${selector.slowToString()}');
     }
-    return new SourceString('operator\$$str');
+    return new SourceString('$receiver\$$str');
   }
 
   static bool isStringSupertype(Element element, Compiler compiler) {
     LibraryElement coreLibrary = compiler.coreLibrary;
     return (element == coreLibrary.find(const SourceString('Comparable')))
         || (element == coreLibrary.find(const SourceString('Hashable')))
         || (element == coreLibrary.find(const SourceString('Pattern')));
   }
 
   static bool isListSupertype(Element element, Compiler compiler) {
@@ skipping 124 matching lines @@
 
   MetadataAnnotation ensureResolved(Compiler compiler) {
     if (resolutionState == STATE_NOT_STARTED) {
       compiler.resolver.resolveMetadataAnnotation(this);
     }
     return this;
   }
 
   String toString() => 'MetadataAnnotation($value, $resolutionState)';
 }