fix(parser): fixes do while edge cases

meriyah · May 16, 2019 · 024e459 · 024e459
1 parent 4ffe12d
commit 024e459
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 3 deletions.
diff --git a/src/parser.ts b/src/parser.ts
@@ -3888,7 +3888,7 @@ export function parseObjectLiteralOrPattern(
                 destructible |= DestructuringKind.NotDestructible;
               }
             } else if (parser.destructible & DestructuringKind.Required) {
-              //              report(parser, Errors.InvalidDestructuringTarget);
+              report(parser, Errors.InvalidDestructuringTarget);
             } else {
               value = parseMemberOrUpdateExpression(parser, context, value, /* assignable */ 0);
               destructible = parser.assignable & AssignmentKind.NotAssignable ? DestructuringKind.NotDestructible : 0;
@@ -4003,9 +4003,29 @@ export function parseObjectLiteralOrPattern(
             if (parser.token === Token.Comma || parser.token === Token.RightBrace) {
               if (parser.assignable & AssignmentKind.NotAssignable) destructible |= DestructuringKind.NotDestructible;
             } else {
-              value = parseMemberOrUpdateExpression(parser, context, value, /* isNewExpression */ 0);
+              value = parseMemberOrUpdateExpression(parser, context, value, /* assignable */ 0);
+
               destructible =
-                parser.assignable & AssignmentKind.Assignable ? 0 : (destructible = DestructuringKind.NotDestructible);
+                parser.assignable & AssignmentKind.NotAssignable ? destructible | DestructuringKind.NotDestructible : 0;
+
+              const notAssignable = parser.token !== Token.Assign;
+
+              if (parser.token !== Token.Comma && parser.token !== Token.RightBrace) {
+                if (notAssignable) destructible |= DestructuringKind.NotDestructible;
+
+                value = parseAssignmentExpression(
+                  parser,
+                  (context | Context.DisallowInContext) ^ Context.DisallowInContext,
+                  value
+                );
+
+                if (notAssignable) destructible |= DestructuringKind.NotDestructible;
+              } else if (notAssignable) {
+                destructible |=
+                  type || parser.assignable & AssignmentKind.NotAssignable
+                    ? DestructuringKind.NotDestructible
+                    : DestructuringKind.Assignable;
+              }
             }
           } else {
             value = parseLeftHandSideExpression(parser, context, /* assignable */ 1);

diff --git a/test/parser/declarations/const.ts b/test/parser/declarations/const.ts
@@ -231,6 +231,8 @@ describe('Declarations - const', () => {
     ['const x, {y};', Context.None],
     ['const {x}, y;', Context.None],
     ['const x = y, {z};', Context.None],
+    ['const let = 1;', Context.Strict],
+    ['let let = 1;', Context.Strict],
     ['const {x=y};', Context.None],
     ['const {x:y=z};', Context.None],
     ['const {x:y=z} = obj, {a:b=c};', Context.None],

diff --git a/test/parser/miscellaneous/pass.ts b/test/parser/miscellaneous/pass.ts
@@ -515,6 +515,30 @@ describe('Miscellaneous - Pass', () => {
     'function f() { [] in [5,6] * [,5,] / [,,5,,] || [a,] && new [,b] % [,,] }',
     'function f() { (delete new function f(){} + function(a,b){}(5)(6)) }',
     '(delete new function f(){} + function(a,b){}(5)(6))',
+    `do x
+    while ({ [y]: {} = x ? null : false  })`,
+    `do x
+    while ({ [y]: {x = y} = z ? null : false  })`,
+    `do x
+    while ({ [y = [yy]]: { x = (y)} ? null : false  })`,
+    `do x
+    while ({ [(y)]: {} ? null : false  })`,
+    `do x
+    while ({ [y]: {} ? function () {} : false  })`,
+    `do x
+    while ({ [(y)()]: {} ? null : false  })`,
+    `do x
+    while ({ [(x)(y = 2 / 3)]: { } ? null : false  })`,
+    `do x
+    while ({ [(x)(y = 2 / 3)]: { x } ? (((y = z))) : {x} = y })`,
+    `do x
+    while ({ [(y)((([[x / y - 2]])))]: {} ? null : false  })`,
+    `do x
+    while ({ [(y)((([[x / y - 2]])))]: {} = {[x]: {} = x ? null : false } ? null : false  })`,
+    `do x
+    while ({ ["foo"]: {bar} ? z - (y) : {a}[b] })`,
+    `do x
+    while ({ [[](e)]: {f,g,h, i: (j)} ? null : false  })`,
     "let e = ['_this_', '_x_', '_y_', '_z_', '[object Arguments]'];",
     "let r = f.call('_this_', '_x_', '_y_', '_z_')();",
     'function f() { function f() {} + function g() {} }',

diff --git a/test/parser/statements/do-while.ts b/test/parser/statements/do-while.ts
@@ -10,6 +10,58 @@ describe('Statements - Do while', () => {
   ]);
 
   pass('Statements - Do while (pass)', [
+    [
+      `do x
+    while ({ [y]: {} ? null : false  })`,
+      Context.None,
+      {
+        body: [
+          {
+            body: {
+              expression: {
+                name: 'x',
+                type: 'Identifier'
+              },
+              type: 'ExpressionStatement'
+            },
+            test: {
+              properties: [
+                {
+                  computed: true,
+                  key: {
+                    name: 'y',
+                    type: 'Identifier'
+                  },
+                  kind: 'init',
+                  method: false,
+                  shorthand: false,
+                  type: 'Property',
+                  value: {
+                    alternate: {
+                      type: 'Literal',
+                      value: false
+                    },
+                    consequent: {
+                      type: 'Literal',
+                      value: null
+                    },
+                    test: {
+                      properties: [],
+                      type: 'ObjectExpression'
+                    },
+                    type: 'ConditionalExpression'
+                  }
+                }
+              ],
+              type: 'ObjectExpression'
+            },
+            type: 'DoWhileStatement'
+          }
+        ],
+        sourceType: 'script',
+        type: 'Program'
+      }
+    ],
     [
       'do async \n while (y)',
       Context.None,