Skip to content

Commit

Permalink
Use for-of loops in src/ instead of incrementing index
Browse files Browse the repository at this point in the history
  • Loading branch information
josephfrazier committed Apr 18, 2018
1 parent acdf390 commit 8c02a0a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 15 deletions.
4 changes: 1 addition & 3 deletions src/addons/unicode-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,8 @@ export default (XRegExp) => {
XRegExp.addUnicodeData = (data) => {
const ERR_NO_NAME = 'Unicode token requires name';
const ERR_NO_DATA = 'Unicode token has no character data ';
let item;

for (let i = 0; i < data.length; ++i) {
item = data[i];
for (const item of data) {
if (!item.name) {
throw new Error(ERR_NO_NAME);
}
Expand Down
21 changes: 9 additions & 12 deletions src/xregexp.js
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,9 @@ function prepareFlags(pattern, flags) {
});

// Throw on unknown native or nonnative flags
for (let i = 0; i < flags.length; ++i) {
if (!registeredFlags[flags[i]]) {
throw new SyntaxError(`Unknown regex flag ${flags[i]}`);
for (const flag of flags) {
if (!registeredFlags[flag]) {
throw new SyntaxError(`Unknown regex flag ${flag}`);
}
}

Expand Down Expand Up @@ -721,8 +721,8 @@ XRegExp.addToken = (regex, handler, options) => {

if (optionalFlags) {
optionalFlags = nativ.split.call(optionalFlags, '');
for (let i = 0; i < optionalFlags.length; ++i) {
registerFlag(optionalFlags[i]);
for (const flag of optionalFlags) {
registerFlag(flag);
}
}

Expand Down Expand Up @@ -1101,8 +1101,8 @@ XRegExp.matchChain = (str, chain) => (function recurseChain(values, level) {
}
}

for (let i = 0; i < values.length; ++i) {
XRegExp.forEach(values[i], item.regex, addMatch);
for (const value of values) {
XRegExp.forEach(value, item.regex, addMatch);
}

return ((level === chain.length - 1) || !matches.length) ?
Expand Down Expand Up @@ -1212,8 +1212,7 @@ XRegExp.replace = (str, search, replacement, scope) => {
* ]);
*/
XRegExp.replaceEach = (str, replacements) => {
for (let i = 0; i < replacements.length; ++i) {
const r = replacements[i];
for (const r of replacements) {
str = XRegExp.replace(str, r[0], r[1], r[2]);
}

Expand Down Expand Up @@ -1359,9 +1358,7 @@ XRegExp.union = (patterns, flags, options) => {

const parts = /(\()(?!\?)|\\([1-9]\d*)|\\[\s\S]|\[(?:[^\\\]]|\\[\s\S])*\]/g;
const output = [];
for (let i = 0; i < patterns.length; ++i) {
const pattern = patterns[i];

for (const pattern of patterns) {
if (XRegExp.isRegExp(pattern)) {
numPriorCaptures = numCaptures;
captureNames = (pattern[REGEX_DATA] && pattern[REGEX_DATA].captureNames) || [];
Expand Down

0 comments on commit 8c02a0a

Please sign in to comment.