Fixed breakage in template utility now that statics aren't inherited.

utils/template/codegen.dart

 // Copyright (c) 2011, 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 CGBlock {
   int _blockType;             // Code type of this block
   int _indent;                // Number of spaces to prefix for each statement
   bool _inEach;               // This block or any currently active blocks is a
                               // #each.  If so then any element marked with a
                               // var attribute is repeated therefore the var
                               // is a List type instead of an Element type.
   String _localName;          // optional local name for #each or #with
   List<CGStatement> _stmts;
   int localIndex;             // Local variable index (e.g., e0, e1, etc.)
 
   // Block Types:
   static final int CONSTRUCTOR = 0;
   static final int EACH = 1;
   static final int WITH = 2;
 
   CGBlock([this._indent = 4,
            this._blockType = CGBlock.CONSTRUCTOR,
            this._inEach = false,
            this._localName = null]) :
       _stmts = new List<CGStatement>(), localIndex = 0 {
     assert(_blockType >= CGBlock.CONSTRUCTOR && _blockType <= CGBlock.WITH);
   }
 
+  bool get anyStatements() => !_stmts.isEmpty();
   bool get isConstructor() => _blockType == CGBlock.CONSTRUCTOR;
   bool get isEach() => _blockType == CGBlock.EACH;
   bool get isWith() => _blockType == CGBlock.WITH;
 
   bool get hasLocalName() => _localName != null;
   String get localName() => _localName;
 
   CGStatement push(var elem, var parentName, [bool exact = false]) {
     var varName;
     if (elem is TemplateElement && elem.hasVar) {
@@ skipping 15 matching lines @@
 
   void add(String value) {
     if (_stmts.last() != null) {
       _stmts.last().add(value);
     }
   }
 
   CGStatement get last() => _stmts.length > 0 ? _stmts.last() : null;
 
   /**
-   * Returns mixed list of elements marked with the var attribute.  If the 
+   * Returns mixed list of elements marked with the var attribute.  If the
    * element is inside of a #each the name exposed is:
    *
    *      List varName;
    *
    * otherwise it's:
    *
    *      var varName;
    *
    * TODO(terry): For scalars var varName should be Element tag type e.g.,
    *
@@ skipping 191 matching lines @@
     assert(fileParts.length == 2);
     filename = fileParts[0];
 
     StringBuffer buff = new StringBuffer();
     int injectId = 0;         // Inject function id
 
     buff.add("// Generated Dart class from HTML template.\n");
     buff.add("// DO NOT EDIT.\n\n");
 
     String addStylesheetFuncName = "add_${filename}_templatesStyles";
-    
+
     for (final template in templates) {
       // Emit the template class.
       TemplateSignature sig = template.signature;
       buff.add(_emitClass(sig.name, sig.params, template.content,
         addStylesheetFuncName));
     }
 
     // TODO(terry): Stylesheet aggregator should not be global needs to be
     //              bound to this template file not global to the app.
 
@@ skipping 224 matching lines @@
   List<String> expressions;         // List of injection function declarations.
   List<String> eachs;               // List of each function declarations.
   List<String> withs;               // List of with function declarations.
 
   ElemCG() :
     expressions = [],
     eachs = [],
     withs = [],
     _cgBlocks = [],
     _globalDecls = new StringBuffer(),
-    _globalInits = new StringBuffer();    
+    _globalInits = new StringBuffer();
 
   bool get isLastBlockConstructor() {
     CGBlock block = _cgBlocks.last();
     return block.isConstructor;
   }
 
   List<String> activeBlocksLocalNames() {
     List<String> result = [];
 
     for (final CGBlock block in _cgBlocks) {
       if (block.isEach || block.isWith) {
         if (block.hasLocalName) {
           result.add(block.localName);
         }
       }
     }
 
     return result;
   }
 
   /**
    * Active block with this localName.
-   */ 
+   */
   bool matchBlocksLocalName(String name) {
     for (final CGBlock block in _cgBlocks) {
       if (block.isEach || block.isWith) {
         if (block.hasLocalName && block.localName == name) {
           return true;
         }
       }
     }
 
     return false;
@@ skipping 108 matching lines @@
   String get globalInitializers() {
     assert(_cgBlocks.length == 1);    // Only constructor body should be left.
     _globalInits.add(lastBlock.globalInitializers);
     return _globalInits.toString();
   }
 
   String get codeBody() {
     closeStatement();
     return _cgBlocks.last().codeBody;
   }
-  
+
   /* scopeName for expression
    * parentVarOrIndex if # it's a local variable if string it's an exposed
    * name (specified by the var attribute) for this element.
    *
    */
   emitElement(var elem,
               [String scopeName = "",
                var parentVarOrIdx = 0,
                bool immediateNestedEach = false]) {
     if (elem is TemplateElement) {
@@ skipping 29 matching lines @@
         }
 
         // TODO(terry): Need to interpolate following:
         //      {sp}  → space
         //      {nil} → empty string
         //      {\r}  → carriage return
         //      {\n}  → new line (line feed)
         //      {\t}  → tab
         //      {lb}  → left brace
         //      {rb}  → right brace
-      
+
         add("${outputValue}");            // remove leading/trailing whitespace.
 
         if (emitTextNode) {
           closeStatement();
         }
       }
     } else if (elem is TemplateExpression) {
       emitExpressions(elem, scopeName);
     } else if (elem is TemplateEachCommand) {
       // Signal to caller new block coming in, returns "each_" prefix
@@ skipping 81 matching lines @@
 
   emitExpressions(TemplateExpression elem, String scopeName) {
     StringBuffer func = new StringBuffer();
 
     String newExpr = elem.expression;
     bool anyNesting = isNestedNamedBlock();
     if (scopeName.length > 0 && !anyNesting) {
       // In a block #command need the scope passed in.
       add("\$\{inject_${expressions.length}(_item)\}");
       func.add("\n  String inject_${expressions.length}(var _item) {\n");
-      // Escape all single-quotes, this expression is embedded as a string 
+      // Escape all single-quotes, this expression is embedded as a string
       // parameter for the call to safeHTML.
       newExpr = _resolveNames(newExpr.replaceAll("'", "\\'"), "_item");
     } else {
       // Not in a block #command item isn't passed in.
       add("\$\{inject_${expressions.length}()\}");
       func.add("\n  String inject_${expressions.length}() {\n");
 
       if (anyNesting) {
         func.add(defineScopes());
       }
@@ skipping 102 matching lines @@
     addScope(4, funcBuff, itemName);
     funcBuff.add(codeBody);
     removeScope(4, funcBuff, itemName);
 
     popBlock();
 
     funcBuff.add("  }\n");
 
     withs[withIndex] = funcBuff.toString();
 
-    // Compute parent node variable before pushing with statement. 
+    // Compute parent node variable before pushing with statement.
     String parentVarName = lastBlockVarName;
 
     pushExactStatement(elem, parentVarIndex);
 
     // Setup call to each func as "each_n(xxxxx, " the parent param is filled
     // in later when we known the parent variable.
     add("${funcName}(${withName}, ${parentVarName})");
   }
 
   String get lastBlockVarName() {
@@ skipping 44 matching lines @@
       for (String name in names) {
         buff.add("    var ${name} = _scopes[\"${name}\"];\n");
       }
       buff.add("\n");
     }
 
     return buff.toString();
   }
 
 }