| Index: sdk/lib/_internal/compiler/implementation/dart_backend/placeholder_collector.dart
|
| diff --git a/sdk/lib/_internal/compiler/implementation/dart_backend/placeholder_collector.dart b/sdk/lib/_internal/compiler/implementation/dart_backend/placeholder_collector.dart
|
| index 2aade10602fc7ea3d0b172cfa8ac32fdc7d7d303..02b47374f78144ff45ff6fcfcd1b8fb8b3959fb5 100644
|
| --- a/sdk/lib/_internal/compiler/implementation/dart_backend/placeholder_collector.dart
|
| +++ b/sdk/lib/_internal/compiler/implementation/dart_backend/placeholder_collector.dart
|
| @@ -55,7 +55,7 @@ class SendVisitor extends ResolvedVisitor {
|
|
|
| visitSuperSend(Send node) {
|
| Element element = elements[node];
|
| - if (element != null && element.isConstructor()) {
|
| + if (element != null && element.isConstructor) {
|
| collector.makeRedirectingConstructorPlaceholder(node.selector, element);
|
| } else {
|
| collector.tryMakeMemberPlaceholder(node.selector);
|
| @@ -64,7 +64,7 @@ class SendVisitor extends ResolvedVisitor {
|
|
|
| visitDynamicSend(Send node) {
|
| final element = elements[node];
|
| - if (element == null || !element.isErroneous()) {
|
| + if (element == null || !element.isErroneous) {
|
| collector.tryMakeMemberPlaceholder(node.selector);
|
| }
|
| }
|
| @@ -81,16 +81,16 @@ class SendVisitor extends ResolvedVisitor {
|
| // element == null means dynamic property access.
|
| if (element == null) {
|
| collector.tryMakeMemberPlaceholder(node.selector);
|
| - } else if (element.isErroneous()) {
|
| + } else if (element.isErroneous) {
|
| return;
|
| - } else if (element.isPrefix()) {
|
| + } else if (element.isPrefix) {
|
| // Node is prefix part in case of source 'lib.somesetter = 5;'
|
| collector.makeNullPlaceholder(node);
|
| } else if (Elements.isStaticOrTopLevel(element)) {
|
| // Unqualified or prefixed top level or static.
|
| collector.makeElementPlaceholder(node.selector, element);
|
| - } else if (!element.isTopLevel()) {
|
| - if (element.isInstanceMember()) {
|
| + } else if (!element.isTopLevel) {
|
| + if (element.isInstanceMember) {
|
| collector.tryMakeMemberPlaceholder(node.selector);
|
| } else {
|
| // May get FunctionExpression here in selector
|
| @@ -114,10 +114,10 @@ class SendVisitor extends ResolvedVisitor {
|
|
|
| if (Elements.isUnresolved(element)
|
| || identical(element, compiler.assertMethod)
|
| - || element.isDeferredLoaderGetter()) {
|
| + || element.isDeferredLoaderGetter) {
|
| return;
|
| }
|
| - if (element.isConstructor() || element.isFactoryConstructor()) {
|
| + if (element.isConstructor || element.isFactoryConstructor) {
|
| // Rename named constructor in redirection position:
|
| // class C { C.named(); C.redirecting() : this.named(); }
|
| if (node.receiver is Identifier
|
| @@ -130,8 +130,8 @@ class SendVisitor extends ResolvedVisitor {
|
| collector.makeElementPlaceholder(node.selector, element);
|
| // Another ugly case: <lib prefix>.<top level> is represented as
|
| // receiver: lib prefix, selector: top level.
|
| - if (element.isTopLevel() && node.receiver != null) {
|
| - assert(elements[node.receiver].isPrefix());
|
| + if (element.isTopLevel && node.receiver != null) {
|
| + assert(elements[node.receiver].isPrefix);
|
| // Hack: putting null into map overrides receiver of original node.
|
| collector.makeNullPlaceholder(node.receiver);
|
| }
|
| @@ -183,15 +183,15 @@ class PlaceholderCollector extends Visitor {
|
|
|
| void collectFunctionDeclarationPlaceholders(
|
| FunctionElement element, FunctionExpression node) {
|
| - if (element.isGenerativeConstructor() || element.isFactoryConstructor()) {
|
| - DartType type = element.getEnclosingClass().thisType.asRaw();
|
| + if (element.isGenerativeConstructor || element.isFactoryConstructor) {
|
| + DartType type = element.enclosingClass.thisType.asRaw();
|
| makeConstructorPlaceholder(node.name, element, type);
|
| Return bodyAsReturn = node.body.asReturn();
|
| if (bodyAsReturn != null && bodyAsReturn.isRedirectingFactoryBody) {
|
| // Factory redirection.
|
| FunctionElement redirectTarget = element.defaultImplementation;
|
| assert(redirectTarget != null && redirectTarget != element);
|
| - type = redirectTarget.getEnclosingClass().thisType.asRaw();
|
| + type = redirectTarget.enclosingClass.thisType.asRaw();
|
| makeConstructorPlaceholder(
|
| bodyAsReturn.expression, redirectTarget, type);
|
| }
|
| @@ -201,7 +201,7 @@ class PlaceholderCollector extends Visitor {
|
| // just to escape conflicts and that should be enough as we shouldn't
|
| // be able to resolve private identifiers for other libraries.
|
| makeElementPlaceholder(node.name, element);
|
| - } else if (element.isMember()) {
|
| + } else if (element.isMember) {
|
| if (node.name is Identifier) {
|
| tryMakeMemberPlaceholder(node.name);
|
| } else {
|
| @@ -249,7 +249,7 @@ class PlaceholderCollector extends Visitor {
|
| bool isTypedefParameter(Element element) {
|
| return element != null &&
|
| element.enclosingElement != null &&
|
| - element.enclosingElement.isTypedef();
|
| + element.enclosingElement.isTypedef;
|
| }
|
|
|
| void tryMakeLocalPlaceholder(Element element, Identifier node) {
|
| @@ -266,7 +266,7 @@ class PlaceholderCollector extends Visitor {
|
| // TODO(smok): Maybe we should rename privates as well, their privacy
|
| // should not matter if they are local vars.
|
| if (isPrivateName(node.source)) return;
|
| - if (element.isParameter() && !isTypedefParameter(element) &&
|
| + if (element.isParameter && !isTypedefParameter(element) &&
|
| isNamedOptionalParameter()) {
|
| currentFunctionScope.registerParameter(node);
|
| } else if (Elements.isLocal(element) && !isTypedefParameter(element)) {
|
| @@ -309,7 +309,7 @@ class PlaceholderCollector extends Visitor {
|
| // and/or catch syntax changes.
|
| if (node.type == null) return;
|
| Element definitionElement = treeElements[node.definitions.nodes.head];
|
| - bool requiresVar = !node.modifiers.isFinalOrConst();
|
| + bool requiresVar = !node.modifiers.isFinalOrConst;
|
| declarationTypePlaceholders.add(
|
| new DeclarationTypePlaceholder(node.type, requiresVar));
|
| }
|
| @@ -323,8 +323,8 @@ class PlaceholderCollector extends Visitor {
|
| assert(node != null);
|
| assert(element != null);
|
| if (identical(element, entryFunction)) return;
|
| - if (identical(element.getLibrary(), coreLibrary)) return;
|
| - if (element.getLibrary().isPlatformLibrary && !element.isTopLevel()) {
|
| + if (identical(element.library, coreLibrary)) return;
|
| + if (element.library.isPlatformLibrary && !element.isTopLevel) {
|
| return;
|
| }
|
| if (element == compiler.dynamicClass) {
|
| @@ -336,7 +336,7 @@ class PlaceholderCollector extends Visitor {
|
| void makePrivateIdentifier(Identifier node) {
|
| assert(node != null);
|
| privateNodes.putIfAbsent(
|
| - currentElement.getLibrary(), () => new Set<Identifier>()).add(node);
|
| + currentElement.library, () => new Set<Identifier>()).add(node);
|
| }
|
|
|
| void makeUnresolvedPlaceholder(Node node) {
|
| @@ -431,13 +431,13 @@ class PlaceholderCollector extends Visitor {
|
| }
|
| if (element == null) {
|
| if (send.receiver != null) tryMakeMemberPlaceholder(send.selector);
|
| - } else if (!element.isErroneous()) {
|
| + } else if (!element.isErroneous) {
|
| if (Elements.isStaticOrTopLevel(element)) {
|
| // TODO(smok): Worth investigating why sometimes we get getter/setter
|
| // here and sometimes abstract field.
|
| - assert(element.isClass() || element is VariableElement ||
|
| - element.isAccessor() || element.isAbstractField() ||
|
| - element.isFunction() || element.isTypedef() ||
|
| + assert(element.isClass || element is VariableElement ||
|
| + element.isAccessor || element.isAbstractField ||
|
| + element.isFunction || element.isTypedef ||
|
| element is TypeVariableElement);
|
| makeElementPlaceholder(send.selector, element);
|
| } else {
|
|
|