Template bug fixes and new features.

utils/template/htmltree.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.
 // Generated by scripts/tree_gen.py.
 
 /////////////////////////////////////////////////////////////////////////
 // CSS specific types:
 /////////////////////////////////////////////////////////////////////////
 
 class Identifier extends ASTNode {
@@ skipping 191 matching lines @@
 
   TemplateExpression(this.expression, SourceSpan span): super(span);
 
   visit(TreeVisitor visitor) => visitor.visitTemplateExpression(this);
 
   String toString() => "\$\{value}";
 }
 
 class TemplateEachCommand extends ASTNode {
   String listName;
+  String loopItem;
   TemplateDocument documentFragment;
 
-  TemplateEachCommand(this.listName, this.documentFragment, SourceSpan span):
-    super(span);
+  TemplateEachCommand(this.listName, this.loopItem, this.documentFragment,
+      SourceSpan span): super(span);
+
+  bool get hasLoopItem() => loopItem != null;
+  String get loopNameOptional() => hasLoopItem ? " ${loopItem}" : "";
 
   visit(TreeVisitor visitor) => visitor.visitTemplateEachCommand(this);
 
-  String toString() => "\$\{#each ${listName}}";
+  String toString() => "\$\{#each ${listName}${loopNameOptional}}";
 }
 
 class TemplateWithCommand extends ASTNode {
   String objectName;
+  String blockItem;
   TemplateDocument documentFragment;
 
-  TemplateWithCommand(this.objectName, this.documentFragment, SourceSpan span):
-    super(span);
+  TemplateWithCommand(this.objectName, this.blockItem, this.documentFragment,
+      SourceSpan span): super(span);
+
+  bool get hasBlockItem() => blockItem != null;
+  String get blockNameOptional() => hasBlockItem ? " ${blockItem}" : "";
 
   visit(TreeVisitor visitor) => visitor.visitTemplateWithCommand(this);
 
-  String toString() => "\$\{#with ${objectName}}";
+  String toString() => "\$\{#with ${objectName}${blockNameOptional}}";
+}
+
+class TemplateCall extends ASTNode {
+  String toCall;
+  String params;
+
+  TemplateCall(this.toCall, this.params, SourceSpan span): super(span);
+
+  visit(TreeVisitor visitor) => visitor.visitTemplateCall(this);
+
+  String toString() => "\$\{#${toCall}${params}}";
 }
 
 interface TreeVisitor {
   void visitIdentifier(Identifier node);
   void visitStringValue(StringValue node);
   void visitCommentDefinition(CommentDefinition node);
   void visitTemplate(Template node);
   void visitTemplateSignature(TemplateSignature node);
   void visitTemplateChildren(TemplateChildren node);
   void visitTemplateDocument(TemplateDocument node);
   void visitTemplateContent(TemplateContent node);
   void visitTemplateElement(TemplateElement node);
   void visitTemplateAttribute(TemplateAttribute node);
   void visitTemplateText(TemplateText node);
   void visitTemplateExpression(TemplateExpression node);
   void visitTemplateEachCommand(TemplateEachCommand node);
   void visitTemplateWithCommand(TemplateWithCommand node);
+  void visitTemplateCall(TemplateCall node);
 }
 
 class TreePrinter implements TreeVisitor {
   var output;
   TreePrinter(this.output) { output.printer = this; }
 
   void visitIdentifier(Identifier node) {
     output.heading('Identifier(${output.toValue(node.name)})', node.span);
   }
 
@@ skipping 78 matching lines @@
     output.heading('#each', node.span);
     output.writeValue('list', node.listName);
     visitTemplateDocument(node.documentFragment);
   }
 
   void visitTemplateWithCommand(TemplateWithCommand node) {
     output.heading('#with', node.span);
     output.writeValue('object', node.objectName);
     visitTemplateDocument(node.documentFragment);
   }
+
+  void visitTemplateCall(TemplateCall node) {
+    output.heading('#call template', node.span);
+    output.writeValue('templateToCall', node.toCall);
+    output.writeValue('params', node.params);
+  }
+
 }