Fixes DanielXMoore#469 (DanielXMoore#470)

Irian3x3 · Mar 21, 2023 · 0a5d183 · 0a5d183
1 parent 8e425b2
commit 0a5d183
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 13 deletions.
diff --git a/source/parser.hera b/source/parser.hera
@@ -4081,11 +4081,17 @@ HoistableDeclaration
 # https://262.ecma-international.org/#prod-LexicalDeclaration
 LexicalDeclaration
   # NOTE: Eliminated left recursion
-  LetOrConst LexicalBinding:binding ( __ Comma LexicalBinding )*:tail ->
+  # TODO: Add support for `let` and `const` declarations with multiple bindings in conditions
+  LetOrConst:d LexicalBinding:binding ( __ Comma LexicalBinding )*:tail ->
     return {
       type: "Declaration",
       children: $0,
       names: [...binding.names].concat(tail.flatMap(([,,b]) => b.names)),
+      binding: {
+        ...binding.binding,
+        children: [d, ...binding.binding.children],
+      },
+      initializer: binding.initializer,
     }
   # NOTE: Added const shorthand
   # NOTE: Using ExtendedExpression to allow for If/SwitchExpressions
@@ -4106,22 +4112,36 @@ LetAssignment
 
 # https://262.ecma-international.org/#prod-LexicalBinding
 LexicalBinding
-  BindingPattern TypeSuffix? Initializer ->
-    const children = [...$1.children]
-    if ($2) children./**/push($2)
-    children./**/push($3)
+  BindingPattern:binding TypeSuffix?:suffix _?:ws Initializer:initializer ->
+    const bindingChildren = [...binding.children]
+    if (suffix) bindingChildren.push(suffix)
+    if (ws) bindingChildren.push(...ws)
+    binding = {
+      ...binding,
+      children: bindingChildren,
+    }
+
     return {
-      children,
-      names: $1.names,
+      children: [binding, initializer],
+      names: binding.names,
+      binding,
+      initializer,
+    }
+
+  BindingIdentifier:binding TypeSuffix?:suffix _?:ws Initializer?:initializer ->
+    const bindingChildren = [...binding.children]
+    if (suffix) bindingChildren.push(suffix)
+    if (ws) bindingChildren.push(...ws)
+    binding = {
+      ...binding,
+      children: bindingChildren,
     }
 
-  BindingIdentifier TypeSuffix? Initializer? ->
-    const children = [...$1.children]
-    if ($2) children./**/push($2)
-    if ($3) children./**/push($3)
     return {
-      children,
-      names: $1.names,
+      children: [binding, initializer],
+      names: binding.names,
+      binding,
+      initializer,
     }
 
 # https://262.ecma-international.org/#prod-Initializer

diff --git a/test/if.civet b/test/if.civet
@@ -598,6 +598,18 @@ describe "if", ->
       }
     """
 
+    testCase """
+      longhand const
+      ---
+      if const match = regex.exec string
+        console.log match
+      ---
+      let ref;if (ref = regex.exec(string)) {
+        const match = ref;
+        console.log(match)
+      }
+    """
+
     // TODO
     throws """
       declaration in expression