From a865c05be732072f0f6be26c97ba97d30eb9ed34 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Tue, 3 Jan 2012 11:10:25 +0000 Subject: [PATCH] Switched the parser to use the compiler rather than the renderer The renderer will be going away shortly --- js/WikiTextParser.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/js/WikiTextParser.js b/js/WikiTextParser.js index 21039a6ef..5097e2561 100644 --- a/js/WikiTextParser.js +++ b/js/WikiTextParser.js @@ -10,6 +10,7 @@ Parses a block of tiddlywiki-format wiki text into a parse tree object. "use strict"; var WikiTextRenderer = require("./WikiTextRenderer.js").WikiTextRenderer, + WikiTextCompiler = require("./WikiTextCompiler.js").WikiTextCompiler, utils = require("./Utils.js"), util = require("util"); @@ -130,8 +131,16 @@ WikiTextParser.prototype.subWikifyTerm = function(output,terminatorRegExp) { }; WikiTextParser.prototype.render = function(type,treenode,store,title) { - var renderer = new WikiTextRenderer(store,title,this); - return renderer.render(type,treenode); + var compiler = new WikiTextCompiler(store,title,this); + var code = compiler.compile(type,treenode); + var fn = eval(code); + var tiddler = store.getTiddler(title); + return fn(tiddler,store,utils); +}; + +WikiTextParser.prototype.compile = function(type,treenode,store,title) { + var compiler = new WikiTextCompiler(store,title,this); + return compiler.compile(type,treenode); }; exports.WikiTextParser = WikiTextParser;