Make InferrerVisitor implement SemanticSendVisitor directly and delete ResolvedVisitor.

pkg/compiler/lib/src/inferrer/inferrer_visitor.dart

 // Copyright (c) 2013, 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 inferrer_visitor;
 
 import 'dart:collection' show
     IterableMixin;
 
 import '../compiler.dart' show
     Compiler;
 import '../constants/constant_system.dart';
 import '../constants/expressions.dart';
 import '../dart_types.dart';
 import '../diagnostics/spannable.dart' show
     Spannable;
 import '../elements/elements.dart';
 import '../resolution/operators.dart';
-import '../resolved_visitor.dart';
+import '../resolution/semantic_visitor.dart';
+import '../resolution/send_resolver.dart' show
+    SendResolverMixin;
+import '../resolution/tree_elements.dart' show
+    TreeElements;
 import '../tree/tree.dart';
 import '../types/types.dart' show
     TypeMask;
 import '../types/constants.dart' show
     computeTypeMask;
 import '../universe/universe.dart';
 import '../util/util.dart';
 import '../world.dart' show
     ClassWorld;
 
@@ skipping 646 matching lines @@
         locals[variable] = newType;
       }
     });
   }
 
   void updateField(Element element, T type) {
     fieldScope.updateField(element, type);
   }
 }
 
-abstract class InferrerVisitor
-    <T, E extends MinimalInferrerEngine<T>> extends NewResolvedVisitor<T> {
+abstract class InferrerVisitor<T, E extends MinimalInferrerEngine<T>>
+    extends Visitor<T>
+    with SendResolverMixin,
+         SemanticSendResolvedMixin<T, dynamic>,
+         CompoundBulkMixin<T, dynamic>,
+         PrefixBulkMixin<T, dynamic>,
+         PostfixBulkMixin<T, dynamic>,
+         ErrorBulkMixin<T, dynamic>,
+         NewBulkMixin<T, dynamic>,
+         SetBulkMixin<T, dynamic>
+    implements SemanticSendVisitor<T, dynamic> {
   final Compiler compiler;
   final AstElement analyzedElement;
   final TypeSystem<T> types;
   final E inferrer;
   final Map<JumpTarget, List<LocalsHandler<T>>> breaksFor =
       new Map<JumpTarget, List<LocalsHandler<T>>>();
   final Map<JumpTarget, List<LocalsHandler>> continuesFor =
       new Map<JumpTarget, List<LocalsHandler<T>>>();
   LocalsHandler<T> locals;
   final List<T> cascadeReceiverStack = new List<T>();
+  final TreeElements elements;
 
   bool accumulateIsChecks = false;
   bool conditionIsSimple = false;
   List<Send> isChecks;
   int loopLevel = 0;
 
   bool get inLoop => loopLevel > 0;
   bool get isThisExposed {
     return analyzedElement.isGenerativeConstructor
         ? locals.fieldScope.isThisExposed
         : true;
   }
   void set isThisExposed(value) {
     if (analyzedElement.isGenerativeConstructor) {
       locals.fieldScope.isThisExposed = value;
     }
   }
 
   InferrerVisitor(AstElement analyzedElement,
                   this.inferrer,
                   this.types,
                   this.compiler,
                   [LocalsHandler<T> handler])
     : this.analyzedElement = analyzedElement,
       this.locals = handler,
-      super(analyzedElement.resolvedAst.elements) {
+      this.elements = analyzedElement.resolvedAst.elements {
     if (handler != null) return;
     Node node = analyzedElement.node;
     FieldInitializationScope<T> fieldScope =
         analyzedElement.isGenerativeConstructor
             ? new FieldInitializationScope<T>(types)
             : null;
     locals = new LocalsHandler<T>(inferrer, types, compiler, node, fieldScope);
   }
 
+  @override
+  SemanticSendVisitor get sendVisitor => this;
+
+  @override
+  T apply(Node node, _) => visit(node);
+
   T handleSendSet(SendSet node);
 
   T handleDynamicInvoke(Send node);
 
   T visitAsyncForIn(AsyncForIn node);
 
   T visitSyncForIn(SyncForIn node);
 
   T visitReturn(Return node);
 
   T visitFunctionExpression(FunctionExpression node);
 
   @override
+  T bulkHandleSet(SendSet node, _) {
+    return handleSendSet(node);
+  }
+
+  @override
+  T bulkHandleCompound(SendSet node, _) {
+    return handleSendSet(node);
+  }
+
+  @override
+  T bulkHandlePrefix(SendSet node, _) {
+    return handleSendSet(node);
+  }
+
+  @override
+  T bulkHandlePostfix(SendSet node, _) {
+    return handleSendSet(node);
+  }
+
+  @override
   T visitAssert(Send node, Node expression, _) {
     if (!compiler.enableUserAssertions) {
       return types.nullType;
     }
     return handleAssert(node, expression);
   }
 
   /// Handle an enabled assertion of [expression].
   T handleAssert(Send node, Node expression);
 
@@ skipping 58 matching lines @@
     return types.nullType;
   }
 
   T visitLiteralSymbol(LiteralSymbol node) {
     // TODO(kasperl): We should be able to tell that the type of a literal
     // symbol is always a non-null exact symbol implementation -- not just
     // any non-null subtype of the symbol interface.
     return types.nonNullSubtype(compiler.symbolClass);
   }
 
-  T visitTypePrefixSend(Send node) {
-    // TODO(johnniwinther): Remove the need for handling this node.
-    return types.dynamicType;
-  }
-
   @override
   void previsitDeferredAccess(Send node, PrefixElement prefix, _) {
     // Deferred access does not affect inference.
   }
 
   T handleTypeLiteralGet() {
     return types.typeType;
   }
 
   T handleTypeLiteralInvoke(NodeList arguments) {
     return types.dynamicType;
   }
 
+
+  @override
+  T bulkHandleNode(Node node, String message, _) {
+    return internalError(node, message.replaceAll('#', '$node'));
+  }
+
+  @override

[Johnni Winther, 2015/08/21 10:55:12]

These are not used, yet.

+  T visitConstantGet(
+      Send node,
+      ConstantExpression constant,
+      _) {
+    return bulkHandleNode(node, "Constant read `#` unhandled.", _);
+  }
+
+  @override
+  T visitConstantInvoke(
+      Send node,
+      ConstantExpression constant,
+      NodeList arguments,
+      CallStructure callStructure,
+      _) {
+    return bulkHandleNode(node, "Constant invoke `#` unhandled.", _);
+  }
+
   T visitClassTypeLiteralGet(
       Send node,
       ConstantExpression constant,
       _) {
     return handleTypeLiteralGet();
   }
 
   T visitClassTypeLiteralInvoke(
       Send node,
       ConstantExpression constant,
@@ skipping 69 matching lines @@
     }
   }
 
   T _superType;
   T get superType {
     if (_superType != null) return _superType;
     return _superType = types.nonNullExact(
         outermostElement.enclosingClass.superclass);
   }
 
+  @override
+  T visitThisGet(Identifier node, _) {
+    return thisType;
+  }
+
   T visitIdentifier(Identifier node) {
     if (node.isThis()) {
       return thisType;
     } else if (node.isSuper()) {
       return superType;
     } else {
       Element element = elements[node];
       if (Elements.isLocal(element)) {
         LocalElement local = element;
         return locals.use(local);
@@ skipping 517 matching lines @@
     return type;
   }
 
   T visitCascade(Cascade node) {
     // Ignore the result of the cascade send and return the type of the cascade
     // receiver.
     visit(node.expression);
     return cascadeReceiverStack.removeLast();
   }
 }