From d3e987896c5682fccdeb94d634361a6cbfb78be2 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Thu, 20 Nov 2014 19:46:47 +1100
Subject: [PATCH] Fix spread attributes within elements inside expression
 containers

---
 acorn.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/acorn.js b/acorn.js
index 419afd10ae..1d357e5133 100644
--- a/acorn.js
+++ b/acorn.js
@@ -3169,13 +3169,14 @@
     if (tokType === _braceL) {
       var tokStart1 = tokStart, tokStartLoc1 = tokStartLoc;
 
-      var origInXJSTag = inXJSTag;
-      inXJSTag = false;
+      var origInXJSTag = inXJSTag, origInXJSChildExpression = inXJSChildExpression;
+      inXJSTag = inXJSChildExpression = false;
 
       next();
       if (tokType !== _ellipsis) unexpected();
       var node = parseMaybeUnary();
 
+      inXJSChildExpression = origInXJSChildExpression;
       inXJSTag = origInXJSTag;
 
       expect(_braceR);