Fix bad merge

pkg/dartdoc/mirrors/dart2js_mirror.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('mirrors.dart2js');
 
 #import('../../../lib/compiler/compiler.dart', prefix: 'diagnostics');
 #import('../../../lib/compiler/implementation/elements/elements.dart');
 #import('../../../lib/compiler/implementation/apiimpl.dart', prefix: 'api');
 #import('../../../lib/compiler/implementation/scanner/scannerlib.dart');
 #import('../../../lib/compiler/implementation/leg.dart');
 #import('../../../lib/compiler/implementation/filenames.dart');
 #import('../../../lib/compiler/implementation/source_file.dart');
 #import('../../../lib/compiler/implementation/tree/tree.dart');
 #import('../../../lib/compiler/implementation/util/util.dart');
 #import('../../../lib/compiler/implementation/util/uri_extras.dart');
 #import('../../../lib/compiler/implementation/dart2js.dart');
-#import('../../../lib/compiler/implementation/ssa/ssa.dart');
 #import('mirrors.dart');
 #import('util.dart');
 #import('dart:io');
 #import('dart:uri');
 
 
 //------------------------------------------------------------------------------
 // Utility types and functions for the dart2js mirror system
 //------------------------------------------------------------------------------
 
@@ skipping 1199 matching lines @@
       _kind = Dart2JsMethodKind.SETTER;
       _canonicalName = '$_name=';
     } else if (_function.kind == ElementKind.GENERATIVE_CONSTRUCTOR) {
       _constructorName = '';
       int dollarPos = _name.indexOf('\$');
       if (dollarPos != -1) {
         _constructorName = _name.substring(dollarPos + 1);
         _name = _name.substring(0, dollarPos);
         // canonical name is TypeName.constructorName
         _canonicalName = '$_name.$_constructorName';
-      } else if (_name == 'negate') {
-        _operatorName = _name;
-        _name = 'operator';
-        _kind = Dart2JsMethodKind.OPERATOR;
-        // canonical name is 'operator operatorName'
-        _canonicalName = 'operator $_operatorName';
-      } else if (_name.startsWith('operator\$')) {
-        String str = _name.substring(9);
-        _name = 'operator';
-        _kind = Dart2JsMethodKind.OPERATOR;
-        _operatorName = _getOperatorFromOperatorName(str);
-        // canonical name is 'operator operatorName'
-        _canonicalName = 'operator $_operatorName';
       } else {
         // canonical name is TypeName
         _canonicalName = _name;
       }
       if (_function.modifiers !== null && _function.modifiers.isConst()) {
         _kind = Dart2JsMethodKind.CONST;
       } else {
         _kind = Dart2JsMethodKind.CONSTRUCTOR;
       }
     } else if (_function.modifiers !== null &&
                _function.modifiers.isFactory()) {
       _kind = Dart2JsMethodKind.FACTORY;
       _constructorName = '';
       int dollarPos = _name.indexOf('\$');
       if (dollarPos != -1) {
         _constructorName = _name.substring(dollarPos+1);
         _name = _name.substring(0, dollarPos);
       }
       // canonical name is TypeName.constructorName
       _canonicalName = '$_name.$_constructorName';
+    } else if (_name == 'negate') {
+      _operatorName = _name;
+      _name = 'operator';
+      _kind = Dart2JsMethodKind.OPERATOR;
+      // canonical name is 'operator operatorName'
+      _canonicalName = 'operator $_operatorName';
     } else if (_name.startsWith('operator\$')) {
       String str = _name.substring(9);
       _name = 'operator';
       _kind = Dart2JsMethodKind.OPERATOR;
       _operatorName = _getOperatorFromOperatorName(str);
       // canonical name is 'operator operatorName'
       _canonicalName = 'operator $_operatorName';
     } else {
       _kind = Dart2JsMethodKind.NORMAL;
       _canonicalName = _name;
@@ skipping 108 matching lines @@
     if (node !== null) {
       var span = system.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     } else {
       var span = system.compiler.spanFromElement(_variable);
       return new Dart2JsLocation(script, span);
     }
   }
 }