Skip to content

Commit 76acd92

Browse files
Use scanRange to prevent variable shadowing
1 parent 5c75b2d commit 76acd92

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

src/compiler/scanner.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2508,22 +2508,17 @@ export function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean
25082508
pos++;
25092509
}
25102510
if (reportErrors) {
2511-
const endOfRegExpFlags = pos;
2512-
pos = startOfRegExpBody;
2513-
const saveTokenPos = tokenStart;
2514-
const saveTokenFlags = tokenFlags;
2515-
scanRegularExpressionWorker(text, endOfRegExpBody, regExpFlags, /*annexB*/ true);
2516-
pos = endOfRegExpFlags;
2517-
tokenStart = saveTokenPos;
2518-
tokenFlags = saveTokenFlags;
2511+
scanRange(startOfRegExpBody, endOfRegExpBody - startOfRegExpBody, () => {
2512+
scanRegularExpressionWorker(regExpFlags, /*annexB*/ true);
2513+
});
25192514
}
25202515
}
25212516
tokenValue = text.substring(tokenStart, pos);
25222517
token = SyntaxKind.RegularExpressionLiteral;
25232518
}
25242519
return token;
25252520

2526-
function scanRegularExpressionWorker(text: string, end: number, regExpFlags: RegularExpressionFlags, annexB: boolean) {
2521+
function scanRegularExpressionWorker(regExpFlags: RegularExpressionFlags, annexB: boolean) {
25272522
/** Grammar parameter */
25282523
const unicodeMode = !!(regExpFlags & RegularExpressionFlags.UnicodeMode);
25292524
/** Grammar parameter */

0 commit comments

Comments
 (0)