Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1315)

Unified Diff: sdk/lib/_internal/compiler/implementation/elements/elements.dart

Issue 137893024: Revert "Reapply "Implement new model for class members." and "Implement new model for interface mem… (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sdk/lib/_internal/compiler/implementation/elements/elements.dart
diff --git a/sdk/lib/_internal/compiler/implementation/elements/elements.dart b/sdk/lib/_internal/compiler/implementation/elements/elements.dart
index ed3b7df6418ce5e251708821c613b01c708084a6..5b80da634868dc808171ade6d20f64ef0af18501 100644
--- a/sdk/lib/_internal/compiler/implementation/elements/elements.dart
+++ b/sdk/lib/_internal/compiler/implementation/elements/elements.dart
@@ -20,8 +20,7 @@ import '../dart2jslib.dart' show InterfaceType,
FunctionType,
Selector,
Constant,
- Compiler,
- isPrivateName;
+ Compiler;
import '../dart_types.dart';
@@ -33,8 +32,6 @@ import '../ordered_typeset.dart' show OrderedTypeSet;
import 'visitor.dart' show ElementVisitor;
-part 'names.dart';
-
const int STATE_NOT_STARTED = 0;
const int STATE_STARTED = 1;
const int STATE_DONE = 2;
@@ -909,9 +906,6 @@ abstract class ClassElement extends TypeDeclarationElement
/// Returns `true` if this class has a @proxy annotation.
bool get isProxy;
- /// Returns `true` if the class hierarchy for this class contains errors.
- bool get hasIncompleteHierarchy;
-
ClassElement ensureResolved(Compiler compiler);
void addMember(Element element, DiagnosticListener listener);
@@ -953,18 +947,6 @@ abstract class ClassElement extends TypeDeclarationElement
void forEachBackendMember(void f(Element member));
Link<DartType> computeTypeParameters(Compiler compiler);
-
- /// Looks up the member [name] in this class.
- Member lookupClassMember(Name name);
-
- /// Calls [f] with each member of this class.
- void forEachClassMember(f(Member member));
-
- /// Looks up the member [name] in the interface of this class.
- MemberSignature lookupInterfaceMember(Name name);
-
- /// Calls [f] with each member of the interface of this class.
- void forEachInterfaceMember(f(MemberSignature member));
}
abstract class MixinApplicationElement extends ClassElement {
@@ -1028,77 +1010,3 @@ abstract class MetadataAnnotation implements Spannable {
}
abstract class VoidElement extends Element {}
-
-/// A [MemberSignature] is a member of an interface.
-///
-/// A signature is either a method or a getter or setter, possibly implicitly
-/// defined by a field declarations. Fields themselves are not members of an
-/// interface.
-///
-/// A [MemberSignature] may be defined by a member declaration or may be
-/// synthetized from a set of declarations.
-abstract class MemberSignature {
- /// The name of this member.
- Name get name;
-
- /// The type of the member when accessed. For getters and setters this is the
- /// return type and argument type, respectively. For methods the type is the
- /// [functionType] defined by the return type and parameters.
- DartType get type;
-
- /// The function type of the member. For a getter `Foo get foo` this is
- /// `() -> Foo`, for a setter `void set foo(Foo _)` this is `(Foo) -> void`.
- /// For methods the function type is defined by the return type and
- /// parameters.
- FunctionType get functionType;
-
- /// Returns `true` if this member is a getter, possibly implictly defined by a
- /// field declaration.
- bool get isGetter;
-
- /// Returns `true` if this member is a setter, possibly implictly defined by a
- /// field declaration.
- bool get isSetter;
-
- /// Returns `true` if this member is a method, that is neither a getter nor
- /// setter.
- bool get isMethod;
-
- /// Returns an iterable of the declarations that define this member.
- Iterable<Member> get declarations;
-}
-
-/// A [Member] is a member of a class, that is either a method or a getter or
-/// setter, possibly implicitly defined by a field declarations. Fields
-/// themselves are not members of a class.
-///
-/// A [Member] of a class also defines a signature which is a member of the
-/// corresponding interface type.
-///
-/// A [Member] is implicitly concrete. An abstract declaration only declares
-/// a signature in the interface of its class.
-///
-/// A [Member] is always declared by an [Element] which is accessibly through
-/// the [element] getter.
-abstract class Member extends MemberSignature {
- /// The [Element] that declared this member, possibly implicitly in case of
- /// a getter or setter defined by a field.
- Element get element;
-
- /// The instance of the class that declared this member.
- ///
- /// For instance:
- /// class A<T> { T m() {} }
- /// class B<S> extends A<S> {}
- /// The declarer of `m` in `A` is `A<T>` whereas the declarer of `m` in `B` is
- /// `A<S>`.
- InterfaceType get declarer;
-
- /// Returns `true` if this member is static.
- bool get isStatic;
-
- /// Returns `true` if this member is a getter or setter implicitly declared
- /// by a field.
- bool get isDeclaredByField;
-}
-

Powered by Google App Engine
This is Rietveld 408576698