Merge branch 'marcioj-boolean-literals'

docs/compiler-api.md

@@ -56,7 +56,7 @@ interface Statement <: Node { }
 interface MustacheStatement <: Statement {
     type: "MustacheStatement";
 
-    path: PathExpression;
+    path: PathExpression | Literal;
     params: [ Expression ];
     hash: Hash;
 

lib/handlebars/compiler/compiler.js

@@ -110,6 +110,8 @@ Compiler.prototype = {
   },
 
   BlockStatement: function(block) {
+    transformLiteralToPath(block);
+
     var program = block.program,
         inverse = block.inverse;
 
@@ -190,6 +192,7 @@ Compiler.prototype = {
   CommentStatement: function() {},
 
   SubExpression: function(sexpr) {
+    transformLiteralToPath(sexpr);
     var type = this.classifySexpr(sexpr);
 
     if (type === 'simple') {
@@ -485,3 +488,12 @@ function argEquals(a, b) {
     return true;
   }
 }
+
+function transformLiteralToPath(sexpr) {
+  if (!sexpr.path.parts) {
+    var literal = sexpr.path;
+    // Casting to string here to make false and 0 literal values play nicely with the rest
+    // of the system.
+    sexpr.path = new AST.PathExpression(false, 0, [literal.original+''], literal.original+'', literal.log);
+  }
+}

spec/basic.js

@@ -229,4 +229,33 @@ describe("basic context", function() {
       CompilerContext.compile(string);
     }, Error);
   });
+
+  it('pass string literals', function() {
+    shouldCompileTo('{{"foo"}}', {}, '');
+    shouldCompileTo('{{"foo"}}', { foo: 'bar' }, 'bar');
+    shouldCompileTo('{{#"foo"}}{{.}}{{/"foo"}}', { foo: ['bar', 'baz'] }, 'barbaz');
+  });
+
+  it('pass number literals', function() {
+    shouldCompileTo('{{12}}', {}, '');
+    shouldCompileTo('{{12}}', { '12': 'bar' }, 'bar');
+    shouldCompileTo('{{12.34}}', {}, '');
+    shouldCompileTo('{{12.34}}', { '12.34': 'bar' }, 'bar');
+    shouldCompileTo('{{12.34 1}}', { '12.34': function(arg) { return 'bar' + arg; } }, 'bar1');
+  });
+
+  it('pass boolean literals', function() {
+    shouldCompileTo('{{true}}', {}, '');
+    shouldCompileTo('{{true}}', { '': 'foo' }, '');
+    shouldCompileTo('{{false}}', { 'false': 'foo' }, 'foo');
+  });
+
+  it('should handle literals in subexpression', function() {
+    var helpers = {
+      foo: function(arg) {
+        return arg;
+      }
+    };
+    shouldCompileTo('{{foo (false)}}', [{ 'false': function() { return 'bar'; } }, helpers], 'bar');
+  });
 });

spec/parser.js

@@ -10,6 +10,10 @@ describe('parser', function() {
   }
 
   it('parses simple mustaches', function() {
+    equals(ast_for('{{123}}'), "{{ NUMBER{123} [] }}\n");
+    equals(ast_for('{{"foo"}}'), '{{ "foo" [] }}\n');
+    equals(ast_for('{{false}}'), '{{ BOOLEAN{false} [] }}\n');
+    equals(ast_for('{{true}}'), '{{ BOOLEAN{true} [] }}\n');
     equals(ast_for('{{foo}}'), "{{ PATH:foo [] }}\n");
     equals(ast_for('{{foo?}}'), "{{ PATH:foo? [] }}\n");
     equals(ast_for('{{foo_}}'), "{{ PATH:foo_ [] }}\n");

src/handlebars.yy

@@ -66,7 +66,7 @@ inverseChain
   ;
 
 closeBlock
-  : OPEN_ENDBLOCK path CLOSE -> {path: $2, strip: yy.stripFlags($1, $3)}
+  : OPEN_ENDBLOCK helperName CLOSE -> {path: $2, strip: yy.stripFlags($1, $3)}
   ;
 
 mustache
@@ -81,11 +81,7 @@ partial
   ;
 
 param
-  : path -> $1
-  | STRING -> new yy.StringLiteral($1, yy.locInfo(@$))
-  | NUMBER -> new yy.NumberLiteral($1, yy.locInfo(@$))
-  | BOOLEAN -> new yy.BooleanLiteral($1, yy.locInfo(@$))
-  | dataName -> $1
+  : helperName -> $1
   | sexpr -> $1
   ;
 
@@ -108,8 +104,9 @@ blockParams
 helperName
   : path -> $1
   | dataName -> $1
-  | STRING -> new yy.StringLiteral($1, yy.locInfo(@$)), yy.locInfo(@$)
+  | STRING -> new yy.StringLiteral($1, yy.locInfo(@$))
   | NUMBER -> new yy.NumberLiteral($1, yy.locInfo(@$))
+  | BOOLEAN -> new yy.BooleanLiteral($1, yy.locInfo(@$))
   ;
 
 partialName