joepie91/pegjs
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Get rid of for-in loops

Browse source 
The for-in statement in JavaScript iterates also over inherited
properties. This is typically not desired and requires adding a
check using Object.prototype.hasOwnProperty inside the loop.

This commit replaces all for-in statements and related checks inside
them with iteration over Object.keys(...). The iteration is performed
using either Array.prototype.forEach of a plain for loop.
This commit is contained in:
David Majda 2016-09-14 16:08:14 +02:00
parent b2a9dabcff
commit 7f01db2fb8
6 changed files with 55 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/pegjs
View file

@ -69,11 +69,9 @@ function addExtraOptions(options, json) {
abort("The JSON with extra options has to represent an object.");
}
for (let key in extraOptions) {
if (extraOptions.hasOwnProperty(key)) {
options[key] = extraOptions[key];
}
}
Object.keys(extraOptions).forEach(key => {
options[key] = extraOptions[key];
});
}
/*

8
lib/compiler/index.js
View file

@ -67,11 +67,9 @@ let compiler = {
trace: false
});
for (let stage in passes) {
if (passes.hasOwnProperty(stage)) {
passes[stage].forEach(p => { p(ast, options); });
}
}
Object.keys(passes).forEach(stage => {
passes[stage].forEach(p => { p(ast, options); });
});
switch (options.output) {
case "parser": return eval(ast.code);

10
lib/peg.js
View file

@ -25,12 +25,10 @@ let peg = {
function convertPasses(passes) {
let converted = {};
for (let stage in passes) {
if (passes.hasOwnProperty(stage)) {
converted[stage] = Object.keys(passes[stage])
.map(name => passes[stage][name]);
}
}
Object.keys(passes).forEach(stage => {
converted[stage] = Object.keys(passes[stage])
.map(name => passes[stage][name]);
});
return converted;
}

33
spec/behavior/generated-parser-behavior.spec.js
View file

@ -10,11 +10,9 @@ describe("generated parser behavior", function() {
function clone(object) {
let result = {};
for (let key in object) {
if (object.hasOwnProperty(key)) {
result[key] = object[key];
}
}
Object.keys(object).forEach(key => {
result[key] = object[key];
});
return result;
}
@ -89,19 +87,20 @@ describe("generated parser behavior", function() {
+ jasmine.pp(e.message) + ".";
} else {
if (details) {
for (let key in details) {
if (details.hasOwnProperty(key)) {
if (!this.env.equals_(e[key], details[key])) {
this.message = () =>
"Expected " + jasmine.pp(input) + " "
+ "with options " + jasmine.pp(options) + " "
+ "to fail to parse"
+ (details ? " with details " + jasmine.pp(details) : "") + ", "
+ "but " + jasmine.pp(key) + " "
+ "is " + jasmine.pp(e[key]) + ".";
let keys = Object.keys(details);
for (let i = 0; i < keys.length; i++) {
let key = keys[i];
return false;
}
if (!this.env.equals_(e[key], details[key])) {
this.message = () =>
"Expected " + jasmine.pp(input) + " "
+ "with options " + jasmine.pp(options) + " "
+ "to fail to parse"
+ (details ? " with details " + jasmine.pp(details) : "") + ", "
+ "but " + jasmine.pp(key) + " "
+ "is " + jasmine.pp(e[key]) + ".";
return false;
}
}
}

34
spec/unit/compiler/passes/helpers.js
View file

@ -28,12 +28,13 @@ beforeEach(function() {
} else if (isObject(details)) {
if (!isObject(value)) { return false; }
for (let key in details) {
if (details.hasOwnProperty(key)) {
if (!(key in value)) { return false; }
let keys = Object.keys(details);
for (let i = 0; i < keys.length; i++) {
let key = keys[i];
if (!matchDetails(value[key], details[key])) { return false; }
}
if (!(key in value)) { return false; }
if (!matchDetails(value[key], details[key])) { return false; }
}
return true;
@ -70,18 +71,19 @@ beforeEach(function() {
+ "but it did.";
} else {
if (details) {
for (let key in details) {
if (details.hasOwnProperty(key)) {
if (!this.env.equals_(e[key], details[key])) {
this.message = () =>
"Expected the pass to report an error "
+ "with details " + jasmine.pp(details) + " "
+ "for grammar " + jasmine.pp(grammar) + ", "
+ "but " + jasmine.pp(key) + " "
+ "is " + jasmine.pp(e[key]) + ".";
let keys = Object.keys(details);
for (let i = 0; i < keys.length; i++) {
let key = keys[i];
return false;
}
if (!this.env.equals_(e[key], details[key])) {
this.message = () =>
"Expected the pass to report an error "
+ "with details " + jasmine.pp(details) + " "
+ "for grammar " + jasmine.pp(grammar) + ", "
+ "but " + jasmine.pp(key) + " "
+ "is " + jasmine.pp(e[key]) + ".";
return false;
}
}
}

21
spec/unit/parser.spec.js
View file

@ -204,17 +204,18 @@ describe("PEG.js grammar parser", function() {
+ jasmine.pp(e.message) + ".";
} else {
if (details) {
for (let key in details) {
if (details.hasOwnProperty(key)) {
if (!this.env.equals_(e[key], details[key])) {
this.message = () =>
"Expected " + jasmine.pp(this.actual) + " to fail to parse"
+ (details ? " with details " + jasmine.pp(details) : "") + ", "
+ "but " + jasmine.pp(key) + " "
+ "is " + jasmine.pp(e[key]) + ".";
let keys = Object.keys(details);
for (let i = 0; i < keys.length; i++) {
let key = keys[i];
return false;
}
if (!this.env.equals_(e[key], details[key])) {
this.message = () =>
"Expected " + jasmine.pp(this.actual) + " to fail to parse"
+ (details ? " with details " + jasmine.pp(details) : "") + ", "
+ "but " + jasmine.pp(key) + " "
+ "is " + jasmine.pp(e[key]) + ".";
return false;
}
}
}