Support top-level field declaration and assignment 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;
 
   CpsGeneratingVisitor(this.converter, this.element);
 
   Source get currentSource => element.source;
 
   analyzer.LibraryElement get currentLibrary => element.library;
 
   ir.Node visit(AstNode node) => node.accept(this);
 
-  @override
-  ir.Primitive visitFunctionExpression(FunctionExpression node) {
-    return irBuilder.buildFunctionExpression(
-        handleFunctionDeclaration(node.element, node));
+  ir.FieldDefinition handleFieldDeclaration(
+      analyzer.PropertyInducingElement field, VariableDeclaration node) {
+    dart2js.FieldElement element = converter.convertElement(field);
+    return withBuilder(
+        new IrBuilder(DART_CONSTANT_SYSTEM,
+                      element,
+                      // TODO(johnniwinther): Supported closure variables.
+                      const <dart2js.Local>[]),
+        () {
+      ir.Primitive initializer = build(node.initializer);
+      return irBuilder.makeFieldDefinition(initializer);
+    });
   }
 
   ir.FunctionDefinition handleFunctionDeclaration(
       analyzer.FunctionElement function, FunctionExpression node) {
     dart2js.FunctionElement element = converter.convertElement(function);
     return withBuilder(
         new IrBuilder(DART_CONSTANT_SYSTEM,
                       element,
                       // TODO(johnniwinther): Supported closure variables.
                       const <dart2js.Local>[]),
         () {
       function.parameters.forEach((analyzer.ParameterElement parameter) {
         // TODO(johnniwinther): Support "closure variables", that is variables
         // accessed from an inner function.
         irBuilder.createParameter(converter.convertElement(parameter));
       });
       // Visit the body directly to avoid processing the signature as
       // expressions.
       visit(node.body);
-      return irBuilder.buildFunctionDefinition(const []);
+      return irBuilder.makeFunctionDefinition(const []);
     });
   }
 
   @override
+  ir.Primitive visitFunctionExpression(FunctionExpression node) {
+    return irBuilder.buildFunctionExpression(
+        handleFunctionDeclaration(node.element, node));
+  }
+
+  @override
   ir.FunctionDefinition visitFunctionDeclaration(FunctionDeclaration node) {
     return handleFunctionDeclaration(node.element, node.functionExpression);
   }
 
   @override
   visitFunctionDeclarationStatement(FunctionDeclarationStatement node) {
     FunctionDeclaration functionDeclaration = node.functionDeclaration;
     analyzer.FunctionElement function = functionDeclaration.element;
     dart2js.FunctionElement element = converter.convertElement(function);
     ir.FunctionDefinition definition = handleFunctionDeclaration(
@@ skipping 162 matching lines @@
     return handleLocalAccess(node, semantics);
   }
 
   @override
   ir.Node visitParameterAccess(AstNode node, AccessSemantics semantics) {
     return handleLocalAccess(node, semantics);
   }
 
   @override
   visitVariableDeclaration(VariableDeclaration node) {
-    // TODO(johnniwinther): Handle constant local variables.
-    ir.Node initialValue = build(node.initializer);
-    irBuilder.declareLocalVariable(
-        converter.convertElement(node.element),
-        initialValue: initialValue);
+    if (hasIrBuilder) {

[sigurdm, 2014/12/01 09:06:00]

Perhaps make a getter encapsulating this check

[Johnni Winther, 2014/12/01 13:00:39]

Done.

+      // Local variable declaration.
+      // TODO(johnniwinther): Handle constant local variables.
+      ir.Node initialValue = build(node.initializer);
+      irBuilder.declareLocalVariable(
+          converter.convertElement(node.element),
+          initialValue: initialValue);
+    } else {
+      // Field declaration.
+      return handleFieldDeclaration(node.element, node);
+    }
   }
 
   dart2js.Element getLocal(AstNode node, AccessSemantics semantics) {
     analyzer.Element element = semantics.element;
     dart2js.Element target = converter.convertElement(element);
     assert(invariant(node, target.isLocal, '$target expected to be local.'));
     return target;
   }
 
   ir.Primitive handleLocalAccess(AstNode node, AccessSemantics semantics) {
@@ skipping 22 matching lines @@
     return handleLocalAssignment(node, semantics);
   }
 
   @override
   ir.Node visitParameterAssignment(AssignmentExpression node,
                                    AccessSemantics semantics) {
     return handleLocalAssignment(node, semantics);
   }
 
   @override
+  ir.Node visitStaticFieldAssignment(AssignmentExpression node,
+                                     AccessSemantics semantics) {
+    if (node.operator.lexeme != '=') {
+      return giveUp(node, 'Assignment operator: ${node.operator.lexeme}');
+    }
+    analyzer.Element element = semantics.element;
+    dart2js.Element target = converter.convertElement(element);
+    // TODO(johnniwinther): Selector information should be computed in the
+    // [TreeShaker] and shared with the [CpsGeneratingVisitor].
+    assert(invariant(node, target.isTopLevel || target.isStatic,
+                     '$target expected to be top-level or static.'));
+    return irBuilder.buildStaticSet(
+        target,
+        new Selector.setter(target.name, target.library),
+        build(node.rightHandSide));
+  }
+
+  @override
   ir.Node visitDynamicAccess(AstNode node, AccessSemantics semantics) {
     // TODO(johnniwinther): Handle implicit `this`.
     ir.Primitive receiver = build(semantics.target);
     return irBuilder.buildDynamicGet(receiver,
         new Selector.getter(semantics.identifier.name,
                             converter.convertElement(element.library)));
   }
 
   @override
   ir.Node visitStaticFieldAccess(AstNode node, AccessSemantics semantics) {
@@ skipping 151 matching lines @@
   }
 
   @override
   ir.Primitive visitAsExpression(AsExpression node) {
     return irBuilder.buildTypeOperator(
         visit(node.expression),
         converter.convertType(node.type.type),
         isTypeTest: false);
   }
 }