From 0da3065987a9f1b0e1370e06f7de06441a84eb8d Mon Sep 17 00:00:00 2001 From: wycats Date: Tue, 28 Dec 2010 15:46:26 -0800 Subject: [PATCH] Clean up after-effects of Jison fix --- lib/handlebars.js | 1 - lib/handlebars/runtime.js | 3 +-- test.js | 56 --------------------------------------- 3 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 test.js diff --git a/lib/handlebars.js b/lib/handlebars.js index 0b867409..c2f88b3d 100644 --- a/lib/handlebars.js +++ b/lib/handlebars.js @@ -1,7 +1,6 @@ var Handlebars = require("handlebars/compiler").Handlebars; Handlebars.AST = require("handlebars/ast").AST; -Handlebars.HandlebarsLexer = require("handlebars/handlebars_lexer").Lexer; Handlebars.PrintVisitor = require("handlebars/printer").PrintVisitor; Handlebars.Runtime = require("handlebars/runtime").Runtime; Handlebars.Context = require("Handlebars/runtime").Context; diff --git a/lib/handlebars/runtime.js b/lib/handlebars/runtime.js index f31e3184..ae2a2709 100644 --- a/lib/handlebars/runtime.js +++ b/lib/handlebars/runtime.js @@ -5,8 +5,7 @@ var inspect = function(obj) { var Handlebars = {}; Handlebars.AST = require("handlebars/ast").AST; -Handlebars.HandlebarsLexer = require("handlebars/handlebars_lexer").Lexer; -Handlebars.Visitor = require("handlebars/jison_ext").Visitor; +Handlebars.Visitor = require("handlebars/visitor").Visitor; Handlebars.PrintVisitor = require("handlebars/printer").PrintVisitor; Handlebars.Parser = require("handlebars/parser").parser; Handlebars.Runtime = require("handlebars/runtime").Runtime; diff --git a/test.js b/test.js deleted file mode 100644 index a8d07a1b..00000000 --- a/test.js +++ /dev/null @@ -1,56 +0,0 @@ -if(exports) { - require.paths.push("lib"); - var Handlebars = require("handlebars").Handlebars; - - if(require("sys")) { - var print = function(val) { - require("sys").print(val + "\n") - } - } -} - -var string = "foo {{ bar ../baz/bat/bam \"baz\" }}baz{{! foo bar baz }}{{#foo}} bar {{^}} baz {{/foo}}{{> partial }}{{# bar }}part1 {{^}} part2{{> foo }}{{/bar}}zomg" -var string = "foo {{#list people}}{{name}}{{/list}}{{#bool}}true: {{name}}{{/bool}}{{#nobool}}false: {{name}}{{/nobool}}"; - - -var helperMissing = function(context, fn) { - var ret = ""; - - if(context === true) { - return fn(this); - } else if(context === false) { - return ""; - } else if(Object.prototype.toString.call(context) === "[object Array]") { - for(var i=0, j=context.length; i" + fn(ctx[i]) + ""; - } - return out + ""; - }, - helperMissing: helperMissing - }; - -var compiled = Handlebars.compile(string); - -var result; - -var time = new Date; - -for(var i=0; i<10000; i++) { - result = compiled(context, fallback); -} -print(new Date - time) -print(result)