mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-10-25 12:47:40 +00:00
Code Issues Releases Wiki Activity

Use the new esprima parser to display javascript modules as parse trees

Browse Source
This commit is contained in:
Jeremy Ruston
2012-03-01 23:59:46 +00:00
parent a274bad1a2
commit 8552f2f894
6 changed files with 54 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/Renderer.js
View File

@@ -11,7 +11,8 @@ Renderer objects
var utils = require("./Utils.js"),
ArgParser = require("./ArgParser.js").ArgParser,
Dependencies = require("./Dependencies.js").Dependencies;
Dependencies = require("./Dependencies.js").Dependencies,
esprima = require("esprima");
var Node = function(children) {
if(this instanceof Node) {
@@ -79,12 +80,13 @@ MacroNode.prototype = new Node();
MacroNode.prototype.constructor = MacroNode;
MacroNode.prototype.parseMacroParamString = function(paramString) {
/*jslint evil: true */
var params = {},
args = new ArgParser(paramString,{defaultName: "anon", cascadeDefaults: this.macro.cascadeDefaults}),
self = this,
insertParam = function(name,arg) {
if(arg.evaluated) {
params[name] = self.store.jsParser.createTree( // (function(tiddler,store,utils) {return {paramOne: 1};})
params[name] = eval(esprima.generate( // (function(tiddler,store,utils) {return {paramOne: 1};})
{
"type": "Program",
"body": [
@@ -112,7 +114,7 @@ MacroNode.prototype.parseMacroParamString = function(paramString) {
"body": [
{
"type": "ReturnStatement",
"argument": self.store.jsParser.parse("(" + arg.string + ")").tree.body[0].expression
"argument": esprima.parse("(" + arg.string + ")").body[0].expression
}
]
}
@@ -120,7 +122,7 @@ MacroNode.prototype.parseMacroParamString = function(paramString) {
}
]
}
).compile("application/javascript").render;
));
} else {
params[name] = arg.string;
}