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

traverse: clean up scope getIds building

Browse Source
This commit is contained in:
Sebastian McKenzie 2014-11-09 12:07:14 +11:00
parent 0b86a2fef8
commit cd9e289dee
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/6to5/traverse/scope.js
View File

@ -7,16 +7,22 @@ var _ = require("lodash");
function Scope(parent, block) { function Scope(parent, block) {
this.parent = parent; this.parent = parent;
this.block = block; this.block = block;
this.ids = block._scopeIds = block._scopeIds || Scope.getIds(block); this.ids = this.getIds();
this.getIds();
} }
Scope.getIds = function (block) { Scope.prototype.getIds = function () {
var ids = {}; var block = this.block;
if (block._scopeIds) return block._scopeIds;
var self = this;
var ids = block._scopeIds = {};
if (t.isBlockStatement(block)) { if (t.isBlockStatement(block)) {
_.each(block.body, function (node) { _.each(block.body, function (node) {
if (t.isVariableDeclaration(node) && node.kind !== "var") { if (t.isVariableDeclaration(node) && node.kind !== "var") {
_.merge(ids, t.getIds(node, true)); self.add(node, ids);
} }
}); });
} else if (t.isProgram(block) || t.isFunction(block)) { } else if (t.isProgram(block) || t.isFunction(block)) {
@ -26,7 +32,7 @@ Scope.getIds = function (block) {
} }
if (t.isDeclaration(node)) { if (t.isDeclaration(node)) {
_.merge(ids, t.getIds(node, true)); self.add(node, ids);
} else if (t.isFunction(node)) { } else if (t.isFunction(node)) {
return false; return false;
} }
@ -35,13 +41,17 @@ Scope.getIds = function (block) {
if (t.isFunction(block)) { if (t.isFunction(block)) {
_.each(block.params, function (param) { _.each(block.params, function (param) {
_.merge(ids, t.getIds(param, true)); self.add(param, ids);
}); });
} }
return ids; return ids;
}; };
Scope.prototype.add = function (node, ids) {
_.merge(ids || this.ids, t.getIds(node, true));
};
Scope.prototype.get = function (id) { Scope.prototype.get = function (id) {
return id && (this.getOwn(id) || this.parentGet(id)); return id && (this.getOwn(id) || this.parentGet(id));
}; };