Rename UniverseSelector to DynamicUse and move it to use.dart

pkg/compiler/lib/src/universe/universe.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 universe;
 
 import 'dart:collection';
 
 import '../common.dart';
 import '../compiler.dart' show
     Compiler;
 import '../elements/elements.dart';
 import '../dart_types.dart';
 import '../util/util.dart';
 import '../world.dart' show
     ClassWorld,
     World;
 
 import 'selector.dart' show
     Selector;
 import 'use.dart' show
+    DynamicUse,
+    DynamicUseKind,
     StaticUse,
     StaticUseKind;
 
-enum DynamicUseKind {
-  INVOKE,
-  GET,
-  SET,
-}
-
-// TODO(johnniwinther): Rename to `DynamicUse` and move to 'use.dart'.
-class UniverseSelector {
-  final Selector selector;
-  final ReceiverConstraint mask;
-
-  UniverseSelector(this.selector, this.mask);
-
-  bool appliesUnnamed(Element element, ClassWorld world) {
-    return selector.appliesUnnamed(element, world) &&
-        (mask == null || mask.canHit(element, selector, world));
-  }
-
-  DynamicUseKind get kind {
-    if (selector.isGetter) {
-      return DynamicUseKind.GET;
-    } else if (selector.isSetter) {
-      return DynamicUseKind.SET;
-    } else {
-      return DynamicUseKind.INVOKE;
-    }
-  }
-
-  int get hashCode => selector.hashCode * 13 + mask.hashCode * 17;
-
-  bool operator ==(other) {
-    if (identical(this, other)) return true;
-    if (other is! UniverseSelector) return false;
-    return selector == other.selector && mask == other.mask;
-  }
-
-  String toString() => '$selector,$mask';
-}
-
 /// The known constraint on receiver for a dynamic call site.
 ///
 /// This can for instance be used to constrain this dynamic call to `foo` to
 /// 'receivers of the exact instance `Bar`':
 ///
 ///     class Bar {
 ///        void foo() {}
 ///     }
 ///     main() => new Bar().foo();
 ///
@@ skipping 262 matching lines @@
   }
 
   bool hasInvokedGetter(Element member, World world) {
     return _hasMatchingSelector(_invokedGetters[member.name], member, world);
   }
 
   bool hasInvokedSetter(Element member, World world) {
     return _hasMatchingSelector(_invokedSetters[member.name], member, world);
   }
 
-  bool registerDynamicUse(UniverseSelector selector) {
-    switch (selector.kind) {
+  bool registerDynamicUse(DynamicUse dynamicUse) {
+    switch (dynamicUse.kind) {
       case DynamicUseKind.INVOKE:
-        return _registerNewSelector(selector, _invokedNames);
+        return _registerNewSelector(dynamicUse, _invokedNames);
       case DynamicUseKind.GET:
-        return _registerNewSelector(selector, _invokedGetters);
+        return _registerNewSelector(dynamicUse, _invokedGetters);
       case DynamicUseKind.SET:
-        return _registerNewSelector(selector, _invokedSetters);
+        return _registerNewSelector(dynamicUse, _invokedSetters);
     }
   }
 
   bool _registerNewSelector(
-      UniverseSelector universeSelector,
+      DynamicUse dynamicUse,
       Map<String, Map<Selector, SelectorConstraints>> selectorMap) {
-    Selector selector = universeSelector.selector;
+    Selector selector = dynamicUse.selector;
     String name = selector.name;
-    ReceiverConstraint mask = universeSelector.mask;
+    ReceiverConstraint mask = dynamicUse.mask;
     Map<Selector, SelectorConstraints> selectors = selectorMap.putIfAbsent(
         name, () => new Maplet<Selector, SelectorConstraints>());
     UniverseSelectorConstraints constraints = selectors.putIfAbsent(
         selector, () => selectorConstraintsStrategy.createSelectorConstraints(selector));
     return constraints.addReceiverConstraint(mask);
   }
 
   Map<Selector, SelectorConstraints> _asUnmodifiable(
       Map<Selector, SelectorConstraints> map) {
     if (map == null) return null;
@@ skipping 81 matching lines @@
   // TODO(ahe): Replace this method with something that is O(1), for example,
   // by using a map.
   List<LocalFunctionElement> slowDirectlyNestedClosures(Element element) {
     // Return new list to guard against concurrent modifications.
     return new List<LocalFunctionElement>.from(
         allClosures.where((LocalFunctionElement closure) {
           return closure.executableContext == element;
         }));
   }
 }