Refactor index operator in SimpleTypeInferrer.

pkg/compiler/lib/src/resolution/semantic_visitor.dart

 // Copyright (c) 2015, 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 dart2js.semantics_visitor;
 
 import '../constants/expressions.dart';
 import '../dart2jslib.dart' show invariant;
 import '../dart_types.dart';
 import '../elements/elements.dart';
@@ skipping 1205 matching lines @@
   ///       m(a) => super + a;
   ///     }
   ///
   R visitSuperBinary(
       Send node,
       FunctionElement function,
       BinaryOperator operator,
       Node argument,
       A arg);
 
+  /// Binary operation on the unresolved super [element].
+  ///
+  /// For instance
+  ///     class B {
+  ///     }
+  ///     class C extends B {
+  ///       m() => super + 42;
+  ///     }
+  ///
+  R visitUnresolvedSuperBinary(
+      Send node,
+      Element element,
+      BinaryOperator operator,
+      Node argument,
+      A arg);
+
   /// Index expression `receiver[index]`.
   ///
   /// For instance:
   ///     lookup(a, b) => a[b];
   ///
   R visitIndex(
       Send node,
       Node receiver,
       Node index,
       A arg);
@@ skipping 34 matching lines @@
   ///     class C extends B {
   ///       m(a) => super[a];
   ///     }
   ///
   R visitSuperIndex(
       Send node,
       FunctionElement function,
       Node index,
       A arg);
 
+  /// Index expression `super[index]` where 'operator []' is unresolved.
+  ///
+  /// For instance:
+  ///     class B {}
+  ///     class C extends B {
+  ///       m(a) => super[a];
+  ///     }
+  ///
+  R visitUnresolvedSuperIndex(
+      Send node,
+      Element element,
+      Node index,
+      A arg);
+
   /// Prefix operation on an index expression `operator super[index]` where
   /// 'operator []' is implemented on a superclass by [indexFunction] and
   /// 'operator []=' is implemented on by [indexSetFunction] and the operation
   /// is defined by [operator].
   ///
   /// For instance:
   ///     class B {
   ///       operator [](_) => null;
   ///       operator []=(a, b) {}
   ///     }
   ///     class C extends B {
   ///       m(a) => --super[a];
   ///     }
   ///
   R visitSuperIndexPrefix(
       Send node,
-      FunctionElement indexFunction,
-      FunctionElement indexSetFunction,
+      MethodElement indexFunction,
+      MethodElement indexSetFunction,
       Node index,
       IncDecOperator operator,
       A arg);
 
   /// Postfix operation on an index expression `super[index] operator` where
   /// 'operator []' is implemented on a superclass by [indexFunction] and
   /// 'operator []=' is implemented on by [indexSetFunction] and the operation
   /// is defined by [operator].
   ///
   /// For instance:
   ///     class B {
   ///       operator [](_) => null;
   ///       operator []=(a, b) {}
   ///     }
   ///     class C extends B {
   ///       m(a) => super[a]++;
   ///     }
   ///
   R visitSuperIndexPostfix(
       Send node,
-      FunctionElement indexFunction,
-      FunctionElement indexSetFunction,
+      MethodElement indexFunction,
+      MethodElement indexSetFunction,
       Node index,
       IncDecOperator operator,
       A arg);
 
-  /// Index expression `super[index]` where 'operator []' is unresolved.
+  /// Prefix operation on an index expression `operator super[index]` where
+  /// 'operator []' and maybe also 'operator []=' is unresolved and the
+  /// operation is defined by [operator].
   ///
   /// For instance:
   ///     class B {}
   ///     class C extends B {
-  ///       m(a) => super[a];
+  ///       m(a) => --super[a];
   ///     }
   ///
