Template bug fixes and new features.

utils/template/parser.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
 
 class TagStack {
   List<ASTNode> _stack;
 
   TagStack(var elem) : _stack = [] {
     _stack.add(elem);
   }
 
@@ skipping 353 matching lines @@
                   '</${TokenKind.tagNameFromTokenId(tagToken.kind)}>');
               }
             } else {
               // Too many end tags.
               _error('Too many end tags at ' +
                   '</${TokenKind.tagNameFromTokenId(tagToken.kind)}>');
             }
           }
         }
       } else if (_maybeEat(TokenKind.START_COMMAND)) {
-        if (_peekIdentifier()) {
-          var commandName = identifier();
+        Identifier commandName = processAsIdentifier();
+        if (commandName != null) {
           switch (commandName.name) {
             case "each":
             case "with":
-              if (_peekIdentifier()) {
-                var listName = identifier();
+              var listName = processAsIdentifier();
+              if (listName != null) {
+                var loopItem = processAsIdentifier();
+                // Is the optional item name specified?
+                //    #each lists [item]
+                //    #with expression [item]
 
                 _eat(TokenKind.RBRACE);
 
                 var frag = new TemplateElement.fragment(
                     _makeSpan(_peekToken.start));
                 TemplateDocument docFrag = processHTML(frag);
 
                 if (docFrag != null) {
                   var span = _makeSpan(start);
                   var cmd;
                   if (commandName.name == "each") {
-                    cmd = new TemplateEachCommand(listName, docFrag, span);
+                    cmd = new TemplateEachCommand(listName, loopItem, docFrag,
+                        span);
                   } else if (commandName.name == "with") {
-                    cmd = new TemplateWithCommand(listName, docFrag, span);
+                    cmd = new TemplateWithCommand(listName, loopItem, docFrag,
+                        span);
                   }
 
                   stack.top().add(cmd);
                   stack.push(cmd);
                 }
 
                 // Process ${/commandName}
                 _eat(TokenKind.END_COMMAND);
 
                 // Close command ${/commandName}
@@ skipping 32 matching lines @@
                 }
               } else {
                 _error("Missing listname for #each command");
               }
               break;
             case "if":
               break;
             case "else":
               break;
             default:
-              _error("Unknown template command");
-          }
+              // Calling another template.
+              int startPos = this._previousToken.end;
+              // Gobble up everything until we hit }
+              while (_peek() != TokenKind.RBRACE &&
+                     _peek() != TokenKind.END_OF_FILE) {
+                _next(false);
+              }
+
+              if (_peek() == TokenKind.RBRACE) {
+                int endPos = this._previousToken.end;
+                TemplateCall callNode = new TemplateCall(commandName.name,
+                    source.text.substring(startPos, endPos), _makeSpan(start));
+                stack.top().add(callNode);
+
+                _next(false);
+              } else {
+                _error("Unknown template command");
+              }
+          }  // End of switch/case
         }
       } else if (_peekKind(TokenKind.END_COMMAND)) {
         break;
       } else {
         // Any text or expression nodes?
         var nodes = processTextNodes();
         if (nodes.length > 0) {
           assert(stack.top() != null);
           for (var node in nodes) {
             stack.top().add(node);
@@ skipping 59 matching lines @@
   }
 
   List<ASTNode> processTextNodes() {
     // May contain TemplateText and TemplateExpression.
     List<ASTNode> nodes = [];
 
     int start = _peekToken.start;
     bool inExpression = false;
     StringBuffer stringValue = new StringBuffer();
 
+    // Any text chars between close of tag and text node?
+    if (_previousToken.kind == TokenKind.GREATER_THAN) {
+      // If the next token is } could be the close template token.  If user
+      // needs } as token in text node use the entity &125;
+      // TODO(terry): Probably need a &RCURLY entity instead of 125.
+      if (_peek() == TokenKind.ERROR) {
+        // Backup, just past previous token, & rescan we're outside of the tag.
+        tokenizer.index = _previousToken.end;
+        _next(false);
+      } else if (_peek() != TokenKind.RBRACE) {
+        // Yes, grab the chars after the >
+        stringValue.add(_previousToken.source.text.substring(
+            this._previousToken.end, this._peekToken.start));
+      }
+    }
+
     // Gobble up everything until we hit <
-    int runningStart = _peekToken.start;
     while (_peek() != TokenKind.LESS_THAN &&
            (_peek() != TokenKind.RBRACE ||
             (_peek() == TokenKind.RBRACE && inExpression)) &&
            _peek() != TokenKind.END_OF_FILE) {
 
       // Beginning of expression?
       if (_peek() == TokenKind.START_EXPRESSION) {
         if (stringValue.length > 0) {
           // We have a real text node create the text node.
           nodes.add(new TemplateText(stringValue.toString(), _makeSpan(start)));
@@ skipping 18 matching lines @@
     }
 
     if (stringValue.length > 0) {
       nodes.add(new TemplateText(stringValue.toString(), _makeSpan(start)));
     }
 
     return nodes;
   }
 
 }