Skip to content

Commit 8c02a0a

Browse files
committed
Use for-of loops in src/ instead of incrementing index
1 parent acdf390 commit 8c02a0a

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

src/addons/unicode-base.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,8 @@ export default (XRegExp) => {
209209
XRegExp.addUnicodeData = (data) => {
210210
const ERR_NO_NAME = 'Unicode token requires name';
211211
const ERR_NO_DATA = 'Unicode token has no character data ';
212-
let item;
213212

214-
for (let i = 0; i < data.length; ++i) {
215-
item = data[i];
213+
for (const item of data) {
216214
if (!item.name) {
217215
throw new Error(ERR_NO_NAME);
218216
}

src/xregexp.js

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,9 @@ function prepareFlags(pattern, flags) {
376376
});
377377

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

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

722722
if (optionalFlags) {
723723
optionalFlags = nativ.split.call(optionalFlags, '');
724-
for (let i = 0; i < optionalFlags.length; ++i) {
725-
registerFlag(optionalFlags[i]);
724+
for (const flag of optionalFlags) {
725+
registerFlag(flag);
726726
}
727727
}
728728

@@ -1101,8 +1101,8 @@ XRegExp.matchChain = (str, chain) => (function recurseChain(values, level) {
11011101
}
11021102
}
11031103

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

11081108
return ((level === chain.length - 1) || !matches.length) ?
@@ -1212,8 +1212,7 @@ XRegExp.replace = (str, search, replacement, scope) => {
12121212
* ]);
12131213
*/
12141214
XRegExp.replaceEach = (str, replacements) => {
1215-
for (let i = 0; i < replacements.length; ++i) {
1216-
const r = replacements[i];
1215+
for (const r of replacements) {
12171216
str = XRegExp.replace(str, r[0], r[1], r[2]);
12181217
}
12191218

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

13601359
const parts = /(\()(?!\?)|\\([1-9]\d*)|\\[\s\S]|\[(?:[^\\\]]|\\[\s\S])*\]/g;
13611360
const output = [];
1362-
for (let i = 0; i < patterns.length; ++i) {
1363-
const pattern = patterns[i];
1364-
1361+
for (const pattern of patterns) {
13651362
if (XRegExp.isRegExp(pattern)) {
13661363
numPriorCaptures = numCaptures;
13671364
captureNames = (pattern[REGEX_DATA] && pattern[REGEX_DATA].captureNames) || [];

0 commit comments

Comments
 (0)