Adddd != operator. Closes #41

stylus · Jan 8, 2011 · e3a55b9 · e3a55b9
1 parent 42aa7e8
commit e3a55b9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/docs/operators.md b/docs/operators.md
@@ -86,7 +86,7 @@ The Exponent operator:
     2 ** 8
     // => 256
 
-### Equality: == >= <= > <
+### Equality: == != >= <= > <
 
 Equality operators can be used to equate units, colors, strings, and even identifiers. This is a powerful concept, as even arbitrary identifiers such as as `wahoo` can be utilized as atoms, a function could return `yes` or `no` instead of `true` or `false` (although not advised). 
 

diff --git a/lib/lexer.js b/lib/lexer.js
@@ -475,6 +475,7 @@ Lexer.prototype = {
    * | '<='
    * | '='
    * | '=='
+   * | '!='
    * | '!'
    * | '~'
    * | '?='
@@ -484,7 +485,7 @@ Lexer.prototype = {
 
   get op() {
     var captures;
-    if (captures = /^(&&|\|\||[<>=?]=|\*\*|[-,=?:!~+<>*\/%])( *)/.exec(this.str)) {
+    if (captures = /^(&&|\|\||[!<>=?]=|\*\*|[-,=?:!~+<>*\/%])( *)/.exec(this.str)) {
       var op = captures[1];
       this.skip(captures);
       op = alias[op] || op;

diff --git a/lib/nodes/node.js b/lib/nodes/node.js
@@ -133,6 +133,8 @@ Node.prototype.operate = function(op, right){
       return nodes.Boolean(val == name || val == lower);
     case '==':
       return nodes.Boolean(this.hash == right.hash);
+    case '!=':
+      return nodes.Boolean(this.hash != right.hash);
     case '>=':
       return nodes.Boolean(this.hash >= right.hash);
     case '<=':

diff --git a/lib/parser.js b/lib/parser.js
@@ -270,6 +270,7 @@ Parser.prototype = {
       case '<':
       case '>=':
       case '<=':
+      case '!=':
       case '==':
       case '?':
       case 'is a':
@@ -565,14 +566,15 @@ Parser.prototype = {
   },
 
   /**
-   * typecheck (('==' | '>=' | '<=' | '>' | '<') typecheck)*
+   * typecheck (('==' | '!=' | '>=' | '<=' | '>' | '<') typecheck)*
    */
 
   get equality() {
     var op
       , node = this.typecheck;
     while (op = 
          this.accept('==')
+      || this.accept('!=')
       || this.accept('>=')
       || this.accept('<=')
       || this.accept('<')

diff --git a/test/integration/tests/operators.css b/test/integration/tests/operators.css
@@ -24,4 +24,5 @@ body {
   foo: true;
   foo: false;
   foo: "got 15px";
+  foo: true;
 }
diff --git a/test/integration/tests/operators.in b/test/integration/tests/operators.in
@@ -76,3 +76,5 @@ body
   // "got 15px"
   foo "got " + 15px
 
+  // true
+  foo 1 != 5