From 1aa8c6a37c478ea5fcdc925f22c6ab24224ea7d7 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Sun, 8 Feb 2015 16:17:53 +1100
Subject: [PATCH] fix function parsing due to faulty merge

---
 acorn.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/acorn.js b/acorn.js
index 3cbd21c5e9..80986eede1 100644
--- a/acorn.js
+++ b/acorn.js
@@ -2426,7 +2426,7 @@
       if (allowEmpty && tokType === _comma) {
         elem = null;
       } else {
-        var left = parseAssignableAtom();
+        var left = parseMaybeDefault();
         parseAssignableListItemTypes(left);
         elem = parseMaybeDefault(null, left);
       }
@@ -3558,8 +3558,6 @@
       node.typeParameters = parseTypeParameterDeclaration();
     }
     parseFunctionParams(node);
-    expect(_parenL);
-    node.params = parseBindingList(_parenR, false);
     parseFunctionBody(node, allowExpressionBody);
     return finishNode(node, isStatement ? "FunctionDeclaration" : "FunctionExpression");
   }