Finish compatibility with the old handlebars:

* foo"bar" is an invalid param
* {{foo}}bar{{/baz}} is invalid
* fix a number of issues with inverse sections
* add partials
This commit is contained in:
wycats
2010-12-03 16:49:04 -05:00
parent 9a6f77af56
commit f205cec745
8 changed files with 173 additions and 96 deletions
+68 -55
View File
@@ -1,69 +1,82 @@
if(exports) { var Handlebars = {} }
Handlebars.AST = {};
(function() {
Handlebars.AST.ProgramNode = function(statements, inverse) {
this.type = "program";
this.statements = statements;
this.inverse = inverse;
};
Handlebars.AST = {};
Handlebars.AST.MustacheNode = function(params, unescaped) {
this.type = "mustache";
this.id = params[0];
this.params = params.slice(1);
this.escaped = !unescaped;
};
Handlebars.AST.ProgramNode = function(statements, inverse) {
this.type = "program";
this.statements = statements;
if(inverse) { this.inverse = new Handlebars.AST.ProgramNode(inverse); }
};
Handlebars.AST.PartialNode = function(id, context) {
this.type = "partial";
this.id = id;
this.context = context;
};
Handlebars.AST.MustacheNode = function(params, unescaped) {
this.type = "mustache";
this.id = params[0];
this.params = params.slice(1);
this.escaped = !unescaped;
};
Handlebars.AST.BlockNode = function(mustache, program) {
this.type = "block";
this.mustache = mustache;
this.program = program;
};
Handlebars.AST.PartialNode = function(id, context) {
this.type = "partial";
this.id = id;
this.context = context;
};
Handlebars.AST.InverseNode = function(mustache, program) {
this.type = "inverse";
this.mustache = mustache;
this.program = program;
};
Handlebars.AST.ContentNode = function(string) {
this.type = "content";
this.string = string;
}
Handlebars.AST.IdNode = function(parts) {
this.type = "ID"
var dig = [], depth = 0;
for(var i=0,l=parts.length; i<l; i++) {
var part = parts[i];
if(part === "..") { depth++; }
else if(part === "." || part === "this") { continue; }
else { dig.push(part) }
var verifyMatch = function(open, close) {
if(open.original !== close.original) {
throw new Handlebars.Exception(open.original + "doesn't match" + close.original);
}
}
this.parts = dig;
this.depth = depth;
}
Handlebars.AST.BlockNode = function(mustache, program, close) {
verifyMatch(mustache.id, close);
this.type = "block";
this.mustache = mustache;
this.program = program;
};
Handlebars.AST.StringNode = function(string) {
this.type = "STRING";
this.string = string;
}
Handlebars.AST.InverseNode = function(mustache, program, close) {
verifyMatch(mustache.id, close)
this.type = "inverse";
this.mustache = mustache;
this.program = program;
};
Handlebars.AST.CommentNode = function(comment) {
this.type = "comment";
this.comment = comment;
}
Handlebars.AST.ContentNode = function(string) {
this.type = "content";
this.string = string;
}
Handlebars.AST.IdNode = function(parts) {
this.type = "ID"
this.original = parts.join("/");
var dig = [], depth = 0;
for(var i=0,l=parts.length; i<l; i++) {
var part = parts[i];
if(part === "..") { depth++; }
else if(part === "." || part === "this") { continue; }
else { dig.push(part) }
}
this.parts = dig;
this.depth = depth;
}
Handlebars.AST.StringNode = function(string) {
this.type = "STRING";
this.string = string;
}
Handlebars.AST.CommentNode = function(comment) {
this.type = "comment";
this.comment = comment;
}
})();
if(exports) {
exports.AST = Handlebars.AST;