Replace ClassHierarchy.classes with getOrderedClasses().

pkg/kernel/lib/src/incremental_class_hierarchy.dart

 // Copyright (c) 2017, 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 kernel.incremental_class_hierarchy;
 
 import 'dart:collection';
 import 'dart:math';
 
 import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart';
@@ skipping 56 matching lines @@
   }
   return null;
 }
 
 /// Lazy and incremental implementation of [ClassHierarchy].
 class IncrementalClassHierarchy implements ClassHierarchy {
   /// The next unique identifier for [_ClassInfo]s.
   int _nextId = 0;
 
   /// The mapping from [Class]es to the corresponding [_ClassInfo]s.
+  /// The map is ordered in such a way that classes are after superclasses.
   /// It is filled lazily as the client requests information about classes.
-  final Map<Class, _ClassInfo> _info = {};
-
-  @override
-  Iterable<Class> get classes {
-    // TODO(scheglov): implement classes
-    throw new UnimplementedError();
-  }
+  final Map<Class, _ClassInfo> _info = new LinkedHashMap<Class, _ClassInfo>();
 
   @override
   void forEachOverridePair(Class node,
       callback(Member declaredMember, Member interfaceMember, bool isSetter)) {
     _ClassInfo info = _getInfo(node);
     for (var supertype in node.supers) {
       var superNode = supertype.classNode;
       var superInfo = _getInfo(superNode);
 
       var superGetters = superInfo.interfaceGettersAndCalls;
@@ skipping 149 matching lines @@
 
   @override
   Member getInterfaceMember(Class node, Name name, {bool setter: false}) {
     _ClassInfo info = _getInfo(node);
     List<Member> members =
         setter ? info.interfaceSetters : info.interfaceGettersAndCalls;
     return _findMemberByName(members, name);
   }
 
   @override
+  Iterable<Class> getOrderedClasses(Iterable<Class> unordered) {
+    unordered.forEach(_getInfo);
+    return _info.keys;
+  }
+
+  @override
   List<Class> getRankedSuperclasses(Class node) {
     var info = _getInfo(node);
     return _getRankedSuperclassList(info).map((info) => info.node).toList();
   }
 
   @override
   InterfaceType getTypeAsInstanceOf(InterfaceType type, Class superclass) {
     Supertype castedType = getClassAsInstanceOf(type.classNode, superclass);
     if (castedType == null) return null;
     return Substitution
@@ skipping 89 matching lines @@
         _inheritMembers(declaredGetters, allInheritedGetters);
     info.interfaceSetters =
         _inheritMembers(declaredSetters, allInheritedSetters);
   }
 
   /// Return the [_ClassInfo] for the [node].
   _ClassInfo _getInfo(Class node) {
     var info = _info[node];
     if (info == null) {
       info = new _ClassInfo(_nextId++, node);
-      _info[node] = info;
 
       void addSupertypeIdentifiers(_ClassInfo superInfo) {
         info.supertypeIdSet.add(superInfo.id);
         info.supertypeIdSet.addAll(superInfo.supertypeIdSet);
       }
 
       int superDepth = -1;
       if (node.supertype != null) {
         var superInfo = _getInfo(node.supertype.classNode);
         superDepth = max(superDepth, superInfo.depth);
         addSupertypeIdentifiers(superInfo);
         _recordSuperTypes(info, node.supertype, superInfo);
       }
       if (node.mixedInType != null) {
         var mixedInfo = _getInfo(node.mixedInType.classNode);
         superDepth = max(superDepth, mixedInfo.depth);
         addSupertypeIdentifiers(mixedInfo);
         _recordSuperTypes(info, node.mixedInType, mixedInfo);
       }
       for (var implementedType in node.implementedTypes) {
         var implementedInfo = _getInfo(implementedType.classNode);
         superDepth = max(superDepth, implementedInfo.depth);
         addSupertypeIdentifiers(implementedInfo);
         _recordSuperTypes(info, implementedType, implementedInfo);
       }
+
       info.depth = superDepth + 1;
+      _info[node] = info;
 
       _buildDeclaredMembers(info);
       _buildImplementedMembers(info);
       _buildInterfaceMembers(info);
     }
     return info;
   }
 
   List<_ClassInfo> _getRankedSuperclassList(_ClassInfo info) {
     if (info.rankedSuperclassList != null) {
@@ skipping 221 matching lines @@
   final int id;
 
   /// The [Class] node described by this [_ClassInfo].
   final Class node;
 
   /// The number of steps in the longest inheritance path from the class
   /// to [Object], or `-1` if the depth has not been computed yet.
   int depth = -1;
 
   /// The list of superclasses sorted by depth (descending order) and
-  /// unique identifiers (ascending order), or `null` if the lit has not
+  /// unique identifiers (ascending order), or `null` if the it has not

[Paul Berry, 2017/06/05 21:59:22]

I think you mean "...if the list has not been computed yet."

[scheglov, 2017/06/05 22:01:33]

Correct. Thank you.

   /// been computed yet.
   List<_ClassInfo> rankedSuperclassList;
 
   /// The set of [id]s for supertypes.
   /// TODO(scheglov): Maybe optimize.
   final Set<int> supertypeIdSet = new HashSet<int>();
 
   /// Maps generic supertype classes to the instantiation implemented by this
   /// class, or `null` if the class does not have generic supertypes.
   ///
@@ skipping 67 matching lines @@
 class _LubHeap extends Heap<_ClassInfo> {
   @override
   bool sortsBefore(_ClassInfo a, _ClassInfo b) => sortsBeforeStatic(a, b);
 
   static bool sortsBeforeStatic(_ClassInfo a, _ClassInfo b) {
     if (a.depth > b.depth) return true;
     if (a.depth < b.depth) return false;
     return a.id < b.id;
   }
 }