Move location to DeclarationMirror

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 85 matching lines @@
    */
   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;
 
+  /**
+   * The source location of this Dart language entity.
+   */
+  SourceLocation get location;
 }
 
 /**
  * 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<String, MemberMirror> get declaredMembers;
 }
 
 /**
  * A library.
  */
 abstract class LibraryMirror implements ObjectMirror, DeclarationMirror {
   /**
    * The name of the library, as given in #library().
    */
   String get simpleName;
 
   /**
    * Returns an iterable over all types in the library.
    */
   Map<String, ClassMirror> get types;
 
   /**
-   * Returns the source location for this library.
-   */
-  Location get location;
-
-  /**
    * Returns the canonical URI for this library.
    */
   Uri get uri;
 }
 
 /**
  * Common interface for classes, interfaces, typedefs and type variables.
  */
 abstract class TypeMirror implements DeclarationMirror {
   /**
-   * Returns the source location for this type.
-   */
-  Location get location;
-
-  /**
    * Returns the library in which this member resides.
    */
   LibraryMirror get library;
 
   /**
    * Is [:true:] iff this type is the [:Object:] type.
    */
   bool get isObject;
 
   /**
@@ skipping 136 matching lines @@
    * for a [:typedef void f(int):].
    */
   TypeMirror get definition;
 }
 
 /**
  * A member of a type, i.e. a field, method or constructor.
  */
 abstract class MemberMirror implements DeclarationMirror {
   /**
-   * Returns the source location for this member.
-   */
-  Location get location;
-
-  /**
    * Returns a mirror on the declaration immediately surrounding the reflectee.
    * This could be a class, interface, library or another method or function.
    */
   ObjectMirror get surroundingDeclaration;
 
   /**
    * Returns true if this is a top level member, i.e. a member not within a
    * type.
    */
   bool get isTopLevel;
@@ skipping 134 matching lines @@
    */
   bool get isInitializingFormal;
 
   /**
    * Returns the initialized field, if this parameter is an initializing formal.
    */
   FieldMirror get initializedField;
 }
 
 /**
- * A [Location] describes the span of an entity in Dart source code.
- * A [Location] should be the minimum span that encloses the declaration of the
- * mirrored entity.
+ * A [SourceLocation] describes the span of an entity in Dart source code.
+ * A [SourceLocation] should be the minimum span that encloses the declaration
+ * of the mirrored entity.
  */
-abstract class Location {
+abstract class SourceLocation {
   /**
    * The character position where the location begins.
    */
   int get start;
 
   /**
    * The character position where the location ends.
    */
   int get end;
 
   /**
-   * Returns the [Source] in which this [Location] indexes.
+   * Returns the [Source] in which this [SourceLocation] indexes.
    * If [:loc:] is a location, [:loc.source().text()[loc.start]:] is where it
    * starts, and [:loc.source().text()[loc.end]:] is where it ends.
    */
   Source get source;
 
   /**
    * The text of the location span.
    */
   String get text;
 }
 
 /**
  * A [Source] describes the source code of a compilation unit in Dart source
  * code.
  */
 abstract class Source {
   /**
    * Returns the URI where the source originated.
    */
   Uri get uri;
 
   /**
    * Returns the text of this source.
    */
   String get text;
 }