-  R visitUnresolvedSuperIndex(
+  R visitUnresolvedSuperGetterIndexPrefix(
       Send node,
       Element element,
       Node index,
+      IncDecOperator operator,
+      A arg);
+
+  /// Postfix operation on an index expression `super[index] operator` where
+  /// 'operator []' and maybe also 'operator []=' is unresolved and the
+  /// operation is defined by [operator].
+  ///
+  /// For instance:
+  ///     class B {}
+  ///     class C extends B {
+  ///       m(a) => super[a]++;
+  ///     }
+  ///
+  R visitUnresolvedSuperGetterIndexPostfix(
+      Send node,
+      Element element,
+      Node index,
+      IncDecOperator operator,
       A arg);
 
   /// Prefix operation on an index expression `operator super[index]` where
-  /// 'operator []' or 'operator []=' is unresolved and the operation
-  /// is defined by [operator].
+  /// 'operator []' is implemented on a superclass by [indexFunction] and
+  /// 'operator []=' is unresolved and the operation is defined by [operator].
   ///
   /// For instance:
   ///     class B {}
   ///     class C extends B {
   ///       m(a) => --super[a];
   ///     }
   ///
-  R errorUnresolvedSuperIndexPrefix(
+  R visitUnresolvedSuperSetterIndexPrefix(
       Send node,
-      Element function,
+      MethodElement indexFunction,
+      Element element,
       Node index,
       IncDecOperator operator,
       A arg);
 
   /// Postfix operation on an index expression `super[index] operator` where
-  /// 'operator []' or 'operator []=' is unresolved and the operation
-  /// is defined by [operator].
+  /// 'operator []' is implemented on a superclass by [indexFunction] and
+  /// 'operator []=' is unresolved and the operation is defined by [operator].
   ///
   /// For instance:
   ///     class B {}
   ///     class C extends B {
   ///       m(a) => super[a]++;
   ///     }
   ///
-  R errorUnresolvedSuperIndexPostfix(
+  R visitUnresolvedSuperSetterIndexPostfix(
       Send node,
-      Element function,
+      MethodElement indexFunction,
+      Element element,
       Node index,
       IncDecOperator operator,
       A arg);
 
   /// Binary expression `left == right`.
   ///
   /// For instance:
   ///     neq(a, b) => a != b;
   ///
   R visitNotEquals(
@@ skipping 70 matching lines @@
   ///     class C extends B {
   ///       m(a) => -super;
   ///     }
   ///
   R visitSuperUnary(
       Send node,
       UnaryOperator operator,
       FunctionElement function,
       A arg);
 
+  /// Unary operation on the unresolved super [element].
+  ///
+  /// For instance
+  ///     class B {
+  ///     }
+  ///     class C extends B {
+  ///       m() => -super;
+  ///     }
+  ///
+  R visitUnresolvedSuperUnary(
+      Send node,
+      UnaryOperator operator,
+      Element element,
+      A arg);
+
   /// Unary expression `!expression`.
   ///
   /// For instance:
   ///     not(a) => !a;
   ///
   R visitNot(
       Send node,
       Node expression,
       A arg);
 
@@ skipping 20 matching lines @@
   ///       m(a, b) => super[a] = b;
   ///     }
   ///
   R visitSuperIndexSet(
       SendSet node,
       FunctionElement function,
       Node index,
       Node rhs,
       A arg);
 
+  /// Index set expression `super[index] = rhs` where `operator []=` is
+  /// undefined.
+  ///
+  /// For instance
+  ///     class B {
+  ///     }
+  ///     class C extends B {
+  ///       m() => super[1] = 42;
+  ///     }
+  ///
+  R visitUnresolvedSuperIndexSet(
+      Send node,
+      Element element,
+      Node index,
+      Node rhs,
+      A arg);
+
   /// Logical and, &&, expression with operands [left] and [right].
   ///
   /// For instance
   ///     m() => left && right;
   ///
   R visitLogicalAnd(
       Send node,
       Node left,
       Node right,
       A arg);
@@ skipping 455 matching lines @@
   /// For instance:
   ///     m(rhs) => dynamic += rhs;
   ///
   R errorDynamicTypeLiteralCompound(
       Send node,
       ConstantExpression constant,
       AssignmentOperator operator,
       Node rhs,
       A arg);
 
-  /// Compound assignment expression of [rhs] with [operator] on the index
-  /// operators of [receiver] whose getter and setter are defined by
+  /// Compound index assignment of [rhs] with [operator] to [index] on the
+  /// index operators of [receiver] whose getter and setter are defined by
   /// [getterSelector] and [setterSelector], respectively.
   ///
   /// For instance:
   ///     m(receiver, index, rhs) => receiver[index] += rhs;
   ///
   R visitCompoundIndexSet(
       SendSet node,
       Node receiver,
       Node index,
       AssignmentOperator operator,
       Node rhs,
       A arg);
 
-  /// Compound assignment expression of [rhs] with [operator] on the index
+  /// Compound index assignment of [rhs] with [operator] to [index] on the index
   /// operators of a super class defined by [getter] and [setter].
   ///
   /// For instance:
   ///     class B {
   ///       operator [](index) {}
   ///       operator [](index, value) {}
   ///     }
   ///     class C extends B {
   ///       m(index, rhs) => super[index] += rhs;
   ///     }
   ///
   R visitSuperCompoundIndexSet(
       SendSet node,
-      FunctionElement getter,
-      FunctionElement setter,
+      MethodElement getter,
+      MethodElement setter,
       Node index,
       AssignmentOperator operator,
       Node rhs,
+      A arg);
+
+  /// Compound index assignment of [rhs] with [operator] to [index] on a super
+  /// super class where the index getter is undefined. The index setter might
+  /// also be undefined.
+  ///
+  /// For instance
+  ///     class B {
+  ///     }
+  ///     class C extends B {
+  ///       m() => super[1] += 42;
+  ///     }
+  ///
+  R visitUnresolvedSuperGetterCompoundIndexSet(
+      Send node,
+      Element element,
+      Node index,
+      AssignmentOperator operator,
+      Node rhs,
+      A arg);
+
+  /// Compound index assignment of [rhs] with [operator] to [index] on a super
+  /// super class where the index getter is defined by [getter] but the index
+  /// setter is undefined.
+  ///
+  /// For instance
+  ///     class B {
+  ///       operator [](index) => 42;
+  ///     }
+  ///     class C extends B {
+  ///       m() => super[1] += 42;
+  ///     }
+  ///
+  R visitUnresolvedSuperSetterCompoundIndexSet(
+      Send node,
+      MethodElement getter,
+      Element element,
+      Node index,
+      AssignmentOperator operator,
+      Node rhs,
       A arg);
 
   /// Prefix expression with [operator] of the property on [receiver] whose
   /// getter and setter are defined by [getterSelector] and [setterSelector],
   /// respectively.
   ///
   /// For instance:
   ///     m(receiver) => ++receiver.foo;
   ///
   R visitDynamicPropertyPrefix(
@@ skipping 818 matching lines @@
   ///     m6() => C.unresolved++;
   ///     m7() => prefix.C.unresolved++;
   ///
   // TODO(johnniwinther): Split the cases in which a prefix is resolved.
   R errorUnresolvedPostfix(
       Send node,
       Element element,
       IncDecOperator operator,
       A arg);
 
-  /// Index set operation on the unresolved super [element].
-  ///
-  /// For instance
-  ///     class B {
-  ///     }
-  ///     class C extends B {
-  ///       m() => super[1] = 42;
-  ///     }
-  ///
-  R errorUnresolvedSuperIndexSet(
-      Send node,
-      Element element,
-      Node index,
-      Node rhs,
-      A arg);
-
-  /// Compound index set operation on the unresolved super [element].
-  ///
-  /// For instance
-  ///     class B {
-  ///     }
-  ///     class C extends B {
-  ///       m() => super[1] += 42;
-  ///     }
-  ///
-  // TODO(johnniwinther): Split this case into unresolved getter/setter cases.
-  R errorUnresolvedSuperCompoundIndexSet(
-      Send node,
-      Element element,
-      Node index,
-      AssignmentOperator operator,
-      Node rhs,
-      A arg);
-
-  /// Unary operation on the unresolved super [element].
-  ///
-  /// For instance
-  ///     class B {
-  ///     }
-  ///     class C extends B {
-  ///       m() => -super;
-  ///     }
-  ///
-  R visitUnresolvedSuperUnary(
-      Send node,
-      UnaryOperator operator,
-      Element element,
-      A arg);
-
-  /// Binary operation on the unresolved super [element].
-  ///
-  /// For instance
-  ///     class B {
-  ///     }
-  ///     class C extends B {
-  ///       m() => super + 42;
-  ///     }
-  ///
-  R visitUnresolvedSuperBinary(
-      Send node,
-      Element element,
-      BinaryOperator operator,
-      Node argument,
-      A arg);
-
   /// Invocation of an undefined unary [operator] on [expression].
   R errorUndefinedUnaryExpression(
       Send node,
       Operator operator,
       Node expression,
       A arg);
 
   /// Invocation of an undefined unary [operator] with operands
   /// [left] and [right].
   R errorUndefinedBinaryExpression(
@@ skipping 710 matching lines @@
   ///       C() : this._(42);
   ///     }
   ///
   R errorUnresolvedThisConstructorInvoke(
       Send node,
       Element element,
       NodeList arguments,
       Selector selector,
       A arg);
 }