Skip to content

Commit 2f2a8aa

Browse files
pezetargos
authored andcommitted
path: replace var with let in lib/path.js
PR-URL: #30260 Refs: nodejs/code-and-learn#97 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: David Carlier <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Сковорода Никита Андреевич <[email protected]>
1 parent 75cb026 commit 2f2a8aa

File tree

1 file changed

+50
-52
lines changed

1 file changed

+50
-52
lines changed

lib/path.js

+50-52
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function normalizeString(path, allowAboveRoot, separator, isPathSeparator) {
5555
let lastSlash = -1;
5656
let dots = 0;
5757
let code = 0;
58-
for (var i = 0; i <= path.length; ++i) {
58+
for (let i = 0; i <= path.length; ++i) {
5959
if (i < path.length)
6060
code = path.charCodeAt(i);
6161
else if (isPathSeparator(code))
@@ -132,7 +132,7 @@ const win32 = {
132132
let resolvedTail = '';
133133
let resolvedAbsolute = false;
134134

135-
for (var i = args.length - 1; i >= -1; i--) {
135+
for (let i = args.length - 1; i >= -1; i--) {
136136
let path;
137137
if (i >= 0) {
138138
path = args[i];
@@ -370,7 +370,7 @@ const win32 = {
370370

371371
let joined;
372372
let firstPart;
373-
for (var i = 0; i < args.length; ++i) {
373+
for (let i = 0; i < args.length; ++i) {
374374
const arg = args[i];
375375
validateString(arg, 'path');
376376
if (arg.length > 0) {
@@ -644,7 +644,7 @@ const win32 = {
644644

645645
let end = -1;
646646
let matchedSlash = true;
647-
for (var i = len - 1; i >= offset; --i) {
647+
for (let i = len - 1; i >= offset; --i) {
648648
if (isPathSeparator(path.charCodeAt(i))) {
649649
if (!matchedSlash) {
650650
end = i;
@@ -669,10 +669,9 @@ const win32 = {
669669
if (ext !== undefined)
670670
validateString(ext, 'ext');
671671
validateString(path, 'path');
672-
var start = 0;
673-
var end = -1;
674-
var matchedSlash = true;
675-
var i;
672+
let start = 0;
673+
let end = -1;
674+
let matchedSlash = true;
676675

677676
// Check for a drive letter prefix so as not to mistake the following
678677
// path separator as an extra separator at the end of the path that can be
@@ -686,9 +685,9 @@ const win32 = {
686685
if (ext !== undefined && ext.length > 0 && ext.length <= path.length) {
687686
if (ext === path)
688687
return '';
689-
var extIdx = ext.length - 1;
690-
var firstNonSlashEnd = -1;
691-
for (i = path.length - 1; i >= start; --i) {
688+
let extIdx = ext.length - 1;
689+
let firstNonSlashEnd = -1;
690+
for (let i = path.length - 1; i >= start; --i) {
692691
const code = path.charCodeAt(i);
693692
if (isPathSeparator(code)) {
694693
// If we reached a path separator that was not part of a set of path
@@ -728,7 +727,7 @@ const win32 = {
728727
end = path.length;
729728
return path.slice(start, end);
730729
}
731-
for (i = path.length - 1; i >= start; --i) {
730+
for (let i = path.length - 1; i >= start; --i) {
732731
if (isPathSeparator(path.charCodeAt(i))) {
733732
// If we reached a path separator that was not part of a set of path
734733
// separators at the end of the string, stop now
@@ -751,14 +750,14 @@ const win32 = {
751750

752751
extname(path) {
753752
validateString(path, 'path');
754-
var start = 0;
755-
var startDot = -1;
756-
var startPart = 0;
757-
var end = -1;
758-
var matchedSlash = true;
753+
let start = 0;
754+
let startDot = -1;
755+
let startPart = 0;
756+
let end = -1;
757+
let matchedSlash = true;
759758
// Track the state of characters (if any) we see before our first dot and
760759
// after any path separator we find
761-
var preDotState = 0;
760+
let preDotState = 0;
762761

763762
// Check for a drive letter prefix so as not to mistake the following
764763
// path separator as an extra separator at the end of the path that can be
@@ -770,7 +769,7 @@ const win32 = {
770769
start = startPart = 2;
771770
}
772771

773-
for (var i = path.length - 1; i >= start; --i) {
772+
for (let i = path.length - 1; i >= start; --i) {
774773
const code = path.charCodeAt(i);
775774
if (isPathSeparator(code)) {
776775
// If we reached a path separator that was not part of a set of path
@@ -823,7 +822,7 @@ const win32 = {
823822
return ret;
824823

825824
const len = path.length;
826-
var rootEnd = 0;
825+
let rootEnd = 0;
827826
let code = path.charCodeAt(0);
828827

829828
if (len === 1) {
@@ -895,15 +894,15 @@ const win32 = {
895894
if (rootEnd > 0)
896895
ret.root = path.slice(0, rootEnd);
897896

898-
var startDot = -1;
899-
var startPart = rootEnd;
900-
var end = -1;
901-
var matchedSlash = true;
902-
var i = path.length - 1;
897+
let startDot = -1;
898+
let startPart = rootEnd;
899+
let end = -1;
900+
let matchedSlash = true;
901+
let i = path.length - 1;
903902

904903
// Track the state of characters (if any) we see before our first dot and
905904
// after any path separator we find
906-
var preDotState = 0;
905+
let preDotState = 0;
907906

908907
// Get non-dir info
909908
for (; i >= rootEnd; --i) {
@@ -975,7 +974,7 @@ const posix = {
975974
let resolvedPath = '';
976975
let resolvedAbsolute = false;
977976

978-
for (var i = args.length - 1; i >= -1 && !resolvedAbsolute; i--) {
977+
for (let i = args.length - 1; i >= -1 && !resolvedAbsolute; i--) {
979978
const path = i >= 0 ? args[i] : process.cwd();
980979

981980
validateString(path, 'path');
@@ -1035,7 +1034,7 @@ const posix = {
10351034
if (args.length === 0)
10361035
return '.';
10371036
let joined;
1038-
for (var i = 0; i < args.length; ++i) {
1037+
for (let i = 0; i < args.length; ++i) {
10391038
const arg = args[i];
10401039
validateString(arg, 'path');
10411040
if (arg.length > 0) {
@@ -1130,9 +1129,9 @@ const posix = {
11301129
if (path.length === 0)
11311130
return '.';
11321131
const hasRoot = path.charCodeAt(0) === CHAR_FORWARD_SLASH;
1133-
var end = -1;
1134-
var matchedSlash = true;
1135-
for (var i = path.length - 1; i >= 1; --i) {
1132+
let end = -1;
1133+
let matchedSlash = true;
1134+
for (let i = path.length - 1; i >= 1; --i) {
11361135
if (path.charCodeAt(i) === CHAR_FORWARD_SLASH) {
11371136
if (!matchedSlash) {
11381137
end = i;
@@ -1156,17 +1155,16 @@ const posix = {
11561155
validateString(ext, 'ext');
11571156
validateString(path, 'path');
11581157

1159-
var start = 0;
1160-
var end = -1;
1161-
var matchedSlash = true;
1162-
var i;
1158+
let start = 0;
1159+
let end = -1;
1160+
let matchedSlash = true;
11631161

11641162
if (ext !== undefined && ext.length > 0 && ext.length <= path.length) {
11651163
if (ext === path)
11661164
return '';
1167-
var extIdx = ext.length - 1;
1168-
var firstNonSlashEnd = -1;
1169-
for (i = path.length - 1; i >= 0; --i) {
1165+
let extIdx = ext.length - 1;
1166+
let firstNonSlashEnd = -1;
1167+
for (let i = path.length - 1; i >= 0; --i) {
11701168
const code = path.charCodeAt(i);
11711169
if (code === CHAR_FORWARD_SLASH) {
11721170
// If we reached a path separator that was not part of a set of path
@@ -1206,7 +1204,7 @@ const posix = {
12061204
end = path.length;
12071205
return path.slice(start, end);
12081206
}
1209-
for (i = path.length - 1; i >= 0; --i) {
1207+
for (let i = path.length - 1; i >= 0; --i) {
12101208
if (path.charCodeAt(i) === CHAR_FORWARD_SLASH) {
12111209
// If we reached a path separator that was not part of a set of path
12121210
// separators at the end of the string, stop now
@@ -1229,14 +1227,14 @@ const posix = {
12291227

12301228
extname(path) {
12311229
validateString(path, 'path');
1232-
var startDot = -1;
1233-
var startPart = 0;
1234-
var end = -1;
1235-
var matchedSlash = true;
1230+
let startDot = -1;
1231+
let startPart = 0;
1232+
let end = -1;
1233+
let matchedSlash = true;
12361234
// Track the state of characters (if any) we see before our first dot and
12371235
// after any path separator we find
1238-
var preDotState = 0;
1239-
for (var i = path.length - 1; i >= 0; --i) {
1236+
let preDotState = 0;
1237+
for (let i = path.length - 1; i >= 0; --i) {
12401238
const code = path.charCodeAt(i);
12411239
if (code === CHAR_FORWARD_SLASH) {
12421240
// If we reached a path separator that was not part of a set of path
@@ -1288,22 +1286,22 @@ const posix = {
12881286
if (path.length === 0)
12891287
return ret;
12901288
const isAbsolute = path.charCodeAt(0) === CHAR_FORWARD_SLASH;
1291-
var start;
1289+
let start;
12921290
if (isAbsolute) {
12931291
ret.root = '/';
12941292
start = 1;
12951293
} else {
12961294
start = 0;
12971295
}
1298-
var startDot = -1;
1299-
var startPart = 0;
1300-
var end = -1;
1301-
var matchedSlash = true;
1302-
var i = path.length - 1;
1296+
let startDot = -1;
1297+
let startPart = 0;
1298+
let end = -1;
1299+
let matchedSlash = true;
1300+
let i = path.length - 1;
13031301

13041302
// Track the state of characters (if any) we see before our first dot and
13051303
// after any path separator we find
1306-
var preDotState = 0;
1304+
let preDotState = 0;
13071305

13081306
// Get non-dir info
13091307
for (; i >= start; --i) {

0 commit comments

Comments
 (0)