cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Store default walker in exports.base, rather than exports itself

Browse Source 
My initial idea, that client code would constantly need to access the individual
walker functions directly, isn't actually the case. This prevents unnecessary copying
of other interface functions into walkers.
This commit is contained in:
Marijn Haverbeke 2013-01-30 19:11:27 +01:00
parent 0632b36c94
commit d98e378590
1 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
util/walk.js
View File

@ -19,7 +19,7 @@
// walker, and state can be used to give this walked an initial // walker, and state can be used to give this walked an initial
// state. // state.
exports.simple = function(node, visitors, base, state) { exports.simple = function(node, visitors, base, state) {
if (!base) base = exports; if (!base) base = exports.base;
function c(node, st, override) { function c(node, st, override) {
var type = override || node.type, found = visitors[type]; var type = override || node.type, found = visitors[type];
base[type](node, st, c); base[type](node, st, c);
@ -48,7 +48,7 @@
// undefined when it doesn't find a matching node. // undefined when it doesn't find a matching node.
exports.findNodeAt = function(node, start, end, targetType, base, state) { exports.findNodeAt = function(node, start, end, targetType, base, state) {
try { try {
if (!base) base = exports; if (!base) base = exports.base;
var c = function(node, st, override) { var c = function(node, st, override) {
var type = override || node.type; var type = override || node.type;
if ((start == null || node.start <= start) && if ((start == null || node.start <= start) &&
@ -70,7 +70,7 @@
// position. Interface similar to findNodeAt. // position. Interface similar to findNodeAt.
exports.findNodeAround = function(node, pos, targetType, base, state) { exports.findNodeAround = function(node, pos, targetType, base, state) {
try { try {
if (!base) base = exports; if (!base) base = exports.base;
var c = function(node, st, override) { var c = function(node, st, override) {
var type = override || node.type; var type = override || node.type;
var inside = node.start <= pos && node.end >= pos; var inside = node.start <= pos && node.end >= pos;
@ -89,7 +89,7 @@
// Used to create a custom walker. Will fill in all missing node // Used to create a custom walker. Will fill in all missing node
// type properties with the defaults. // type properties with the defaults.
exports.make = function(funcs, base) { exports.make = function(funcs, base) {
if (!base) base = exports; if (!base) base = exports.base;
var visitor = {}; var visitor = {};
for (var type in base) visitor[type] = base[type]; for (var type in base) visitor[type] = base[type];
for (var type in funcs) visitor[type] = funcs[type]; for (var type in funcs) visitor[type] = funcs[type];
@ -101,29 +101,30 @@
// Node walkers. // Node walkers.
exports.Program = exports.BlockStatement = function(node, st, c) { var base = exports.base = {};
base.Program = base.BlockStatement = function(node, st, c) {
for (var i = 0; i < node.body.length; ++i) for (var i = 0; i < node.body.length; ++i)
c(node.body[i], st, "Statement"); c(node.body[i], st, "Statement");
}; };
exports.Statement = skipThrough; base.Statement = skipThrough;
exports.EmptyStatement = ignore; base.EmptyStatement = ignore;
exports.ExpressionStatement = function(node, st, c) { base.ExpressionStatement = function(node, st, c) {
c(node.expression, st, "Expression"); c(node.expression, st, "Expression");
}; };
exports.IfStatement = function(node, st, c) { base.IfStatement = function(node, st, c) {
c(node.test, st, "Expression"); c(node.test, st, "Expression");
c(node.consequent, st, "Statement"); c(node.consequent, st, "Statement");
if (node.alternate) c(node.alternate, st, "Statement"); if (node.alternate) c(node.alternate, st, "Statement");
}; };
exports.LabeledStatement = function(node, st, c) { base.LabeledStatement = function(node, st, c) {
c(node.body, st, "Statement"); c(node.body, st, "Statement");
}; };
exports.BreakStatement = exports.ContinueStatement = ignore; base.BreakStatement = base.ContinueStatement = ignore;
exports.WithStatement = function(node, st, c) { base.WithStatement = function(node, st, c) {
c(node.object, st, "Expression"); c(node.object, st, "Expression");
c(node.body, st, "Statement"); c(node.body, st, "Statement");
}; };
exports.SwitchStatement = function(node, st, c) { base.SwitchStatement = function(node, st, c) {
c(node.discriminant, st, "Expression"); c(node.discriminant, st, "Expression");
for (var i = 0; i < node.cases.length; ++i) { for (var i = 0; i < node.cases.length; ++i) {
var cs = node.cases[i]; var cs = node.cases[i];
@ -132,96 +133,96 @@
c(cs.consequent[j], st, "Statement"); c(cs.consequent[j], st, "Statement");
} }
}; };
exports.ReturnStatement = function(node, st, c) { base.ReturnStatement = function(node, st, c) {
if (node.argument) c(node.argument, st, "Expression"); if (node.argument) c(node.argument, st, "Expression");
}; };
exports.ThrowStatement = function(node, st, c) { base.ThrowStatement = function(node, st, c) {
c(node.argument, st, "Expression"); c(node.argument, st, "Expression");
}; };
exports.TryStatement = function(node, st, c) { base.TryStatement = function(node, st, c) {
c(node.block, st, "Statement"); c(node.block, st, "Statement");
for (var i = 0; i < node.handlers.length; ++i) for (var i = 0; i < node.handlers.length; ++i)
c(node.handlers[i].body, st, "ScopeBody"); c(node.handlers[i].body, st, "ScopeBody");
if (node.finalizer) c(node.finalizer, st, "Statement"); if (node.finalizer) c(node.finalizer, st, "Statement");
}; };
exports.WhileStatement = function(node, st, c) { base.WhileStatement = function(node, st, c) {
c(node.test, st, "Expression"); c(node.test, st, "Expression");
c(node.body, st, "Statement"); c(node.body, st, "Statement");
}; };
exports.DoWhileStatement = exports.WhileStatement; base.DoWhileStatement = base.WhileStatement;
exports.ForStatement = function(node, st, c) { base.ForStatement = function(node, st, c) {
if (node.init) c(node.init, st, "ForInit"); if (node.init) c(node.init, st, "ForInit");
if (node.test) c(node.test, st, "Expression"); if (node.test) c(node.test, st, "Expression");
if (node.update) c(node.update, st, "Expression"); if (node.update) c(node.update, st, "Expression");
c(node.body, st, "Statement"); c(node.body, st, "Statement");
}; };
exports.ForInStatement = function(node, st, c) { base.ForInStatement = function(node, st, c) {
c(node.left, st, "ForInit"); c(node.left, st, "ForInit");
c(node.right, st, "Expression"); c(node.right, st, "Expression");
c(node.body, st, "Statement"); c(node.body, st, "Statement");
}; };
exports.ForInit = function(node, st, c) { base.ForInit = function(node, st, c) {
if (node.type == "VariableDeclaration") c(node, st); if (node.type == "VariableDeclaration") c(node, st);
else c(node, st, "Expression"); else c(node, st, "Expression");
}; };
exports.DebuggerStatement = ignore; base.DebuggerStatement = ignore;
exports.FunctionDeclaration = function(node, st, c) { base.FunctionDeclaration = function(node, st, c) {
c(node, st, "Function"); c(node, st, "Function");
}; };
exports.VariableDeclaration = function(node, st, c) { base.VariableDeclaration = function(node, st, c) {
for (var i = 0; i < node.declarations.length; ++i) { for (var i = 0; i < node.declarations.length; ++i) {
var decl = node.declarations[i]; var decl = node.declarations[i];
if (decl.init) c(decl.init, st, "Expression"); if (decl.init) c(decl.init, st, "Expression");
} }
}; };
exports.Function = function(node, st, c) { base.Function = function(node, st, c) {
c(node.body, st, "ScopeBody"); c(node.body, st, "ScopeBody");
}; };
exports.ScopeBody = function(node, st, c) { base.ScopeBody = function(node, st, c) {
c(node, st, "Statement"); c(node, st, "Statement");
}; };
exports.Expression = skipThrough; base.Expression = skipThrough;
exports.ThisExpression = ignore; base.ThisExpression = ignore;
exports.ArrayExpression = function(node, st, c) { base.ArrayExpression = function(node, st, c) {
for (var i = 0; i < node.elements.length; ++i) { for (var i = 0; i < node.elements.length; ++i) {
var elt = node.elements[i]; var elt = node.elements[i];
if (elt) c(elt, st, "Expression"); if (elt) c(elt, st, "Expression");
} }
}; };
exports.ObjectExpression = function(node, st, c) { base.ObjectExpression = function(node, st, c) {
for (var i = 0; i < node.properties.length; ++i) for (var i = 0; i < node.properties.length; ++i)
c(node.properties[i].value, st, "Expression"); c(node.properties[i].value, st, "Expression");
}; };
exports.FunctionExpression = exports.FunctionDeclaration; base.FunctionExpression = base.FunctionDeclaration;
exports.SequenceExpression = function(node, st, c) { base.SequenceExpression = function(node, st, c) {
for (var i = 0; i < node.expressions.length; ++i) for (var i = 0; i < node.expressions.length; ++i)
c(node.expressions[i], st, "Expression"); c(node.expressions[i], st, "Expression");
}; };
exports.UnaryExpression = exports.UpdateExpression = function(node, st, c) { base.UnaryExpression = base.UpdateExpression = function(node, st, c) {
c(node.argument, st, "Expression"); c(node.argument, st, "Expression");
}; };
exports.BinaryExpression = exports.AssignmentExpression = exports.LogicalExpression = function(node, st, c) { base.BinaryExpression = base.AssignmentExpression = base.LogicalExpression = function(node, st, c) {
c(node.left, st, "Expression"); c(node.left, st, "Expression");
c(node.right, st, "Expression"); c(node.right, st, "Expression");
}; };
exports.ConditionalExpression = function(node, st, c) { base.ConditionalExpression = function(node, st, c) {
c(node.test, st, "Expression"); c(node.test, st, "Expression");
c(node.consequent, st, "Expression"); c(node.consequent, st, "Expression");
c(node.alternate, st, "Expression"); c(node.alternate, st, "Expression");
}; };
exports.NewExpression = exports.CallExpression = function(node, st, c) { base.NewExpression = base.CallExpression = function(node, st, c) {
c(node.callee, st, "Expression"); c(node.callee, st, "Expression");
if (node.arguments) for (var i = 0; i < node.arguments.length; ++i) if (node.arguments) for (var i = 0; i < node.arguments.length; ++i)
c(node.arguments[i], st, "Expression"); c(node.arguments[i], st, "Expression");
}; };
exports.MemberExpression = function(node, st, c) { base.MemberExpression = function(node, st, c) {
c(node.object, st, "Expression"); c(node.object, st, "Expression");
if (node.computed) c(node.property, st, "Expression"); if (node.computed) c(node.property, st, "Expression");
}; };
exports.Identifier = exports.Literal = ignore; base.Identifier = base.Literal = ignore;
// A custom walker that keeps track of the scope chain and the // A custom walker that keeps track of the scope chain and the
// variables defined in it. // variables defined in it.