Skip to content

Improve traverse and parse performance #900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 9, 2016
Merged

Improve traverse and parse performance #900

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 18 additions & 24 deletions build/jslib/parse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ define(['./esprimaAdapter', 'lang'], function (esprima, lang) {

//From an esprima example for traversing its ast.
function traverse(object, visitor) {
var key, child;
var child;

if (!object) {
return;
Expand All @@ -35,13 +35,11 @@ define(['./esprimaAdapter', 'lang'], function (esprima, lang) {
if (visitor.call(null, object) === false) {
return false;
}
for (key in object) {
if (object.hasOwnProperty(key)) {
child = object[key];
if (typeof child === 'object' && child !== null) {
if (traverse(child, visitor) === false) {
return false;
}
for (var i = 0, keys = Object.keys(object); i < keys.length; i++) {
child = object[keys[i]];
if (typeof child === 'object' && child !== null) {
if (traverse(child, visitor) === false) {
return false;
}
}
}
Expand All @@ -51,7 +49,7 @@ define(['./esprimaAdapter', 'lang'], function (esprima, lang) {
//stops that subtree analysis, not the rest of tree
//visiting.
function traverseBroad(object, visitor) {
var key, child;
var child;

if (!object) {
return;
Expand All @@ -60,12 +58,10 @@ define(['./esprimaAdapter', 'lang'], function (esprima, lang) {
if (visitor.call(null, object) === false) {
return false;
}
for (key in object) {
if (object.hasOwnProperty(key)) {
child = object[key];
if (typeof child === 'object' && child !== null) {
traverseBroad(child, visitor);
}
for (var i = 0, keys = Object.keys(object); i < keys.length; i++) {
child = object[key];
if (typeof child === 'object' && child !== null) {
traverseBroad(child, visitor);
}
}
}
Expand Down Expand Up @@ -212,7 +208,7 @@ define(['./esprimaAdapter', 'lang'], function (esprima, lang) {
//Like traverse, but skips if branches that would not be processed
//after has application that results in tests of true or false boolean
//literal values.
var key, child, result, i, params, param, tempObject,
var keys, child, result, i, params, param, tempObject,
hasHas = options && options.has;

fnExpScope = fnExpScope || emptyScope;
Expand Down Expand Up @@ -266,14 +262,12 @@ define(['./esprimaAdapter', 'lang'], function (esprima, lang) {
}
}

for (key in object) {
if (object.hasOwnProperty(key)) {
child = object[key];
if (typeof child === 'object' && child !== null) {
result = this.recurse(child, onMatch, options, fnExpScope);
if (typeof result === 'string') {
break;
}
for (i = 0, keys = Object.keys(object); i < keys.length; i++) {
child = object[keys[i]];
if (typeof child === 'object' && child !== null) {
result = this.recurse(child, onMatch, options, fnExpScope);
if (typeof result === 'string') {
break;
}
}
}
Expand Down