Lazy implementation of final variables.

lib/compiler/implementation/compiler.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.
 
 
 /**
  * If true, print a warning for each method that was resolved, but not
  * compiled.
  */
 final bool REPORT_EXCESS_RESOLUTION = false;
@@ skipping 731 matching lines @@
       // TODO(ahe): Add structured diagnostics to the compiler API and
       // use it to separate this from the --verbose option.
       if (phase == PHASE_COMPILING) {
         log('Compiled ${codegenWorld.generatedCode.length} methods.');
       } else {
         log('Recompiled ${world.recompilationCandidates.processed} methods.');
       }
       progress.reset();
     }
     if (work.element.kind.category == ElementCategory.VARIABLE) {
-      constantHandler.compileWorkItem(work);
-      return null;
-    } else {
-      CodeBuffer codeBuffer = backend.codegen(work);
-      codegenWorld.addGeneratedCode(work, codeBuffer);
-      return codeBuffer.toString();
+      Constant initialValue = constantHandler.compileWorkItem(work);
+      if (initialValue != null) return null;
+      // Otherwise we need to go through the builder.

[kasperl, 2012/08/16 14:41:37]

Maybe change the comment to explain why we have to go through the builder for
this.

[floitsch, 2012/08/16 22:52:33]

Done.

     }
+    CodeBuffer codeBuffer = backend.codegen(work);
+    codegenWorld.addGeneratedCode(work, codeBuffer);
+    return codeBuffer.toString();
   }
 
   void registerInstantiatedClass(ClassElement cls) {
     enqueuer.resolution.registerInstantiatedClass(cls);
     enqueuer.codegen.registerInstantiatedClass(cls);
   }
 
   void resolveClass(ClassElement element) {
     withCurrentElement(element, () => resolver.resolveClass(element));
   }
@@ skipping 17 matching lines @@
     return withCurrentElement(element,
                               () => resolver.resolveTypedef(element));
   }
 
   FunctionType computeFunctionType(Element element,
                                    FunctionSignature signature) {
     return withCurrentElement(element,
         () => resolver.computeFunctionType(element, signature));
   }
 
+  bool isLazilyInitialized(VariableElement element) {
+    Constant initialValue = compileVariable(element);
+    return initialValue == null;

[kasperl, 2012/08/16 14:41:37]

===?

[floitsch, 2012/08/16 22:52:33]

Done.

+  }
+
+  /** Compiles compile-time constants. Must not return `null`. */
+  Constant compileConstant(VariableElement element) {
+    return withCurrentElement(element, () {
+      return constantHandler.compileConstant(element);
+    });
+  }
+
   Constant compileVariable(VariableElement element) {
     return withCurrentElement(element, () {
       return constantHandler.compileVariable(element);
     });
   }
 
   reportWarning(Node node, var message) {
     if (message is TypeWarning) {
       // TODO(ahe): Don't supress these warning when the type checker
       // is more complete.
@@ skipping 140 matching lines @@
     final endOffset = end.charOffset + end.slowCharCount;
 
     // [begin] and [end] might be the same for the same empty token. This
     // happens for instance when scanning '$$'.
     assert(endOffset >= beginOffset);
     return f(beginOffset, endOffset);
   }
 
   String toString() => 'SourceSpan($uri, $begin, $end)';
 }