Support both === and !==

CesiumGS · Oct 18, 2016 · 0f5016a · 0f5016a
1 parent 8823472
commit 0f5016a
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 10 deletions.
diff --git a/Source/Scene/Expression.js b/Source/Scene/Expression.js
@@ -18,7 +18,7 @@ define([
     "use strict";
 
     var unaryOperators = ['!', '-', '+'];
-    var binaryOperators = ['+', '-', '*', '/', '%', '==', '!=', '>', '>=', '<', '<=', '&&', '||', '!~', '=~'];
+    var binaryOperators = ['+', '-', '*', '/', '%', '===', '==', '!==', '!=', '>', '>=', '<', '<=', '&&', '||', '!~', '=~'];
 
     var variableRegex = /\${(.*?)}/g;
     var backslashRegex = /\\/g;
@@ -531,8 +531,12 @@ define([
                 node.evaluate = node._evaluateDivide;
             } else if (node._value === '%') {
                 node.evaluate = node._evaluateMod;
+            } else if (node._value === '===') {
+                node.evaluate = node._evaluateEqualsStrict;
             } else if (node._value === '==') {
                 node.evaluate = node._evaluateEquals;
+            } else if (node._value === '!==') {
+                node.evaluate = node._evaluateNotEquals;
             } else if (node._value === '!=') {
                 node.evaluate = node._evaluateNotEquals;
             } else if (node._value === '<') {
@@ -834,6 +838,15 @@ define([
         return left % right;
     };
 
+    Node.prototype._evaluateEqualsStrict = function(feature) {
+        var left = this._left.evaluate(feature);
+        var right = this._right.evaluate(feature);
+        if ((right instanceof Color) && (left instanceof Color)) {
+            return Color.equals(left, right);
+        }
+        return left === right;
+    };
+
     Node.prototype._evaluateEquals = function(feature) {
         var left = this._left.evaluate(feature);
         var right = this._right.evaluate(feature);
@@ -1095,9 +1108,13 @@ define([
                 //>>includeEnd('debug');
                 return value + left;
             case ExpressionNodeType.BINARY:
-                // Supported types: ||, &&, ==, !=, <, >, <=, >=, +, -, *, /, %
+                // Supported types: ||, &&, ===, ==, !==, !=, <, >, <=, >=, +, -, *, /, %
                 if (value === '%') {
                     return 'mod(' + left + ', ' + right + ')';
+                } else if (value === '===') {
+                    return '(' + left + ' == ' + right + ')';
+                } else if (value === '!==') {
+                    return '(' + left + ' != ' + right + ')';
                 }
                 return '(' + left + ' ' + value + ' ' + right + ')';
             case ExpressionNodeType.CONDITIONAL:

diff --git a/Specs/Scene/ExpressionSpec.js b/Specs/Scene/ExpressionSpec.js
@@ -160,14 +160,6 @@ defineSuite([
             return new Expression('2 & 3');
         }).toThrowDeveloperError();
 
-        expect(function() {
-            return new Expression('2 === 3');
-        }).toThrowDeveloperError();
-
-        expect(function() {
-            return new Expression('2 !== 3');
-        }).toThrowDeveloperError();
-
         expect(function() {
             return new Expression('2 << 3');
         }).toThrowDeveloperError();
@@ -543,6 +535,20 @@ defineSuite([
         expect(expression.evaluate(undefined)).toEqual(2);
     });
 
+    it('evaluates binary equals strict', function() {
+        var expression = new Expression('\'hello\' === \'hello\'');
+        expect(expression.evaluate(undefined)).toEqual(true);
+
+        expression = new Expression('1 === 2');
+        expect(expression.evaluate(undefined)).toEqual(false);
+
+        expression = new Expression('false === true === false');
+        expect(expression.evaluate(undefined)).toEqual(true);
+
+        expression = new Expression('1 === "1"');
+        expect(expression.evaluate(undefined)).toEqual(false);
+    });
+
     it('evaluates binary equals', function() {
         var expression = new Expression('\'hello\' == \'hello\'');
         expect(expression.evaluate(undefined)).toEqual(true);
@@ -552,6 +558,20 @@ defineSuite([
 
         expression = new Expression('false == true == false');
         expect(expression.evaluate(undefined)).toEqual(true);
+
+        expression = new Expression('1 == "1"');
+        expect(expression.evaluate(undefined)).toEqual(true);
+    });
+
+    it('evaluates binary not equals strict', function() {
+        var expression = new Expression('\'hello\' !== \'hello\'');
+        expect(expression.evaluate(undefined)).toEqual(false);
+
+        expression = new Expression('1 !== 2');
+        expect(expression.evaluate(undefined)).toEqual(true);
+
+        expression = new Expression('false !== true !== false');
+        expect(expression.evaluate(undefined)).toEqual(true);
     });
 
     it('evaluates binary not equals', function() {
@@ -1292,13 +1312,27 @@ defineSuite([
         expect(shaderExpression).toEqual(expected);
     });
 
+    it('gets shader expression for binary equals strict', function() {
+        var expression = new Expression('1.0 === 2.0');
+        var shaderExpression = expression.getShaderExpression('', {});
+        var expected = '(1.0 == 2.0)';
+        expect(shaderExpression).toEqual(expected);
+    });
+
     it('gets shader expression for binary equals', function() {
         var expression = new Expression('1.0 == 2.0');
         var shaderExpression = expression.getShaderExpression('', {});
         var expected = '(1.0 == 2.0)';
         expect(shaderExpression).toEqual(expected);
     });
 
+    it('gets shader expression for binary not equals strict', function() {
+        var expression = new Expression('1.0 !== 2.0');
+        var shaderExpression = expression.getShaderExpression('', {});
+        var expected = '(1.0 != 2.0)';
+        expect(shaderExpression).toEqual(expected);
+    });
+
     it('gets shader expression for binary not equals', function() {
         var expression = new Expression('1.0 != 2.0');
         var shaderExpression = expression.getShaderExpression('', {});