Call the compile-time constant handler inside bodies.

frog/leg/compile_time_constants.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.
 
 class Constant implements Hashable {
   const Constant();
 
   bool isNull() => false;
   bool isBool() => false;
   bool isTrue() => false;
@@ skipping 477 matching lines @@
     assert(work.element.kind == ElementKind.FIELD
            || work.element.kind == ElementKind.PARAMETER
            || work.element.kind == ElementKind.FIELD_PARAMETER);
     VariableElement element = work.element;
     // Shortcut if it has already been compiled.
     if (initialVariableValues.containsKey(element)) return;
     compileVariableWithDefinitions(element, work.resolutionTree);
     assert(pendingVariables.isEmpty());
   }
 
-  compileVariable(VariableElement element) {
+  Constant compileVariable(VariableElement element) {
+    // TODO(floitsch): wrap this method in 'measure'.
     if (initialVariableValues.containsKey(element)) {
       Constant result = initialVariableValues[element];
       return result;
     }
     // TODO(floitsch): keep track of currently compiling elements so that we
     // don't end up in an infinite loop: final x = y; final y = x;
     TreeElements definitions = compiler.analyzeElement(element);
     Constant constant =  compileVariableWithDefinitions(element, definitions);
     return constant;
   }
 
   Constant compileVariableWithDefinitions(VariableElement element,
                                           TreeElements definitions) {
     return measure(() {
       Node node = element.parseNode(compiler);
-      assert(node !== null);
+      if (pendingVariables.contains(element)) {
+        MessageKind kind = MessageKind.CYCLIC_COMPILE_TIME_CONSTANTS;
+        compiler.reportError(node,
+                             new CompileTimeConstantError(kind, const []));
+      }
+      pendingVariables.add(element);
+
       SendSet assignment = node.asSendSet();
-      var value;
+      Constant value;
       if (assignment === null) {
         // No initial value.
         value = new NullConstant();
       } else {
-        if (pendingVariables.contains(element)) {
-          MessageKind kind = MessageKind.CYCLIC_COMPILE_TIME_CONSTANTS;
-          compiler.reportError(node,
-                               new CompileTimeConstantError(kind, const []));
-        }
-        pendingVariables.add(element);
-
         Node right = assignment.arguments.head;
-        CompileTimeConstantEvaluator evaluator =
-            new CompileTimeConstantEvaluator(this, definitions, compiler);
-        value = evaluator.evaluate(right);
-
-        pendingVariables.remove(element);
+        value = compileNodeWithDefinitions(right, definitions);
       }
       initialVariableValues[element] = value;
+      pendingVariables.remove(element);
       return value;
     });
   }
 
+  Constant compileNodeWithDefinitions(Node node, TreeElements definitions) {
+    return measure(() {
+      assert(node !== null);
+      CompileTimeConstantEvaluator evaluator =
+          new CompileTimeConstantEvaluator(this, definitions, compiler);
+      return evaluator.evaluate(node);
+    });
+  }
+
   /**
    * Returns a [List] of static non final fields that need to be initialized.
    * The list must be evaluated in order since the fields might depend on each
    * other.
    */
   List<VariableElement> getStaticNonFinalFieldsForEmission() {
     return initialVariableValues.getKeys().filter((element) {
       return element.kind == ElementKind.FIELD
           && !element.isInstanceMember()
           && !element.modifiers.isFinal();
@@ skipping 493 matching lines @@
     return constant;
   }
 
   error(Node node) {
     // TODO(floitsch): get the list of constants that are currently compiled
     // and present some kind of stack-trace.
     MessageKind kind = MessageKind.NOT_A_COMPILE_TIME_CONSTANT;
     compiler.reportError(node, new CompileTimeConstantError(kind, const []));
   }
 }