Refactor SsaBuilder.visitSuperSend.

pkg/compiler/lib/src/resolved_visitor.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.
 
 part of dart2js;
 
 /// Enum for the visit methods added in [ResolvedVisitor].
 // TODO(johnniwinther): Remove this.
 enum ResolvedKind {
   ASSERT,
   TYPE_LITERAL,
   SUPER,
   OPERATOR,
   TYPE_PREFIX,
   GETTER,
   STATIC,
   CLOSURE,
   DYNAMIC,
   ERROR,
   SEND_SET,
   NEW,
+  SUPER_CONSTRUCTOR,
 }
 
 /// Abstract interface for a [ResolvedVisitor].
 // TODO(johnniwinther): Remove this.
 abstract class ResolvedKindVisitor<R> {
   R visitSuperSend(Send node);
 
   @deprecated
   R visitOperatorSend(Send node);
   R visitGetterSend(Send node);
 
   @deprecated
   R visitClosureSend(Send node);
   R visitDynamicSend(Send node);
   R visitStaticSend(Send node);
+
+  R handleSuperConstructorInvoke(Send node);
   R handleSendSet(SendSet node);
   R handleNewExpression(NewExpression node);
 
   /// Visitor callback for a type literal.
   @deprecated
   R visitTypeLiteralSend(Send node);
 
   /// Visitor callback for the class prefix of a static access, like `Foo` in
   /// `Foo.staticField`.
   // TODO(johnniwinther): Remove this when not needed by the inferrer.
@@ skipping 13 matching lines @@
 
   ResolvedKind visitSuperSend(Send node) => ResolvedKind.SUPER;
   ResolvedKind visitOperatorSend(Send node) => ResolvedKind.OPERATOR;
   ResolvedKind visitGetterSend(Send node) => ResolvedKind.GETTER;
   ResolvedKind visitClosureSend(Send node) => ResolvedKind.CLOSURE;
   ResolvedKind visitDynamicSend(Send node) => ResolvedKind.DYNAMIC;
   ResolvedKind visitStaticSend(Send node) => ResolvedKind.STATIC;
   ResolvedKind visitTypeLiteralSend(Send node) => ResolvedKind.TYPE_LITERAL;
   ResolvedKind visitTypePrefixSend(Send node) => ResolvedKind.TYPE_PREFIX;
   ResolvedKind visitAssertSend(Send node) => ResolvedKind.ASSERT;
+  ResolvedKind handleSuperConstructorInvoke(Send node) {
+    return ResolvedKind.SUPER_CONSTRUCTOR;
+  }
   ResolvedKind handleSendSet(SendSet node) => ResolvedKind.SEND_SET;
   ResolvedKind handleNewExpression(NewExpression node) => ResolvedKind.NEW;
   internalError(Spannable node, String reason) => ResolvedKind.ERROR;
 }
 
 abstract class ResolvedVisitor<R>
     implements Visitor<R>, ResolvedKindVisitor<R> {}
 
 abstract class BaseResolvedVisitor<R> extends Visitor<R>
     implements ResolvedVisitor<R> {
 
   TreeElements elements;
 
   BaseResolvedVisitor(this.elements);
 
   /// Dispatch using the old [ResolvedVisitor] logic.
   // TODO(johnniwinther): Remove this.
   _oldDispatch(Send node, ResolvedKindVisitor visitor) {
     Element element = elements[node];
     if (elements.isAssert(node)) {
       return visitor.visitAssertSend(node);
     } else if (elements.isTypeLiteral(node)) {
       return visitor.visitTypeLiteralSend(node);
     } else if (node.isSuperCall) {
+      if (element != null && element.isConstructor) {
+        return visitor.handleSuperConstructorInvoke(node);
+      }
       return visitor.visitSuperSend(node);
     } else if (node.isOperator) {
       return visitor.visitOperatorSend(node);
     } else if (node.isPropertyAccess) {
       if (!Elements.isUnresolved(element) && element.impliesType) {
         return visitor.visitTypePrefixSend(node);
       } else {
         return visitor.visitGetterSend(node);
       }
     } else if (element != null && Initializers.isConstructorRedirect(node)) {
@@ skipping 54 matching lines @@
 
   NewResolvedVisitor(TreeElements elements) : super(elements);
 
   /// Dispatch using the new [SemanticSendVisitor] logic.
   _newDispatch(Send node,
                ResolvedKindVisitor kindVisitor,
                SemanticSendVisitor sendVisitor) {
     Element element = elements[node];
     if (element != null && element.isConstructor) {
       if (node.isSuperCall) {
-        return kindVisitor.visitSuperSend(node);
+        return kindVisitor.handleSuperConstructorInvoke(node);
       } else {
         return kindVisitor.visitStaticSend(node);
       }
     } else if (element != null && element.isPrefix) {
       return kindVisitor.visitGetterSend(node);
     } else if (!elements.isTypeLiteral(node) &&
                node.isPropertyAccess &&
                !Elements.isUnresolved(element) &&
                element.impliesType) {
       return kindVisitor.visitTypePrefixSend(node);
@@ skipping 282 matching lines @@
       Node expression,
       ResolvedKindVisitor<R> visitor) {
     return visitor.visitOperatorSend(node);
   }
 
   @override
   R errorUnresolvedGet(
       Send node,
       Element element,
       ResolvedKindVisitor<R> visitor) {
-    if (node.isSuperCall) {
-      return visitor.visitSuperSend(node);
-    }
     return visitor.visitGetterSend(node);
   }
 
   @override
   R errorUnresolvedInvoke(
       Send node,
       Element element,
       NodeList arguments,
       Selector selector,
       ResolvedKindVisitor<R> visitor) {
-    if (node.isSuperCall) {
-      return visitor.visitSuperSend(node);
-    }
     return visitor.visitStaticSend(node);
   }
 
   @override
   R errorUnresolvedPostfix(
       Send node,
       Element element,
       op.IncDecOperator operator,
       ResolvedKindVisitor<R> visitor) {
     return visitor.handleSendSet(node);
   }
 
   @override
   R errorUnresolvedPrefix(
       Send node,
       Element element,
       op.IncDecOperator operator,
       ResolvedKindVisitor<R> visitor) {
     return visitor.handleSendSet(node);
   }
 
   @override
-  R errorUnresolvedSuperBinary(
-      Send node,
-      Element element,
-      op.BinaryOperator operator,
-      Node argument,
-      ResolvedKindVisitor<R> visitor) {
-    return visitor.visitSuperSend(node);
-  }
-
-  @override
-  R errorUnresolvedSuperUnary(
-      Send node,
-      op.UnaryOperator operator,
-      Element element,
-      ResolvedKindVisitor<R> visitor) {
-    return visitor.visitSuperSend(node);
-  }
-
-  @override
   R visitAs(
       Send node,
       Node expression,
       DartType type,
       ResolvedKindVisitor<R> visitor) {
     return visitor.visitOperatorSend(node);
   }
 
   @override
   R visitAssert(
@@ skipping 234 matching lines @@
   }
 
   @override
   R visitSuperIndex(
       Send node,
       FunctionElement function,
       Node index,
       ResolvedKindVisitor<R> visitor) {
     return visitor.visitSuperSend(node);
   }
-
-  @override
-  R errorUnresolvedSuperIndex(
-      Send node,
-      Element function,
-      Node index,
-      ResolvedKindVisitor<R> visitor) {
-    return visitor.visitSuperSend(node);
-  }
 }