Skip to content

Commit f622c80

Browse files
zloirockzloirock
committed
fix some more entries of ES3 reserved words, #980 
1 parent 1b93419 commit f622c80

File tree

4 files changed

+77
-77
lines changed

4 files changed

+77
-77
lines changed

‎packages/core-js/modules/web.url.js‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,9 @@ var userinfoPercentEncodeSet = assign({}, pathPercentEncodeSet, {
252252
'/': 1, ':': 1, ';': 1, '=': 1, '@': 1, '[': 1, '\\': 1, ']': 1, '^': 1, '|': 1
253253
});
254254

255-
var percentEncode = function (char, set) {
256-
var code = codeAt(char, 0);
257-
return code > 0x20 && code < 0x7F && !has(set, char) ? char : encodeURIComponent(char);
255+
var percentEncode = function (chr, set) {
256+
var code = codeAt(chr, 0);
257+
return code > 0x20 && code < 0x7F && !has(set, chr) ? chr : encodeURIComponent(chr);
258258
};
259259

260260
var specialSchemes = {
@@ -340,7 +340,7 @@ var parseURL = function (url, input, stateOverride, base) {
340340
var seenAt = false;
341341
var seenBracket = false;
342342
var seenPasswordToken = false;
343-
var codePoints, char, bufferCodePoints, failure;
343+
var codePoints, chr, bufferCodePoints, failure;
344344

345345
if (!stateOverride) {
346346
url.scheme = '';
@@ -360,11 +360,11 @@ var parseURL = function (url, input, stateOverride, base) {
360360
codePoints = arrayFrom(input);
361361

362362
while (pointer <= codePoints.length) {
363-
char = codePoints[pointer];
363+
chr = codePoints[pointer];
364364
switch (state) {
365365
case SCHEME_START:
366-
if (char && ALPHA.test(char)) {
367-
buffer += char.toLowerCase();
366+
if (chr && ALPHA.test(chr)) {
367+
buffer += chr.toLowerCase();
368368
state = SCHEME;
369369
} else if (!stateOverride) {
370370
state = NO_SCHEME;
@@ -373,9 +373,9 @@ var parseURL = function (url, input, stateOverride, base) {
373373
break;
374374

375375
case SCHEME:
376-
if (char && (ALPHANUMERIC.test(char) || char == '+' || char == '-' || char == '.')) {
377-
buffer += char.toLowerCase();
378-
} else if (char == ':') {
376+
if (chr && (ALPHANUMERIC.test(chr) || chr == '+' || chr == '-' || chr == '.')) {
377+
buffer += chr.toLowerCase();
378+
} else if (chr == ':') {
379379
if (stateOverride && (
380380
(isSpecial(url) != has(specialSchemes, buffer)) ||
381381
(buffer == 'file' && (includesCredentials(url) || url.port !== null)) ||
@@ -410,8 +410,8 @@ var parseURL = function (url, input, stateOverride, base) {
410410
break;
411411

412412
case NO_SCHEME:
413-
if (!base || (base.cannotBeABaseURL && char != '#')) return INVALID_SCHEME;
414-
if (base.cannotBeABaseURL && char == '#') {
413+
if (!base || (base.cannotBeABaseURL && chr != '#')) return INVALID_SCHEME;
414+
if (base.cannotBeABaseURL && chr == '#') {
415415
url.scheme = base.scheme;
416416
url.path = base.path.slice();
417417
url.query = base.query;
@@ -424,7 +424,7 @@ var parseURL = function (url, input, stateOverride, base) {
424424
continue;
425425

426426
case SPECIAL_RELATIVE_OR_AUTHORITY:
427-
if (char == '/' && codePoints[pointer + 1] == '/') {
427+
if (chr == '/' && codePoints[pointer + 1] == '/') {
428428
state = SPECIAL_AUTHORITY_IGNORE_SLASHES;
429429
pointer++;
430430
} else {
@@ -433,7 +433,7 @@ var parseURL = function (url, input, stateOverride, base) {
433433
} break;
434434

435435
case PATH_OR_AUTHORITY:
436-
if (char == '/') {
436+
if (chr == '/') {
437437
state = AUTHORITY;
438438
break;
439439
} else {
@@ -443,24 +443,24 @@ var parseURL = function (url, input, stateOverride, base) {
443443

444444
case RELATIVE:
445445
url.scheme = base.scheme;
446-
if (char == EOF) {
446+
if (chr == EOF) {
447447
url.username = base.username;
448448
url.password = base.password;
449449
url.host = base.host;
450450
url.port = base.port;
451451
url.path = base.path.slice();
452452
url.query = base.query;
453-
} else if (char == '/' || (char == '\\' && isSpecial(url))) {
453+
} else if (chr == '/' || (chr == '\\' && isSpecial(url))) {
454454
state = RELATIVE_SLASH;
455-
} else if (char == '?') {
455+
} else if (chr == '?') {
456456
url.username = base.username;
457457
url.password = base.password;
458458
url.host = base.host;
459459
url.port = base.port;
460460
url.path = base.path.slice();
461461
url.query = '';
462462
state = QUERY;
463-
} else if (char == '#') {
463+
} else if (chr == '#') {
464464
url.username = base.username;
465465
url.password = base.password;
466466
url.host = base.host;
@@ -481,9 +481,9 @@ var parseURL = function (url, input, stateOverride, base) {
481481
} break;
482482

483483
case RELATIVE_SLASH:
484-
if (isSpecial(url) && (char == '/' || char == '\\')) {
484+
if (isSpecial(url) && (chr == '/' || chr == '\\')) {
485485
state = SPECIAL_AUTHORITY_IGNORE_SLASHES;
486-
} else if (char == '/') {
486+
} else if (chr == '/') {
487487
state = AUTHORITY;
488488
} else {
489489
url.username = base.username;
@@ -496,18 +496,18 @@ var parseURL = function (url, input, stateOverride, base) {
496496

497497
case SPECIAL_AUTHORITY_SLASHES:
498498
state = SPECIAL_AUTHORITY_IGNORE_SLASHES;
499-
if (char != '/' || buffer.charAt(pointer + 1) != '/') continue;
499+
if (chr != '/' || buffer.charAt(pointer + 1) != '/') continue;
500500
pointer++;
501501
break;
502502

503503
case SPECIAL_AUTHORITY_IGNORE_SLASHES:
504-
if (char != '/' && char != '\\') {
504+
if (chr != '/' && chr != '\\') {
505505
state = AUTHORITY;
506506
continue;
507507
} break;
508508

509509
case AUTHORITY:
510-
if (char == '@') {
510+
if (chr == '@') {
511511
if (seenAt) buffer = '%40' + buffer;
512512
seenAt = true;
513513
bufferCodePoints = arrayFrom(buffer);
@@ -523,31 +523,31 @@ var parseURL = function (url, input, stateOverride, base) {
523523
}
524524
buffer = '';
525525
} else if (
526-
char == EOF || char == '/' || char == '?' || char == '#' ||
527-
(char == '\\' && isSpecial(url))
526+
chr == EOF || chr == '/' || chr == '?' || chr == '#' ||
527+
(chr == '\\' && isSpecial(url))
528528
) {
529529
if (seenAt && buffer == '') return INVALID_AUTHORITY;
530530
pointer -= arrayFrom(buffer).length + 1;
531531
buffer = '';
532532
state = HOST;
533-
} else buffer += char;
533+
} else buffer += chr;
534534
break;
535535

536536
case HOST:
537537
case HOSTNAME:
538538
if (stateOverride && url.scheme == 'file') {
539539
state = FILE_HOST;
540540
continue;
541-
} else if (char == ':' && !seenBracket) {
541+
} else if (chr == ':' && !seenBracket) {
542542
if (buffer == '') return INVALID_HOST;
543543
failure = parseHost(url, buffer);
544544
if (failure) return failure;
545545
buffer = '';
546546
state = PORT;
547547
if (stateOverride == HOSTNAME) return;
548548
} else if (
549-
char == EOF || char == '/' || char == '?' || char == '#' ||
550-
(char == '\\' && isSpecial(url))
549+
chr == EOF || chr == '/' || chr == '?' || chr == '#' ||
550+
(chr == '\\' && isSpecial(url))
551551
) {
552552
if (isSpecial(url) && buffer == '') return INVALID_HOST;
553553
if (stateOverride && buffer == '' && (includesCredentials(url) || url.port !== null)) return;
@@ -558,17 +558,17 @@ var parseURL = function (url, input, stateOverride, base) {
558558
if (stateOverride) return;
559559
continue;
560560
} else {
561-
if (char == '[') seenBracket = true;
562-
else if (char == ']') seenBracket = false;
563-
buffer += char;
561+
if (chr == '[') seenBracket = true;
562+
else if (chr == ']') seenBracket = false;
563+
buffer += chr;
564564
} break;
565565

566566
case PORT:
567-
if (DIGIT.test(char)) {
568-
buffer += char;
567+
if (DIGIT.test(chr)) {
568+
buffer += chr;
569569
} else if (
570-
char == EOF || char == '/' || char == '?' || char == '#' ||
571-
(char == '\\' && isSpecial(url)) ||
570+
chr == EOF || chr == '/' || chr == '?' || chr == '#' ||
571+
(chr == '\\' && isSpecial(url)) ||
572572
stateOverride
573573
) {
574574
if (buffer != '') {
@@ -585,18 +585,18 @@ var parseURL = function (url, input, stateOverride, base) {
585585

586586
case FILE:
587587
url.scheme = 'file';
588-
if (char == '/' || char == '\\') state = FILE_SLASH;
588+
if (chr == '/' || chr == '\\') state = FILE_SLASH;
589589
else if (base && base.scheme == 'file') {
590-
if (char == EOF) {
590+
if (chr == EOF) {
591591
url.host = base.host;
592592
url.path = base.path.slice();
593593
url.query = base.query;
594-
} else if (char == '?') {
594+
} else if (chr == '?') {
595595
url.host = base.host;
596596
url.path = base.path.slice();
597597
url.query = '';
598598
state = QUERY;
599-
} else if (char == '#') {
599+
} else if (chr == '#') {
600600
url.host = base.host;
601601
url.path = base.path.slice();
602602
url.query = base.query;
@@ -617,7 +617,7 @@ var parseURL = function (url, input, stateOverride, base) {
617617
} break;
618618

619619
case FILE_SLASH:
620-
if (char == '/' || char == '\\') {
620+
if (chr == '/' || chr == '\\') {
621621
state = FILE_HOST;
622622
break;
623623
}
@@ -629,7 +629,7 @@ var parseURL = function (url, input, stateOverride, base) {
629629
continue;
630630

631631
case FILE_HOST:
632-
if (char == EOF || char == '/' || char == '\\' || char == '?' || char == '#') {
632+
if (chr == EOF || chr == '/' || chr == '\\' || chr == '?' || chr == '#') {
633633
if (!stateOverride && isWindowsDriveLetter(buffer)) {
634634
state = PATH;
635635
} else if (buffer == '') {
@@ -644,37 +644,37 @@ var parseURL = function (url, input, stateOverride, base) {
644644
buffer = '';
645645
state = PATH_START;
646646
} continue;
647-
} else buffer += char;
647+
} else buffer += chr;
648648
break;
649649

650650
case PATH_START:
651651
if (isSpecial(url)) {
652652
state = PATH;
653-
if (char != '/' && char != '\\') continue;
654-
} else if (!stateOverride && char == '?') {
653+
if (chr != '/' && chr != '\\') continue;
654+
} else if (!stateOverride && chr == '?') {
655655
url.query = '';
656656
state = QUERY;
657-
} else if (!stateOverride && char == '#') {
657+
} else if (!stateOverride && chr == '#') {
658658
url.fragment = '';
659659
state = FRAGMENT;
660-
} else if (char != EOF) {
660+
} else if (chr != EOF) {
661661
state = PATH;
662-
if (char != '/') continue;
662+
if (chr != '/') continue;
663663
} break;
664664

665665
case PATH:
666666
if (
667-
char == EOF || char == '/' ||
668-
(char == '\\' && isSpecial(url)) ||
669-
(!stateOverride && (char == '?' || char == '#'))
667+
chr == EOF || chr == '/' ||
668+
(chr == '\\' && isSpecial(url)) ||
669+
(!stateOverride && (chr == '?' || chr == '#'))
670670
) {
671671
if (isDoubleDot(buffer)) {
672672
shortenURLsPath(url);
673-
if (char != '/' && !(char == '\\' && isSpecial(url))) {
673+
if (chr != '/' && !(chr == '\\' && isSpecial(url))) {
674674
url.path.push('');
675675
}
676676
} else if (isSingleDot(buffer)) {
677-
if (char != '/' && !(char == '\\' && isSpecial(url))) {
677+
if (chr != '/' && !(chr == '\\' && isSpecial(url))) {
678678
url.path.push('');
679679
}
680680
} else {
@@ -685,45 +685,45 @@ var parseURL = function (url, input, stateOverride, base) {
685685
url.path.push(buffer);
686686
}
687687
buffer = '';
688-
if (url.scheme == 'file' && (char == EOF || char == '?' || char == '#')) {
688+
if (url.scheme == 'file' && (chr == EOF || chr == '?' || chr == '#')) {
689689
while (url.path.length > 1 && url.path[0] === '') {
690690
url.path.shift();
691691
}
692692
}
693-
if (char == '?') {
693+
if (chr == '?') {
694694
url.query = '';
695695
state = QUERY;
696-
} else if (char == '#') {
696+
} else if (chr == '#') {
697697
url.fragment = '';
698698
state = FRAGMENT;
699699
}
700700
} else {
701-
buffer += percentEncode(char, pathPercentEncodeSet);
701+
buffer += percentEncode(chr, pathPercentEncodeSet);
702702
} break;
703703

704704
case CANNOT_BE_A_BASE_URL_PATH:
705-
if (char == '?') {
705+
if (chr == '?') {
706706
url.query = '';
707707
state = QUERY;
708-
} else if (char == '#') {
708+
} else if (chr == '#') {
709709
url.fragment = '';
710710
state = FRAGMENT;
711-
} else if (char != EOF) {
712-
url.path[0] += percentEncode(char, C0ControlPercentEncodeSet);
711+
} else if (chr != EOF) {
712+
url.path[0] += percentEncode(chr, C0ControlPercentEncodeSet);
713713
} break;
714714

715715
case QUERY:
716-
if (!stateOverride && char == '#') {
716+
if (!stateOverride && chr == '#') {
717717
url.fragment = '';
718718
state = FRAGMENT;
719-
} else if (char != EOF) {
720-
if (char == "'" && isSpecial(url)) url.query += '%27';
721-
else if (char == '#') url.query += '%23';
722-
else url.query += percentEncode(char, C0ControlPercentEncodeSet);
719+
} else if (chr != EOF) {
720+
if (chr == "'" && isSpecial(url)) url.query += '%27';
721+
else if (chr == '#') url.query += '%23';
722+
else url.query += percentEncode(chr, C0ControlPercentEncodeSet);
723723
} break;
724724

725725
case FRAGMENT:
726-
if (char != EOF) url.fragment += percentEncode(char, fragmentPercentEncodeSet);
726+
if (chr != EOF) url.fragment += percentEncode(chr, fragmentPercentEncodeSet);
727727
break;
728728
}
729729

‎tests/helpers/qunit-helpers.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,18 @@ QUnit.assert.nonEnumerable = function (O, key, message) {
143143
};
144144

145145
QUnit.assert.notThrows = function (fn, message) {
146-
let throws, result, error;
146+
let thrown, result, error;
147147
try {
148148
result = fn();
149-
throws = false;
149+
thrown = false;
150150
} catch (err) {
151-
throws = true;
151+
thrown = true;
152152
error = err;
153153
}
154154
this.pushResult({
155-
result: !throws && result,
156-
actual: throws ? error : result,
157-
expected: throws ? undefined : true,
155+
result: !thrown && result,
156+
actual: thrown ? error : result,
157+
expected: thrown ? undefined : true,
158158
message: message || 'does not throw',
159159
});
160160
};

‎tests/pure/es.object.assign.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ QUnit.test('Object.assign', assert => {
5757
string = 'abcdefghijklmnopqrst';
5858
const result = {};
5959
for (let i = 0, { length } = string; i < length; ++i) {
60-
const char = string.charAt(i);
61-
result[char] = char;
60+
const chr = string.charAt(i);
61+
result[chr] = chr;
6262
}
6363
assert.strictEqual(keys(assign({}, result)).join(''), string);
6464
});

0 commit comments

Comments
 (0)