Add name and library to selectors.

lib/compiler/implementation/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.
 
 class Universe {
   Map<Element, CodeBuffer> generatedCode;
   Map<Element, CodeBuffer> generatedBailoutCode;
   final Set<ClassElement> instantiatedClasses;
   final Set<SourceString> instantiatedClassInstanceFields;
   final Set<FunctionElement> staticFunctionsNeedingGetter;
@@ skipping 57 matching lines @@
     return hasMatchingSelector(fieldSetters[member.name], member, compiler);
   }
 }
 
 class SelectorKind {
   final String name;
   const SelectorKind(this.name);
 
   static final SelectorKind GETTER = const SelectorKind('getter');
   static final SelectorKind SETTER = const SelectorKind('setter');
   static final SelectorKind INVOCATION = const SelectorKind('invocation');

[Søren Gjesse, 2012/08/14 12:01:38]

Rename INVOCATION and 'invocation' to CALL and 'call'?

[kasperl, 2012/08/14 12:15:46]

Will do in next CL.

   static final SelectorKind OPERATOR = const SelectorKind('operator');
   static final SelectorKind INDEX = const SelectorKind('index');
 
   toString() => name;
 }
 
 class Selector implements Hashable {
+  final SelectorKind kind;
+  final SourceString name;  // May be null for callAny.
+  final LibraryElement library;  // XXX: Should be null for non-private names?

[kasperl, 2012/08/14 08:18:46]

I think I need to make sure this is actually null for non-private names in order
for the tree shaker to do its job properly.

+
   // The numbers of arguments of the selector. Includes named arguments.
   final int argumentCount;
-  final SelectorKind kind;
   final List<SourceString> namedArguments;
   final List<SourceString> orderedNamedArguments;
 
-  // The const constructor.
-  const Selector.constant(this.kind, this.argumentCount)
-    : this.namedArguments = const <SourceString>[],
-      this.orderedNamedArguments = const <SourceString>[];
-
   Selector(
       this.kind,
+      this.name,
+      this.library,

[kasperl, 2012/08/14 08:18:46]

I'll make the library null for non-private names here.

       this.argumentCount,
       [List<SourceString> namedArguments = const <SourceString>[]])
     : this.namedArguments = namedArguments,
       this.orderedNamedArguments = namedArguments.isEmpty()
           ? namedArguments
-          : <SourceString>[];
+          : <SourceString>[] {
+    assert(name == null || !name.isPrivate() || library != null);
+  }
 
-  Selector.invocation(
-      int argumentCount,
-      [List<SourceString> namedArguments = const <SourceString>[]])
-    : this(SelectorKind.INVOCATION, argumentCount, namedArguments);
+  Selector.getter(SourceString name, LibraryElement library)
+      : this(SelectorKind.GETTER, name, library, 0);
+
+  Selector.setter(SourceString name, LibraryElement library)
+      : this(SelectorKind.SETTER, name, library, 1);
+
+  Selector.unaryOperator(SourceString name)
+      : this(SelectorKind.OPERATOR, operatorName(name, true), null, 0);
+
+  Selector.binaryOperator(SourceString name)
+      : this(SelectorKind.OPERATOR, operatorName(name, false), null, 1);
+
+  Selector.index()
+      : this(SelectorKind.INDEX, indexName(), null, 1);
+
+  Selector.indexSet()
+      : this(SelectorKind.INDEX, indexSetName(), null, 2);
+
+  Selector.call(SourceString name,
+                LibraryElement library,
+                int arity,
+                [List<SourceString> named = const []])
+      : this(SelectorKind.INVOCATION, name, library, arity, named);
+
+  Selector.callAny(int arity, [List<SourceString> named = const []])
+      : this(SelectorKind.INVOCATION, null, null, arity, named);
+
+  // TODO(kasperl): This belongs somewhere else.
+  Selector.noSuchMethod()
+      : this(SelectorKind.INVOCATION, Compiler.NO_SUCH_METHOD, null, 2);
+
+  bool isGetter() => kind === SelectorKind.GETTER;
+  bool isSetter() => kind === SelectorKind.SETTER;
+  bool isCall() => kind === SelectorKind.INVOCATION;
+
+  bool isIndex() => kind === SelectorKind.INDEX && argumentCount == 1;
+  bool isIndexSet() => kind === SelectorKind.INDEX && argumentCount == 2;
+
+  bool isOperator() => kind === SelectorKind.OPERATOR;
+  bool isUnaryOperator() => isOperator() && argumentCount == 0;
+  bool isBinaryOperator() => isOperator() && argumentCount == 1;
+
+  static SourceString operatorName(SourceString name, bool isUnary)
+      => Elements.constructOperatorName(
+             const SourceString('operator'), name, isUnary);
+
+  static SourceString indexName()
+      => operatorName(const SourceString('[]'), false);
+
+  static SourceString indexSetName()
+      => operatorName(const SourceString('[]='), false);
 
   int hashCode() => argumentCount + 1000 * namedArguments.length;
   int get namedArgumentCount() => namedArguments.length;
   int get positionalArgumentCount() => argumentCount - namedArgumentCount;
   Type get receiverType() => null;
 
-  static final Selector GETTER =
-      const Selector.constant(SelectorKind.GETTER, 0);
-  static final Selector SETTER =
-      const Selector.constant(SelectorKind.SETTER, 1);
-  static final Selector UNARY_OPERATOR =
-      const Selector.constant(SelectorKind.OPERATOR, 0);
-  static final Selector BINARY_OPERATOR =
-      const Selector.constant(SelectorKind.OPERATOR, 1);
-  static final Selector INDEX =
-      const Selector.constant(SelectorKind.INDEX, 1);
-  static final Selector INDEX_SET =
-      const Selector.constant(SelectorKind.INDEX, 2);
-  static final Selector INDEX_AND_INDEX_SET =
-      const Selector.constant(SelectorKind.INDEX, 2);
-  static final Selector GETTER_AND_SETTER =
-      const Selector.constant(SelectorKind.SETTER, 1);
-  static final Selector INVOCATION_0 =
-      const Selector.constant(SelectorKind.INVOCATION, 0);
-  static final Selector INVOCATION_1 =
-      const Selector.constant(SelectorKind.INVOCATION, 1);
-  static final Selector INVOCATION_2 =
-      const Selector.constant(SelectorKind.INVOCATION, 2);
-
   bool applies(Element element, Compiler compiler) {
     if (element.isSetter()) return kind === SelectorKind.SETTER;
     if (element.isGetter()) {
       return kind === SelectorKind.GETTER || kind === SelectorKind.INVOCATION;
     }
     if (element.isField()) {
       return kind === SelectorKind.GETTER
           || kind === SelectorKind.INVOCATION
           || kind === SelectorKind.SETTER;
     }
@@ skipping 112 matching lines @@
 
   static bool sameNames(List<SourceString> first, List<SourceString> second) {
     for (int i = 0; i < first.length; i++) {
       if (first[i] != second[i]) return false;
     }
     return true;
   }
 
   bool operator ==(other) {
     if (other is !Selector) return false;
-    if (receiverType !== other.receiverType) return false;
-    return argumentCount == other.argumentCount
+    return name == other.name
+           && library === other.library
+           && argumentCount == other.argumentCount
            && namedArguments.length == other.namedArguments.length
+           && receiverType === other.receiverType
            && sameNames(namedArguments, other.namedArguments);
   }
 
   List<SourceString> getOrderedNamedArguments() {
     if (namedArguments.isEmpty()) return namedArguments;
     if (!orderedNamedArguments.isEmpty()) return orderedNamedArguments;
 
     orderedNamedArguments.addAll(namedArguments);
     orderedNamedArguments.sort((SourceString first, SourceString second) {
       return first.slowToString().compareTo(second.slowToString());
     });
     return orderedNamedArguments;
   }
 
-  toString() => 'Selector($kind, $argumentCount)';
+  toString() => 'Selector($kind, $name, $argumentCount)';
 }
 
 class TypedSelector extends Selector {
   /**
    * The type of the receiver. Any subtype of that type can be the
    * target of the invocation.
    */
   final Type receiverType;
 
   TypedSelector(this.receiverType, Selector selector)
     : super(selector.kind,
+            selector.name,
+            selector.library,
             selector.argumentCount,
             selector.namedArguments);
 
   /**
    * Check if [element] will be the one used at runtime when being
    * invoked on an instance of [cls].
    */
   bool hasElementIn(ClassElement cls, Element element) {
     Element resolved = cls.lookupMember(element.name);
     if (resolved === element) return true;
@@ skipping 35 matching lines @@
       // Resolve an invocation of [element.name] on [self]. If it
       // is found, this selector is a candidate.
       return hasElementIn(self, element) && super.applies(element, compiler);
     }
 
     return false;
   }
 
   toString() => 'TypedSelector($kind, $receiverType, $argumentCount)';
 }