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

add declaration/reference support to scope

Browse Source
This commit is contained in:
Sebastian McKenzie
2014-12-16 08:06:56 +11:00
parent bd78e3ed4d
commit fc7fc384c9
2 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/6to5/traverse/index.js
View File

@@ -93,9 +93,9 @@ function traverse(parent, callbacks, opts) {
traverse.removeProperties = function (tree) {
var clear = function (node) {
delete node._scopeReferences;
delete node._declarations;
delete node.extendedRange;
delete node._scopeInfo;
delete node._parent;
delete node._scope;
delete node.tokens;

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

@@ -18,9 +18,14 @@ function Scope(block, parent) {
this.parent = parent;
this.block = block;
this.references = this.getReferences();
var info = this.getInfo();
this.references = info.references;
this.declarations = info.declarations;
}
var vars = require("jshint/src/vars");
Scope.defaultDeclarations = _.flatten([vars.newEcmaIdentifiers, vars.node, vars.ecmaIdentifiers, vars.reservedVars].map(_.keys));
Scope.add = function (node, references) {
if (!node) return;
_.defaults(references, t.getIds(node, true));
@@ -35,14 +40,17 @@ Scope.prototype.generateTemp = function (file, name) {
return id;
};
Scope.prototype.getReferences = function () {
Scope.prototype.getInfo = function () {
var block = this.block;
if (block._scopeReferences) return block._scopeReferences;
if (block._scopeInfo) return block._scopeInfo;
var references = block._scopeReferences = {};
var info = block._scopeInfo = {};
var references = info.references = {};
var declarations = info.declarations = {};
var add = function (node) {
var add = function (node, reference) {
Scope.add(node, references);
if (!reference) Scope.add(node, declarations);
};
// ForStatement - left, init
@@ -90,7 +98,7 @@ Scope.prototype.getReferences = function () {
if (block.id && node === block.id) return;
if (t.isIdentifier(node) && t.isReferenced(node, parent) && !scope.has(node.name)) {
add(node);
add(node, true);
}
// we've ran into a declaration!
@@ -110,7 +118,7 @@ Scope.prototype.getReferences = function () {
});
}
return references;
return info;
};
Scope.prototype.push = function (opts) {
@@ -137,26 +145,29 @@ Scope.prototype.add = function (node) {
Scope.add(node, this.references);
};
Scope.prototype.get = function (id) {
return id && (this.getOwn(id) || this.parentGet(id));
Scope.prototype.get = function (id, decl) {
return id && (this.getOwn(id, decl) || this.parentGet(id, decl));
};
Scope.prototype.getOwn = function (id) {
return _.has(this.references, id) && this.references[id];
Scope.prototype.getOwn = function (id, decl) {
var refs = this.references;
if (decl) refs = this.declarations;
return _.has(refs, id) && refs[id];
};
Scope.prototype.parentGet = function (id) {
return this.parent && this.parent.get(id);
Scope.prototype.parentGet = function (id, decl) {
return this.parent && this.parent.get(id, decl);
};
Scope.prototype.has = function (id) {
return id && (this.hasOwn(id) || this.parentHas(id));
Scope.prototype.has = function (id, decl) {
return (id && (this.hasOwn(id, decl) || this.parentHas(id, decl))) ||
_.contains(Scope.defaultDeclarations, id);
};
Scope.prototype.hasOwn = function (id) {
return !!this.getOwn(id);
Scope.prototype.hasOwn = function (id, decl) {
return !!this.getOwn(id, decl);
};
Scope.prototype.parentHas = function (id) {
return this.parent && this.parent.has(id);
Scope.prototype.parentHas = function (id, decl) {
return this.parent && this.parent.has(id, decl);
};