From daefc220daff973038bccea7700a07cf0f6cbd70 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 17 Oct 2012 23:09:15 +0200
Subject: [PATCH] Require a semicolon after do/while

---
 acorn.js      |  1 +
 index.html    |  1 +
 test/tests.js | 17 ++---------------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/acorn.js b/acorn.js
index 552eee7208..07c15ee28b 100644
--- a/acorn.js
+++ b/acorn.js
@@ -1017,6 +1017,7 @@
       labels.pop();
       expect(_while);
       node.test = parseParenExpression();
+      semicolon();
       return finishNode(node, "DoWhileStatement");
 
       // Disambiguating between a `for` and a `for`/`in` loop is
diff --git a/index.html b/index.html
index bba0ab301b..faa7fd8a67 100644
--- a/index.html
+++ b/index.html
@@ -699,6 +699,7 @@ continue to.</p>             </td>             <td class="code">               <
       <span class="nx">labels</span><span class="p">.</span><span class="nx">pop</span><span class="p">();</span>
       <span class="nx">expect</span><span class="p">(</span><span class="nx">_while</span><span class="p">);</span>
       <span class="nx">node</span><span class="p">.</span><span class="nx">test</span> <span class="o">=</span> <span class="nx">parseParenExpression</span><span class="p">();</span>
+      <span class="nx">semicolon</span><span class="p">();</span>
       <span class="k">return</span> <span class="nx">finishNode</span><span class="p">(</span><span class="nx">node</span><span class="p">,</span> <span class="s2">&quot;DoWhileStatement&quot;</span><span class="p">);</span></pre></div>             </td>           </tr>                               <tr id="section-93">             <td class="docs">               <div class="pilwrap">                 <a class="pilcrow" href="#section-93">&#182;</a>               </div>               <p>Disambiguating between a <code>for</code> and a <code>for</code>/<code>in</code> loop is
 non-trivial. Basically, we have to parse the init <code>var</code>
 statement or expression, disallowing the <code>in</code> operator (see
diff --git a/test/tests.js b/test/tests.js
index d9c4670ca1..2b267615b0 100644
--- a/test/tests.js
+++ b/test/tests.js
@@ -17695,19 +17695,6 @@ test("do keep(); while (true);", {
           line: 1,
           column: 0
         },
-        end: {
-          line: 1,
-          column: 23
-        }
-      }
-    },
-    {
-      type: "EmptyStatement",
-      loc: {
-        start: {
-          line: 1,
-          column: 23
-        },
         end: {
           line: 1,
           column: 24
@@ -17897,7 +17884,7 @@ test("do { x++; y--; } while (x < 10)", {
   }
 });
 
-test("{ do { } while (false) false }", {
+test("{ do { } while (false);false }", {
   type: "Program",
   body: [
     {
@@ -17940,7 +17927,7 @@ test("{ do { } while (false) false }", {
             },
             end: {
               line: 1,
-              column: 22
+              column: 23
             }
           }
         },