Support instance methods in analyzer2dart.

pkg/analyzer2dart/lib/src/cps_generator.dart

 // Copyright (c) 2014, 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 analyzer2dart.cps_generator;
 
 import 'package:analyzer/analyzer.dart';
 
 import 'package:compiler/src/dart_types.dart' as dart2js;
 import 'package:compiler/src/elements/elements.dart' as dart2js;
@@ skipping 17 matching lines @@
   final ElementConverter converter;
   final AstNode node;
 
   CpsElementVisitor(this.converter, this.node);
 
   @override
   ir.FunctionDefinition visitFunctionElement(analyzer.FunctionElement element) {
     CpsGeneratingVisitor visitor = new CpsGeneratingVisitor(converter, element);
     FunctionDeclaration functionDeclaration = node;
     return visitor.handleFunctionDeclaration(
-        element, functionDeclaration.functionExpression);
+        element, functionDeclaration.functionExpression.body);
   }
 
   @override
+  ir.FunctionDefinition visitMethodElement(analyzer.MethodElement element) {
+    CpsGeneratingVisitor visitor = new CpsGeneratingVisitor(converter, element);
+    MethodDeclaration methodDeclaration = node;
+    return visitor.handleFunctionDeclaration(element, methodDeclaration.body);
+  }
+
+  @override
   ir.FieldDefinition visitTopLevelVariableElement(
       analyzer.TopLevelVariableElement element) {
     CpsGeneratingVisitor visitor = new CpsGeneratingVisitor(converter, element);
     VariableDeclaration variableDeclaration = node;
     return visitor.handleFieldDeclaration(element, variableDeclaration);
   }
 
   @override
   ir.ExecutableDefinition visitConstructorElement(
       analyzer.ConstructorElement element) {
     CpsGeneratingVisitor visitor = new CpsGeneratingVisitor(converter, element);
     if (!element.isFactory) {
       ConstructorDeclaration constructorDeclaration = node;
-      return visitor.handleConstructorDeclaration(
-          element, constructorDeclaration);
+      FunctionBody body;
+      if (constructorDeclaration != null) {
+        body = constructorDeclaration.body;
+      } else {
+        assert(element.isSynthetic);
+      }
+      return visitor.handleConstructorDeclaration(element, body);
     }
     // TODO(johnniwinther): Support factory constructors.
     return null;
   }
 }
 
 /// Visitor that converts analyzer AST nodes into CPS ir nodes.
 class CpsGeneratingVisitor extends SemanticVisitor<ir.Node>
     with IrBuilderMixin<AstNode> {
   /// Promote the type of [irBuilder] to [DartIrBuilder].
   /// The JS backend requires closure conversion which we do not support yet.
   DartIrBuilder get irBuilder => super.irBuilder;
   final analyzer.Element element;
   final ElementConverter converter;
 
   CpsGeneratingVisitor(this.converter, this.element);
 
   Source get currentSource => element.source;
 
   analyzer.LibraryElement get currentLibrary => element.library;
 
   ir.Node visit(AstNode node) => node.accept(this);
 
   ir.ConstructorDefinition handleConstructorDeclaration(
-      analyzer.ConstructorElement constructor, ConstructorDeclaration node) {
-    FunctionBody body = node.body;
+      analyzer.ConstructorElement constructor, FunctionBody body) {
     dart2js.ConstructorElement element = converter.convertElement(constructor);
     return withBuilder(
         new DartIrBuilder(DART_CONSTANT_SYSTEM,
                           element,
                           // TODO(johnniwinther): Supported closure variables.
                           new NullCapturedVariableInfo()),
         () {
       irBuilder.buildFunctionHeader(
           constructor.parameters.map(converter.convertElement));
       // Visit the body directly to avoid processing the signature as
       // expressions.
-      visit(node.body);
+      // Call to allow for `body == null` in case of synthesized constructors.

[sigurdm, 2015/02/06 15:04:46]

Call `build` ...

+      build(body);
       return irBuilder.makeConstructorDefinition(const [], const []);
     });
   }
 
   ir.FieldDefinition handleFieldDeclaration(
       analyzer.PropertyInducingElement field, VariableDeclaration node) {
     dart2js.FieldElement element = converter.convertElement(field);
     return withBuilder(
         new DartIrBuilder(DART_CONSTANT_SYSTEM,
                           element,
                           // TODO(johnniwinther): Supported closure variables.
                           new NullCapturedVariableInfo()),
         () {
       irBuilder.buildFieldInitializerHeader();
       ir.Primitive initializer = build(node.initializer);
       return irBuilder.makeFieldDefinition(initializer);
     });
   }
 
   ir.FunctionDefinition handleFunctionDeclaration(
-      analyzer.FunctionElement function, FunctionExpression node) {
+      analyzer.ExecutableElement function, FunctionBody body) {
     dart2js.FunctionElement element = converter.convertElement(function);
     return withBuilder(
         new DartIrBuilder(DART_CONSTANT_SYSTEM,
                           element,
                           // TODO(johnniwinther): Supported closure variables.
                           new NullCapturedVariableInfo()),
         () {
       irBuilder.buildFunctionHeader(
           function.parameters.map(converter.convertElement));
       // Visit the body directly to avoid processing the signature as
       // expressions.
-      visit(node.body);
+      visit(body);
       return irBuilder.makeFunctionDefinition(const []);
     });
   }
 
   @override
   ir.Primitive visitFunctionExpression(FunctionExpression node) {
     return irBuilder.buildFunctionExpression(
-        handleFunctionDeclaration(node.element, node));
+        handleFunctionDeclaration(node.element, node.body));
   }
 
   @override
   ir.FunctionDefinition visitFunctionDeclaration(FunctionDeclaration node) {
-    return handleFunctionDeclaration(node.element, node.functionExpression);
+    return handleFunctionDeclaration(
+        node.element, node.functionExpression.body);
   }
 
   @override
   visitFunctionDeclarationStatement(FunctionDeclarationStatement node) {
     FunctionDeclaration functionDeclaration = node.functionDeclaration;
     analyzer.FunctionElement function = functionDeclaration.element;
     dart2js.FunctionElement element = converter.convertElement(function);
     ir.FunctionDefinition definition = handleFunctionDeclaration(
-        function, functionDeclaration.functionExpression);
+        function, functionDeclaration.functionExpression.body);
     irBuilder.declareLocalFunction(element, definition);
   }
 
   List<ir.Primitive> visitArguments(ArgumentList argumentList) {
     List<ir.Primitive> arguments = <ir.Primitive>[];
     for (Expression argument in argumentList.arguments) {
       ir.Primitive value = build(argument);
       if (value == null) {
         giveUp(argument,
             'Unsupported argument: $argument (${argument.runtimeType}).');
@@ skipping 396 matching lines @@
     return irBuilder.buildTypeOperator(
         visit(node.expression),
         converter.convertType(node.type.type),
         isTypeTest: false);
   }
 }
 
 class NullCapturedVariableInfo extends DartCapturedVariableInfo {
   Iterable get capturedVariables => const [];
 }