Create SendStructure for unary and binary in resolution.

pkg/compiler/lib/src/elements/modelx.dart

 // Copyright (c) 2013, 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 elements.modelx;
 
 import 'elements.dart';
 import '../constants/expressions.dart';
 import '../constants/constructors.dart';
 import '../helpers/helpers.dart';  // Included for debug helpers.
@@ skipping 2459 matching lines @@
       Element e = s.lookupLocalMember(memberName);
       if (e == null) continue;
       // Static members are not inherited.
       if (e.isStatic) continue;
       return e;
     }
     return null;
   }
 
   /**
-   * Find the first member in the class chain with the given [selector].
+   * Find the first member in the class chain with the given [memberName].
    *
    * This method is NOT to be used for resolving
    * unqualified sends because it does not implement the scoping
    * rules, where library scope comes before superclass scope.
    *
    * When called on the implementation element both members declared in the
    * origin and the patch class are returned.
    */
-  Element lookupSelector(Selector selector) {
-    return internalLookupSelector(selector, false);
+  Element lookupByName(Name memberName) {
+    return internalLookupByName(memberName, isSuperLookup: false);
   }
 
-  Element lookupSuperSelector(Selector selector) {
-    return internalLookupSelector(selector, true);
+  Element lookupSuperByName(Name memberName) {
+    return internalLookupByName(memberName, isSuperLookup: true);
   }
 
-  Element internalLookupSelector(Selector selector,
-                                 bool isSuperLookup) {
-    String name = selector.name;
-    bool isPrivate = isPrivateName(name);
-    LibraryElement library = selector.library;
+  Element internalLookupByName(Name memberName,
+                                 {bool isSuperLookup}) {

[karlklose, 2015/05/26 08:23:32]

Fix indentation. Does it fit on one line now?

[Johnni Winther, 2015/05/26 08:53:11]

Done.

+    String name = memberName.text;
+    bool isPrivate = memberName.isPrivate;
+    LibraryElement library = memberName.library;
     for (ClassElement current = isSuperLookup ? superclass : this;
          current != null;
          current = current.superclass) {
       Element member = current.lookupLocalMember(name);
       if (member == null && current.isPatched) {
         // Doing lookups on selectors is done after resolution, so it
         // is safe to look in the patch class.
         member = current.patch.lookupLocalMember(name);
       }
       if (member == null) continue;
       // Private members from a different library are not visible.
       if (isPrivate && !identical(library, member.library)) continue;
       // Static members are not inherited.
       if (member.isStatic && !identical(this, current)) continue;
       // If we find an abstract field we have to make sure that it has
       // the getter or setter part we're actually looking
       // for. Otherwise, we continue up the superclass chain.
       if (member.isAbstractField) {
         AbstractFieldElement field = member;
         FunctionElement getter = field.getter;
         FunctionElement setter = field.setter;
-        if (selector.isSetter) {
+        if (memberName.isSetter) {
           // Abstract members can be defined in a super class.
-          if (setter != null && !setter.isAbstract) return setter;
+          if (setter != null && !setter.isAbstract) {
+            return setter;
+          }
         } else {
-          assert(selector.isGetter || selector.isCall);
-          if (getter != null && !getter.isAbstract) return getter;
+          if (getter != null && !getter.isAbstract) {
+            return getter;
+          }
         }
       // Abstract members can be defined in a super class.
       } else if (!member.isAbstract) {
         return member;
       }
     }
     return null;
   }
 
   /**
@@ skipping 678 matching lines @@
   AstElement get definingElement;
 
   bool get hasResolvedAst => definingElement.hasTreeElements;
 
   ResolvedAst get resolvedAst {
     return new ResolvedAst(declaration,
         definingElement.node, definingElement.treeElements);
   }
 
 }