fix(parser): renamed deFacto opt to "specDeviation"

meriyah · Jul 15, 2019 · d2e7e08 · d2e7e08
1 parent 6cfbbfd
commit d2e7e08
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ This is the available options:
    // Enable React JSX parsing
   jsx: false
   // Allow edge cases that deviate from the spec
-  deFacto: false
+  specDeviation: false
 }
 ```
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meriyah",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "A 100% compliant, self-hosted javascript parser with high focus on both performance and stability",
   "main": "dist/meriyah.umd.js",
   "module": "dist/meriyah.esm.js",

diff --git a/src/common.ts b/src/common.ts
@@ -37,7 +37,7 @@ export const enum Context {
   DisallowIn = 1 << 27,
   InClass = 1 << 28,
   OptionsIdentifierPattern = 1 << 29,
-  OptionsDeFacto = 1 << 30,
+  OptionsSpecDeviation = 1 << 30,
 }
 
 export const enum PropertyKind {
@@ -160,8 +160,10 @@ export interface ParserState {
  * @param parser Parser object
  * @param context Context masks
  */
-export function consumeSemicolon(parser: ParserState, context: Context): void {
-  if ((parser.flags & Flags.NewLine) === 0 && (parser.token & Token.IsAutoSemicolon) !== Token.IsAutoSemicolon) {
+
+export function consumeSemicolon(parser: ParserState, context: Context, specDeviation?: number): void {
+  if ((parser.flags & Flags.NewLine) === 0 && (parser.token & Token.IsAutoSemicolon) !== Token.IsAutoSemicolon
+  && !specDeviation) {
     report(parser, Errors.UnexpectedToken, KeywordDescTable[parser.token & Token.Type]);
   }
   consumeOpt(parser, context, Token.Semicolon);

diff --git a/src/parser.ts b/src/parser.ts
@@ -195,8 +195,8 @@ export interface Options {
   identifierPattern?: boolean;
   // Enable React JSX parsing
   jsx?: boolean;
-  //
-  deFacto?: boolean;
+  // Allow edge cases that deviate from the spec
+  specDeviation?: boolean;
 }
 
 /**
@@ -218,7 +218,7 @@ export function parseSource(source: string, options: Options | void, context: Co
     if (options.impliedStrict) context |= Context.Strict;
     if (options.jsx) context |= Context.OptionsJSX;
     if (options.identifierPattern) context |= Context.OptionsIdentifierPattern;
-    if (options.deFacto) context |= Context.OptionsDeFacto;
+    if (options.specDeviation) context |= Context.OptionsSpecDeviation;
     if (options.source) sourceFile = options.source;
   }
 
@@ -1695,17 +1695,7 @@ export function parseDoWhileStatement(
   consume(parser, context | Context.AllowRegExp, Token.LeftParen);
   const test = parseExpressions(parser, context, 1, parser.tokenIndex, parser.linePos, parser.colPos);
   consume(parser, context | Context.AllowRegExp, Token.RightParen);
-  // Fixes edge case where mayority of parser & js engines allowes
-  // cases like
-  //
-  // do;while(0) 0;
-  //
-  if (context & Context.OptionsDeFacto) {
-    consumeOpt(parser, context | Context.AllowRegExp, Token.Semicolon);
-    // doStatement[?Yield, ?Await, ?Return]while(Expression[+In, ?Yield, ?Await] ) ;
-  } else {
-    consumeSemicolon(parser, context | Context.AllowRegExp);
-  }
+  consumeSemicolon(parser, context | Context.AllowRegExp, context & Context.OptionsSpecDeviation);
   return finishNode(parser, context, start, line, column, {
     type: 'DoWhileStatement',
     body,

diff --git a/test/parser/statements/do-while.ts b/test/parser/statements/do-while.ts
@@ -20,7 +20,7 @@ describe('Statements - Do while', () => {
   pass('Statements - Do while (pass)', [
     [
       `do;while(0) 0;`,
-      Context.OptionsDeFacto,
+      Context.OptionsSpecDeviation,
       {
         body: [
           {