fix(lexer): improved line counting

meriyah · Aug 23, 2019 · c29be84 · c29be84
1 parent 6c28caf
commit c29be84
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/lexer/comments.ts b/src/lexer/comments.ts
@@ -84,7 +84,7 @@ export function skipMultiLineComment(parser: ParserState, state: LexerState): Le
       state |= LexerState.NewLine | LexerState.LastIsCR;
       scanNewLine(parser);
     } else if (parser.currentChar === Chars.LineFeed) {
-      consumeLineFeed(parser, (state & LexerState.LastIsCR) !== 0);
+      consumeLineFeed(parser, state);
       state = (state | LexerState.LastIsCR | LexerState.NewLine) ^ LexerState.LastIsCR;
     } else if ((parser.currentChar ^ Chars.LineSeparator) <= 1) {
       state = (state | LexerState.LastIsCR | LexerState.NewLine) ^ LexerState.LastIsCR;

diff --git a/src/lexer/common.ts b/src/lexer/common.ts
@@ -54,10 +54,10 @@ export function consumeMultiUnitCodePoint(parser: ParserState, hi: number): 0 |
 /**
  * Use to consume a line feed instead of `scanNewLine`.
  */
-export function consumeLineFeed(parser: ParserState, lastIsCR: boolean): void {
+export function consumeLineFeed(parser: ParserState, state: LexerState): void {
   parser.currentChar = parser.source.charCodeAt(++parser.index);
   parser.flags |= Flags.NewLine;
-  if (!lastIsCR) {
+  if ((state & LexerState.LastIsCR) === 0) {
     parser.column = 0;
     parser.line++;
   }

diff --git a/src/lexer/scan.ts b/src/lexer/scan.ts
@@ -531,7 +531,7 @@ export function scanSingleToken(parser: ParserState, context: Context, state: Le
           break;
 
         case Token.LineFeed:
-          consumeLineFeed(parser, (state & LexerState.LastIsCR) !== 0);
+          consumeLineFeed(parser, state);
           state = (state | LexerState.LastIsCR | LexerState.NewLine) ^ LexerState.LastIsCR;
           break;