Introduce DeclarationMirror

pkg/dartdoc/lib/src/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 'dart:io';
 import 'dart:uri';
 
 import '../../../../../lib/compiler/compiler.dart' as diagnostics;
@@ skipping 366 matching lines @@
 
 
 //------------------------------------------------------------------------------
 // Dart2Js specific extensions of mirror interfaces
 //------------------------------------------------------------------------------
 
 abstract class Dart2JsMirror implements Mirror {
   Dart2JsMirrorSystem get system;
 }
 
-abstract class Dart2JsMemberMirror implements Dart2JsMirror, MemberMirror {
+abstract class Dart2JsDeclarationMirror
+  implements Dart2JsMirror, DeclarationMirror {

[kasperl, 2012/10/30 10:11:05]

More indentation of implements for consistency?

[Johnni Winther, 2012/10/30 10:24:25]

Done.

 
 }
 
-abstract class Dart2JsTypeMirror implements Dart2JsMirror, TypeMirror {
+abstract class Dart2JsMemberMirror
+    implements Dart2JsDeclarationMirror, MemberMirror {
 
 }
 
-abstract class Dart2JsElementMirror implements Dart2JsMirror {
+abstract class Dart2JsTypeMirror
+    implements Dart2JsDeclarationMirror, TypeMirror {
+
+}
+
+abstract class Dart2JsElementMirror implements Dart2JsDeclarationMirror {
   final Dart2JsMirrorSystem system;
   final Element _element;
 
   Dart2JsElementMirror(this.system, this._element) {
     assert (system !== null);
     assert (_element !== null);
   }
 
   String get simpleName => _element.name.slowToString();
 
   String get displayName => simpleName;
 
   Location get location => new Dart2JsLocation(
       _element.getCompilationUnit().script,
       system.compiler.spanFromElement(_element));
 
   String toString() => _element.toString();
 
   int get hashCode => qualifiedName.hashCode;
 }
 
-abstract class Dart2JsProxyMirror implements Dart2JsMirror {
+abstract class Dart2JsProxyMirror implements Dart2JsDeclarationMirror {
   final Dart2JsMirrorSystem system;
 
   Dart2JsProxyMirror(this.system);
 
   String get displayName => simpleName;
 
   int get hashCode => qualifiedName.hashCode;
 }
 
 //------------------------------------------------------------------------------
@@ skipping 963 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);
     }
   }
 }