fix(parser): fixed edgy cases

meriyah · Aug 13, 2019 · a4434ef · a4434ef
1 parent 43130ac
commit a4434ef
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
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.6.7",
+  "version": "1.6.8",
   "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/meriyah.ts b/src/meriyah.ts
@@ -26,4 +26,4 @@ export function parse(source: string, options?: Options): ESTree.Program {
 export { Options, ESTree };
 
 // Export current version
-export const version = '1.6.7';
+export const version = '1.6.8';
diff --git a/src/parser.ts b/src/parser.ts
@@ -3871,12 +3871,12 @@ export function parseMemberOrUpdateExpression(
   }
 
   if ((parser.token & Token.IsMemberOrCallExpression) === Token.IsMemberOrCallExpression) {
-    context = (context | Context.DisallowIn) ^ Context.DisallowIn;
+    context = (context | Context.DisallowIn | Context.InGlobal) ^ (Context.DisallowIn | Context.InGlobal);
 
     switch (parser.token) {
       /* Property */
       case Token.Period: {
-        nextToken(parser, context);
+        nextToken(parser, context | Context.AllowEscapedKeyword);
 
         parser.assignable = AssignmentKind.Assignable;
 
@@ -7309,7 +7309,7 @@ export function parseMembeExpressionNoCall(
   if (token & Token.IsMemberOrCallExpression) {
     /* Property */
     if (token === Token.Period) {
-      nextToken(parser, context);
+      nextToken(parser, context | Context.AllowEscapedKeyword);
 
       parser.assignable = AssignmentKind.Assignable;
 

diff --git a/test/parser/miscellaneous/escaped-keyword.ts b/test/parser/miscellaneous/escaped-keyword.ts
@@ -11,6 +11,7 @@ describe('Miscellaneous - Escaped keywords', () => {
     '(\\u0069nterface = 1);',
     '({ def\\u0061ult: 0 })',
     '({ def\\u{61}ult: 0 })',
+    'foo = {}; foo.def\\u{61}ult = 3;',
     'var int\\u0065rface = 1;',
     'var { int\\u0065rface  } = {};',
     '(p\\u0061ckage = 1);',
@@ -104,6 +105,7 @@ describe('Miscellaneous - Escaped keywords', () => {
     ['(x === tr\\u0075e);', Context.None],
     ['var x = tr\\u0075e;', Context.None],
     ['var tr\\u0075e = 1;', Context.None],
+    ['({ def\\u0061ult })', Context.None],
     ['var { tr\\u0075e } = {};', Context.None],
     ['tr\\u0075e = 1;', Context.None],
     ['(x === f\\u0061lse);', Context.None],