Revert "Extract CallStructure from Selector."

pkg/compiler/lib/src/closure.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 closureToClassMapper;
 
 import "elements/elements.dart";
 import "dart2jslib.dart";
 import "dart_types.dart";
 import "js_backend/js_backend.dart" show JavaScriptBackend;
@@ skipping 75 matching lines @@
   }
 }
 
 /// Common interface for [BoxFieldElement] and [ClosureFieldElement] as
 /// non-elements.
 abstract class CapturedVariable {}
 
 // TODO(ahe): These classes continuously cause problems.  We need to
 // find a more general solution.
 class ClosureFieldElement extends ElementX
-    implements FieldElement, CapturedVariable {
+    implements VariableElement, CapturedVariable {
   /// The [BoxLocal] or [LocalElement] being accessed through the field.
   final Local local;
 
   ClosureFieldElement(String name,
                       this.local,
                       ClosureClassElement enclosing)
       : super(name, ElementKind.FIELD, enclosing);
 
   /// Use [closureClass] instead.
   @deprecated
@@ skipping 32 matching lines @@
       return element.type;
     }
     return const DynamicType();
   }
 
   String toString() => "ClosureFieldElement($name)";
 
   accept(ElementVisitor visitor) => visitor.visitClosureFieldElement(this);
 
   Element get analyzableElement => closureClass.methodElement.analyzableElement;
-
-  @override
-  List<FunctionElement> get nestedClosures => const <FunctionElement>[];
 }
 
 // TODO(ahe): These classes continuously cause problems.  We need to find
 // a more general solution.
 class ClosureClassElement extends ClassElementX {
   DartType rawType;
   DartType thisType;
   FunctionType callType;
   /// Node that corresponds to this closure, used for source position.
   final FunctionExpression node;
@@ skipping 60 matching lines @@
 class BoxLocal extends Local {
   final String name;
   final ExecutableElement executableContext;
 
   BoxLocal(this.name, this.executableContext);
 }
 
 // TODO(ngeoffray, ahe): These classes continuously cause problems.  We need to
 // find a more general solution.
 class BoxFieldElement extends ElementX
-    implements TypedElement, CapturedVariable, FieldElement {
+    implements TypedElement, CapturedVariable {
   final BoxLocal box;
 
   BoxFieldElement(String name, this.variableElement, BoxLocal box)
       : this.box = box,
         super(name, ElementKind.FIELD, box.executableContext);
 
   DartType computeType(Compiler compiler) => type;
 
   DartType get type => variableElement.type;
 
   final VariableElement variableElement;
 
   accept(ElementVisitor visitor) => visitor.visitBoxFieldElement(this);
-
-  @override
-  bool get hasNode => false;
-
-  @override
-  bool get hasResolvedAst => false;
-
-  @override
-  Expression get initializer {
-    throw new UnsupportedError("BoxFieldElement.initializer");
-  }
-
-  @override
-  MemberElement get memberContext => box.executableContext.memberContext;
-
-  @override
-  List<FunctionElement> get nestedClosures => const <FunctionElement>[];
-
-  @override
-  Node get node {
-    throw new UnsupportedError("BoxFieldElement.node");
-  }
-
-  @override
-  ResolvedAst get resolvedAst {
-    throw new UnsupportedError("BoxFieldElement.resolvedAst");
-  }
 }
 
 /// A local variable used encode the direct (uncaptured) references to [this].
 class ThisLocal extends Local {
   final ExecutableElement executableContext;
 
   ThisLocal(this.executableContext);
 
   String get name => 'this';
 
   ClassElement get enclosingClass => executableContext.enclosingClass;
 }
 
 /// Call method of a closure class.
-class SynthesizedCallMethodElementX extends BaseFunctionElementX
-    implements MethodElement {
+class SynthesizedCallMethodElementX extends BaseFunctionElementX {
   final LocalFunctionElement expression;
 
   SynthesizedCallMethodElementX(String name,
                                 LocalFunctionElementX other,
                                 ClosureClassElement enclosing)
       : expression = other,
         super(name, other.kind, other.modifiers, enclosing, false) {
     asyncMarker = other.asyncMarker;
     functionSignatureCache = other.functionSignature;
   }
@@ skipping 792 matching lines @@
 
   String get name => typeVariable.name;
 
   int get hashCode => typeVariable.hashCode;
 
   bool operator ==(other) {
     if (other is! TypeVariableLocal) return false;
     return typeVariable == other.typeVariable;
   }
 }