Remove this.state.octalPosition

Kai Cataldo · Kai Cataldo · commit bcc78c9530f8 · 2020-03-04T20:06:15.000-05:00
diff --git a/packages/babel-parser/src/parser/statement.js b/packages/babel-parser/src/parser/statement.js
@@ -1,5 +1,4 @@
 // @flow
-/*:: declare var invariant; */
 
 import * as N from "../types";
 import { types as tt, type TokenType } from "../tokenizer/types";
@@ -857,8 +856,10 @@ export default class StatementParser extends ExpressionParser {
     while (!this.eat(end)) {
       // Track octal literals that occur before a "use strict" directive.
       if (!parsedNonDirective && this.state.containsOctal) {
-        /*:: invariant(this.state.octalPosition !== null) */
-        octalPositions.push(this.state.octalPosition);
+        // This octal literal will always occur in a directive and will
+        // therefore be escaped. Subtract two from the current position to
+        // account for the "\" character.
+        octalPositions.push(this.state.pos - 2);
       }
 
       const stmt = this.parseStatement(null, topLevel);
diff --git a/packages/babel-parser/src/tokenizer/index.js b/packages/babel-parser/src/tokenizer/index.js
@@ -225,7 +225,6 @@ export default class Tokenizer extends LocationParser {
     if (!curContext || !curContext.preserveSpace) this.skipSpace();
 
     this.state.containsOctal = false;
-    this.state.octalPosition = null;
     this.state.start = this.state.pos;
     this.state.startLoc = this.state.curPosition();
     if (this.state.pos >= this.length) {
@@ -1297,10 +1296,7 @@ export default class Tokenizer extends LocationParser {
             } else if (this.state.strict) {
               this.raise(codePos, Errors.StrictOctalLiteral);
             } else if (!this.state.containsOctal) {
-              // These properties are only used to throw an error for an octal which occurs
-              // in a directive which occurs prior to a "use strict" directive.
               this.state.containsOctal = true;
-              this.state.octalPosition = codePos;
             }
           }
 
diff --git a/packages/babel-parser/src/tokenizer/state.js b/packages/babel-parser/src/tokenizer/state.js
@@ -141,9 +141,9 @@ export default class State {
   // escape sequences must not be interpreted as keywords.
   containsEsc: boolean = false;
 
-  // TODO
+  // Used to throw an error for an octal literal which occurs
+  // in a directive which occurs prior to a "use strict" directive.
   containsOctal: boolean = false;
-  octalPosition: number | null = null;
 
   // Names of exports store. `default` is stored as a name for both
   // `export default foo;` and `export { foo as default };`.
