Make Mirror.simpleName unique.

pkg/dartdoc/lib/mirrors.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');
 
 #import('dart:io');
 #import('dart:uri');
 
 // TODO(rnystrom): Use "package:" URL (#4968).
@@ skipping 37 matching lines @@
   abstract Future<String> compileToJavaScript();
 }
 
 /**
  * The main interface for the whole mirror system.
  */
 abstract class MirrorSystem {
   /**
    * Returns an unmodifiable map of all libraries in this mirror system.
    */
-  Map<Object, LibraryMirror> get libraries;
+  Map<String, LibraryMirror> get libraries;
 }
 
 
 /**
  * An entity in the mirror system.
  */
 abstract class Mirror {
+  static const String UNARY_MINUS = 'unary-';
+
   /**
-   * The simple name of the entity. The simple name is in most cases the
-   * the declared single identifier name of the entity, such as 'method' for
-   * a method [:void method() {...}:].
+   * The simple name of the entity. The simple name is unique within the
+   * scope of the entity declaration.
+   *
+   * The simple name is in most cases the the declared single identifier name of

[ngeoffray, 2012/10/02 20:19:43]

the the -> the

[Johnni Winther, 2012/10/03 09:36:24]

Done.

+   * the entity, such as 'method' for a method [:void method() {...}:]. For an
+   * unnamed constructor for [:class Foo:] the simple name is 'Foo'. For a
+   * constructor for [:class Foo:] named 'named' the simple name is 'Foo.named'.
+   * For a property [:foo:] the simple name of the getter method is 'foo' and
+   * the simple name of the setter is 'foo='. For operators the simple name is
+   * the operator itself, for example '+' for [:operator +:].
+   *
+   * The simple name for the unary minus operator is [UNARY_MINUS].
    */
   String get simpleName;
 
   /**
+   * The display name is normal representation of the entity name. In most cases

[ngeoffray, 2012/10/02 20:19:43]

is normal -> is the normal

[Johnni Winther, 2012/10/03 09:36:24]

Done.

+   * the display name is the simple name, but for a setter 'foo=' the display
+   * name is simply 'foo' and for the unary minus operator the display name is
+   * 'operator -'. The display name is not unique.
+   */
+  String get displayName;
+
+  /**
    * Returns the name of this entity qualified by is enclosing context. For
    * instance, the qualified name of a method 'method' in class 'Class' in
    * library 'library' is 'library.Class.method'.
    */
   String get qualifiedName;
 
   /**
    * Returns the mirror system which contains this mirror.
    */
   MirrorSystem get system;
 }
 
 /**
  * Common interface for interface types and libraries.
  */
 abstract class ObjectMirror implements Mirror {
 
   /**
    * Returns an unmodifiable map of the members of declared in this type or
    * library.
    */
-  Map<Object, MemberMirror> get declaredMembers;
+  Map<String, MemberMirror> get declaredMembers;
 }
 
 /**
  * A library.
  */
 abstract class LibraryMirror extends ObjectMirror {
   /**
    * The name of the library, as given in #library().
    */
   String get simpleName;
 
   /**
    * Returns an iterable over all types in the library.
    */
-  Map<Object, InterfaceMirror> get types;
+  Map<String, InterfaceMirror> get types;
 
   /**
    * Returns the source location for this library.
    */
   Location get location;
 }
 
 /**
  * Common interface for classes, interfaces, typedefs and type variables.
  */
@@ skipping 48 matching lines @@
    */
   InterfaceMirror get declaration;
 
   /**
    * Returns the super class of this type, or null if this type is [Object] or a
    * typedef.
    */
   InterfaceMirror get superclass;
 
   /**
-   * Returns an iterable over the interfaces directly implemented by this type.
+   * Returns a list of the interfaces directly implemented by this type.
    */
-  Map<Object, InterfaceMirror> get interfaces;
+  List<InterfaceMirror> get interfaces;
 
   /**
    * Is [:true:] iff this type is a class.
    */
   bool get isClass;
 
   /**
    * Is [:true:] iff this type is an interface.
    */
   bool get isInterface;
@@ skipping 19 matching lines @@
   List<TypeMirror> get typeArguments;
 
   /**
    * Returns the list of type variables for this type.
    */
   List<TypeVariableMirror> get typeVariables;
 
   /**
    * Returns an immutable map of the constructors in this interface.
    */
-  Map<Object, MethodMirror> get constructors;
+  Map<String, MethodMirror> get constructors;
 
   /**
    * Returns the default type for this interface.
    */
   InterfaceMirror get defaultType;
 }
 
 /**
  * A type parameter as declared on a generic type.
  */
@@ skipping 239 matching lines @@
   /**
    * Returns the URI where the source originated.
    */
   Uri get uri;
 
   /**
    * Returns the text of this source.
    */
   String get text;
 }