grouped TRUE/FALSE/NULL into BOOL

lib/grammar.js

@@ -64,12 +64,8 @@
         return new Literal($1);
       }), o("REGEX", function() {
         return new Literal($1);
-      }), o("TRUE", function() {
+      }), o("BOOL", function() {
-        return new Literal(true);
+        return new Literal($1);
-      }), o("FALSE", function() {
-        return new Literal(false);
-      }), o("NULL", function() {
-        return new Literal('null');
       })
     ],
     Assign: [

lib/lexer.js

@@ -1,5 +1,5 @@
 (function() {
-  var ASSIGNED, CALLABLE, CODE, COFFEE_ALIASES, COFFEE_KEYWORDS, COMMENT, COMPARE, COMPOUND_ASSIGN, HEREDOC, HEREDOC_INDENT, HEREGEX, HEREGEX_OMIT, IDENTIFIER, JSTOKEN, JS_FORBIDDEN, JS_KEYWORDS, LEADING_SPACES, LINE_BREAK, LOGIC, Lexer, MATH, MULTILINER, MULTI_DENT, NEXT_CHARACTER, NOT_REGEX, NO_NEWLINE, NUMBER, OPERATOR, REGEX, RELATION, RESERVED, Rewriter, SHIFT, SIMPLESTR, TRAILING_SPACES, UNARY, WHITESPACE, _ref, compact, count, include, last, op, starts;
+  var ASSIGNED, BOOL, CALLABLE, CODE, COFFEE_ALIASES, COFFEE_KEYWORDS, COMMENT, COMPARE, COMPOUND_ASSIGN, HEREDOC, HEREDOC_INDENT, HEREGEX, HEREGEX_OMIT, IDENTIFIER, JSTOKEN, JS_FORBIDDEN, JS_KEYWORDS, LEADING_SPACES, LINE_BREAK, LOGIC, Lexer, MATH, MULTILINER, MULTI_DENT, NEXT_CHARACTER, NOT_REGEX, NO_NEWLINE, NUMBER, OPERATOR, REGEX, RELATION, RESERVED, Rewriter, SHIFT, SIMPLESTR, TRAILING_SPACES, UNARY, WHITESPACE, _ref, compact, count, include, last, op, starts;
   Rewriter = require('./rewriter').Rewriter;
   _ref = require('./helpers'), include = _ref.include, count = _ref.count, starts = _ref.starts, compact = _ref.compact, last = _ref.last;
   exports.Lexer = (function() {
@@ -79,6 +79,9 @@
           tag = 'UNARY';
         } else if (include(LOGIC, id)) {
           tag = 'LOGIC';
+        } else if (include(BOOL, tag)) {
+          id = tag.toLowerCase();
+          tag = 'BOOL';
         }
       }
       this.token(tag, id);
@@ -622,7 +625,8 @@
   COMPARE = ['<=', '<', '>', '>='];
   MATH = ['*', '/', '%'];
   RELATION = ['IN', 'OF', 'INSTANCEOF'];
-  NOT_REGEX = ['NUMBER', 'REGEX', '++', '--', 'FALSE', 'NULL', 'TRUE', ']'];
+  BOOL = ['TRUE', 'FALSE', 'NULL'];
+  NOT_REGEX = ['NUMBER', 'REGEX', 'BOOL', '++', '--', ']'];
   CALLABLE = ['IDENTIFIER', 'SUPER', ')', ']', '}', 'STRING', '@', 'THIS', '?', '::'];
   LINE_BREAK = ['INDENT', 'OUTDENT', 'TERMINATOR'];
 }).call(this);

lib/rewriter.js

@@ -365,7 +365,7 @@
   }
   EXPRESSION_CLOSE = ['CATCH', 'WHEN', 'ELSE', 'FINALLY'].concat(EXPRESSION_END);
   IMPLICIT_FUNC = ['IDENTIFIER', 'SUPER', ')', 'CALL_END', ']', 'INDEX_END', '@', 'THIS'];
-  IMPLICIT_CALL = ['IDENTIFIER', 'NUMBER', 'STRING', 'JS', 'REGEX', 'NEW', 'PARAM_START', 'CLASS', 'IF', 'UNLESS', 'TRY', 'SWITCH', 'THIS', 'NULL', 'UNARY', 'TRUE', 'FALSE', '@', '->', '=>', '[', '(', '{'];
+  IMPLICIT_CALL = ['IDENTIFIER', 'NUMBER', 'STRING', 'JS', 'REGEX', 'NEW', 'PARAM_START', 'CLASS', 'IF', 'UNLESS', 'TRY', 'SWITCH', 'THIS', 'BOOL', 'UNARY', '@', '->', '=>', '[', '(', '{'];
   IMPLICIT_BLOCK = ['->', '=>', '{', '[', ','];
   IMPLICIT_END = ['POST_IF', 'POST_UNLESS', 'FOR', 'WHILE', 'UNTIL', 'LOOP', 'TERMINATOR', 'INDENT'];
   SINGLE_LINERS = ['ELSE', '->', '=>', 'TRY', 'FINALLY', 'THEN'];

src/grammar.coffee

@@ -130,9 +130,7 @@ grammar =
     o "AlphaNumeric"
     o "JS",                                     -> new Literal $1
     o "REGEX",                                  -> new Literal $1
-    o "TRUE",                                   -> new Literal true
+    o "BOOL",                                   -> new Literal $1
-    o "FALSE",                                  -> new Literal false
-    o "NULL",                                   -> new Literal 'null'
   ]
 
   # Assignment of a variable, property, or index to a value.

src/lexer.coffee

@@ -111,6 +111,9 @@ exports.Lexer = class Lexer
         tag = 'UNARY'
       else if include LOGIC, id
         tag = 'LOGIC'
+      else if include BOOL, tag
+        id  = tag.toLowerCase()
+        tag = 'BOOL'
     @token tag, id
     true
 
@@ -604,13 +607,16 @@ MATH    = ['*', '/', '%']
 # Relational tokens that are negatable with `not` prefix.
 RELATION = ['IN', 'OF', 'INSTANCEOF']
 
+# Boolean tokens.
+BOOL = ['TRUE', 'FALSE', 'NULL']
+
 # Tokens which a regular expression will never immediately follow, but which
 # a division operator might.
 #
 # See: http://www.mozilla.org/js/language/js20-2002-04/rationale/syntax.html#regular-expressions
 #
 # Our list is shorter, due to sans-parentheses method calls.
-NOT_REGEX = ['NUMBER', 'REGEX', '++', '--', 'FALSE', 'NULL', 'TRUE', ']']
+NOT_REGEX = ['NUMBER', 'REGEX', 'BOOL', '++', '--', ']']
 
 # Tokens which could legitimately be invoked or indexed. A opening
 # parentheses or bracket following these tokens will be recorded as the start

src/rewriter.coffee

@@ -328,7 +328,7 @@ IMPLICIT_FUNC    = ['IDENTIFIER', 'SUPER', ')', 'CALL_END', ']', 'INDEX_END', '@
 # If preceded by an `IMPLICIT_FUNC`, indicates a function invocation.
 IMPLICIT_CALL    = [
   'IDENTIFIER', 'NUMBER', 'STRING', 'JS', 'REGEX', 'NEW', 'PARAM_START', 'CLASS'
-  'IF', 'UNLESS', 'TRY', 'SWITCH', 'THIS', 'NULL', 'UNARY', 'TRUE', 'FALSE'
+  'IF', 'UNLESS', 'TRY', 'SWITCH', 'THIS', 'BOOL', 'UNARY',
   '@', '->', '=>', '[', '(', '{'
 ]