Fixed equality op coercion issue. Closes #19

lib/nodes/color.js

@@ -74,7 +74,7 @@ Color.prototype.coerce = function(other){
     var n = other.val;
     return new Color(n,n,n,1);
   } else {
-    Node.prototype.coerce.call(this, other);
+    return Node.prototype.coerce.call(this, other);
   }
 };
 

lib/nodes/hsla.js

@@ -85,7 +85,7 @@ HSLA.prototype.coerce = function(other){
   if (other instanceof nodes.Color) {
     return other.hsl;
   } else {
-    Node.prototype.coerce.call(this, other);
+    return Node.prototype.coerce.call(this, other);
   }
 };
 

lib/nodes/node.js

@@ -150,5 +150,6 @@ Node.prototype.operate = function(op, right){
  */
 
 Node.prototype.coerce = function(other){
+  if (other.nodeName == this.nodeName) return other;
   throw new Error('cannot coerce ' + other + ' to ' + this.nodeName);
 };

lib/nodes/string.js

@@ -71,7 +71,11 @@ String.prototype.toBoolean = function(){
  */
 
 String.prototype.coerce = function(other){
-  return new String(other.toString());
+  if (other instanceof String) {
+    return other;
+  } else {
+    return new String(other.toString());
+  }
 };
 
 /**

lib/nodes/unit.js

@@ -164,6 +164,6 @@ Unit.prototype.coerce = function(other){
     }
     return new nodes.Unit(b.val, a.type);
   } else {
-    Node.prototype.coerce.call(this, other);
+    return Node.prototype.coerce.call(this, other);
   }
 };

lib/visitor/evaluator.js

@@ -249,9 +249,7 @@ Evaluator.prototype.visitBinOp = function(binop){
   // Coercion
   var ignore = ['||', '&&', 'is a'];
   if (!~ignore.indexOf(op)) {
-    if (right.nodeName != left.nodeName) {
-      right = left.coerce(right);
-    }
+    right = left.coerce(right);
   }
 
   // Operate

test/integration/tests/operators.css

@@ -21,4 +21,7 @@ body {
   foo: wahoo;
   foo: nope;
   foo: true;
+  foo: true;
+  foo: false;
+  foo: "got 15px";
 }

test/integration/tests/operators.in

@@ -67,3 +67,12 @@ body
   // true
   foo (@foo is defined ? yes : nope) == yes
 
+  // true
+  foo 1000ms == 1s
+
+  // false
+  foo 1ms == 1s
+
+  // "got 15px"
+  foo "got " + 15px
+