feat(parser): implements ranges

meriyah · May 30, 2019 · 73ede30 · 73ede30
1 parent cb09a9c
commit 73ede30
Show file tree

Hide file tree

Showing 41 changed files with 21,645 additions and 6,510 deletions.
diff --git a/src/common.ts b/src/common.ts
@@ -1,5 +1,6 @@
 import { Token, KeywordDescTable } from './token';
 import { Errors, report } from './errors';
+import { Node } from './estree';
 import { nextToken } from './lexer/scan';
 
 /**
@@ -121,6 +122,7 @@ export interface ParserState {
   line: number;
   column: number;
   startIndex: number;
+  lastIndex: number;
   length: number;
   token: Token;
   tokenValue: any;
@@ -358,3 +360,18 @@ export function validateAndDeclareLabel(parser: ParserState, labels: any, name:
 
   labels['€' + name] = 1;
 }
+
+
+export function finishNode<T extends Node>(
+  parser: ParserState,
+  context: Context,
+  start: number,
+  node: T,
+): T {
+  if (context & Context.OptionsRanges) {
+    node.start = start;
+    node.end = parser.lastIndex;
+}
+
+  return node;
+}
diff --git a/src/lexer/scan.ts b/src/lexer/scan.ts
@@ -162,9 +162,10 @@ export const OneCharToken = [
   /* 127 - Delete             */ Token.Illegal
 ];
 
-export function nextToken(state: ParserState, context: Context): void {
-  state.flags &= ~Flags.NewLine;
-  state.token = scanSingleToken(state, context);
+export function nextToken(parser: ParserState, context: Context): void {
+  parser.flags &= ~Flags.NewLine;
+  parser.lastIndex = parser.index;
+  parser.token = scanSingleToken(parser, context);
 }
 
 export function scanSingleToken(parser: ParserState, context: Context): Token {

diff --git a/src/lexer/template.ts b/src/lexer/template.ts
@@ -103,5 +103,6 @@ function scanBadTemplate(parser: ParserState, ch: number): number {
 export function scanTemplateTail(state: ParserState, context: Context): Token {
   if (state.index >= state.length) return Token.Illegal;
   state.index--;
+  state.column--;
   return scanTemplate(state, context);
 }