From f1af6fe683fd06eed2a7a7849f01c227db12cda3 Mon Sep 17 00:00:00 2001
From: Rafael Weinstein <rafaelw@chromium.org>
Date: Tue, 2 Jul 2013 13:40:53 -0700
Subject: [PATCH] Refactor mustache token parsing in advance of building
 instance-binding-map

R=arv
BUG=

Review URL: https://codereview.appspot.com/10858044
---
 src/template_element.js | 50 ++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/template_element.js b/src/template_element.js
index 39bbe48..0a653a9 100644
--- a/src/template_element.js
+++ b/src/template_element.js
@@ -968,15 +968,18 @@
     }
   });
 
-  var TEXT = 0;
-  var BINDING = 1;
-
-  function Token(type, value) {
-    this.type = type;
-    this.value = value;
+  function isSimpleBinding(tokens) {
+    // tokens ==? ['', path, '']
+    return tokens.length == 3 && tokens[0].length == 0 && tokens[2].length == 0;
   }
 
+  // Returns
+  //   a) undefined if there are no mustaches.
+  //   b) [TEXT, (PATH, TEXT)+] if there is at least one mustache.
   function parseMustacheTokens(s) {
+    if (!s || s.length === 0)
+      return;
+
     var tokens = undefined;
     var length = s.length;
     var startIndex = 0, lastIndex = 0, endIndex = 0;
@@ -985,22 +988,22 @@
       endIndex = startIndex < 0 ? -1 : s.indexOf('}}', startIndex + 2);
 
       if (endIndex < 0) {
-        if (tokens)
-          tokens.push(new Token(TEXT, s.slice(lastIndex)));
-        break;
-      }
+        if (!tokens)
+          return;
 
-      // There is a non-empty text run before the next path token.
-      if (startIndex - lastIndex > 0) {
-        tokens = tokens || [];
-        tokens.push(new Token(TEXT, s.slice(lastIndex, startIndex)));
+        tokens.push(s.slice(lastIndex)); // TEXT
+        break;
       }
 
       tokens = tokens || [];
-      tokens.push(new Token(BINDING, s.slice(startIndex + 2, endIndex).trim()));
+      tokens.push(s.slice(lastIndex, startIndex)); // TEXT
+      tokens.push(s.slice(startIndex + 2, endIndex).trim()); // PATH
       lastIndex = endIndex + 2;
     }
 
+    if (lastIndex === length)
+      tokens.push(''); // TEXT
+
     return tokens;
   }
 
@@ -1023,25 +1026,22 @@
     if (!tokens)
       return;
 
-    if (tokens.length == 1) {
-      bindOrDelegate(node, name, model, tokens[0].value, delegate);
+    if (isSimpleBinding(tokens)) {
+      bindOrDelegate(node, name, model, tokens[1], delegate);
       return;
     }
 
     var replacementBinding = new CompoundBinding();
-    for (var i = 0; i < tokens.length; i++) {
-      var token = tokens[i];
-      if (token.type == BINDING)
-        bindOrDelegate(replacementBinding, i, model, token.value, delegate);
+    for (var i = 1; i < tokens.length; i = i + 2) {
+      bindOrDelegate(replacementBinding, i, model, tokens[i], delegate);
     }
 
     replacementBinding.combinator = function(values) {
       var newValue = '';
 
-      for (var i = 0; i < tokens.length; i++) {
-        var token = tokens[i];
-        if (token.type === TEXT) {
-          newValue += token.value;
+      for (var i = 0, text = true; i < tokens.length; i++, text = !text) {
+        if (text) {
+          newValue += tokens[i];
         } else {
           var value = values[i];
           if (value !== undefined)