| Index: sdk/lib/_internal/compiler/implementation/resolution/class_members.dart
|
| diff --git a/sdk/lib/_internal/compiler/implementation/resolution/class_members.dart b/sdk/lib/_internal/compiler/implementation/resolution/class_members.dart
|
| index 9a1a085926095e4edec7b1fc0736da46654b311c..9710be8b4c53822f9f185251e0d57b71e9b6d0cc 100644
|
| --- a/sdk/lib/_internal/compiler/implementation/resolution/class_members.dart
|
| +++ b/sdk/lib/_internal/compiler/implementation/resolution/class_members.dart
|
| @@ -70,7 +70,7 @@ abstract class MembersCreator {
|
| /// interface unless it is abstract or declares a `noSuchMethod` method.
|
| void computeAllMembers() {
|
| Map<Name, Member> declaredMembers = computeMembers(null, null);
|
| - if (!cls.modifiers.isAbstract() &&
|
| + if (!cls.modifiers.isAbstract &&
|
| !declaredMembers.containsKey(const PublicName('noSuchMethod'))) {
|
| // Check for unimplemented members on concrete classes that neither have
|
| // a `@proxy` annotation nor declare a `noSuchMethod` method.
|
| @@ -160,11 +160,11 @@ abstract class MembersCreator {
|
| }
|
| }
|
| } else {
|
| - LibraryElement library = cls.getLibrary();
|
| + LibraryElement library = cls.library;
|
| InterfaceType thisType = cls.thisType;
|
|
|
| void createMember(Element element) {
|
| - if (element.isConstructor()) return;
|
| + if (element.isConstructor) return;
|
| String elementName = element.name;
|
| if (shouldSkipName(elementName)) return;
|
| if (nameText != null && elementName != nameText) return;
|
| @@ -187,22 +187,22 @@ abstract class MembersCreator {
|
| }
|
|
|
| Name name = new Name(element.name, library);
|
| - if (element.isField()) {
|
| + if (element.isField) {
|
| DartType type = element.computeType(compiler);
|
| addDeclaredMember(name, type,
|
| new FunctionType(compiler.functionClass, type));
|
| - if (!element.modifiers.isConst() &&
|
| - !element.modifiers.isFinal()) {
|
| + if (!element.modifiers.isConst &&
|
| + !element.modifiers.isFinal) {
|
| addDeclaredMember(name.setter, type,
|
| new FunctionType(compiler.functionClass,
|
| compiler.types.voidType,
|
| const Link<DartType>().prepend(type)));
|
| }
|
| - } else if (element.isGetter()) {
|
| + } else if (element.isGetter) {
|
| FunctionType functionType = element.computeType(compiler);
|
| DartType type = functionType.returnType;
|
| addDeclaredMember(name, type, functionType);
|
| - } else if (element.isSetter()) {
|
| + } else if (element.isSetter) {
|
| FunctionType functionType = element.computeType(compiler);
|
| DartType type;
|
| if (!functionType.parameterTypes.isEmpty) {
|
| @@ -213,7 +213,7 @@ abstract class MembersCreator {
|
| name = name.setter;
|
| addDeclaredMember(name, type, functionType);
|
| } else {
|
| - assert(invariant(element, element.isFunction()));
|
| + assert(invariant(element, element.isFunction));
|
| FunctionType type = element.computeType(compiler);
|
| addDeclaredMember(name, type, type);
|
| }
|
| @@ -441,7 +441,7 @@ abstract class MembersCreator {
|
| errorneousElement,
|
| errorMessage,
|
| {'memberName': contextElement.name,
|
| - 'className': contextElement.getEnclosingClass().name});
|
| + 'className': contextElement.enclosingClass.name});
|
| compiler.reportInfo(contextElement, contextMessage);
|
| }
|
|
|
| @@ -450,7 +450,7 @@ abstract class MembersCreator {
|
| ClassMemberMixin cls,
|
| String name) {
|
| if (cls.isMemberComputed(name)) return;
|
| - LibraryElement library = cls.getLibrary();
|
| + LibraryElement library = cls.library;
|
| _computeClassMember(compiler, cls, name,
|
| new Setlet<Name>()..add(new Name(name, library))
|
| ..add(new Name(name, library, isSetter: true)));
|
| @@ -488,7 +488,7 @@ class ClassMembersCreator extends MembersCreator {
|
| }
|
|
|
| void checkInterfaceImplementation() {
|
| - LibraryElement library = cls.getLibrary();
|
| + LibraryElement library = cls.library;
|
| classMembers.forEach((Name name, Member classMember) {
|
| if (!name.isAccessibleFrom(library)) return;
|
| checkInterfaceMember(name, classMember, classMember.implementation);
|
| @@ -589,7 +589,7 @@ class InterfaceMembersCreator extends MembersCreator {
|
|
|
| /// Checks that a class member exists for every interface member.
|
| void checkInterfaceImplementation() {
|
| - LibraryElement library = cls.getLibrary();
|
| + LibraryElement library = cls.library;
|
| interfaceMembers.forEach((Name name, MemberSignature interfaceMember) {
|
| if (!name.isAccessibleFrom(library)) return;
|
| Member classMember = classMembers[name];
|
| @@ -812,7 +812,6 @@ abstract class ClassMemberMixin implements ClassElement {
|
| void computeClassMember(Compiler compiler, String name, Setlet<Name> names) {
|
| if (isMemberComputed(name)) return;
|
| if (isPrivateName(name)) {
|
| - LibraryElement library = getLibrary();
|
| names..add(new Name(name, library))
|
| ..add(new Name(name, library, isSetter: true));
|
| }
|
|
|