From 080d12f90b6bf6738ad240c0ac2c7637d33328c9 Mon Sep 17 00:00:00 2001
From: Rafael Weinstein <rafaelw@chromium.org>
Date: Tue, 14 Jan 2014 12:24:40 -0800
Subject: [PATCH] cr cleanup

---
 src/polymer-expressions.js | 39 ++++++++++++++++++--------------------
 tests/tests.js             | 26 ++++++++++++-------------
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/polymer-expressions.js b/src/polymer-expressions.js
index d1772a1..3f68492 100644
--- a/src/polymer-expressions.js
+++ b/src/polymer-expressions.js
@@ -77,6 +77,7 @@
 
   function Literal(value) {
     this.value = value;
+    this.valueFn_ = undefined;
   }
 
   Literal.prototype = {
@@ -119,21 +120,15 @@
   };
 
   function MemberExpression(object, property, accessor) {
-    if (typeof object == 'function' || object.dynamic)
-      this.nonModelPath = true;
-
-    if (typeof property == 'function' || property.dynamic ||
-        (accessor == '[' && (!(property instanceof Literal)))) {
-      this.dynamic = true;
-    }
-
+    this.dynamicDeps = typeof object == 'function' || object.dynamic;
+    this.dynamic =
+        typeof property == 'function' || property.dynamic ||
+        (accessor == '[' && !(property instanceof Literal));
     this.object = getFn(object);
     this.property = accessor == '.' ? property : getFn(property);
   }
 
   MemberExpression.prototype = {
-    dynamic: false,
-    nonModelPath: false,
     valueFn: function() {
       if (!this.valueFn_) {
         var object = this.object;
@@ -250,10 +245,10 @@
     this.currentPath = undefined;
     this.scopeIdent = undefined;
     this.indexIdent = undefined;
+    this.dynamicDeps = false;
   }
 
   ASTDelegate.prototype = {
-    nonModelPath: false,
     createUnaryExpression: function(op, argument) {
       if (!unaryOperators[op])
         throw Error('Disallowed operator: ' + op);
@@ -273,7 +268,8 @@
       right = getFn(right);
 
       return function(model, observer) {
-        return binaryOperators[op](left(model, observer), right(model, observer));
+        return binaryOperators[op](left(model, observer),
+                                   right(model, observer));
       };
     },
 
@@ -296,8 +292,8 @@
 
     createMemberExpression: function(accessor, object, property) {
       var ex = new MemberExpression(object, property, accessor);
-      if (ex.nonModelPath)
-        this.nonModelPath = true;
+      if (ex.dynamicDeps)
+        this.dynamicDeps = true;
       return ex;
     },
 
@@ -380,7 +376,7 @@
     getFn(this.expression); // forces enumeration of path dependencies
 
     this.filters = delegate.filters;
-    this.nonModelPath = delegate.nonModelPath;
+    this.dynamicDeps = delegate.dynamicDeps;
   }
 
   Expression.prototype = {
@@ -388,17 +384,18 @@
       if (oneTime)
         return this.getValue(model, undefined, filterRegistry);
 
-      var observer = oneTime ? undefined : new CompoundObserver();
-      var value = this.getValue(model, observer, filterRegistry);
+      var observer = new CompoundObserver();
+      this.getValue(model, observer, filterRegistry);  // captures deps.
       var self = this;
 
       function valueFn() {
-        if (self.nonModelPath)
+        if (self.dynamicDeps)
           observer.startReset();
 
-        value = self.getValue(model, self.nonModelPath ? observer : undefined,
-                              filterRegistry);
-        if (self.nonModelPath)
+        var value = self.getValue(model,
+                                  self.dynamicDeps ? observer : undefined,
+                                  filterRegistry);
+        if (self.dynamicDeps)
           observer.finishReset();
 
         return value;
diff --git a/tests/tests.js b/tests/tests.js
index b9cae49..e40df6a 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -1624,18 +1624,18 @@ suite('PolymerExpressions', function() {
     });
   });
 
-  test('Non-model path expressions', function() {
-    assert.isFalse(getExpression_('a + b').nonModelPath);
-    assert.isFalse(getExpression_('a + b > 3 + hello["kitty"]').nonModelPath);
-    assert.isFalse(getExpression_('a[a.b]').nonModelPath);
-    assert.isFalse(getExpression_('a[a.b] + d[e]').nonModelPath);
-    assert.isFalse(getExpression_('a[0].c').nonModelPath);
-    assert.isFalse(getExpression_('a[1][0]').nonModelPath);
-
-    assert.isTrue(getExpression_('a[b].c').nonModelPath);
-    assert.isTrue(getExpression_('(a + 1).c').nonModelPath);
-    assert.isTrue(getExpression_('a[a.b].c').nonModelPath);
-    assert.isTrue(getExpression_('a[a][0]').nonModelPath);
-    assert.isTrue(getExpression_('a[a.b] + d[e].f').nonModelPath);
+  test('Dynamic deps path expressions', function() {
+    assert.isFalse(getExpression_('a + b').dynamicDeps);
+    assert.isFalse(getExpression_('a + b > 3 + hello["kitty"]').dynamicDeps);
+    assert.isFalse(getExpression_('a[a.b]').dynamicDeps);
+    assert.isFalse(getExpression_('a[a.b] + d[e]').dynamicDeps);
+    assert.isFalse(getExpression_('a[0].c').dynamicDeps);
+    assert.isFalse(getExpression_('a[1][0]').dynamicDeps);
+
+    assert.isTrue(getExpression_('a[b].c').dynamicDeps);
+    assert.isTrue(getExpression_('(a + 1).c').dynamicDeps);
+    assert.isTrue(getExpression_('a[a.b].c').dynamicDeps);
+    assert.isTrue(getExpression_('a[a][0]').dynamicDeps);
+    assert.isTrue(getExpression_('a[a.b] + d[e].f').dynamicDeps);
   });
 });