Use more entities in program_builder, collector and registry

pkg/compiler/lib/src/js_emitter/program_builder/registry.dart

 // Copyright (c) 2014, 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.
 
 part of dart2js.js_emitter.program_builder;
 
-/// Maps [LibraryElement]s to their [Element]s.
+class LibraryMapping {

[Siggi Cherem (dart-lang), 2017/04/27 21:24:18]

nit: rename? (because "mapping" below is used to refer to the actual mapping)

ideas:
- LibraryContents
- LibraryBody
- LibraryClassesNadMembers
- OutputEntitites (is it meant to be entities that are generated in the end?)

[Johnni Winther, 2017/04/28 07:48:57]

LibraryContents it is.

+  final List<ClassEntity> classes = <ClassEntity>[];
+  final List<MemberEntity> members = <MemberEntity>[];
+}
+
+/// Maps [LibraryEntity]s to their [ClassEntity]s and [MemberEntity]s.
 ///
 /// Fundamentally, this class nicely encapsulates a
-/// `Map<LibraryElement, List<Element>>`.
+/// `Map<LibraryElement, Pair<List<ClassElement>, List<MemberElement>>>`.
 ///
 /// There exists exactly one instance per [OutputUnit].
 class LibrariesMap {
-  final Map<LibraryElement, List<Element>> _mapping =
-      <LibraryElement, List<Element>>{};
+  final Map<LibraryEntity, LibraryMapping> _mapping =
+      <LibraryEntity, LibraryMapping>{};
 
   // It is very common to access the same library multiple times in a row, so
   // we cache the last access.
-  LibraryElement _lastLibrary;
-  List<Element> _lastElements;
+  LibraryEntity _lastLibrary;
+  LibraryMapping _lastMapping;
 
   /// A unique name representing this instance.
   final String name;
   final OutputUnit outputUnit;
 
   LibrariesMap.main(this.outputUnit) : name = "";
 
   LibrariesMap.deferred(this.outputUnit, this.name) {
     assert(name != "");
   }
 
-  void add(LibraryElement library, Element element) {
+  LibraryMapping _getMapping(LibraryEntity library) {
     if (_lastLibrary != library) {
       _lastLibrary = library;
-      _lastElements = _mapping.putIfAbsent(library, () => <Element>[]);
+      _lastMapping = _mapping.putIfAbsent(library, () => new LibraryMapping());
     }
-    _lastElements.add(element);
+    return _lastMapping;
+  }
+
+  void addClass(LibraryEntity library, ClassEntity element) {
+    _getMapping(library).classes.add(element);
+  }
+
+  void addMember(LibraryEntity library, MemberEntity element) {
+    _getMapping(library).members.add(element);
   }
 
   int get length => _mapping.length;
 
-  void forEach(void f(LibraryElement library, List<Element> elements)) {
-    _mapping.forEach(f);
+  void forEach(
+      void f(LibraryEntity library, List<ClassEntity> classes,
+          List<MemberEntity> members)) {
+    _mapping.forEach((LibraryEntity library, LibraryMapping mapping) {
+      f(library, mapping.classes, mapping.members);
+    });
   }
 }
 
 /// Keeps track of all elements and holders.
 ///
 /// This class assigns each registered element to its [LibrariesMap] (which are
 /// in bijection with [OutputUnit]s).
 ///
 /// Registered holders are assigned a name.
 class Registry {
   final DeferredLoadTask _deferredLoadTask;
+  final Sorter _sorter;
   final Map<String, Holder> _holdersMap = <String, Holder>{};
   final Map<OutputUnit, LibrariesMap> _deferredLibrariesMap =
       <OutputUnit, LibrariesMap>{};
 
   /// Cache for the last seen output unit.
   OutputUnit _lastOutputUnit;
   LibrariesMap _lastLibrariesMap;
 
   Iterable<Holder> get holders => _holdersMap.values;
   Iterable<LibrariesMap> get deferredLibrariesMap =>
       _deferredLibrariesMap.values;
 
   // Add one for the main libraries map.
   int get librariesMapCount => _deferredLibrariesMap.length + 1;
 
   LibrariesMap mainLibrariesMap;
 
-  Registry(this._deferredLoadTask);
+  Registry(this._deferredLoadTask, this._sorter);
 
   OutputUnit get _mainOutputUnit => _deferredLoadTask.mainOutputUnit;
 
   LibrariesMap _mapUnitToLibrariesMap(OutputUnit targetUnit) {
     if (targetUnit == _lastOutputUnit) return _lastLibrariesMap;
 
     LibrariesMap result = (targetUnit == _mainOutputUnit)
         ? mainLibrariesMap
         : _deferredLibrariesMap[targetUnit];
 
@@ skipping 11 matching lines @@
     } else {
       assert(!_deferredLibrariesMap.containsKey(outputUnit));
       String name = outputUnit.name;
       _deferredLibrariesMap[outputUnit] =
           new LibrariesMap.deferred(outputUnit, name);
     }
   }
 
   /// Adds all elements to their respective libraries in the correct
   /// libraries map.
-  void registerElements(OutputUnit outputUnit, Iterable<Element> elements) {
+  void registerClasses(OutputUnit outputUnit, Iterable<ClassEntity> elements) {
     LibrariesMap targetLibrariesMap = _mapUnitToLibrariesMap(outputUnit);
-    for (Element element in Elements.sortedByPosition(elements)) {
-      targetLibrariesMap.add(element.library, element);
+    for (ClassEntity element in _sorter.sortClasses(elements)) {
+      targetLibrariesMap.addClass(element.library, element);
     }
   }
 
+  /// Adds all elements to their respective libraries in the correct
+  /// libraries map.
+  void registerMembers(OutputUnit outputUnit, Iterable<MemberEntity> elements) {
+    LibrariesMap targetLibrariesMap = _mapUnitToLibrariesMap(outputUnit);
+    for (MemberEntity element in _sorter.sortMembers(elements)) {
+      targetLibrariesMap.addMember(element.library, element);
+    }
+  }
+
   void registerConstant(OutputUnit outputUnit, ConstantValue constantValue) {
     // Ignore for now.
   }
 
   Holder registerHolder(String name,
       {bool isStaticStateHolder: false, bool isConstantsHolder: false}) {
     assert(_holdersMap[name] == null ||
         (_holdersMap[name].isStaticStateHolder == isStaticStateHolder &&
             _holdersMap[name].isConstantsHolder == isConstantsHolder));
 
     return _holdersMap.putIfAbsent(name, () {
       return new Holder(name, _holdersMap.length,
           isStaticStateHolder: isStaticStateHolder,
           isConstantsHolder: isConstantsHolder);
     });
   }
 }