Alignments for the ClassMirror interface.

pkg/dartdoc/lib/mirrors_util.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.util');
 
 // TODO(rnystrom): Use "package:" URL (#4968).
 #import('mirrors.dart');
 #import('../../../lib/compiler/implementation/util/characters.dart');
 
 //------------------------------------------------------------------------------
 // Utility functions for using the Mirror API
 //------------------------------------------------------------------------------
 
 /**
  * Returns an iterable over the type declarations directly inheriting from
  * the declaration of this type.
  */
 Iterable<ClassMirror> computeSubdeclarations(ClassMirror type) {
-  type = type.declaration;
+  type = type.originalDeclaration;
   var subtypes = <ClassMirror>[];
   type.system.libraries.forEach((_, library) {
     for (ClassMirror otherType in library.classes.values) {
       var superClass = otherType.superclass;
       if (superClass !== null) {
-        superClass = superClass.declaration;
+        superClass = superClass.originalDeclaration;
         if (type.library === superClass.library) {
           if (superClass == type) {
              subtypes.add(otherType);
           }
         }
       }
-      final superInterfaces = otherType.interfaces;
+      final superInterfaces = otherType.superinterfaces;
       for (ClassMirror superInterface in superInterfaces) {
-        superInterface = superInterface.declaration;
+        superInterface = superInterface.originalDeclaration;
         if (type.library === superInterface.library) {
           if (superInterface == type) {
             subtypes.add(otherType);
           }
         }
       }
     }
   });
   return subtypes;
 }
@@ skipping 60 matching lines @@
   }
 
   ClassMirror push(ClassMirror type) {
     if (type.superclass !== null) {
       if (type.superclass.isObject) {
         object = type.superclass;
       } else {
         queue.addFirst(type.superclass);
       }
     }
-    queue.addAll(type.interfaces);
+    queue.addAll(type.superinterfaces);
     return type;
   }
 
   ClassMirror next() {
     ClassMirror type;
     if (queue.isEmpty) {
       if (object === null) {
         throw new StateError("No more elements");
       }
       type = object;
       object = null;
       return type;
     } else {
       return push(queue.removeFirst());
     }
   }
 
   bool get hasNext => !queue.isEmpty || object !== null;
 }