Merge pull request #746 from oughter/support-type-check-comparisons

Add support for strict type check comparisons

CHANGELOG.md

@@ -24,6 +24,7 @@ Changelog
 2.x (unreleased)
 ----------------
 
+* Add support for strict type check comparisons (=== and !===)
 * Allow full expressions (incl. filters) in import and from tags. Thanks legutierr.
  Merge of [#710](https://github.com/mozilla/nunjucks/pull/710).
 

docs/cn/templating.md

@@ -586,7 +586,9 @@ Nunjucks 支持运算 (但尽量少用，把逻辑放在代码中)，可使用
 ### 比较 (Comparisons)
 
 * `==`
+* `===`
 * `!=`
+* `!==`
 * `>`
 * `>=`
 * `<`

docs/fr/templating.md

@@ -699,7 +699,9 @@ Vous pouvez les utiliser ainsi :
 ### Comparaisons
 
 * `==`
+* `===`
 * `!=`
+* `!==`
 * `>`
 * `>=`
 * `<`

docs/templating.md

@@ -699,7 +699,9 @@ You can use them like this:
 ### Comparisons
 
 * `==`
+* `===`
 * `!=`
+* `!==`
 * `>`
 * `>=`
 * `<`

src/compiler.js

@@ -12,7 +12,9 @@ var Frame = require('./runtime').Frame;
 // through
 var compareOps = {
  '==': '==',
+ '===': '===',
  '!=': '!=',
+ '!==': '!==',
  '<': '<',
  '>': '>',
  '<=': '<=',

src/lexer.js

@@ -163,13 +163,19 @@ Tokenizer.prototype.nextToken = function() {
  else if(delimChars.indexOf(cur) !== -1) {
  // We've hit a delimiter (a special char like a bracket)
  this.forward();
- var complexOps = ['==', '!=', '<=', '>=', '//', '**'];
+ var complexOps = ['==', '===', '!=', '!==', '<=', '>=', '//', '**'];
  var curComplex = cur + this.current();
  var type;
 
  if(lib.indexOf(complexOps, curComplex) !== -1) {
  this.forward();
  cur = curComplex;
+
+ // See if this is a strict equality/inequality comparator
+ if(lib.indexOf(complexOps, curComplex + this.current()) !== -1) {
+ cur = curComplex + this.current();
+ this.forward();
+ }
  }
 
  switch(cur) {

src/parser.js

@@ -760,7 +760,7 @@ var Parser = Object.extend({
  },
 
  parseCompare: function() {
- var compareOps = ['==', '!=', '<', '>', '<=', '>='];
+ var compareOps = ['==', '===', '!=', '!==', '<', '>', '<=', '>='];
  var expr = this.parseConcat();
  var ops = [];
 

tests/compiler.js

@@ -399,6 +399,12 @@
  equal('{% if 10 != 10 %}yes{% endif %}', '');
  equal('{% if 10 == 10 %}yes{% endif %}', 'yes');
 
+ equal('{% if "0" == 0 %}yes{% endif %}', 'yes');
+ equal('{% if "0" === 0 %}yes{% endif %}', '');
+ equal('{% if "0" !== 0 %}yes{% endif %}', 'yes');
+ equal('{% if 0 == false %}yes{% endif %}', 'yes');
+ equal('{% if 0 === false %}yes{% endif %}', '');
+
  equal('{% if foo(20) > bar %}yes{% endif %}',
  { foo: function(n) { return n - 1; },
  bar: 15 },