2.2.2 (#4986)

* Changelog for 2.2.2

* Bump version to 2.2.2

* Bump dependencies

* Update output

Cakefile

@@ -332,7 +332,7 @@ task 'doc:test:watch', 'watch and continually rebuild the browser-based tests',
 
 buildAnnotatedSource = (watch = no) ->
   do generateAnnotatedSource = ->
-    exec "node_modules/docco/bin/docco src/*.*coffee --output docs/v#{majorVersion}/annotated-source", (err) -> throw err if err
+    exec "cd src && ../node_modules/docco/bin/docco *.*coffee --output ../docs/v#{majorVersion}/annotated-source", (err) -> throw err if err
     log 'generated', green, "annotated source in docs/v#{majorVersion}/annotated-source/"
 
   if watch

appveyor.yml

@@ -0,0 +1,27 @@
+environment:
+  matrix:
+    - nodejs_version: '6'
+    - nodejs_version: '8'
+    - nodejs_version: '' # Installs latest.
+
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - node --version
+  - npm --version
+  - npm install
+
+cache:
+  - node_modules
+
+test_script:
+  - node ./bin/cake build:except-parser
+  - node ./bin/cake build:parser
+  - node ./bin/cake build:full
+  - node ./bin/cake build:browser
+  - node ./bin/cake test
+  - node ./bin/cake test:browser
+  - node ./bin/cake test:integrations
+
+build: off
+
+version: "{build}"

bin/cake

@@ -1,5 +1,12 @@
 #!/usr/bin/env node
 
+try {
+  new Function('var {a} = {a: 1}')();
+} catch (error) {
+  console.error('Your JavaScript runtime does not support some features used by the cake command. Please use Node 6 or later.');
+  process.exit(1);
+}
+
 var path = require('path');
 var fs   = require('fs');
 

bin/coffee

@@ -1,5 +1,12 @@
 #!/usr/bin/env node
 
+try {
+  new Function('var {a} = {a: 1}')();
+} catch (error) {
+  console.error('Your JavaScript runtime does not support some features used by the coffee command. Please use Node 6 or later.');
+  process.exit(1);
+}
+
 var path = require('path');
 var fs   = require('fs');
 

docs/v2/annotated-source/lexer.html

@@ -461,13 +461,17 @@ what CoffeeScript would normally interpret as calls to functions named
             </div>
             
             <div class="content"><div class='highlight'><pre>    <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'PROPERTY'</span> <span class="hljs-keyword">and</span> prev
-      <span class="hljs-keyword">if</span> prev.spaced <span class="hljs-keyword">and</span> prev[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> CALLABLE <span class="hljs-keyword">and</span> <span class="hljs-regexp">/^[gs]et$/</span>.test(prev[<span class="hljs-number">1</span>]) <span class="hljs-keyword">and</span> @tokens[@tokens.length - <span class="hljs-number">2</span>][<span class="hljs-number">0</span>] <span class="hljs-keyword">isnt</span> <span class="hljs-string">'.'</span>
-        @error <span class="hljs-string">"'<span class="hljs-subst">#{prev[<span class="hljs-number">1</span>]}</span>' cannot be used as a keyword, or as a function call without parentheses"</span>, prev[<span class="hljs-number">2</span>]
-      <span class="hljs-keyword">else</span>
+      <span class="hljs-keyword">if</span> prev.spaced <span class="hljs-keyword">and</span> prev[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> CALLABLE <span class="hljs-keyword">and</span> <span class="hljs-regexp">/^[gs]et$/</span>.test(prev[<span class="hljs-number">1</span>]) <span class="hljs-keyword">and</span>
+         @tokens.length &gt; <span class="hljs-number">1</span> <span class="hljs-keyword">and</span> @tokens[@tokens.length - <span class="hljs-number">2</span>][<span class="hljs-number">0</span>] <span class="hljs-keyword">not</span> <span class="hljs-keyword">in</span> [<span class="hljs-string">'.'</span>, <span class="hljs-string">'?.'</span>, <span class="hljs-string">'@'</span>]
+        @error <span class="hljs-string">"'<span class="hljs-subst">#{prev[<span class="hljs-number">1</span>]}</span>' cannot be used as a keyword, or as a function call
+        without parentheses"</span>, prev[<span class="hljs-number">2</span>]
+      <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> @tokens.length &gt; <span class="hljs-number">2</span>
         prevprev = @tokens[@tokens.length - <span class="hljs-number">2</span>]
-        <span class="hljs-keyword">if</span> prev[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> [<span class="hljs-string">'@'</span>, <span class="hljs-string">'THIS'</span>] <span class="hljs-keyword">and</span> prevprev <span class="hljs-keyword">and</span> prevprev.spaced <span class="hljs-keyword">and</span> <span class="hljs-regexp">/^[gs]et$/</span>.test(prevprev[<span class="hljs-number">1</span>]) <span class="hljs-keyword">and</span>
-        @tokens[@tokens.length - <span class="hljs-number">3</span>][<span class="hljs-number">0</span>] <span class="hljs-keyword">isnt</span> <span class="hljs-string">'.'</span>
-          @error <span class="hljs-string">"'<span class="hljs-subst">#{prevprev[<span class="hljs-number">1</span>]}</span>' cannot be used as a keyword, or as a function call without parentheses"</span>, prevprev[<span class="hljs-number">2</span>]
+        <span class="hljs-keyword">if</span> prev[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> [<span class="hljs-string">'@'</span>, <span class="hljs-string">'THIS'</span>] <span class="hljs-keyword">and</span> prevprev <span class="hljs-keyword">and</span> prevprev.spaced <span class="hljs-keyword">and</span>
+           <span class="hljs-regexp">/^[gs]et$/</span>.test(prevprev[<span class="hljs-number">1</span>]) <span class="hljs-keyword">and</span>
+           @tokens[@tokens.length - <span class="hljs-number">3</span>][<span class="hljs-number">0</span>] <span class="hljs-keyword">not</span> <span class="hljs-keyword">in</span> [<span class="hljs-string">'.'</span>, <span class="hljs-string">'?.'</span>, <span class="hljs-string">'@'</span>]
+          @error <span class="hljs-string">"'<span class="hljs-subst">#{prevprev[<span class="hljs-number">1</span>]}</span>' cannot be used as a keyword, or as a
+          function call without parentheses"</span>, prevprev[<span class="hljs-number">2</span>]
 
     <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'IDENTIFIER'</span> <span class="hljs-keyword">and</span> id <span class="hljs-keyword">in</span> RESERVED
       @error <span class="hljs-string">"reserved word '<span class="hljs-subst">#{id}</span>'"</span>, length: id.length
@@ -915,9 +919,11 @@ can close multiple indents, so we need to know how far in we happen to be.</p>
     <span class="hljs-keyword">return</span> <span class="hljs-number">0</span> <span class="hljs-keyword">unless</span> match = MULTI_DENT.exec chunk
     indent = match[<span class="hljs-number">0</span>]
 
-    @seenFor = <span class="hljs-literal">no</span>
-    @seenImport = <span class="hljs-literal">no</span> <span class="hljs-keyword">unless</span> @importSpecifierList
-    @seenExport = <span class="hljs-literal">no</span> <span class="hljs-keyword">unless</span> @exportSpecifierList
+    prev = @prev()
+    backslash = prev?[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'\\'</span>
+    @seenFor = <span class="hljs-literal">no</span> <span class="hljs-keyword">unless</span> backslash <span class="hljs-keyword">and</span> @seenFor
+    @seenImport = <span class="hljs-literal">no</span> <span class="hljs-keyword">unless</span> (backslash <span class="hljs-keyword">and</span> @seenImport) <span class="hljs-keyword">or</span> @importSpecifierList
+    @seenExport = <span class="hljs-literal">no</span> <span class="hljs-keyword">unless</span> (backslash <span class="hljs-keyword">and</span> @seenExport) <span class="hljs-keyword">or</span> @exportSpecifierList
 
     size = indent.length - <span class="hljs-number">1</span> - indent.lastIndexOf <span class="hljs-string">'\n'</span>
     noNewlines = @unfinished()
@@ -938,7 +944,7 @@ can close multiple indents, so we need to know how far in we happen to be.</p>
 
     <span class="hljs-keyword">if</span> size &gt; @indent
       <span class="hljs-keyword">if</span> noNewlines
-        @indebt = size - @indent
+        @indebt = size - @indent <span class="hljs-keyword">unless</span> backslash
         @suppressNewlines()
         <span class="hljs-keyword">return</span> indent.length
       <span class="hljs-keyword">unless</span> @tokens.length
@@ -1121,7 +1127,7 @@ comments that trail it.</p>
             
             <div class="content"><div class='highlight'><pre>    prevChar = <span class="hljs-keyword">if</span> @tokens.length &gt; <span class="hljs-number">0</span> <span class="hljs-keyword">then</span> @tokens[@tokens.length - <span class="hljs-number">1</span>][<span class="hljs-number">0</span>] <span class="hljs-keyword">else</span> <span class="hljs-string">''</span>
     <span class="hljs-keyword">if</span> firstChar <span class="hljs-keyword">is</span> <span class="hljs-string">'&lt;'</span>
-      match = CSX_IDENTIFIER.exec @chunk[<span class="hljs-number">1.</span>..]
+      match = CSX_IDENTIFIER.exec(@chunk[<span class="hljs-number">1.</span>..]) <span class="hljs-keyword">or</span> CSX_FRAGMENT_IDENTIFIER.exec(@chunk[<span class="hljs-number">1.</span>..])
       <span class="hljs-keyword">return</span> <span class="hljs-number">0</span> <span class="hljs-keyword">unless</span> match <span class="hljs-keyword">and</span> (
         @csxDepth &gt; <span class="hljs-number">0</span> <span class="hljs-keyword">or</span></pre></div></div>
             
@@ -1187,8 +1193,8 @@ comments that trail it.</p>
           @matchWithInterpolations INSIDE_CSX, <span class="hljs-string">'&gt;'</span>, <span class="hljs-string">'&lt;/'</span>, CSX_INTERPOLATION
         @mergeInterpolationTokens tokens, {delimiter: <span class="hljs-string">'"'</span>}, <span class="hljs-function"><span class="hljs-params">(value, i)</span> =&gt;</span>
           @formatString value, delimiter: <span class="hljs-string">'&gt;'</span>
-        match = CSX_IDENTIFIER.exec @chunk[end...]
-        <span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> match <span class="hljs-keyword">or</span> match[<span class="hljs-number">0</span>] <span class="hljs-keyword">isnt</span> csxTag.name
+        match = CSX_IDENTIFIER.exec(@chunk[end...]) <span class="hljs-keyword">or</span> CSX_FRAGMENT_IDENTIFIER.exec(@chunk[end...])
+        <span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> match <span class="hljs-keyword">or</span> match[<span class="hljs-number">1</span>] <span class="hljs-keyword">isnt</span> csxTag.name
           @error <span class="hljs-string">"expected corresponding CSX closing tag for <span class="hljs-subst">#{csxTag.name}</span>"</span>,
             csxTag.origin[<span class="hljs-number">2</span>]
         afterTag = end + csxTag.name.length
@@ -1641,8 +1647,8 @@ of <code>&#39;NEOSTRING&#39;</code>s are converted using <code>fn</code> and tur
                 <a class="pilcrow" href="#section-58">&#182;</a>
               </div>
               <p>This is an interpolated string, not a CSX tag; and for whatever
-reason <code>`a${/*test*/}b` </code> is invalid JS. So compile to
-<code>`a${/*test*/&#39;&#39;}b` </code> instead.</p>
+reason <code>`a${/*test*/}b`</code> is invalid JS. So compile to
+<code>`a${/*test*/&#39;&#39;}b`</code> instead.</p>
 
             </div>
             
@@ -2458,6 +2464,23 @@ be used as identifiers or properties.</p>
 CSX_IDENTIFIER = <span class="hljs-regexp">/// ^
   (?![\d&lt;]) <span class="hljs-comment"># Must not start with `&lt;`.</span>
   ( (?: (?!\s)[\.\-$\w\x7f-\uffff] )+ ) <span class="hljs-comment"># Like `IDENTIFIER`, but includes `-`s and `.`s.</span>
+///</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-98">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-98">&#182;</a>
+              </div>
+              <p>Fragment: &lt;&gt;&lt;/&gt;</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>CSX_FRAGMENT_IDENTIFIER = <span class="hljs-regexp">/// ^
+  ()&gt; <span class="hljs-comment"># Ends immediately with `&gt;`.</span>
 ///</span>
 
 CSX_ATTRIBUTE = <span class="hljs-regexp">/// ^
@@ -2497,11 +2520,11 @@ HERE_JSTOKEN = <span class="hljs-regexp">///^ ```     ((?: [^`\\] | \\[\s\S] | `
         </li>
         
         
-        <li id="section-98">
+        <li id="section-99">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-98">&#182;</a>
+                <a class="pilcrow" href="#section-99">&#182;</a>
               </div>
               <p>String-matching-regexes.</p>
 
@@ -2535,11 +2558,11 @@ HEREDOC_INDENT     = <span class="hljs-regexp">/\n+([^\n\S]*)(?=\S)/g</span></pr
         </li>
         
         
-        <li id="section-99">
+        <li id="section-100">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-99">&#182;</a>
+                <a class="pilcrow" href="#section-100">&#182;</a>
               </div>
               <p>Regex-matching-regexes.</p>
 
@@ -2558,7 +2581,86 @@ HEREDOC_INDENT     = <span class="hljs-regexp">/\n+([^\n\S]*)(?=\S)/g</span></pr
 REGEX_FLAGS  = <span class="hljs-regexp">/^\w*/</span>
 VALID_FLAGS  = <span class="hljs-regexp">/^(?!.*(.).*\1)[imguy]*$/</span>
 
-HEREGEX      = <span class="hljs-regexp">/// ^(?: [^\\/<span class="hljs-comment">#] | \\[\s\S] | /(?!//) | \#(?!\{) )* ///</span>
+HEREGEX      = <span class="hljs-regexp">/// ^
+  (?:
+</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-101">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-101">&#182;</a>
+              </div>
+              <p>Match any character, except those that need special handling below.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>      [^\\/<span class="hljs-comment">#\s]</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-102">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-102">&#182;</a>
+              </div>
+              <p>Match <code>\</code> followed by any character.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    | \\[\s\S]</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-103">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-103">&#182;</a>
+              </div>
+              <p>Match any <code>/</code> except <code>///</code>.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    | <span class="hljs-regexp">/(?!/</span>/)</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-104">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-104">&#182;</a>
+              </div>
+              <p>Match <code>#</code> which is not part of interpolation, e.g. <code>#{}</code>.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    | \<span class="hljs-comment">#(?!\{)</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-105">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-105">&#182;</a>
+              </div>
+              <p>Comments consume everything until the end of the line, including <code>///</code>.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    | \s+(?:<span class="hljs-comment">#(?!\{).*)?</span>
+  )*
+<span class="hljs-regexp">///
 
 HEREGEX_OMIT = ///</span>
     ((?:\\\\)+)     <span class="hljs-comment"># Consume (and preserve) an even number of backslashes.</span>
@@ -2573,11 +2675,11 @@ POSSIBLY_DIVISION   = <span class="hljs-regexp">/// ^ /=?\s ///</span></pre></di
         </li>
         
         
-        <li id="section-100">
+        <li id="section-106">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-100">&#182;</a>
+                <a class="pilcrow" href="#section-106">&#182;</a>
               </div>
               <p>Other regexes.</p>
 
@@ -2620,11 +2722,11 @@ TRAILING_SPACES     = <span class="hljs-regexp">/\s+$/</span></pre></div></div>
         </li>
         
         
-        <li id="section-101">
+        <li id="section-107">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-101">&#182;</a>
+                <a class="pilcrow" href="#section-107">&#182;</a>
               </div>
               <p>Compound assignment tokens.</p>
 
@@ -2638,11 +2740,11 @@ TRAILING_SPACES     = <span class="hljs-regexp">/\s+$/</span></pre></div></div>
         </li>
         
         
-        <li id="section-102">
+        <li id="section-108">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-102">&#182;</a>
+                <a class="pilcrow" href="#section-108">&#182;</a>
               </div>
               <p>Unary tokens.</p>
 
@@ -2655,11 +2757,11 @@ UNARY_MATH = [<span class="hljs-string">'!'</span>, <span class="hljs-string">'~
         </li>
         
         
-        <li id="section-103">
+        <li id="section-109">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-103">&#182;</a>
+                <a class="pilcrow" href="#section-109">&#182;</a>
               </div>
               <p>Bit-shifting tokens.</p>
 
@@ -2670,11 +2772,11 @@ UNARY_MATH = [<span class="hljs-string">'!'</span>, <span class="hljs-string">'~
         </li>
         
         
-        <li id="section-104">
+        <li id="section-110">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-104">&#182;</a>
+                <a class="pilcrow" href="#section-110">&#182;</a>
               </div>
               <p>Comparison tokens.</p>
 
@@ -2685,11 +2787,11 @@ UNARY_MATH = [<span class="hljs-string">'!'</span>, <span class="hljs-string">'~
         </li>
         
         
-        <li id="section-105">
+        <li id="section-111">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-105">&#182;</a>
+                <a class="pilcrow" href="#section-111">&#182;</a>
               </div>
               <p>Mathematical tokens.</p>
 
@@ -2700,11 +2802,11 @@ UNARY_MATH = [<span class="hljs-string">'!'</span>, <span class="hljs-string">'~
         </li>
         
         
-        <li id="section-106">
+        <li id="section-112">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-106">&#182;</a>
+                <a class="pilcrow" href="#section-112">&#182;</a>
               </div>
               <p>Relational tokens that are negatable with <code>not</code> prefix.</p>
 
@@ -2715,11 +2817,11 @@ UNARY_MATH = [<span class="hljs-string">'!'</span>, <span class="hljs-string">'~
         </li>
         
         
-        <li id="section-107">
+        <li id="section-113">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-107">&#182;</a>
+                <a class="pilcrow" href="#section-113">&#182;</a>
               </div>
               <p>Boolean tokens.</p>
 
@@ -2730,11 +2832,11 @@ UNARY_MATH = [<span class="hljs-string">'!'</span>, <span class="hljs-string">'~
         </li>
         
         
-        <li id="section-108">
+        <li id="section-114">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-108">&#182;</a>
+                <a class="pilcrow" href="#section-114">&#182;</a>
               </div>
               <p>Tokens which could legitimately be invoked or indexed. An opening
 parentheses or bracket following these tokens will be recorded as the start
@@ -2751,11 +2853,11 @@ INDEXABLE = CALLABLE.concat [
         </li>
         
         
-        <li id="section-109">
+        <li id="section-115">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-109">&#182;</a>
+                <a class="pilcrow" href="#section-115">&#182;</a>
               </div>
               <p>Tokens which can be the left-hand side of a less-than comparison, i.e. <code>a&lt;b</code>.</p>
 
@@ -2766,11 +2868,11 @@ INDEXABLE = CALLABLE.concat [
         </li>
         
         
-        <li id="section-110">
+        <li id="section-116">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-110">&#182;</a>
+                <a class="pilcrow" href="#section-116">&#182;</a>
               </div>
               <p>Tokens which a regular expression will never immediately follow (except spaced
 CALLABLEs in some cases), but which a division operator can.</p>
@@ -2783,11 +2885,11 @@ CALLABLEs in some cases), but which a division operator can.</p>
         </li>
         
         
-        <li id="section-111">
+        <li id="section-117">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-111">&#182;</a>
+                <a class="pilcrow" href="#section-117">&#182;</a>
               </div>
               <p>Tokens that, when immediately preceding a <code>WHEN</code>, indicate that the <code>WHEN</code>
 occurs at the start of a line. We disambiguate these from trailing whens to
@@ -2800,11 +2902,11 @@ avoid an ambiguity in the grammar.</p>
         </li>
         
         
-        <li id="section-112">
+        <li id="section-118">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-112">&#182;</a>
+                <a class="pilcrow" href="#section-118">&#182;</a>
               </div>
               <p>Additional indent in front of these is ignored.</p>
 
@@ -2815,11 +2917,11 @@ avoid an ambiguity in the grammar.</p>
         </li>
         
         
-        <li id="section-113">
+        <li id="section-119">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-113">&#182;</a>
+                <a class="pilcrow" href="#section-119">&#182;</a>
               </div>
               <p>Tokens that, when appearing at the end of a line, suppress a following TERMINATOR/INDENT token</p>
 

docs/v2/annotated-source/rewriter.html

@@ -676,7 +676,21 @@ class declaration or if-conditionals).</p>
             endImplicitObject()
           <span class="hljs-keyword">else</span>
             stack.pop()
-        start = stack.pop()</pre></div></div>
+        start = stack.pop()
+<span class="hljs-function">
+      <span class="hljs-title">inControlFlow</span> = =&gt;</span>
+        seenFor = @findTagsBackwards(i, [<span class="hljs-string">'FOR'</span>]) <span class="hljs-keyword">and</span> @findTagsBackwards(i, [<span class="hljs-string">'FORIN'</span>, <span class="hljs-string">'FOROF'</span>, <span class="hljs-string">'FORFROM'</span>])
+        controlFlow = seenFor <span class="hljs-keyword">or</span> @findTagsBackwards i, [<span class="hljs-string">'WHILE'</span>, <span class="hljs-string">'UNTIL'</span>, <span class="hljs-string">'LOOP'</span>, <span class="hljs-string">'LEADING_WHEN'</span>]
+        <span class="hljs-keyword">return</span> <span class="hljs-literal">no</span> <span class="hljs-keyword">unless</span> controlFlow
+        isFunc = <span class="hljs-literal">no</span>
+        tagCurrentLine = token[<span class="hljs-number">2</span>].first_line
+        @detectEnd i,
+          <span class="hljs-function"><span class="hljs-params">(token, i)</span> -&gt;</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> LINEBREAKS
+          (token, i) -&gt;
+            [prevTag, ,{first_line}] = tokens[i - <span class="hljs-number">1</span>] || []
+            isFunc = tagCurrentLine <span class="hljs-keyword">is</span> first_line <span class="hljs-keyword">and</span> prevTag <span class="hljs-keyword">in</span> [<span class="hljs-string">'-&gt;'</span>, <span class="hljs-string">'=&gt;'</span>]
+          returnOnNegativeLevel: <span class="hljs-literal">yes</span>
+        isFunc</pre></div></div>
             
         </li>
         
@@ -698,7 +712,8 @@ Added support for spread dots on the left side: f …a</p>
          (nextTag <span class="hljs-keyword">in</span> IMPLICIT_CALL <span class="hljs-keyword">or</span>
          (nextTag <span class="hljs-keyword">is</span> <span class="hljs-string">'...'</span> <span class="hljs-keyword">and</span> @tag(i + <span class="hljs-number">2</span>) <span class="hljs-keyword">in</span> IMPLICIT_CALL <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> @findTagsBackwards(i, [<span class="hljs-string">'INDEX_START'</span>, <span class="hljs-string">'['</span>])) <span class="hljs-keyword">or</span>
           nextTag <span class="hljs-keyword">in</span> IMPLICIT_UNSPACED_CALL <span class="hljs-keyword">and</span>
-          <span class="hljs-keyword">not</span> nextToken.spaced <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> nextToken.newLine)
+          <span class="hljs-keyword">not</span> nextToken.spaced <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> nextToken.newLine) <span class="hljs-keyword">and</span>
+          <span class="hljs-keyword">not</span> inControlFlow()
         tag = token[<span class="hljs-number">0</span>] = <span class="hljs-string">'FUNC_EXIST'</span> <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'?'</span>
         startImplicitCall i + <span class="hljs-number">1</span>
         <span class="hljs-keyword">return</span> forward(<span class="hljs-number">2</span>)</pre></div></div>
@@ -835,7 +850,9 @@ like e.g.:</p>
           stackItem[<span class="hljs-number">2</span>].sameLine = <span class="hljs-literal">no</span> <span class="hljs-keyword">if</span> isImplicitObject stackItem
 
       newLine = prevTag <span class="hljs-keyword">is</span> <span class="hljs-string">'OUTDENT'</span> <span class="hljs-keyword">or</span> prevToken.newLine
-      <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">in</span> IMPLICIT_END <span class="hljs-keyword">or</span> tag <span class="hljs-keyword">in</span> CALL_CLOSERS <span class="hljs-keyword">and</span> newLine
+      <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">in</span> IMPLICIT_END <span class="hljs-keyword">or</span>
+          (tag <span class="hljs-keyword">in</span> CALL_CLOSERS <span class="hljs-keyword">and</span> newLine) <span class="hljs-keyword">or</span>
+          (tag <span class="hljs-keyword">in</span> [<span class="hljs-string">'..'</span>, <span class="hljs-string">'...'</span>] <span class="hljs-keyword">and</span> @findTagsBackwards(i, [<span class="hljs-string">"INDEX_START"</span>]))
         <span class="hljs-keyword">while</span> inImplicit()
           [stackTag, stackIdx, {sameLine, startsLine}] = stackTop()</pre></div></div>
             
@@ -852,7 +869,8 @@ like e.g.:</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>          <span class="hljs-keyword">if</span> inImplicitCall() <span class="hljs-keyword">and</span> prevTag <span class="hljs-keyword">isnt</span> <span class="hljs-string">','</span>
+            <div class="content"><div class='highlight'><pre>          <span class="hljs-keyword">if</span> inImplicitCall() <span class="hljs-keyword">and</span> prevTag <span class="hljs-keyword">isnt</span> <span class="hljs-string">','</span> <span class="hljs-keyword">or</span>
+              (prevTag <span class="hljs-keyword">is</span> <span class="hljs-string">','</span> <span class="hljs-keyword">and</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'TERMINATOR'</span> <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> nextTag?)
             endImplicitCall()</pre></div></div>
             
         </li>
@@ -1245,20 +1263,101 @@ blocks are added.</p>
             
             <div class="content"><div class='highlight'><pre>  normalizeLines: <span class="hljs-function">-&gt;</span>
     starter = indent = outdent = <span class="hljs-literal">null</span>
+    leading_switch_when = <span class="hljs-literal">null</span>
+    leading_if_then = <span class="hljs-literal">null</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-50">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-50">&#182;</a>
+              </div>
+              <p>Count <code>THEN</code> tags</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    ifThens = []
 <span class="hljs-function">
     <span class="hljs-title">condition</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
       token[<span class="hljs-number">1</span>] <span class="hljs-keyword">isnt</span> <span class="hljs-string">';'</span> <span class="hljs-keyword">and</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> SINGLE_CLOSERS <span class="hljs-keyword">and</span>
       <span class="hljs-keyword">not</span> (token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'TERMINATOR'</span> <span class="hljs-keyword">and</span> @tag(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">in</span> EXPRESSION_CLOSE) <span class="hljs-keyword">and</span>
-      <span class="hljs-keyword">not</span> (token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'ELSE'</span> <span class="hljs-keyword">and</span> starter <span class="hljs-keyword">isnt</span> <span class="hljs-string">'THEN'</span>) <span class="hljs-keyword">and</span>
+      <span class="hljs-keyword">not</span> (token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'ELSE'</span> <span class="hljs-keyword">and</span>
+           (starter <span class="hljs-keyword">isnt</span> <span class="hljs-string">'THEN'</span> <span class="hljs-keyword">or</span> (leading_if_then <span class="hljs-keyword">or</span> leading_switch_when))) <span class="hljs-keyword">and</span>
       <span class="hljs-keyword">not</span> (token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> [<span class="hljs-string">'CATCH'</span>, <span class="hljs-string">'FINALLY'</span>] <span class="hljs-keyword">and</span> starter <span class="hljs-keyword">in</span> [<span class="hljs-string">'-&gt;'</span>, <span class="hljs-string">'=&gt;'</span>]) <span class="hljs-keyword">or</span>
       token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> CALL_CLOSERS <span class="hljs-keyword">and</span>
       (@tokens[i - <span class="hljs-number">1</span>].newLine <span class="hljs-keyword">or</span> @tokens[i - <span class="hljs-number">1</span>][<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'OUTDENT'</span>)
 <span class="hljs-function">
     <span class="hljs-title">action</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
+      ifThens.pop() <span class="hljs-keyword">if</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'ELSE'</span> <span class="hljs-keyword">and</span> starter <span class="hljs-keyword">is</span> <span class="hljs-string">'THEN'</span>
       @tokens.splice (<span class="hljs-keyword">if</span> @tag(i - <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">','</span> <span class="hljs-keyword">then</span> i - <span class="hljs-number">1</span> <span class="hljs-keyword">else</span> i), <span class="hljs-number">0</span>, outdent
+<span class="hljs-function">
+    <span class="hljs-title">closeElseTag</span> = <span class="hljs-params">(tokens, i)</span> =&gt;</span>
+      tlen = ifThens.length
+      <span class="hljs-keyword">return</span> i <span class="hljs-keyword">unless</span> tlen &gt; <span class="hljs-number">0</span>
+      lastThen = ifThens.pop()
+      [, outdentElse] = @indentation tokens[lastThen]</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-51">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-51">&#182;</a>
+              </div>
+              <p>Insert <code>OUTDENT</code> to close inner <code>IF</code>.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>      outdentElse[<span class="hljs-number">1</span>] = tlen*<span class="hljs-number">2</span>
+      tokens.splice(i, <span class="hljs-number">0</span>, outdentElse)</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-52">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-52">&#182;</a>
+              </div>
+              <p>Insert <code>OUTDENT</code> to close outer <code>IF</code>.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>      outdentElse[<span class="hljs-number">1</span>] = <span class="hljs-number">2</span>
+      tokens.splice(i + <span class="hljs-number">1</span>, <span class="hljs-number">0</span>, outdentElse)</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-53">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-53">&#182;</a>
+              </div>
+              <p>Remove outdents from the end.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>      @detectEnd i + <span class="hljs-number">2</span>,
+        <span class="hljs-function"><span class="hljs-params">(token, i)</span> -&gt;</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> [<span class="hljs-string">'OUTDENT'</span>, <span class="hljs-string">'TERMINATOR'</span>]
+        (token, i) -&gt;
+            <span class="hljs-keyword">if</span> @tag(i) <span class="hljs-keyword">is</span> <span class="hljs-string">'OUTDENT'</span> <span class="hljs-keyword">and</span> @tag(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'OUTDENT'</span>
+              tokens.splice i, <span class="hljs-number">2</span>
+      i + <span class="hljs-number">2</span>
 
     @scanTokens (token, i, tokens) -&gt;
       [tag] = token
+      conditionTag = tag <span class="hljs-keyword">in</span> [<span class="hljs-string">'-&gt;'</span>, <span class="hljs-string">'=&gt;'</span>] <span class="hljs-keyword">and</span>
+        @findTagsBackwards(i, [<span class="hljs-string">'IF'</span>, <span class="hljs-string">'WHILE'</span>, <span class="hljs-string">'FOR'</span>, <span class="hljs-string">'UNTIL'</span>, <span class="hljs-string">'SWITCH'</span>, <span class="hljs-string">'WHEN'</span>, <span class="hljs-string">'LEADING_WHEN'</span>, <span class="hljs-string">'['</span>, <span class="hljs-string">'INDEX_START'</span>]) <span class="hljs-keyword">and</span>
+        <span class="hljs-keyword">not</span> (@findTagsBackwards i, [<span class="hljs-string">'THEN'</span>, <span class="hljs-string">'..'</span>, <span class="hljs-string">'...'</span>])
+
       <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'TERMINATOR'</span>
         <span class="hljs-keyword">if</span> @tag(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'ELSE'</span> <span class="hljs-keyword">and</span> @tag(i - <span class="hljs-number">1</span>) <span class="hljs-keyword">isnt</span> <span class="hljs-string">'OUTDENT'</span>
           tokens.splice i, <span class="hljs-number">1</span>, @indentation()...
@@ -1275,10 +1374,31 @@ blocks are added.</p>
         tokens.splice i + <span class="hljs-number">1</span>, <span class="hljs-number">0</span>, indent, outdent
         <span class="hljs-keyword">return</span> <span class="hljs-number">1</span>
       <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">in</span> SINGLE_LINERS <span class="hljs-keyword">and</span> @tag(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">isnt</span> <span class="hljs-string">'INDENT'</span> <span class="hljs-keyword">and</span>
-         <span class="hljs-keyword">not</span> (tag <span class="hljs-keyword">is</span> <span class="hljs-string">'ELSE'</span> <span class="hljs-keyword">and</span> @tag(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'IF'</span>)
+         <span class="hljs-keyword">not</span> (tag <span class="hljs-keyword">is</span> <span class="hljs-string">'ELSE'</span> <span class="hljs-keyword">and</span> @tag(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'IF'</span>) <span class="hljs-keyword">and</span>
+         <span class="hljs-keyword">not</span> conditionTag
         starter = tag
         [indent, outdent] = @indentation tokens[i]
         indent.fromThen   = <span class="hljs-literal">true</span> <span class="hljs-keyword">if</span> starter <span class="hljs-keyword">is</span> <span class="hljs-string">'THEN'</span>
+        <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'THEN'</span>
+          leading_switch_when = @findTagsBackwards(i, [<span class="hljs-string">'LEADING_WHEN'</span>]) <span class="hljs-keyword">and</span> @tag(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'IF'</span>
+          leading_if_then = @findTagsBackwards(i, [<span class="hljs-string">'IF'</span>]) <span class="hljs-keyword">and</span> @tag(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'IF'</span>
+        ifThens.push i <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'THEN'</span> <span class="hljs-keyword">and</span> @findTagsBackwards(i, [<span class="hljs-string">'IF'</span>])</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-54">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-54">&#182;</a>
+              </div>
+              <p><code>ELSE</code> tag is not closed.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>        <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'ELSE'</span> <span class="hljs-keyword">and</span> @tag(i - <span class="hljs-number">1</span>) <span class="hljs-keyword">isnt</span> <span class="hljs-string">'OUTDENT'</span>
+          i = closeElseTag tokens, i
         tokens.splice i + <span class="hljs-number">1</span>, <span class="hljs-number">0</span>, indent
         @detectEnd i + <span class="hljs-number">2</span>, condition, action
         tokens.splice i, <span class="hljs-number">1</span> <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'THEN'</span>
@@ -1288,11 +1408,11 @@ blocks are added.</p>
         </li>
         
         
-        <li id="section-50">
+        <li id="section-55">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-50">&#182;</a>
+                <a class="pilcrow" href="#section-55">&#182;</a>
               </div>
               <p>Tag postfix conditionals as such, so that we can parse them with a
 different precedence.</p>
@@ -1320,11 +1440,11 @@ different precedence.</p>
         </li>
         
         
-        <li id="section-51">
+        <li id="section-56">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-51">&#182;</a>
+                <a class="pilcrow" href="#section-56">&#182;</a>
               </div>
               <p>Generate the indentation tokens, based on another token on the same line.</p>
 
@@ -1345,11 +1465,11 @@ different precedence.</p>
         </li>
         
         
-        <li id="section-52">
+        <li id="section-57">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-52">&#182;</a>
+                <a class="pilcrow" href="#section-57">&#182;</a>
               </div>
               <p>Look up a tag by token index.</p>
 
@@ -1360,11 +1480,11 @@ different precedence.</p>
         </li>
         
         
-        <li id="section-53">
+        <li id="section-58">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-53">&#182;</a>
+                <a class="pilcrow" href="#section-58">&#182;</a>
               </div>
               <h2 id="constants">Constants</h2>
 
@@ -1373,11 +1493,11 @@ different precedence.</p>
         </li>
         
         
-        <li id="section-54">
+        <li id="section-59">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-54">&#182;</a>
+                <a class="pilcrow" href="#section-59">&#182;</a>
               </div>
               
             </div>
@@ -1385,11 +1505,11 @@ different precedence.</p>
         </li>
         
         
-        <li id="section-55">
+        <li id="section-60">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-55">&#182;</a>
+                <a class="pilcrow" href="#section-60">&#182;</a>
               </div>
               <p>List of the token pairs that must be balanced.</p>
 
@@ -1410,11 +1530,11 @@ different precedence.</p>
         </li>
         
         
-        <li id="section-56">
+        <li id="section-61">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-56">&#182;</a>
+                <a class="pilcrow" href="#section-61">&#182;</a>
               </div>
               <p>The inverse mappings of <code>BALANCED_PAIRS</code> we’re trying to fix up, so we can
 look things up from either end.</p>
@@ -1426,11 +1546,11 @@ look things up from either end.</p>
         </li>
         
         
-        <li id="section-57">
+        <li id="section-62">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-57">&#182;</a>
+                <a class="pilcrow" href="#section-62">&#182;</a>
               </div>
               <p>The tokens that signal the start/end of a balanced pair.</p>
 
@@ -1446,11 +1566,11 @@ EXPRESSION_END   = []
         </li>
         
         
-        <li id="section-58">
+        <li id="section-63">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-58">&#182;</a>
+                <a class="pilcrow" href="#section-63">&#182;</a>
               </div>
               <p>Tokens that indicate the close of a clause of an expression.</p>
 
@@ -1461,11 +1581,11 @@ EXPRESSION_END   = []
         </li>
         
         
-        <li id="section-59">
+        <li id="section-64">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-59">&#182;</a>
+                <a class="pilcrow" href="#section-64">&#182;</a>
               </div>
               <p>Tokens that, if followed by an <code>IMPLICIT_CALL</code>, indicate a function invocation.</p>
 
@@ -1476,11 +1596,11 @@ EXPRESSION_END   = []
         </li>
         
         
-        <li id="section-60">
+        <li id="section-65">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-60">&#182;</a>
+                <a class="pilcrow" href="#section-65">&#182;</a>
               </div>
               <p>If preceded by an <code>IMPLICIT_FUNC</code>, indicates a function invocation.</p>
 
@@ -1500,11 +1620,11 @@ IMPLICIT_UNSPACED_CALL = [<span class="hljs-string">'+'</span>, <span class="hlj
         </li>
         
         
-        <li id="section-61">
+        <li id="section-66">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-61">&#182;</a>
+                <a class="pilcrow" href="#section-66">&#182;</a>
               </div>
               <p>Tokens that always mark the end of an implicit call for single-liners.</p>
 
@@ -1516,11 +1636,11 @@ IMPLICIT_UNSPACED_CALL = [<span class="hljs-string">'+'</span>, <span class="hlj
         </li>
         
         
-        <li id="section-62">
+        <li id="section-67">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-62">&#182;</a>
+                <a class="pilcrow" href="#section-67">&#182;</a>
               </div>
               <p>Single-line flavors of block expressions that have unclosed endings.
 The grammar can’t disambiguate them, so we insert the implicit indentation.</p>
@@ -1533,11 +1653,11 @@ SINGLE_CLOSERS   = [<span class="hljs-string">'TERMINATOR'</span>, <span class="
         </li>
         
         
-        <li id="section-63">
+        <li id="section-68">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-63">&#182;</a>
+                <a class="pilcrow" href="#section-68">&#182;</a>
               </div>
               <p>Tokens that end a line.</p>
 
@@ -1548,11 +1668,11 @@ SINGLE_CLOSERS   = [<span class="hljs-string">'TERMINATOR'</span>, <span class="
         </li>
         
         
-        <li id="section-64">
+        <li id="section-69">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-64">&#182;</a>
+                <a class="pilcrow" href="#section-69">&#182;</a>
               </div>
               <p>Tokens that close open calls when they follow a newline.</p>
 
@@ -1563,11 +1683,11 @@ SINGLE_CLOSERS   = [<span class="hljs-string">'TERMINATOR'</span>, <span class="
         </li>
         
         
-        <li id="section-65">
+        <li id="section-70">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-65">&#182;</a>
+                <a class="pilcrow" href="#section-70">&#182;</a>
               </div>
               <p>Tokens that prevent a subsequent indent from ending implicit calls/objects</p>
 
@@ -1578,11 +1698,11 @@ SINGLE_CLOSERS   = [<span class="hljs-string">'TERMINATOR'</span>, <span class="
         </li>
         
         
-        <li id="section-66">
+        <li id="section-71">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-66">&#182;</a>
+                <a class="pilcrow" href="#section-71">&#182;</a>
               </div>
               <p>Tokens that are swallowed up by the parser, never leading to code generation.
 You can spot these in <code>grammar.coffee</code> because the <code>o</code> function second

documentation/sections/changelog.md

@@ -1,5 +1,55 @@
 ## Changelog
 
+```
+releaseHeader('2018-02-21', '2.2.2', '2.1.1')
+```
+*   Bugfix for regression in 2.2.0 where a range with a `by` (step) value that increments or decrements in the opposite direction as the range was returning an array containing the first value of the range, whereas it should be returning an empty array. In other words, `x for x in [2..1] by 1` should equal `[]`, not `[2]` (because the step value is positive 1, counting up, whereas the range goes from 2 to 1, counting down).
+*   Bugfixes for allowing backslashes in `import` and `export` statements and lines that trigger the start of an indented block, like an `if` statement.
+
+```
+releaseHeader('2018-02-06', '2.2.1', '2.1.0')
+```
+*   Bugfix for regression in 2.2.0 involving an error thrown by the compiler in certain cases when using destructuring with a splat or expansion in an array.
+*   Bugfix for regression in 2.2.0 where in certain cases a range iterator variable was declared in the global scope.
+
+```
+releaseHeader('2018-02-01', '2.2.0', '2.1.1')
+```
+*   This release fixes *all* currently open bugs, dating as far back as 2014, 2012 and 2011.
+*   **Potential breaking change:** An inline `if` or `switch` statement with an ambiguous `else`, such as `if no then if yes then alert 1 else alert 2`, now compiles where the `else` always corresponds to the closest open `then`. Previously the behavior of an ambiguous `else` was unpredictable. If your code has any `if … then` or `switch … then` statements with multiple `then`s (and one or more `else`s) the compiled output might be different now, unless you had resolved ambiguity via parentheses. We made this change because the previous behavior was inconsistent and basically a bug: depending on what grammar was where, for example if there was an inline function or something that implied a block, the `else` might bind to an earlier `then` rather than a later `then`. Now an `else` essentially closes a block opened by a `then`, similar to closing an open parenthesis.
+*   When a required `then` is missing, the error more accurately points out the location of the mistake.
+*   An error is thrown when the `coffee` command is run in an environment that doesn’t support some ES2015 JavaScript features that the CoffeeScript compiler itself requires. This can happen if CoffeeScript is installed in Node older than version 6.
+*   Destructuring with a non-final splat/spread, e.g. `[open, contents..., close] = tag.split('')` is now output using ES2015 rest syntax.
+*   Functions named `get` or `set` can be used without parentheses in more cases, including when attached to `this` or `@` or `?.`; or when the first argument is an implicit object, e.g. `@set key: 'val'`.
+*   Statements such as `break` can now be used inside parentheses, e.g. `(doSomething(); break) while condition` or `(pick(key); break) for key of obj`.
+*   Bugfix for assigning to a property attached to `this`/`@` in destructuring, e.g. `({@prop = yes, @otherProp = no}) ->`.
+*   Bugfix for incorrect errors being thrown about calling `super` with a parameter attached to `this` when said parameter is in a lower scope, e.g. `class Child extends Parent then constructor: -> super(-> @prop)`.
+*   Bugfix to prevent a possible infinite loop when a `for` loop is given a variable to step by, e.g. `for x in [1..3] by step` (as opposed to `by 0.5` or some other primitive numeric value).
+*   Bugfix to no longer declare iterator variables twice when evaluating a range, e.g. `end = 3; fn [0..end]`.
+*   Bugfix for incorrect scope of variables in chained calls, e.g. `start(x = 3).then(-> x = 4)`.
+*   Bugfix for incorrect scope of variables in a function passed to `do`, e.g. `for [1..3] then masked = 10; do -> alert masked`.
+*   Bugfix to no longer throw a syntax error for a trailing comma in a function call, e.g. `fn arg1, arg2,`.
+*   Bugfix for an expression in a property access, e.g. `a[!b in c..]`.
+*   Bugfix to allow a line continuation backslash (`\`) at any point in a `for` line.
+
+```
+releaseHeader('2017-12-29', '2.1.1', '2.1.0')
+```
+
+*   Bugfix to set the correct context for executable class bodies. So in `class @B extends @A then @property = 1`, the `@` in `@property` now refers to the class, not the global object.
+*   Bugfix where anonymous classes were getting created using the same automatic variable name. They now each receive unique names, so as not to override each other.
+
+
+```
+releaseHeader('2017-12-10', '2.1.0', '2.0.3')
+```
+
+*   Computed property keys in object literals are now supported: `obj = { ['key' + i]: 42 }`, or `obj = [Symbol.iterator]: -> yield i++`.
+*   Skipping of array elements, a.k.a. elision, is now supported: `arr = [a, , b]`, or `[, protocol] = url.match /^(.*):\/\//`.
+*   [JSX fragments syntax](https://reactjs.org/blog/2017/11/28/react-v16.2.0-fragment-support.html) is now supported.
+*   Bugfix where `///` within a `#` line comment inside a `///` block regex was erroneously closing the regex, rather than being treated as part of the comment.
+*   Bugfix for incorrect output for object rest destructuring inside array destructuring.
+
 ```
 releaseHeader('2017-11-26', '2.0.3', '2.0.2')
 ```

documentation/sections/objects_and_arrays.md

@@ -6,12 +6,6 @@ The CoffeeScript literals for objects and arrays look very similar to their Java
 codeFor('objects_and_arrays', 'song.join(" … ")')
 ```
 
-In JavaScript, you can’t use reserved words, like `class`, as properties of an object, without quoting them as strings. CoffeeScript notices reserved words used as keys in objects and quotes them for you, so you don’t have to worry about it (say, when using jQuery).
-
-```
-codeFor('objects_reserved')
-```
-
 CoffeeScript has a shortcut for creating objects when you want the key to be set with a variable of the same name.
 
 ```

documentation/sections/operators.md

@@ -18,7 +18,7 @@ You can use `in` to test for array presence, and `of` to test for JavaScript obj
 
 In a `for` loop, `from` compiles to the [ES2015 `of`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for...of). (Yes, it’s unfortunate; the CoffeeScript `of` predates the ES2015 `of`.)
 
-To simplify math expressions, `**` can be used for exponentiation and `//` performs integer division. `%` works just like in JavaScript, while `%%` provides [“dividend dependent modulo”](https://en.wikipedia.org/wiki/Modulo_operation):
+To simplify math expressions, `**` can be used for exponentiation and `//` performs floor division. `%` works just like in JavaScript, while `%%` provides [“dividend dependent modulo”](https://en.wikipedia.org/wiki/Modulo_operation):
 
 ```
 codeFor('modulo')

lib/coffeescript/browser.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   // This **Browser** compatibility layer extends core CoffeeScript functions
   // to make things work smoothly when compiling code directly in the browser.
@@ -77,7 +77,7 @@
   // all script tags with a content-type of `text/coffeescript`.
   // This happens on page load.
   runScripts = function() {
-    var coffees, coffeetypes, execute, fn, i, index, j, len, s, script, scripts;
+    var coffees, coffeetypes, execute, i, index, j, len, s, script, scripts;
     scripts = window.document.getElementsByTagName('script');
     coffeetypes = ['text/coffeescript', 'text/literate-coffeescript'];
     coffees = (function() {
@@ -101,32 +101,31 @@
         return execute();
       }
     };
-    fn = function(script, i) {
-      var options, source;
-      options = {
-        literate: script.type === coffeetypes[1]
-      };
-      source = script.src || script.getAttribute('data-src');
-      if (source) {
-        options.filename = source;
-        return CoffeeScript.load(source, function(param) {
-          coffees[i] = param;
-          return execute();
-        }, options, true);
-      } else {
-        // `options.filename` defines the filename the source map appears as
-        // in Developer Tools. If a script tag has an `id`, use that as the
-        // filename; otherwise use `coffeescript`, or `coffeescript1` etc.,
-        // leaving the first one unnumbered for the common case that there’s
-        // only one CoffeeScript script block to parse.
-        options.filename = script.id && script.id !== '' ? script.id : `coffeescript${(i !== 0 ? i : '')}`;
-        options.sourceFiles = ['embedded'];
-        return coffees[i] = [script.innerHTML, options];
-      }
-    };
     for (i = j = 0, len = coffees.length; j < len; i = ++j) {
       script = coffees[i];
-      fn(script, i);
+      (function(script, i) {
+        var options, source;
+        options = {
+          literate: script.type === coffeetypes[1]
+        };
+        source = script.src || script.getAttribute('data-src');
+        if (source) {
+          options.filename = source;
+          return CoffeeScript.load(source, function(param) {
+            coffees[i] = param;
+            return execute();
+          }, options, true);
+        } else {
+          // `options.filename` defines the filename the source map appears as
+          // in Developer Tools. If a script tag has an `id`, use that as the
+          // filename; otherwise use `coffeescript`, or `coffeescript1` etc.,
+          // leaving the first one unnumbered for the common case that there’s
+          // only one CoffeeScript script block to parse.
+          options.filename = script.id && script.id !== '' ? script.id : `coffeescript${(i !== 0 ? i : '')}`;
+          options.sourceFiles = ['embedded'];
+          return coffees[i] = [script.innerHTML, options];
+        }
+      })(script, i);
     }
     return execute();
   };

lib/coffeescript/cake.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   // `cake` is a simplified version of [Make](http://www.gnu.org/software/make/)
   // ([Rake](http://rake.rubyforge.org/), [Jake](https://github.com/280north/jake))

lib/coffeescript/coffeescript.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   // CoffeeScript can be used both on the server, as a command-line compiler based
   // on Node.js/V8, or to run CoffeeScript directly in the browser. This module

lib/coffeescript/command.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   // The `coffee` utility. Handles command-line compilation of CoffeeScript
   // into various forms: saved into `.js` files or printed to stdout

lib/coffeescript/grammar.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   // The CoffeeScript parser is generated by [Jison](https://github.com/zaach/jison)
   // from this grammar file. Jison is a bottom-up parser generator, similar in
@@ -97,7 +97,7 @@
     // Block and statements, which make up a line in a body. YieldReturn is a
     // statement, but not included in Statement because that results in an ambiguous
     // grammar.
-    Line: [o('Expression'), o('Statement'), o('FuncDirective')],
+    Line: [o('Expression'), o('ExpressionLine'), o('Statement'), o('FuncDirective')],
     FuncDirective: [o('YieldReturn'), o('AwaitReturn')],
     // Pure statements which cannot be expressions.
     Statement: [
@@ -114,6 +114,10 @@
     // is one. Blocks serve as the building blocks of many other rules, making
     // them somewhat circular.
     Expression: [o('Value'), o('Code'), o('Operation'), o('Assign'), o('If'), o('Try'), o('While'), o('For'), o('Switch'), o('Class'), o('Throw'), o('Yield')],
+    // Expressions which are written in single line and would otherwise require being
+    // wrapped in braces: E.g `a = b if do -> f a is 1`, `if f (a) -> a*2 then ...`,
+    // `for x in do (obj) -> f obj when x > 8 then f x`
+    ExpressionLine: [o('CodeLine'), o('IfLine'), o('OperationLine')],
     Yield: [
       o('YIELD',
       function() {
@@ -282,7 +286,15 @@
         });
       })
     ],
-    SimpleObjAssignable: [o('Identifier'), o('Property'), o('ThisProperty')],
+    SimpleObjAssignable: [
+      o('Identifier'),
+      o('Property'),
+      o('ThisProperty'),
+      o('[ Expression ]',
+      function() {
+        return new Value(new ComputedPropertyName($2));
+      })
+    ],
     ObjAssignable: [o('SimpleObjAssignable'), o('AlphaNumeric')],
     // Object literal spread properties.
     ObjRestValue: [
@@ -399,6 +411,22 @@
       $1);
       })
     ],
+    // The Codeline is the **Code** node with **Line** instead of indented **Block**.
+    CodeLine: [
+      o('PARAM_START ParamList PARAM_END FuncGlyph Line',
+      function() {
+        return new Code($2,
+      LOC(5)(Block.wrap([$5])),
+      $4,
+      LOC(1)(new Literal($1)));
+      }),
+      o('FuncGlyph Line',
+      function() {
+        return new Code([],
+      LOC(2)(Block.wrap([$2])),
+      $1);
+      })
+    ],
     // CoffeeScript has two different symbols for functions. `->` is for ordinary
     // functions, and `=>` is for functions bound to the current value of *this*.
     FuncGlyph: [
@@ -954,9 +982,14 @@
       function() {
         return new Arr([]);
       }),
-      o('[ ArgList OptComma ]',
+      o('[ Elisions ]',
       function() {
         return new Arr($2);
+      }),
+      o('[ ArgElisionList OptElisions ]',
+      function() {
+        return new Arr([].concat($2,
+      $3));
       })
     ],
     // Inclusive and exclusive range dots.
@@ -977,6 +1010,12 @@
         return new Range($2,
       $4,
       $3);
+      }),
+      o('[ ExpressionLine RangeDots Expression ]',
+      function() {
+        return new Range($2,
+      $4,
+      $3);
       })
     ],
     // Array slice literals.
@@ -993,6 +1032,18 @@
       null,
       $2);
       }),
+      o('ExpressionLine RangeDots Expression',
+      function() {
+        return new Range($1,
+      $3,
+      $2);
+      }),
+      o('ExpressionLine RangeDots',
+      function() {
+        return new Range($1,
+      null,
+      $2);
+      }),
       o('RangeDots Expression',
       function() {
         return new Range(null,
@@ -1006,8 +1057,7 @@
       $1);
       })
     ],
-    // The **ArgList** is both the list of objects passed into a function call,
-    // as well as the contents of an array literal
+    // The **ArgList** is the list of objects passed into a function call
     // (i.e. comma-separated expressions). Newlines work as well.
     ArgList: [
       o('Arg',
@@ -1034,21 +1084,88 @@
     // Valid arguments are Blocks or Splats.
     Arg: [
       o('Expression'),
+      o('ExpressionLine'),
       o('Splat'),
       o('...',
       function() {
         return new Expansion;
       })
     ],
+    // The **ArgElisionList** is the list of objects, contents of an array literal
+    // (i.e. comma-separated expressions and elisions). Newlines work as well.
+    ArgElisionList: [
+      o('ArgElision'),
+      o('ArgElisionList , ArgElision',
+      function() {
+        return $1.concat($3);
+      }),
+      o('ArgElisionList OptElisions TERMINATOR ArgElision',
+      function() {
+        return $1.concat($2,
+      $4);
+      }),
+      o('INDENT ArgElisionList OptElisions OUTDENT',
+      function() {
+        return $2.concat($3);
+      }),
+      o('ArgElisionList OptElisions INDENT ArgElisionList OptElisions OUTDENT',
+      function() {
+        return $1.concat($2,
+      $4,
+      $5);
+      })
+    ],
+    ArgElision: [
+      o('Arg',
+      function() {
+        return [$1];
+      }),
+      o('Elisions Arg',
+      function() {
+        return $1.concat($2);
+      })
+    ],
+    OptElisions: [
+      o('OptComma',
+      function() {
+        return [];
+      }),
+      o(', Elisions',
+      function() {
+        return [].concat($2);
+      })
+    ],
+    Elisions: [
+      o('Elision',
+      function() {
+        return [$1];
+      }),
+      o('Elisions Elision',
+      function() {
+        return $1.concat($2);
+      })
+    ],
+    Elision: [
+      o(',',
+      function() {
+        return new Elision;
+      })
+    ],
     // Just simple, comma-separated, required arguments (no fancy syntax). We need
     // this to be separate from the **ArgList** for use in **Switch** blocks, where
     // having the newlines wouldn't make sense.
     SimpleArgs: [
       o('Expression'),
+      o('ExpressionLine'),
       o('SimpleArgs , Expression',
       function() {
         return [].concat($1,
       $3);
+      }),
+      o('SimpleArgs , ExpressionLine',
+      function() {
+        return [].concat($1,
+      $3);
       })
     ],
     // The variants of *try/catch/finally* exception handling blocks.
@@ -1122,6 +1239,34 @@
       })
     ],
     // The condition portion of a while loop.
+    WhileLineSource: [
+      o('WHILE ExpressionLine',
+      function() {
+        return new While($2);
+      }),
+      o('WHILE ExpressionLine WHEN ExpressionLine',
+      function() {
+        return new While($2,
+      {
+          guard: $4
+        });
+      }),
+      o('UNTIL ExpressionLine',
+      function() {
+        return new While($2,
+      {
+          invert: true
+        });
+      }),
+      o('UNTIL ExpressionLine WHEN ExpressionLine',
+      function() {
+        return new While($2,
+      {
+          invert: true,
+          guard: $4
+        });
+      })
+    ],
     WhileSource: [
       o('WHILE Expression',
       function() {
@@ -1134,6 +1279,13 @@
           guard: $4
         });
       }),
+      o('WHILE ExpressionLine WHEN Expression',
+      function() {
+        return new While($2,
+      {
+          guard: $4
+        });
+      }),
       o('UNTIL Expression',
       function() {
         return new While($2,
@@ -1142,6 +1294,14 @@
         });
       }),
       o('UNTIL Expression WHEN Expression',
+      function() {
+        return new While($2,
+      {
+          invert: true,
+          guard: $4
+        });
+      }),
+      o('UNTIL ExpressionLine WHEN Expression',
       function() {
         return new While($2,
       {
@@ -1157,6 +1317,10 @@
       function() {
         return $1.addBody($2);
       }),
+      o('WhileLineSource Block',
+      function() {
+        return $1.addBody($2);
+      }),
       o('Statement  WhileSource',
       function() {
         return $2.addBody(LOC(1)(Block.wrap([$1])));
@@ -1198,6 +1362,11 @@
       function() {
         return new For($2,
       $1);
+      }),
+      o('ForLineBody  Block',
+      function() {
+        return new For($2,
+      $1);
       })
     ],
     ForBody: [
@@ -1223,6 +1392,23 @@
         return $2;
       })
     ],
+    ForLineBody: [
+      o('FOR Range BY ExpressionLine',
+      function() {
+        return {
+          source: LOC(2)(new Value($2)),
+          step: $4
+        };
+      }),
+      o('ForStart ForLineSource',
+      function() {
+        $2.own = $1.own;
+        $2.ownTag = $1.ownTag;
+        $2.name = $1[0];
+        $2.index = $1[1];
+        return $2;
+      })
+    ],
     ForStart: [
       o('FOR ForVariables',
       function() {
@@ -1287,6 +1473,13 @@
           guard: $4
         };
       }),
+      o('FORIN ExpressionLine WHEN Expression',
+      function() {
+        return {
+          source: $2,
+          guard: $4
+        };
+      }),
       o('FOROF Expression WHEN Expression',
       function() {
         return {
@@ -1295,6 +1488,14 @@
           object: true
         };
       }),
+      o('FOROF ExpressionLine WHEN Expression',
+      function() {
+        return {
+          source: $2,
+          guard: $4,
+          object: true
+        };
+      }),
       o('FORIN Expression BY Expression',
       function() {
         return {
@@ -1302,6 +1503,13 @@
           step: $4
         };
       }),
+      o('FORIN ExpressionLine BY Expression',
+      function() {
+        return {
+          source: $2,
+          step: $4
+        };
+      }),
       o('FORIN Expression WHEN Expression BY Expression',
       function() {
         return {
@@ -1310,6 +1518,30 @@
           step: $6
         };
       }),
+      o('FORIN ExpressionLine WHEN Expression BY Expression',
+      function() {
+        return {
+          source: $2,
+          guard: $4,
+          step: $6
+        };
+      }),
+      o('FORIN Expression WHEN ExpressionLine BY Expression',
+      function() {
+        return {
+          source: $2,
+          guard: $4,
+          step: $6
+        };
+      }),
+      o('FORIN ExpressionLine WHEN ExpressionLine BY Expression',
+      function() {
+        return {
+          source: $2,
+          guard: $4,
+          step: $6
+        };
+      }),
       o('FORIN Expression BY Expression WHEN Expression',
       function() {
         return {
@@ -1318,6 +1550,30 @@
           guard: $6
         };
       }),
+      o('FORIN ExpressionLine BY Expression WHEN Expression',
+      function() {
+        return {
+          source: $2,
+          step: $4,
+          guard: $6
+        };
+      }),
+      o('FORIN Expression BY ExpressionLine WHEN Expression',
+      function() {
+        return {
+          source: $2,
+          step: $4,
+          guard: $6
+        };
+      }),
+      o('FORIN ExpressionLine BY ExpressionLine WHEN Expression',
+      function() {
+        return {
+          source: $2,
+          step: $4,
+          guard: $6
+        };
+      }),
       o('FORFROM Expression',
       function() {
         return {
@@ -1326,6 +1582,160 @@
         };
       }),
       o('FORFROM Expression WHEN Expression',
+      function() {
+        return {
+          source: $2,
+          guard: $4,
+          from: true
+        };
+      }),
+      o('FORFROM ExpressionLine WHEN Expression',
+      function() {
+        return {
+          source: $2,
+          guard: $4,
+          from: true
+        };
+      })
+    ],
+    ForLineSource: [
+      o('FORIN ExpressionLine',
+      function() {
+        return {
+          source: $2
+        };
+      }),
+      o('FOROF ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          object: true
+        };
+      }),
+      o('FORIN Expression WHEN ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          guard: $4
+        };
+      }),
+      o('FORIN ExpressionLine WHEN ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          guard: $4
+        };
+      }),
+      o('FOROF Expression WHEN ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          guard: $4,
+          object: true
+        };
+      }),
+      o('FOROF ExpressionLine WHEN ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          guard: $4,
+          object: true
+        };
+      }),
+      o('FORIN Expression BY ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          step: $4
+        };
+      }),
+      o('FORIN ExpressionLine BY ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          step: $4
+        };
+      }),
+      o('FORIN Expression WHEN Expression BY ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          guard: $4,
+          step: $6
+        };
+      }),
+      o('FORIN ExpressionLine WHEN Expression BY ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          guard: $4,
+          step: $6
+        };
+      }),
+      o('FORIN Expression WHEN ExpressionLine BY ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          guard: $4,
+          step: $6
+        };
+      }),
+      o('FORIN ExpressionLine WHEN ExpressionLine BY ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          guard: $4,
+          step: $6
+        };
+      }),
+      o('FORIN Expression BY Expression WHEN ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          step: $4,
+          guard: $6
+        };
+      }),
+      o('FORIN ExpressionLine BY Expression WHEN ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          step: $4,
+          guard: $6
+        };
+      }),
+      o('FORIN Expression BY ExpressionLine WHEN ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          step: $4,
+          guard: $6
+        };
+      }),
+      o('FORIN ExpressionLine BY ExpressionLine WHEN ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          step: $4,
+          guard: $6
+        };
+      }),
+      o('FORFROM ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          from: true
+        };
+      }),
+      o('FORFROM Expression WHEN ExpressionLine',
+      function() {
+        return {
+          source: $2,
+          guard: $4,
+          from: true
+        };
+      }),
+      o('FORFROM ExpressionLine WHEN ExpressionLine',
       function() {
         return {
           source: $2,
@@ -1340,12 +1750,23 @@
         return new Switch($2,
       $4);
       }),
+      o('SWITCH ExpressionLine INDENT Whens OUTDENT',
+      function() {
+        return new Switch($2,
+      $4);
+      }),
       o('SWITCH Expression INDENT Whens ELSE Block OUTDENT',
       function() {
         return new Switch($2,
       $4,
       $6);
       }),
+      o('SWITCH ExpressionLine INDENT Whens ELSE Block OUTDENT',
+      function() {
+        return new Switch($2,
+      $4,
+      $6);
+      }),
       o('SWITCH INDENT Whens OUTDENT',
       function() {
         return new Switch(null,
@@ -1427,12 +1848,63 @@
         });
       })
     ],
+    IfBlockLine: [
+      o('IF ExpressionLine Block',
+      function() {
+        return new If($2,
+      $3,
+      {
+          type: $1
+        });
+      }),
+      o('IfBlockLine ELSE IF ExpressionLine Block',
+      function() {
+        return $1.addElse(LOC(3,
+      5)(new If($4,
+      $5,
+      {
+          type: $3
+        })));
+      })
+    ],
+    IfLine: [
+      o('IfBlockLine'),
+      o('IfBlockLine ELSE Block',
+      function() {
+        return $1.addElse($3);
+      }),
+      o('Statement  POST_IF ExpressionLine',
+      function() {
+        return new If($3,
+      LOC(1)(Block.wrap([$1])),
+      {
+          type: $2,
+          statement: true
+        });
+      }),
+      o('Expression POST_IF ExpressionLine',
+      function() {
+        return new If($3,
+      LOC(1)(Block.wrap([$1])),
+      {
+          type: $2,
+          statement: true
+        });
+      })
+    ],
     // Arithmetic and logical operators, working on one or more operands.
     // Here they are grouped by order of precedence. The actual precedence rules
     // are defined at the bottom of the page. It would be shorter if we could
     // combine most of these rules into a single generic *Operand OpSymbol Operand*
     // -type rule, but in order to make the precedence binding possible, separate
     // rules are necessary.
+    OperationLine: [
+      o('UNARY ExpressionLine',
+      function() {
+        return new Op($1,
+      $2);
+      })
+    ],
     Operation: [
       o('UNARY Expression',
       function() {

lib/coffeescript/helpers.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   // This file contains the common helper functions that we'd like to share among
   // the **Lexer**, **Rewriter**, and the **Nodes**. Merge objects, flatten

lib/coffeescript/index.js

@@ -1,7 +1,7 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   // Node.js Implementation
-  var CoffeeScript, ext, fn, fs, helpers, i, len, path, ref, universalCompile, vm,
+  var CoffeeScript, ext, fs, helpers, i, len, path, ref, universalCompile, vm,
     hasProp = {}.hasOwnProperty;
 
   CoffeeScript = require('./coffeescript');
@@ -137,15 +137,14 @@
   // Throw error with deprecation warning when depending upon implicit `require.extensions` registration
   if (require.extensions) {
     ref = CoffeeScript.FILE_EXTENSIONS;
-    fn = function(ext) {
-      var base;
-      return (base = require.extensions)[ext] != null ? base[ext] : base[ext] = function() {
-        throw new Error(`Use CoffeeScript.register() or require the coffeescript/register module to require ${ext} files.`);
-      };
-    };
     for (i = 0, len = ref.length; i < len; i++) {
       ext = ref[i];
-      fn(ext);
+      (function(ext) {
+        var base;
+        return (base = require.extensions)[ext] != null ? base[ext] : base[ext] = function() {
+          throw new Error(`Use CoffeeScript.register() or require the coffeescript/register module to require ${ext} files.`);
+        };
+      })(ext);
     }
   }
 

lib/coffeescript/lexer.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   // The CoffeeScript Lexer. Uses a series of token-matching regexes to attempt
   // matches against the beginning of the source code. When a match is found,
@@ -10,8 +10,9 @@
   // where locationData is {first_line, first_column, last_line, last_column}, which is a
   // format that can be fed directly into [Jison](https://github.com/zaach/jison).  These
   // are read by jison in the `parser.lexer` function defined in coffeescript.coffee.
-  var BOM, BOOL, CALLABLE, CODE, COFFEE_ALIASES, COFFEE_ALIAS_MAP, COFFEE_KEYWORDS, COMMENT, COMPARABLE_LEFT_SIDE, COMPARE, COMPOUND_ASSIGN, CSX_ATTRIBUTE, CSX_IDENTIFIER, CSX_INTERPOLATION, HERECOMMENT_ILLEGAL, HEREDOC_DOUBLE, HEREDOC_INDENT, HEREDOC_SINGLE, HEREGEX, HEREGEX_OMIT, HERE_JSTOKEN, IDENTIFIER, INDENTABLE_CLOSERS, INDEXABLE, INSIDE_CSX, INVERSES, JSTOKEN, JS_KEYWORDS, LEADING_BLANK_LINE, LINE_BREAK, LINE_CONTINUER, Lexer, MATH, MULTI_DENT, NOT_REGEX, NUMBER, OPERATOR, POSSIBLY_DIVISION, REGEX, REGEX_FLAGS, REGEX_ILLEGAL, REGEX_INVALID_ESCAPE, RELATION, RESERVED, Rewriter, SHIFT, SIMPLE_STRING_OMIT, STRICT_PROSCRIBED, STRING_DOUBLE, STRING_INVALID_ESCAPE, STRING_OMIT, STRING_SINGLE, STRING_START, TRAILING_BLANK_LINE, TRAILING_SPACES, UNARY, UNARY_MATH, UNFINISHED, UNICODE_CODE_POINT_ESCAPE, VALID_FLAGS, WHITESPACE, attachCommentsToNode, compact, count, invertLiterate, isForFrom, isUnassignable, key, locationDataToString, merge, repeat, starts, throwSyntaxError,
-    indexOf = [].indexOf;
+  var BOM, BOOL, CALLABLE, CODE, COFFEE_ALIASES, COFFEE_ALIAS_MAP, COFFEE_KEYWORDS, COMMENT, COMPARABLE_LEFT_SIDE, COMPARE, COMPOUND_ASSIGN, CSX_ATTRIBUTE, CSX_FRAGMENT_IDENTIFIER, CSX_IDENTIFIER, CSX_INTERPOLATION, HERECOMMENT_ILLEGAL, HEREDOC_DOUBLE, HEREDOC_INDENT, HEREDOC_SINGLE, HEREGEX, HEREGEX_OMIT, HERE_JSTOKEN, IDENTIFIER, INDENTABLE_CLOSERS, INDEXABLE, INSIDE_CSX, INVERSES, JSTOKEN, JS_KEYWORDS, LEADING_BLANK_LINE, LINE_BREAK, LINE_CONTINUER, Lexer, MATH, MULTI_DENT, NOT_REGEX, NUMBER, OPERATOR, POSSIBLY_DIVISION, REGEX, REGEX_FLAGS, REGEX_ILLEGAL, REGEX_INVALID_ESCAPE, RELATION, RESERVED, Rewriter, SHIFT, SIMPLE_STRING_OMIT, STRICT_PROSCRIBED, STRING_DOUBLE, STRING_INVALID_ESCAPE, STRING_OMIT, STRING_SINGLE, STRING_START, TRAILING_BLANK_LINE, TRAILING_SPACES, UNARY, UNARY_MATH, UNFINISHED, UNICODE_CODE_POINT_ESCAPE, VALID_FLAGS, WHITESPACE, attachCommentsToNode, compact, count, invertLiterate, isForFrom, isUnassignable, key, locationDataToString, merge, repeat, starts, throwSyntaxError,
+    indexOf = [].indexOf,
+    slice = [].slice;
 
   ({Rewriter, INVERSES} = require('./rewriter'));
 
@@ -111,7 +112,7 @@
     // referenced as property names here, so you can still do `jQuery.is()` even
     // though `is` means `===` otherwise.
     identifierToken() {
-      var alias, colon, colonOffset, colonToken, id, idLength, inCSXTag, input, match, poppedToken, prev, prevprev, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, ref8, regExSuper, regex, sup, tag, tagToken;
+      var alias, colon, colonOffset, colonToken, id, idLength, inCSXTag, input, match, poppedToken, prev, prevprev, ref, ref1, ref10, ref2, ref3, ref4, ref5, ref6, ref7, ref8, ref9, regExSuper, regex, sup, tag, tagToken;
       inCSXTag = this.atCSXTag();
       regex = inCSXTag ? CSX_ATTRIBUTE : IDENTIFIER;
       if (!(match = regex.exec(this.chunk))) {
@@ -199,11 +200,11 @@
       // what CoffeeScript would normally interpret as calls to functions named
       // `get` or `set`, i.e. `get({foo: function () {}})`.
       } else if (tag === 'PROPERTY' && prev) {
-        if (prev.spaced && (ref7 = prev[0], indexOf.call(CALLABLE, ref7) >= 0) && /^[gs]et$/.test(prev[1]) && this.tokens[this.tokens.length - 2][0] !== '.') {
+        if (prev.spaced && (ref7 = prev[0], indexOf.call(CALLABLE, ref7) >= 0) && /^[gs]et$/.test(prev[1]) && this.tokens.length > 1 && ((ref8 = this.tokens[this.tokens.length - 2][0]) !== '.' && ref8 !== '?.' && ref8 !== '@')) {
           this.error(`'${prev[1]}' cannot be used as a keyword, or as a function call without parentheses`, prev[2]);
-        } else {
+        } else if (this.tokens.length > 2) {
           prevprev = this.tokens[this.tokens.length - 2];
-          if (((ref8 = prev[0]) === '@' || ref8 === 'THIS') && prevprev && prevprev.spaced && /^[gs]et$/.test(prevprev[1]) && this.tokens[this.tokens.length - 3][0] !== '.') {
+          if (((ref9 = prev[0]) === '@' || ref9 === 'THIS') && prevprev && prevprev.spaced && /^[gs]et$/.test(prevprev[1]) && ((ref10 = this.tokens[this.tokens.length - 3][0]) !== '.' && ref10 !== '?.' && ref10 !== '@')) {
             this.error(`'${prevprev[1]}' cannot be used as a keyword, or as a function call without parentheses`, prevprev[2]);
           }
         }
@@ -586,16 +587,20 @@
     // Keeps track of the level of indentation, because a single outdent token
     // can close multiple indents, so we need to know how far in we happen to be.
     lineToken(chunk = this.chunk) {
-      var diff, indent, match, minLiteralLength, newIndentLiteral, noNewlines, size;
+      var backslash, diff, indent, match, minLiteralLength, newIndentLiteral, noNewlines, prev, size;
       if (!(match = MULTI_DENT.exec(chunk))) {
         return 0;
       }
       indent = match[0];
-      this.seenFor = false;
-      if (!this.importSpecifierList) {
+      prev = this.prev();
+      backslash = (prev != null ? prev[0] : void 0) === '\\';
+      if (!(backslash && this.seenFor)) {
+        this.seenFor = false;
+      }
+      if (!((backslash && this.seenImport) || this.importSpecifierList)) {
         this.seenImport = false;
       }
-      if (!this.exportSpecifierList) {
+      if (!((backslash && this.seenExport) || this.exportSpecifierList)) {
         this.seenExport = false;
       }
       size = indent.length - 1 - indent.lastIndexOf('\n');
@@ -624,7 +629,9 @@
       }
       if (size > this.indent) {
         if (noNewlines) {
-          this.indebt = size - this.indent;
+          if (!backslash) {
+            this.indebt = size - this.indent;
+          }
           this.suppressNewlines();
           return indent.length;
         }
@@ -741,7 +748,7 @@
       // Check the previous token to detect if attribute is spread.
       prevChar = this.tokens.length > 0 ? this.tokens[this.tokens.length - 1][0] : '';
       if (firstChar === '<') {
-        match = CSX_IDENTIFIER.exec(this.chunk.slice(1));
+        match = CSX_IDENTIFIER.exec(this.chunk.slice(1)) || CSX_FRAGMENT_IDENTIFIER.exec(this.chunk.slice(1));
         // Not the right hand side of an unspaced comparison (i.e. `a<b`).
         if (!(match && (this.csxDepth > 0 || !(prev = this.prev()) || prev.spaced || (ref = prev[0], indexOf.call(COMPARABLE_LEFT_SIDE, ref) < 0)))) {
           return 0;
@@ -793,8 +800,8 @@
               delimiter: '>'
             });
           });
-          match = CSX_IDENTIFIER.exec(this.chunk.slice(end));
-          if (!match || match[0] !== csxTag.name) {
+          match = CSX_IDENTIFIER.exec(this.chunk.slice(end)) || CSX_FRAGMENT_IDENTIFIER.exec(this.chunk.slice(end));
+          if (!match || match[1] !== csxTag.name) {
             this.error(`expected corresponding CSX closing tag for ${csxTag.name}`, csxTag.origin[2]);
           }
           afterTag = end + csxTag.name.length;
@@ -1050,7 +1057,7 @@
         if (braceInterpolator) {
           // Turn the leading and trailing `{` and `}` into parentheses. Unnecessary
           // parentheses will be removed later.
-          open = nested[0], close = nested[nested.length - 1];
+          [open] = nested, [close] = slice.call(nested, -1);
           open[0] = open[1] = '(';
           close[0] = close[1] = ')';
           close.origin = ['', 'end of interpolation', close[2]];
@@ -1075,7 +1082,7 @@
           length: delimiter.length
         });
       }
-      firstToken = tokens[0], lastToken = tokens[tokens.length - 1];
+      [firstToken] = tokens, [lastToken] = slice.call(tokens, -1);
       firstToken[2].first_column -= delimiter.length;
       if (lastToken[1].substr(-1) === '\n') {
         lastToken[2].last_line += 1;
@@ -1176,7 +1183,7 @@
         this.tokens.push(...tokensToPush);
       }
       if (lparen) {
-        lastToken = tokens[tokens.length - 1];
+        [lastToken] = slice.call(tokens, -1);
         lparen.origin = [
           'STRING',
           null,
@@ -1202,7 +1209,7 @@
     // correctly balanced throughout the course of the token stream.
     pair(tag) {
       var lastIndent, prev, ref, ref1, wanted;
-      ref = this.ends, prev = ref[ref.length - 1];
+      ref = this.ends, [prev] = slice.call(ref, -1);
       if (tag !== (wanted = prev != null ? prev.tag : void 0)) {
         if ('OUTDENT' !== wanted) {
           this.error(`unmatched ${tag}`);
@@ -1212,7 +1219,7 @@
         //     el.click((event) ->
         //       el.hide())
 
-        ref1 = this.indents, lastIndent = ref1[ref1.length - 1];
+        ref1 = this.indents, [lastIndent] = slice.call(ref1, -1);
         this.outdentToken(lastIndent, true);
         return this.pair(tag);
       }
@@ -1238,7 +1245,7 @@
       lineCount = count(string, '\n');
       column = this.chunkColumn;
       if (lineCount > 0) {
-        ref = string.split('\n'), lastLine = ref[ref.length - 1];
+        ref = string.split('\n'), [lastLine] = slice.call(ref, -1);
         column = lastLine.length;
       } else {
         column += string.length;
@@ -1279,14 +1286,14 @@
     // Peek at the last tag in the token stream.
     tag() {
       var ref, token;
-      ref = this.tokens, token = ref[ref.length - 1];
+      ref = this.tokens, [token] = slice.call(ref, -1);
       return token != null ? token[0] : void 0;
     }
 
     // Peek at the last value in the token stream.
     value(useOrigin = false) {
       var ref, ref1, token;
-      ref = this.tokens, token = ref[ref.length - 1];
+      ref = this.tokens, [token] = slice.call(ref, -1);
       if (useOrigin && ((token != null ? token.origin : void 0) != null)) {
         return (ref1 = token.origin) != null ? ref1[1] : void 0;
       } else {
@@ -1541,6 +1548,9 @@
   CSX_IDENTIFIER = /^(?![\d<])((?:(?!\s)[\.\-$\w\x7f-\uffff])+)/; // Must not start with `<`.
   // Like `IDENTIFIER`, but includes `-`s and `.`s.
 
+  // Fragment: <></>
+  CSX_FRAGMENT_IDENTIFIER = /^()>/; // Ends immediately with `>`.
+
   CSX_ATTRIBUTE = /^(?!\d)((?:(?!\s)[\-$\w\x7f-\uffff])+)([^\S]*=(?!=))?/; // Like `IDENTIFIER`, but includes `-`s.
   // Is this an attribute with a value?
 
@@ -1602,7 +1612,12 @@
 
   VALID_FLAGS = /^(?!.*(.).*\1)[imguy]*$/;
 
-  HEREGEX = /^(?:[^\\\/#]|\\[\s\S]|\/(?!\/\/)|\#(?!\{))*/;
+  // Match any character, except those that need special handling below.
+  // Match `\` followed by any character.
+  // Match any `/` except `///`.
+  // Match `#` which is not part of interpolation, e.g. `#{}`.
+  // Comments consume everything until the end of the line, including `///`.
+  HEREGEX = /^(?:[^\\\/#\s]|\\[\s\S]|\/(?!\/\/)|\#(?!\{)|\s+(?:#(?!\{).*)?)*/;
 
   HEREGEX_OMIT = /((?:\\\\)+)|\\(\s)|\s+(?:#.*)?/g; // Consume (and preserve) an even number of backslashes.
   // Preserve escaped whitespace.

lib/coffeescript/optparse.js

@@ -1,7 +1,7 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   var LONG_FLAG, MULTI_FLAG, OPTIONAL, OptionParser, SHORT_FLAG, buildRule, buildRules, normalizeArguments, repeat,
-    slice = [].slice;
+    splice = [].splice;
 
   ({repeat} = require('./helpers'));
 
@@ -44,8 +44,8 @@
       // `--` argument after, because that will fail on Linux (see #3946).
       ({rules, positional} = normalizeArguments(args, this.rules.flagDict));
       options = {};
-      // The `argument` field is added to the rule instance non-destructively by
-      // `normalizeArguments`.
+// The `argument` field is added to the rule instance non-destructively by
+// `normalizeArguments`.
       for (i = 0, len = rules.length; i < len; i++) {
         ({hasArgument, argument, isList, name} = rules[i]);
         if (hasArgument) {
@@ -157,7 +157,7 @@
   };
 
   normalizeArguments = function(args, flagDict) {
-    var arg, argIndex, flag, i, innerOpts, j, k, lastOpt, len, len1, multiFlags, multiOpts, needsArgOpt, positional, ref, rule, rules, singleRule, withArg;
+    var arg, argIndex, flag, i, innerOpts, j, lastOpt, len, len1, multiFlags, multiOpts, needsArgOpt, positional, ref, rule, rules, singleRule, withArg;
     rules = [];
     positional = [];
     needsArgOpt = null;
@@ -187,9 +187,9 @@
           return {rule, flag};
         });
         // Only the last flag in a multi-flag may have an argument.
-        innerOpts = 2 <= multiOpts.length ? slice.call(multiOpts, 0, j = multiOpts.length - 1) : (j = 0, []), lastOpt = multiOpts[j++];
-        for (k = 0, len1 = innerOpts.length; k < len1; k++) {
-          ({rule, flag} = innerOpts[k]);
+        [...innerOpts] = multiOpts, [lastOpt] = splice.call(innerOpts, -1);
+        for (j = 0, len1 = innerOpts.length; j < len1; j++) {
+          ({rule, flag} = innerOpts[j]);
           if (rule.hasArgument) {
             throw new Error(`cannot use option ${flag} in multi-flag ${arg} except as the last option, because it needs an argument`);
           }

lib/coffeescript/register.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   var CoffeeScript, Module, binary, child_process, ext, findExtension, fork, getRootModule, helpers, i, len, loadFile, path, ref;
 

lib/coffeescript/repl.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   var CoffeeScript, addHistory, addMultilineHandler, fs, getCommandId, merge, nodeREPL, path, replDefaults, runInContext, sawSIGINT, transpile, updateSyntaxError, vm;
 

lib/coffeescript/rewriter.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   // The CoffeeScript language has a good deal of optional syntax, implicit syntax,
   // and shorthand syntax. This can greatly complicate a grammar and bloat
@@ -218,7 +218,7 @@
       indexOfTag(i, ...pattern) {
         var fuzz, j, k, ref, ref1;
         fuzz = 0;
-        for (j = k = 0, ref = pattern.length; 0 <= ref ? k < ref : k > ref; j = 0 <= ref ? ++k : --k) {
+        for (j = k = 0, ref = pattern.length; (0 <= ref ? k < ref : k > ref); j = 0 <= ref ? ++k : --k) {
           if (pattern[j] == null) {
             continue;
           }
@@ -281,7 +281,7 @@
         stack = [];
         start = null;
         return this.scanTokens(function(token, i, tokens) {
-          var endImplicitCall, endImplicitObject, forward, implicitObjectContinues, inImplicit, inImplicitCall, inImplicitControl, inImplicitObject, isImplicit, isImplicitCall, isImplicitObject, k, newLine, nextTag, nextToken, offset, prevTag, prevToken, ref, ref1, ref2, s, sameLine, stackIdx, stackItem, stackTag, stackTop, startIdx, startImplicitCall, startImplicitObject, startsLine, tag;
+          var endImplicitCall, endImplicitObject, forward, implicitObjectContinues, inControlFlow, inImplicit, inImplicitCall, inImplicitControl, inImplicitObject, isImplicit, isImplicitCall, isImplicitObject, k, newLine, nextTag, nextToken, offset, prevTag, prevToken, ref, ref1, ref2, s, sameLine, stackIdx, stackItem, stackTag, stackTop, startIdx, startImplicitCall, startImplicitObject, startsLine, tag;
           [tag] = token;
           [prevTag] = prevToken = i > 0 ? tokens[i - 1] : [];
           [nextTag] = nextToken = i < tokens.length - 1 ? tokens[i + 1] : [];
@@ -420,10 +420,31 @@
             }
             start = stack.pop();
           }
+          inControlFlow = () => {
+            var controlFlow, isFunc, seenFor, tagCurrentLine;
+            seenFor = this.findTagsBackwards(i, ['FOR']) && this.findTagsBackwards(i, ['FORIN', 'FOROF', 'FORFROM']);
+            controlFlow = seenFor || this.findTagsBackwards(i, ['WHILE', 'UNTIL', 'LOOP', 'LEADING_WHEN']);
+            if (!controlFlow) {
+              return false;
+            }
+            isFunc = false;
+            tagCurrentLine = token[2].first_line;
+            this.detectEnd(i, function(token, i) {
+              var ref;
+              return ref = token[0], indexOf.call(LINEBREAKS, ref) >= 0;
+            }, function(token, i) {
+              var first_line;
+              [prevTag, , {first_line}] = tokens[i - 1] || [];
+              return isFunc = tagCurrentLine === first_line && (prevTag === '->' || prevTag === '=>');
+            }, {
+              returnOnNegativeLevel: true
+            });
+            return isFunc;
+          };
           // Recognize standard implicit calls like
           // f a, f() b, f? c, h[0] d etc.
           // Added support for spread dots on the left side: f ...a
-          if ((indexOf.call(IMPLICIT_FUNC, tag) >= 0 && token.spaced || tag === '?' && i > 0 && !tokens[i - 1].spaced) && (indexOf.call(IMPLICIT_CALL, nextTag) >= 0 || (nextTag === '...' && (ref = this.tag(i + 2), indexOf.call(IMPLICIT_CALL, ref) >= 0) && !this.findTagsBackwards(i, ['INDEX_START', '['])) || indexOf.call(IMPLICIT_UNSPACED_CALL, nextTag) >= 0 && !nextToken.spaced && !nextToken.newLine)) {
+          if ((indexOf.call(IMPLICIT_FUNC, tag) >= 0 && token.spaced || tag === '?' && i > 0 && !tokens[i - 1].spaced) && (indexOf.call(IMPLICIT_CALL, nextTag) >= 0 || (nextTag === '...' && (ref = this.tag(i + 2), indexOf.call(IMPLICIT_CALL, ref) >= 0) && !this.findTagsBackwards(i, ['INDEX_START', '['])) || indexOf.call(IMPLICIT_UNSPACED_CALL, nextTag) >= 0 && !nextToken.spaced && !nextToken.newLine) && !inControlFlow()) {
             if (tag === '?') {
               tag = token[0] = 'FUNC_EXIST';
             }
@@ -506,11 +527,11 @@
             }
           }
           newLine = prevTag === 'OUTDENT' || prevToken.newLine;
-          if (indexOf.call(IMPLICIT_END, tag) >= 0 || indexOf.call(CALL_CLOSERS, tag) >= 0 && newLine) {
+          if (indexOf.call(IMPLICIT_END, tag) >= 0 || (indexOf.call(CALL_CLOSERS, tag) >= 0 && newLine) || ((tag === '..' || tag === '...') && this.findTagsBackwards(i, ["INDEX_START"]))) {
             while (inImplicit()) {
               [stackTag, stackIdx, {sameLine, startsLine}] = stackTop();
               // Close implicit calls when reached end of argument list
-              if (inImplicitCall() && prevTag !== ',') {
+              if (inImplicitCall() && prevTag !== ',' || (prevTag === ',' && tag === 'TERMINATOR' && (nextTag == null))) {
                 endImplicitCall();
               // Close implicit objects such as:
               // return a: 1, b: 2 unless true
@@ -781,18 +802,51 @@
       // newlines within expressions are removed and the indentation tokens of empty
       // blocks are added.
       normalizeLines() {
-        var action, condition, indent, outdent, starter;
+        var action, closeElseTag, condition, ifThens, indent, leading_if_then, leading_switch_when, outdent, starter;
         starter = indent = outdent = null;
+        leading_switch_when = null;
+        leading_if_then = null;
+        // Count `THEN` tags
+        ifThens = [];
         condition = function(token, i) {
           var ref, ref1, ref2, ref3;
-          return token[1] !== ';' && (ref = token[0], indexOf.call(SINGLE_CLOSERS, ref) >= 0) && !(token[0] === 'TERMINATOR' && (ref1 = this.tag(i + 1), indexOf.call(EXPRESSION_CLOSE, ref1) >= 0)) && !(token[0] === 'ELSE' && starter !== 'THEN') && !(((ref2 = token[0]) === 'CATCH' || ref2 === 'FINALLY') && (starter === '->' || starter === '=>')) || (ref3 = token[0], indexOf.call(CALL_CLOSERS, ref3) >= 0) && (this.tokens[i - 1].newLine || this.tokens[i - 1][0] === 'OUTDENT');
+          return token[1] !== ';' && (ref = token[0], indexOf.call(SINGLE_CLOSERS, ref) >= 0) && !(token[0] === 'TERMINATOR' && (ref1 = this.tag(i + 1), indexOf.call(EXPRESSION_CLOSE, ref1) >= 0)) && !(token[0] === 'ELSE' && (starter !== 'THEN' || (leading_if_then || leading_switch_when))) && !(((ref2 = token[0]) === 'CATCH' || ref2 === 'FINALLY') && (starter === '->' || starter === '=>')) || (ref3 = token[0], indexOf.call(CALL_CLOSERS, ref3) >= 0) && (this.tokens[i - 1].newLine || this.tokens[i - 1][0] === 'OUTDENT');
         };
         action = function(token, i) {
+          if (token[0] === 'ELSE' && starter === 'THEN') {
+            ifThens.pop();
+          }
           return this.tokens.splice((this.tag(i - 1) === ',' ? i - 1 : i), 0, outdent);
         };
+        closeElseTag = (tokens, i) => {
+          var lastThen, outdentElse, tlen;
+          tlen = ifThens.length;
+          if (!(tlen > 0)) {
+            return i;
+          }
+          lastThen = ifThens.pop();
+          [, outdentElse] = this.indentation(tokens[lastThen]);
+          // Insert `OUTDENT` to close inner `IF`.
+          outdentElse[1] = tlen * 2;
+          tokens.splice(i, 0, outdentElse);
+          // Insert `OUTDENT` to close outer `IF`.
+          outdentElse[1] = 2;
+          tokens.splice(i + 1, 0, outdentElse);
+          // Remove outdents from the end.
+          this.detectEnd(i + 2, function(token, i) {
+            var ref;
+            return (ref = token[0]) === 'OUTDENT' || ref === 'TERMINATOR';
+          }, function(token, i) {
+            if (this.tag(i) === 'OUTDENT' && this.tag(i + 1) === 'OUTDENT') {
+              return tokens.splice(i, 2);
+            }
+          });
+          return i + 2;
+        };
         return this.scanTokens(function(token, i, tokens) {
-          var j, k, ref, ref1, tag;
+          var conditionTag, j, k, ref, ref1, tag;
           [tag] = token;
+          conditionTag = (tag === '->' || tag === '=>') && this.findTagsBackwards(i, ['IF', 'WHILE', 'FOR', 'UNTIL', 'SWITCH', 'WHEN', 'LEADING_WHEN', '[', 'INDEX_START']) && !(this.findTagsBackwards(i, ['THEN', '..', '...']));
           if (tag === 'TERMINATOR') {
             if (this.tag(i + 1) === 'ELSE' && this.tag(i - 1) !== 'OUTDENT') {
               tokens.splice(i, 1, ...this.indentation());
@@ -817,12 +871,23 @@
             tokens.splice(i + 1, 0, indent, outdent);
             return 1;
           }
-          if (indexOf.call(SINGLE_LINERS, tag) >= 0 && this.tag(i + 1) !== 'INDENT' && !(tag === 'ELSE' && this.tag(i + 1) === 'IF')) {
+          if (indexOf.call(SINGLE_LINERS, tag) >= 0 && this.tag(i + 1) !== 'INDENT' && !(tag === 'ELSE' && this.tag(i + 1) === 'IF') && !conditionTag) {
             starter = tag;
             [indent, outdent] = this.indentation(tokens[i]);
             if (starter === 'THEN') {
               indent.fromThen = true;
             }
+            if (tag === 'THEN') {
+              leading_switch_when = this.findTagsBackwards(i, ['LEADING_WHEN']) && this.tag(i + 1) === 'IF';
+              leading_if_then = this.findTagsBackwards(i, ['IF']) && this.tag(i + 1) === 'IF';
+            }
+            if (tag === 'THEN' && this.findTagsBackwards(i, ['IF'])) {
+              ifThens.push(i);
+            }
+            // `ELSE` tag is not closed.
+            if (tag === 'ELSE' && this.tag(i - 1) !== 'OUTDENT') {
+              i = closeElseTag(tokens, i);
+            }
             tokens.splice(i + 1, 0, indent);
             this.detectEnd(i + 2, condition, action);
             if (tag === 'THEN') {
@@ -886,7 +951,7 @@
 
     return Rewriter;
 
-  })();
+  }).call(this);
 
   // Constants
   // ---------

lib/coffeescript/scope.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   // The **Scope** class regulates lexical scoping within CoffeeScript. As you
   // generate code, you create a tree of scopes in the same shape as the nested

lib/coffeescript/sourcemap.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.3
+// Generated by CoffeeScript 2.2.2
 (function() {
   // Source maps allow JavaScript runtimes to match running JavaScript back to
   // the original source code that corresponds to it. This can be minified
@@ -203,7 +203,7 @@
 
     return SourceMap;
 
-  })();
+  }).call(this);
 
   // Our API for source maps is just the `SourceMap` class.
   module.exports = SourceMap;

package.json

@@ -8,7 +8,7 @@
     "compiler"
   ],
   "author": "Jeremy Ashkenas",
-  "version": "2.0.3",
+  "version": "2.2.2",
   "license": "MIT",
   "engines": {
     "node": ">=6"
@@ -41,15 +41,15 @@
   "devDependencies": {
     "babel-core": "~6.26.0",
     "babel-preset-babili": "~0.1.4",
-    "babel-preset-env": "~1.6.0",
-    "babel-preset-minify": "^0.2.0",
-    "codemirror": "^5.29.0",
-    "docco": "~0.7.0",
+    "babel-preset-env": "~1.6.1",
+    "babel-preset-minify": "^0.3.0",
+    "codemirror": "^5.35.0",
+    "docco": "~0.8.0",
     "highlight.js": "~9.12.0",
     "jison": ">=0.4.18",
-    "markdown-it": "~8.4.0",
+    "markdown-it": "~8.4.1",
     "underscore": "~1.8.3",
-    "webpack": "~3.6.0"
+    "webpack": "~3.11.0"
   },
   "dependencies": {}
 }

src/grammar.coffee

@@ -89,6 +89,7 @@ grammar =
   # grammar.
   Line: [
     o 'Expression'
+    o 'ExpressionLine'
     o 'Statement'
     o 'FuncDirective'
   ]
@@ -125,6 +126,15 @@ grammar =
     o 'Yield'
   ]
 
+  # Expressions which are written in single line and would otherwise require being
+  # wrapped in braces: E.g `a = b if do -> f a is 1`, `if f (a) -> a*2 then ...`,
+  # `for x in do (obj) -> f obj when x > 8 then f x`
+  ExpressionLine: [
+    o 'CodeLine'
+    o 'IfLine'
+    o 'OperationLine'
+  ]
+
   Yield: [
     o 'YIELD',                                  -> new Op $1, new Value new Literal ''
     o 'YIELD Expression',                       -> new Op $1, $2
@@ -206,6 +216,7 @@ grammar =
     o 'Identifier'
     o 'Property'
     o 'ThisProperty'
+    o '[ Expression ]',          -> new Value new ComputedPropertyName $2
   ]
 
   ObjAssignable: [
@@ -266,6 +277,13 @@ grammar =
     o 'FuncGlyph Block',                                 -> new Code [], $2, $1
   ]
 
+  # The Codeline is the **Code** node with **Line** instead of indented **Block**.
+  CodeLine: [
+    o 'PARAM_START ParamList PARAM_END FuncGlyph Line', -> new Code $2, LOC(5)(Block.wrap [$5]), $4,
+                                                              LOC(1)(new Literal $1)
+    o 'FuncGlyph Line',                                 -> new Code [], LOC(2)(Block.wrap [$2]), $1
+  ]
+
   # CoffeeScript has two different symbols for functions. `->` is for ordinary
   # functions, and `=>` is for functions bound to the current value of *this*.
   FuncGlyph: [
@@ -493,7 +511,8 @@ grammar =
   # The array literal.
   Array: [
     o '[ ]',                                    -> new Arr []
-    o '[ ArgList OptComma ]',                   -> new Arr $2
+    o '[ Elisions ]',                           -> new Arr $2
+    o '[ ArgElisionList OptElisions ]',         -> new Arr [].concat $2, $3
   ]
 
   # Inclusive and exclusive range dots.
@@ -504,19 +523,21 @@ grammar =
 
   # The CoffeeScript range literal.
   Range: [
-    o '[ Expression RangeDots Expression ]',    -> new Range $2, $4, $3
+    o '[ Expression RangeDots Expression ]',      -> new Range $2, $4, $3
+    o '[ ExpressionLine RangeDots Expression ]',  -> new Range $2, $4, $3
   ]
 
   # Array slice literals.
   Slice: [
     o 'Expression RangeDots Expression',        -> new Range $1, $3, $2
     o 'Expression RangeDots',                   -> new Range $1, null, $2
+    o 'ExpressionLine RangeDots Expression',    -> new Range $1, $3, $2
+    o 'ExpressionLine RangeDots',               -> new Range $1, null, $2
     o 'RangeDots Expression',                   -> new Range null, $2, $1
     o 'RangeDots',                              -> new Range null, null, $1
   ]
 
-  # The **ArgList** is both the list of objects passed into a function call,
-  # as well as the contents of an array literal
+  # The **ArgList** is the list of objects passed into a function call
   # (i.e. comma-separated expressions). Newlines work as well.
   ArgList: [
     o 'Arg',                                              -> [$1]
@@ -529,16 +550,48 @@ grammar =
   # Valid arguments are Blocks or Splats.
   Arg: [
     o 'Expression'
+    o 'ExpressionLine'
     o 'Splat'
     o '...',                                     -> new Expansion
   ]
 
+  # The **ArgElisionList** is the list of objects, contents of an array literal
+  # (i.e. comma-separated expressions and elisions). Newlines work as well.
+  ArgElisionList: [
+    o 'ArgElision'
+    o 'ArgElisionList , ArgElision',                                          -> $1.concat $3
+    o 'ArgElisionList OptElisions TERMINATOR ArgElision',                     -> $1.concat $2, $4
+    o 'INDENT ArgElisionList OptElisions OUTDENT',                            -> $2.concat $3
+    o 'ArgElisionList OptElisions INDENT ArgElisionList OptElisions OUTDENT', -> $1.concat $2, $4, $5
+  ]
+
+  ArgElision: [
+    o 'Arg',                  -> [$1]
+    o 'Elisions Arg',         -> $1.concat $2
+  ]
+
+  OptElisions: [
+    o 'OptComma',             -> []
+    o ', Elisions',           -> [].concat $2
+  ]
+
+  Elisions: [
+    o 'Elision',              -> [$1]
+    o 'Elisions Elision',     -> $1.concat $2
+  ]
+
+  Elision: [
+    o ',',                    -> new Elision
+  ]
+
   # Just simple, comma-separated, required arguments (no fancy syntax). We need
   # this to be separate from the **ArgList** for use in **Switch** blocks, where
   # having the newlines wouldn't make sense.
   SimpleArgs: [
     o 'Expression'
+    o 'ExpressionLine'
     o 'SimpleArgs , Expression',                -> [].concat $1, $3
+    o 'SimpleArgs , ExpressionLine',            -> [].concat $1, $3
   ]
 
   # The variants of *try/catch/finally* exception handling blocks.
@@ -572,17 +625,27 @@ grammar =
   ]
 
   # The condition portion of a while loop.
+  WhileLineSource: [
+    o 'WHILE ExpressionLine',                       -> new While $2
+    o 'WHILE ExpressionLine WHEN ExpressionLine',   -> new While $2, guard: $4
+    o 'UNTIL ExpressionLine',                       -> new While $2, invert: true
+    o 'UNTIL ExpressionLine WHEN ExpressionLine',   -> new While $2, invert: true, guard: $4
+  ]
+
   WhileSource: [
     o 'WHILE Expression',                       -> new While $2
     o 'WHILE Expression WHEN Expression',       -> new While $2, guard: $4
+    o 'WHILE ExpressionLine WHEN Expression',   -> new While $2, guard: $4
     o 'UNTIL Expression',                       -> new While $2, invert: true
     o 'UNTIL Expression WHEN Expression',       -> new While $2, invert: true, guard: $4
+    o 'UNTIL ExpressionLine WHEN Expression',   -> new While $2, invert: true, guard: $4
   ]
 
   # The while loop can either be normal, with a block of expressions to execute,
   # or postfix, with a single expression. There is no do..while.
   While: [
     o 'WhileSource Block',                      -> $1.addBody $2
+    o 'WhileLineSource Block',                  -> $1.addBody $2
     o 'Statement  WhileSource',                 -> $2.addBody LOC(1) Block.wrap([$1])
     o 'Expression WhileSource',                 -> $2.addBody LOC(1) Block.wrap([$1])
     o 'Loop',                                   -> $1
@@ -600,6 +663,7 @@ grammar =
     o 'Statement  ForBody',                     -> new For $1, $2
     o 'Expression ForBody',                     -> new For $1, $2
     o 'ForBody    Block',                       -> new For $2, $1
+    o 'ForLineBody  Block',                     -> new For $2, $1
   ]
 
   ForBody: [
@@ -608,6 +672,11 @@ grammar =
     o 'ForStart ForSource',                     -> $2.own = $1.own; $2.ownTag = $1.ownTag; $2.name = $1[0]; $2.index = $1[1]; $2
   ]
 
+  ForLineBody: [
+    o 'FOR Range BY ExpressionLine',            -> source: (LOC(2) new Value($2)), step: $4
+    o 'ForStart ForLineSource',                 -> $2.own = $1.own; $2.ownTag = $1.ownTag; $2.name = $1[0]; $2.index = $1[1]; $2
+  ]
+
   ForStart: [
     o 'FOR ForVariables',                       -> $2
     o 'FOR OWN ForVariables',                   -> $3.own = yes; $3.ownTag = (LOC(2) new Literal($2)); $3
@@ -634,22 +703,56 @@ grammar =
   # clause. If it's an array comprehension, you can also choose to step through
   # in fixed-size increments.
   ForSource: [
-    o 'FORIN Expression',                               -> source: $2
-    o 'FOROF Expression',                               -> source: $2, object: yes
-    o 'FORIN Expression WHEN Expression',               -> source: $2, guard: $4
-    o 'FOROF Expression WHEN Expression',               -> source: $2, guard: $4, object: yes
-    o 'FORIN Expression BY Expression',                 -> source: $2, step:  $4
-    o 'FORIN Expression WHEN Expression BY Expression', -> source: $2, guard: $4, step: $6
-    o 'FORIN Expression BY Expression WHEN Expression', -> source: $2, step:  $4, guard: $6
-    o 'FORFROM Expression',                             -> source: $2, from: yes
-    o 'FORFROM Expression WHEN Expression',             -> source: $2, guard: $4, from: yes
+    o 'FORIN Expression',                                           -> source: $2
+    o 'FOROF Expression',                                           -> source: $2, object: yes
+    o 'FORIN Expression WHEN Expression',                           -> source: $2, guard: $4
+    o 'FORIN ExpressionLine WHEN Expression',                       -> source: $2, guard: $4
+    o 'FOROF Expression WHEN Expression',                           -> source: $2, guard: $4, object: yes
+    o 'FOROF ExpressionLine WHEN Expression',                       -> source: $2, guard: $4, object: yes
+    o 'FORIN Expression BY Expression',                             -> source: $2, step:  $4
+    o 'FORIN ExpressionLine BY Expression',                         -> source: $2, step:  $4
+    o 'FORIN Expression WHEN Expression BY Expression',             -> source: $2, guard: $4, step: $6
+    o 'FORIN ExpressionLine WHEN Expression BY Expression',         -> source: $2, guard: $4, step: $6
+    o 'FORIN Expression WHEN ExpressionLine BY Expression',         -> source: $2, guard: $4, step: $6
+    o 'FORIN ExpressionLine WHEN ExpressionLine BY Expression',     -> source: $2, guard: $4, step: $6
+    o 'FORIN Expression BY Expression WHEN Expression',             -> source: $2, step:  $4, guard: $6
+    o 'FORIN ExpressionLine BY Expression WHEN Expression',         -> source: $2, step:  $4, guard: $6
+    o 'FORIN Expression BY ExpressionLine WHEN Expression',         -> source: $2, step:  $4, guard: $6
+    o 'FORIN ExpressionLine BY ExpressionLine WHEN Expression',     -> source: $2, step:  $4, guard: $6
+    o 'FORFROM Expression',                                         -> source: $2, from: yes
+    o 'FORFROM Expression WHEN Expression',                         -> source: $2, guard: $4, from: yes
+    o 'FORFROM ExpressionLine WHEN Expression',                     -> source: $2, guard: $4, from: yes
+  ]
+
+  ForLineSource: [
+    o 'FORIN ExpressionLine',                                       -> source: $2
+    o 'FOROF ExpressionLine',                                       -> source: $2, object: yes
+    o 'FORIN Expression WHEN ExpressionLine',                       -> source: $2, guard: $4
+    o 'FORIN ExpressionLine WHEN ExpressionLine',                   -> source: $2, guard: $4
+    o 'FOROF Expression WHEN ExpressionLine',                       -> source: $2, guard: $4, object: yes
+    o 'FOROF ExpressionLine WHEN ExpressionLine',                   -> source: $2, guard: $4, object: yes
+    o 'FORIN Expression BY ExpressionLine',                         -> source: $2, step:  $4
+    o 'FORIN ExpressionLine BY ExpressionLine',                     -> source: $2, step:  $4
+    o 'FORIN Expression WHEN Expression BY ExpressionLine',         -> source: $2, guard: $4, step: $6
+    o 'FORIN ExpressionLine WHEN Expression BY ExpressionLine',     -> source: $2, guard: $4, step: $6
+    o 'FORIN Expression WHEN ExpressionLine BY ExpressionLine',     -> source: $2, guard: $4, step: $6
+    o 'FORIN ExpressionLine WHEN ExpressionLine BY ExpressionLine', -> source: $2, guard: $4, step: $6
+    o 'FORIN Expression BY Expression WHEN ExpressionLine',         -> source: $2, step:  $4, guard: $6
+    o 'FORIN ExpressionLine BY Expression WHEN ExpressionLine',     -> source: $2, step:  $4, guard: $6
+    o 'FORIN Expression BY ExpressionLine WHEN ExpressionLine',     -> source: $2, step:  $4, guard: $6
+    o 'FORIN ExpressionLine BY ExpressionLine WHEN ExpressionLine', -> source: $2, step:  $4, guard: $6
+    o 'FORFROM ExpressionLine',                                     -> source: $2, from: yes
+    o 'FORFROM Expression WHEN ExpressionLine',                     -> source: $2, guard: $4, from: yes
+    o 'FORFROM ExpressionLine WHEN ExpressionLine',                 -> source: $2, guard: $4, from: yes
   ]
 
   Switch: [
-    o 'SWITCH Expression INDENT Whens OUTDENT',            -> new Switch $2, $4
-    o 'SWITCH Expression INDENT Whens ELSE Block OUTDENT', -> new Switch $2, $4, $6
-    o 'SWITCH INDENT Whens OUTDENT',                       -> new Switch null, $3
-    o 'SWITCH INDENT Whens ELSE Block OUTDENT',            -> new Switch null, $3, $5
+    o 'SWITCH Expression INDENT Whens OUTDENT',                -> new Switch $2, $4
+    o 'SWITCH ExpressionLine INDENT Whens OUTDENT',            -> new Switch $2, $4
+    o 'SWITCH Expression INDENT Whens ELSE Block OUTDENT',     -> new Switch $2, $4, $6
+    o 'SWITCH ExpressionLine INDENT Whens ELSE Block OUTDENT', -> new Switch $2, $4, $6
+    o 'SWITCH INDENT Whens OUTDENT',                           -> new Switch null, $3
+    o 'SWITCH INDENT Whens ELSE Block OUTDENT',                -> new Switch null, $3, $5
   ]
 
   Whens: [
@@ -680,12 +783,28 @@ grammar =
     o 'Expression POST_IF Expression',          -> new If $3, LOC(1)(Block.wrap [$1]), type: $2, statement: true
   ]
 
+  IfBlockLine: [
+    o 'IF ExpressionLine Block',                  -> new If $2, $3, type: $1
+    o 'IfBlockLine ELSE IF ExpressionLine Block', -> $1.addElse LOC(3,5) new If $4, $5, type: $3
+  ]
+
+  IfLine: [
+    o 'IfBlockLine'
+    o 'IfBlockLine ELSE Block',               -> $1.addElse $3
+    o 'Statement  POST_IF ExpressionLine',    -> new If $3, LOC(1)(Block.wrap [$1]), type: $2, statement: true
+    o 'Expression POST_IF ExpressionLine',    -> new If $3, LOC(1)(Block.wrap [$1]), type: $2, statement: true
+  ]
+
   # Arithmetic and logical operators, working on one or more operands.
   # Here they are grouped by order of precedence. The actual precedence rules
   # are defined at the bottom of the page. It would be shorter if we could
   # combine most of these rules into a single generic *Operand OpSymbol Operand*
   # -type rule, but in order to make the precedence binding possible, separate
   # rules are necessary.
+  OperationLine: [
+    o 'UNARY ExpressionLine',                   -> new Op $1, $2
+  ]
+
   Operation: [
     o 'UNARY Expression',                       -> new Op $1 , $2
     o 'UNARY_MATH Expression',                  -> new Op $1 , $2

src/lexer.coffee

@@ -192,13 +192,17 @@ exports.Lexer = class Lexer
     # what CoffeeScript would normally interpret as calls to functions named
     # `get` or `set`, i.e. `get({foo: function () {}})`.
     else if tag is 'PROPERTY' and prev
-      if prev.spaced and prev[0] in CALLABLE and /^[gs]et$/.test(prev[1]) and @tokens[@tokens.length - 2][0] isnt '.'
-        @error "'#{prev[1]}' cannot be used as a keyword, or as a function call without parentheses", prev[2]
-      else
+      if prev.spaced and prev[0] in CALLABLE and /^[gs]et$/.test(prev[1]) and
+         @tokens.length > 1 and @tokens[@tokens.length - 2][0] not in ['.', '?.', '@']
+        @error "'#{prev[1]}' cannot be used as a keyword, or as a function call
+        without parentheses", prev[2]
+      else if @tokens.length > 2
         prevprev = @tokens[@tokens.length - 2]
-        if prev[0] in ['@', 'THIS'] and prevprev and prevprev.spaced and /^[gs]et$/.test(prevprev[1]) and
-        @tokens[@tokens.length - 3][0] isnt '.'
-          @error "'#{prevprev[1]}' cannot be used as a keyword, or as a function call without parentheses", prevprev[2]
+        if prev[0] in ['@', 'THIS'] and prevprev and prevprev.spaced and
+           /^[gs]et$/.test(prevprev[1]) and
+           @tokens[@tokens.length - 3][0] not in ['.', '?.', '@']
+          @error "'#{prevprev[1]}' cannot be used as a keyword, or as a
+          function call without parentheses", prevprev[2]
 
     if tag is 'IDENTIFIER' and id in RESERVED
       @error "reserved word '#{id}'", length: id.length
@@ -449,9 +453,11 @@ exports.Lexer = class Lexer
     return 0 unless match = MULTI_DENT.exec chunk
     indent = match[0]
 
-    @seenFor = no
-    @seenImport = no unless @importSpecifierList
-    @seenExport = no unless @exportSpecifierList
+    prev = @prev()
+    backslash = prev?[0] is '\\'
+    @seenFor = no unless backslash and @seenFor
+    @seenImport = no unless (backslash and @seenImport) or @importSpecifierList
+    @seenExport = no unless (backslash and @seenExport) or @exportSpecifierList
 
     size = indent.length - 1 - indent.lastIndexOf '\n'
     noNewlines = @unfinished()
@@ -472,7 +478,7 @@ exports.Lexer = class Lexer
 
     if size > @indent
       if noNewlines
-        @indebt = size - @indent
+        @indebt = size - @indent unless backslash
         @suppressNewlines()
         return indent.length
       unless @tokens.length
@@ -556,7 +562,7 @@ exports.Lexer = class Lexer
     # Check the previous token to detect if attribute is spread.
     prevChar = if @tokens.length > 0 then @tokens[@tokens.length - 1][0] else ''
     if firstChar is '<'
-      match = CSX_IDENTIFIER.exec @chunk[1...]
+      match = CSX_IDENTIFIER.exec(@chunk[1...]) or CSX_FRAGMENT_IDENTIFIER.exec(@chunk[1...])
       return 0 unless match and (
         @csxDepth > 0 or
         # Not the right hand side of an unspaced comparison (i.e. `a<b`).
@@ -596,8 +602,8 @@ exports.Lexer = class Lexer
           @matchWithInterpolations INSIDE_CSX, '>', '</', CSX_INTERPOLATION
         @mergeInterpolationTokens tokens, {delimiter: '"'}, (value, i) =>
           @formatString value, delimiter: '>'
-        match = CSX_IDENTIFIER.exec @chunk[end...]
-        if not match or match[0] isnt csxTag.name
+        match = CSX_IDENTIFIER.exec(@chunk[end...]) or CSX_FRAGMENT_IDENTIFIER.exec(@chunk[end...])
+        if not match or match[1] isnt csxTag.name
           @error "expected corresponding CSX closing tag for #{csxTag.name}",
             csxTag.origin[2]
         afterTag = end + csxTag.name.length
@@ -1178,6 +1184,11 @@ CSX_IDENTIFIER = /// ^
   ( (?: (?!\s)[\.\-$\w\x7f-\uffff] )+ ) # Like `IDENTIFIER`, but includes `-`s and `.`s.
 ///
 
+# Fragment: <></>
+CSX_FRAGMENT_IDENTIFIER = /// ^
+  ()> # Ends immediately with `>`.
+///
+
 CSX_ATTRIBUTE = /// ^
   (?!\d)
   ( (?: (?!\s)[\-$\w\x7f-\uffff] )+ ) # Like `IDENTIFIER`, but includes `-`s.
@@ -1252,7 +1263,20 @@ REGEX = /// ^
 REGEX_FLAGS  = /^\w*/
 VALID_FLAGS  = /^(?!.*(.).*\1)[imguy]*$/
 
-HEREGEX      = /// ^(?: [^\\/#] | \\[\s\S] | /(?!//) | \#(?!\{) )* ///
+HEREGEX      = /// ^
+  (?:
+      # Match any character, except those that need special handling below.
+      [^\\/#\s]
+      # Match `\` followed by any character.
+    | \\[\s\S]
+      # Match any `/` except `///`.
+    | /(?!//)
+      # Match `#` which is not part of interpolation, e.g. `#{}`.
+    | \#(?!\{)
+      # Comments consume everything until the end of the line, including `///`.
+    | \s+(?:#(?!\{).*)?
+  )*
+///
 
 HEREGEX_OMIT = ///
     ((?:\\\\)+)     # Consume (and preserve) an even number of backslashes.

src/nodes.coffee

@@ -765,6 +765,10 @@ exports.CSXTag = class CSXTag extends IdentifierLiteral
 exports.PropertyName = class PropertyName extends Literal
   isAssignable: YES
 
+exports.ComputedPropertyName = class ComputedPropertyName extends PropertyName
+  compileNode: (o) ->
+    [@makeCode('['), @value.compileToFragments(o, LEVEL_LIST)..., @makeCode(']')]
+
 exports.StatementLiteral = class StatementLiteral extends Literal
   isStatement: YES
 
@@ -859,6 +863,11 @@ exports.Value = class Value extends Base
   constructor: (base, props, tag, isDefaultValue = no) ->
     super()
     return base if not props and base instanceof Value
+    # When `Parens` block includes a `StatementLiteral` (e.g. `(b; break) for a in arr`),
+    # it won't compile since `Parens` (`(b; break)`) is compiled as `Value` and
+    # pure statement (`break`) can't be used in an expression.
+    # For this reasons, we return `Block` instead of `Parens`.
+    return base.unwrap() if base instanceof Parens and base.contains (n) -> n instanceof StatementLiteral
     @base           = base
     @properties     = props or []
     @[tag]          = yes if tag
@@ -910,6 +919,10 @@ exports.Value = class Value extends Base
     return no if @properties.length
     (@base instanceof Obj) and (not onlyGenerated or @base.generated)
 
+  isElision: ->
+    return no unless @base instanceof Arr
+    @base.hasElision()
+
   isSplice: ->
     [..., lastProp] = @properties
     lastProp instanceof Slice
@@ -948,11 +961,21 @@ exports.Value = class Value extends Base
   compileNode: (o) ->
     @base.front = @front
     props = @properties
-    fragments = @base.compileToFragments o, (if props.length then LEVEL_ACCESS else null)
+    if props.length and @base.cached?
+      # Cached fragments enable correct order of the compilation,
+      # and reuse of variables in the scope.
+      # Example:
+      # `a(x = 5).b(-> x = 6)` should compile in the same order as
+      # `a(x = 5); b(-> x = 6)`
+      # (see issue #4437, https://github.com/jashkenas/coffeescript/issues/4437)
+      fragments = @base.cached
+    else
+      fragments = @base.compileToFragments o, (if props.length then LEVEL_ACCESS else null)
     if props.length and SIMPLENUM.test fragmentsToText fragments
       fragments.push @makeCode '.'
     for prop in props
       fragments.push (prop.compileToFragments o)...
+
     fragments
 
   # Unfold a soak into an `If`: `a?.b` -> `a.b if a?`
@@ -1112,6 +1135,19 @@ exports.Call = class Call extends Base
     return @compileCSX o if @csx
     @variable?.front = @front
     compiledArgs = []
+    # If variable is `Accessor` fragments are cached and used later
+    # in `Value::compileNode` to ensure correct order of the compilation,
+    # and reuse of variables in the scope.
+    # Example:
+    # `a(x = 5).b(-> x = 6)` should compile in the same order as
+    # `a(x = 5); b(-> x = 6)`
+    # (see issue #4437, https://github.com/jashkenas/coffeescript/issues/4437)
+    varAccess = @variable?.properties?[0] instanceof Access
+    argCode = (arg for arg in (@args || []) when arg instanceof Code)
+    if argCode.length > 0 and varAccess and not @variable.base.cached
+      [cache] = @variable.base.cache o, LEVEL_ACCESS, -> no
+      @variable.base.cached = cache
+
     for arg, argIndex in @args
       if argIndex then compiledArgs.push @makeCode ", "
       compiledArgs.push (arg.compileToFragments o, LEVEL_LIST)...
@@ -1317,20 +1353,32 @@ exports.Range = class Range extends Base
     idx      = del o, 'index'
     idxName  = del o, 'name'
     namedIndex = idxName and idxName isnt idx
-    varPart  = "#{idx} = #{@fromC}"
+    varPart  =
+      if known and not namedIndex
+        "var #{idx} = #{@fromC}"
+      else
+        "#{idx} = #{@fromC}"
     varPart += ", #{@toC}" if @toC isnt @toVar
     varPart += ", #{@step}" if @step isnt @stepVar
     [lt, gt] = ["#{idx} <#{@equals}", "#{idx} >#{@equals}"]
 
     # Generate the condition.
-    condPart = if @stepNum?
-      if @stepNum > 0 then "#{lt} #{@toVar}" else "#{gt} #{@toVar}"
-    else if known
-      [from, to] = [@fromNum, @toNum]
-      if from <= to then "#{lt} #{to}" else "#{gt} #{to}"
-    else
-      cond = if @stepVar then "#{@stepVar} > 0" else "#{@fromVar} <= #{@toVar}"
-      "#{cond} ? #{lt} #{@toVar} : #{gt} #{@toVar}"
+    [from, to] = [@fromNum, @toNum]
+    # Always check if the `step` isn't zero to avoid the infinite loop.
+    stepNotZero = "#{ @stepNum ? @stepVar } !== 0"
+    stepCond = "#{ @stepNum ? @stepVar } > 0"
+    lowerBound = "#{lt} #{ if known then to else @toVar }"
+    upperBound = "#{gt} #{ if known then to else @toVar }"
+    condPart =
+       if @step?
+         "#{stepNotZero} && (#{stepCond} ? #{lowerBound} : #{upperBound})"
+       else
+         if known
+           "#{ if from <= to then lt else gt } #{to}"
+         else
+          "(#{@fromVar} <= #{@toVar} ? #{lowerBound} : #{upperBound})"
+
+    cond = if @stepVar then "#{@stepVar} > 0" else "#{@fromVar} <= #{@toVar}"
 
     # Generate the step.
     stepPart = if @stepVar
@@ -1361,9 +1409,9 @@ exports.Range = class Range extends Base
       range.pop() if @exclusive
       return [@makeCode "[#{ range.join(', ') }]"]
     idt    = @tab + TAB
-    i      = o.scope.freeVariable 'i', single: true
-    result = o.scope.freeVariable 'results'
-    pre    = "\n#{idt}#{result} = [];"
+    i      = o.scope.freeVariable 'i', single: true, reserve: no
+    result = o.scope.freeVariable 'results', reserve: no
+    pre    = "\n#{idt}var #{result} = [];"
     if known
       o.index = i
       body    = fragmentsToText @compileNode o
@@ -1393,8 +1441,12 @@ exports.Slice = class Slice extends Base
   # `9e9` should be safe because `9e9` > `2**32`, the max array length.
   compileNode: (o) ->
     {to, from} = @range
-    fromCompiled = from and from.compileToFragments(o, LEVEL_PAREN) or [@makeCode '0']
-    # TODO: jwalton - move this into the 'if'?
+    # Handle an expression in the property access, e.g. `a[!b in c..]`.
+    if from?.shouldCache()
+      from = new Value new Parens from
+    if to?.shouldCache()
+      to = new Value new Parens to
+    fromCompiled = from?.compileToFragments(o, LEVEL_PAREN) or [@makeCode '0']
     if to
       compiled     = to.compileToFragments o, LEVEL_PAREN
       compiledText = fragmentsToText compiled
@@ -1497,6 +1549,15 @@ exports.Obj = class Obj extends Base
           [key, value] = prop.base.cache o
           key  = new PropertyName key.value if key instanceof IdentifierLiteral
           prop = new Assign key, value, 'object'
+        else if key instanceof Value and key.base instanceof ComputedPropertyName
+          # `{ [foo()] }` output as `{ [ref = foo()]: ref }`.
+          if prop.base.value.shouldCache()
+            [key, value] = prop.base.value.cache o
+            key  = new ComputedPropertyName key.value if key instanceof IdentifierLiteral
+            prop = new Assign key, value, 'object'
+          else
+            # `{ [expression] }` output as `{ [expression]: expression }`.
+            prop = new Assign key, prop.base.value, 'object'
         else if not prop.bareLiteral?(IdentifierLiteral)
           prop = new Assign prop, prop, 'object'
       if indent then answer.push @makeCode indent
@@ -1561,6 +1622,10 @@ exports.Arr = class Arr extends Base
 
   children: ['objects']
 
+  hasElision: ->
+    return yes for obj in @objects when obj instanceof Elision
+    no
+
   isAssignable: ->
     return no unless @objects.length
 
@@ -1575,6 +1640,9 @@ exports.Arr = class Arr extends Base
   compileNode: (o) ->
     return [@makeCode '[]'] unless @objects.length
     o.indent += TAB
+    fragmentIsElision = (fragment) -> fragmentsToText(fragment).trim() is ','
+    # Detect if `Elisions` at the beginning of the array are processed (e.g. [, , , a]).
+    passedElision = no
 
     answer = []
     for obj, objIndex in @objects
@@ -1590,6 +1658,7 @@ exports.Arr = class Arr extends Base
         unwrappedObj.lhs = yes if unwrappedObj instanceof Arr or unwrappedObj instanceof Obj
 
     compiledObjs = (obj.compileToFragments o, LEVEL_LIST for obj in @objects)
+    olen = compiledObjs.length
     # If `compiledObjs` includes newlines, we will output this as a multiline
     # array (i.e. with a newline and indentation after the `[`). If an element
     # contains line comments, that should also trigger multiline output since
@@ -1604,14 +1673,17 @@ exports.Arr = class Arr extends Base
           fragment.code = fragment.code.trim()
         else if index isnt 0 and includesLineCommentsOnNonFirstElement is no and hasLineComments fragment
           includesLineCommentsOnNonFirstElement = yes
-      if index isnt 0
+      # Add ', ' if all `Elisions` from the beginning of the array are processed (e.g. [, , , a]) and
+      # element isn't `Elision` or last element is `Elision` (e.g. [a,,b,,])
+      if index isnt 0 and passedElision and (not fragmentIsElision(fragments) or index is olen - 1)
         answer.push @makeCode ', '
+      passedElision = passedElision or not fragmentIsElision fragments
       answer.push fragments...
     if includesLineCommentsOnNonFirstElement or '\n' in fragmentsToText(answer)
       for fragment, fragmentIndex in answer
         if fragment.isHereComment
           fragment.code = "#{multident(fragment.code, o.indent, no)}\n#{o.indent}"
-        else if fragment.code is ', '
+        else if fragment.code is ', ' and not fragment?.isElision
           fragment.code = ",\n#{o.indent}"
       answer.unshift @makeCode "[\n#{o.indent}"
       answer.push @makeCode "\n#{@tab}]"
@@ -1843,20 +1915,20 @@ exports.ExecutableClassBody = class ExecutableClassBody extends Base
     if argumentsNode = @body.contains isLiteralArguments
       argumentsNode.error "Class bodies shouldn't reference arguments"
 
-    @name      = @class.name ? @defaultClassVariableName
-    directives = @walkBody()
-    @setContext()
-
-    ident   = new IdentifierLiteral @name
     params  = []
-    args    = []
+    args    = [new ThisLiteral]
     wrapper = new Code params, @body
-    klass   = new Parens new Call wrapper, args
+    klass   = new Parens new Call (new Value wrapper, [new Access new PropertyName 'call']), args
 
     @body.spaced = true
 
     o.classScope = wrapper.makeScope o.scope
 
+    @name      = @class.name ? o.classScope.freeVariable @defaultClassVariableName
+    ident      = new IdentifierLiteral @name
+    directives = @walkBody()
+    @setContext()
+
     if @class.hasNameClash
       parent = new IdentifierLiteral o.classScope.freeVariable 'superClass'
       wrapper.params.push new Param parent
@@ -2141,10 +2213,11 @@ exports.Assign = class Assign extends Base
         # know that, so that those nodes know that they’re assignable as
         # destructured variables.
         @variable.base.lhs = yes
-        return @compileDestructuring o unless @variable.isAssignable()
+        # Check if @variable contains Obj with splats.
+        hasSplat = @variable.contains (node) -> node instanceof Obj and node.hasSplat()
+        return @compileDestructuring o if not @variable.isAssignable() or @variable.isArray() and hasSplat
         # Object destructuring. Can be removed once ES proposal hits Stage 4.
-        objDestructAnswer = @compileObjectDestruct(o) if @variable.isObject() and @variable.contains (node) ->
-          node instanceof Obj and node.hasSplat()
+        objDestructAnswer = @compileObjectDestruct(o) if @variable.isObject() and hasSplat
         return objDestructAnswer if objDestructAnswer
 
       return @compileSplice       o if @variable.isSplice()
@@ -2322,47 +2395,26 @@ exports.Assign = class Assign extends Base
     if olen is 1 and obj instanceof Expansion
       obj.error 'Destructuring assignment has no target'
 
-    isObject = @variable.isObject()
+    # Count all `Splats`: [a, b, c..., d, e]
+    splats = (i for obj, i in objects when obj instanceof Splat)
+    # Count all `Expansions`: [a, b, ..., c, d]
+    expans = (i for obj, i in objects when obj instanceof Expansion)
+    # Combine splats and expansions.
+    splatsAndExpans = [splats..., expans...]
+    # Show error if there is more than one `Splat`, or `Expansion`.
+    # Examples: [a, b, c..., d, e, f...], [a, b, ..., c, d, ...], [a, b, ..., c, d, e...]
+    if splatsAndExpans.length > 1
+      # Sort 'splatsAndExpans' so we can show error at first disallowed token.
+      objects[splatsAndExpans.sort()[1]].error "multiple splats/expansions are disallowed in an assignment"
 
-    # Special case for when there's only one thing destructured off of
-    # something. `{a} = b`, `[a] = b`, `{a: b} = c`
-    if top and olen is 1 and obj not instanceof Splat
-      # Pick the property straight off the value when there’s just one to pick
-      # (no need to cache the value into a variable).
-      defaultValue = undefined
-      if obj instanceof Assign and obj.context is 'object'
-        # A regular object pattern-match.
-        {variable: {base: idx}, value: obj} = obj
-        if obj instanceof Assign
-          defaultValue = obj.value
-          obj = obj.variable
-      else
-        if obj instanceof Assign
-          defaultValue = obj.value
-          obj = obj.variable
-        idx = if isObject
-          # A shorthand `{a, b, @c} = val` pattern-match.
-          if obj.this
-            obj.properties[0].name
-          else
-            new PropertyName obj.unwrap().value
-        else
-          # A regular array pattern-match.
-          new NumberLiteral 0
-      acc   = idx.unwrap() instanceof PropertyName
-      value = new Value value
-      value.properties.push new (if acc then Access else Index) idx
-      message = isUnassignable obj.unwrap().value
-      obj.error message if message
-      if defaultValue
-        defaultValue.isDefaultValue = yes
-        value = new Op '?', value, defaultValue
-      return new Assign(obj, value, null, param: @param).compileToFragments o, LEVEL_TOP
+    isSplat = splats?.length > 0
+    isExpans = expans?.length > 0
+    isObject = @variable.isObject()
+    isArray = @variable.isArray()
 
     vvar     = value.compileToFragments o, LEVEL_LIST
     vvarText = fragmentsToText vvar
     assigns  = []
-    expandedIdx = false
 
     # At this point, there are several things to destructure. So the `fn()` in
     # `{a, b} = fn()` must be cached, for example. Make vvar into a simple
@@ -2373,75 +2425,108 @@ exports.Assign = class Assign extends Base
       vvar = [@makeCode ref]
       vvarText = ref
 
-    # And here comes the big loop that handles all of these cases:
-    # `[a, b] = c`
-    # `[a..., b] = c`
-    # `[..., a, b] = c`
-    # `[@a, b] = c`
-    # `[a = 1, b] = c`
-    # `{a, b} = c`
-    # `{@a, b} = c`
-    # `{a = 1, b} = c`
-    # etc.
-    for obj, i in objects
-      idx = i
-      if not expandedIdx and obj instanceof Splat
-        name = obj.name.unwrap().value
-        obj = obj.unwrap()
-        val = "#{olen} <= #{vvarText}.length ? #{utility 'slice', o}.call(#{vvarText}, #{i}"
-        rest = olen - i - 1
-        if rest isnt 0
-          ivar = o.scope.freeVariable 'i', single: true
-          val += ", #{ivar} = #{vvarText}.length - #{rest}) : (#{ivar} = #{i}, [])"
-        else
-          val += ") : []"
-        val   = new Literal val
-        expandedIdx = "#{ivar}++"
-      else if not expandedIdx and obj instanceof Expansion
-        rest = olen - i - 1
-        if rest isnt 0
-          if rest is 1
-            expandedIdx = "#{vvarText}.length - 1"
-          else
-            ivar = o.scope.freeVariable 'i', single: true
-            val = new Literal "#{ivar} = #{vvarText}.length - #{rest}"
-            expandedIdx = "#{ivar}++"
-            assigns.push val.compileToFragments o, LEVEL_LIST
-        continue
-      else
-        if obj instanceof Splat or obj instanceof Expansion
-          obj.error "multiple splats/expansions are disallowed in an assignment"
-        defaultValue = undefined
-        if obj instanceof Assign and obj.context is 'object'
-          # A regular object pattern-match.
-          {variable: {base: idx}, value: obj} = obj
-          if obj instanceof Assign
-            defaultValue = obj.value
-            obj = obj.variable
-        else
-          if obj instanceof Assign
-            defaultValue = obj.value
-            obj = obj.variable
-          idx = if isObject
-            # A shorthand `{a, b, @c} = val` pattern-match.
-            if obj.this
-              obj.properties[0].name
-            else
-              new PropertyName obj.unwrap().value
-          else
-            # A regular array pattern-match.
-            new Literal expandedIdx or idx
-        name = obj.unwrap().value
-        acc = idx.unwrap() instanceof PropertyName
-        val = new Value new Literal(vvarText), [new (if acc then Access else Index) idx]
-        if defaultValue
-          defaultValue.isDefaultValue = yes
-          val = new Op '?', val, defaultValue
-      if name?
-        message = isUnassignable name
-        obj.error message if message
-      assigns.push new Assign(obj, val, null, param: @param, subpattern: yes).compileToFragments o, LEVEL_LIST
+    slicer = (type) -> (vvar, start, end = no) ->
+      args = [new IdentifierLiteral(vvar), new NumberLiteral(start)]
+      args.push new NumberLiteral end if end
+      slice = new Value (new IdentifierLiteral utility type, o), [new Access new PropertyName 'call']
+      new Value new Call slice, args
 
+    # Helper which outputs `[].slice` code.
+    compSlice = slicer "slice"
+
+    # Helper which outputs `[].splice` code.
+    compSplice = slicer "splice"
+
+    # Check if `objects` array contains object spread (`{a, r...}`), e.g. `[a, b, {c, r...}]`.
+    hasObjSpreads = (objs) ->
+      (i for obj, i in objs when obj.base instanceof Obj and obj.base.hasSplat())
+
+    # Check if `objects` array contains any instance of `Assign`, e.g. {a:1}.
+    hasObjAssigns = (objs) ->
+      (i for obj, i in objs when obj instanceof Assign and obj.context is 'object')
+
+    # Check if `objects` array contains any unassignable object.
+    objIsUnassignable = (objs) ->
+      return yes for obj in objs when not obj.isAssignable()
+      no
+
+    # `objects` are complex when there is object spread ({a...}), object assign ({a:1}),
+    # unassignable object, or just a single node.
+    complexObjects = (objs) ->
+      hasObjSpreads(objs).length or hasObjAssigns(objs).length or objIsUnassignable(objs) or olen is 1
+
+    # "Complex" `objects` are processed in a loop.
+    # Examples: [a, b, {c, r...}, d], [a, ..., {b, r...}, c, d]
+    loopObjects = (objs, vvar, vvarTxt) =>
+      objSpreads = hasObjSpreads objs
+      for obj, i in objs
+        # `Elision` can be skipped.
+        continue if obj instanceof Elision
+        # If `obj` is {a: 1}
+        if obj instanceof Assign and obj.context is 'object'
+          {variable: {base: idx}, value: vvar} = obj
+          {variable: vvar} = vvar if vvar instanceof Assign
+          idx =
+            if vvar.this
+              vvar.properties[0].name
+            else
+              new PropertyName vvar.unwrap().value
+          acc = idx.unwrap() instanceof PropertyName
+          vval = new Value value, [new (if acc then Access else Index) idx]
+        else
+          # `obj` is [a...], {a...} or a
+          vvar = switch
+            when obj instanceof Splat then new Value obj.name
+            when i in objSpreads then new Value obj.base
+            else obj
+          vval = switch
+            when obj instanceof Splat then compSlice(vvarTxt, i)
+            else new Value new Literal(vvarTxt), [new Index new NumberLiteral i]
+        message = isUnassignable vvar.unwrap().value
+        vvar.error message if message
+        assigns.push new Assign(vvar, vval, null, param: @param, subpattern: yes).compileToFragments o, LEVEL_LIST
+
+    # "Simple" `objects` can be split and compiled to arrays, [a, b, c] = arr, [a, b, c...] = arr
+    assignObjects = (objs, vvar, vvarTxt) =>
+      vvar = new Value new Arr(objs, yes)
+      vval = if vvarTxt instanceof Value then vvarTxt else new Value new Literal(vvarTxt)
+      assigns.push new Assign(vvar, vval, null, param: @param, subpattern: yes).compileToFragments o, LEVEL_LIST
+
+    processObjects = (objs, vvar, vvarTxt) ->
+      if complexObjects objs
+        loopObjects objs, vvar, vvarTxt
+      else
+        assignObjects objs, vvar, vvarTxt
+
+    # In case there is `Splat` or `Expansion` in `objects`,
+    # we can split array in two simple subarrays.
+    # `Splat` [a, b, c..., d, e] can be split into  [a, b, c...] and [d, e].
+    # `Expansion` [a, b, ..., c, d] can be split into [a, b] and [c, d].
+    # Examples:
+    # a) `Splat`
+    #   CS: [a, b, c..., d, e] = arr
+    #   JS: [a, b, ...c] = arr, [d, e] = splice.call(c, -2)
+    # b) `Expansion`
+    #   CS: [a, b, ..., d, e] = arr
+    #   JS: [a, b] = arr, [d, e] = slice.call(arr, -2)
+    if splatsAndExpans.length
+      expIdx = splatsAndExpans[0]
+      leftObjs = objects.slice 0, expIdx + (if isSplat then 1 else 0)
+      rightObjs = objects.slice expIdx + 1
+      processObjects leftObjs, vvar, vvarText if leftObjs.length isnt 0
+      if rightObjs.length isnt 0
+        # Slice or splice `objects`.
+        refExp = switch
+          when isSplat then compSplice objects[expIdx].unwrapAll().value, rightObjs.length * -1
+          when isExpans then compSlice vvarText, rightObjs.length * -1
+        if complexObjects rightObjs
+          restVar = refExp
+          refExp = o.scope.freeVariable 'ref'
+          assigns.push [@makeCode(refExp + ' = '), restVar.compileToFragments(o, LEVEL_LIST)...]
+        processObjects rightObjs, vvar, refExp
+    else
+      # There is no `Splat` or `Expansion` in `objects`.
+      processObjects objects, vvar, vvarText
     assigns.push vvar unless top or @subpattern
     fragments = @joinFragmentArrays assigns, ', '
     if o.level < LEVEL_LIST then fragments else @wrapInParentheses fragments
@@ -2564,14 +2649,24 @@ exports.Code = class Code extends Base
 
     # Check for duplicate parameters and separate `this` assignments.
     paramNames = []
-    @eachParamName (name, node, param) ->
+    @eachParamName (name, node, param, obj) ->
       node.error "multiple parameters named '#{name}'" if name in paramNames
       paramNames.push name
+
       if node.this
         name   = node.properties[0].name.value
         name   = "_#{name}" if name in JS_FORBIDDEN
-        target = new IdentifierLiteral o.scope.freeVariable name
-        param.renameParam node, target
+        target = new IdentifierLiteral o.scope.freeVariable name, reserve: no
+        # `Param` is object destructuring with a default value: ({@prop = 1}) ->
+        # In a case when the variable name is already reserved, we have to assign
+        # a new variable name to the destructured variable: ({prop:prop1 = 1}) ->
+        replacement =
+            if param.name instanceof Obj and obj instanceof Assign and
+                obj.operatorToken.value is '='
+              new Assign (new IdentifierLiteral name), target, 'object' #, operatorToken: new Literal ':'
+            else
+              target
+        param.renameParam node, replacement
         thisAssignments.push new Assign node, target
 
     # Parse the parameters, adding them to the list of parameters to put in the
@@ -2802,7 +2897,9 @@ exports.Code = class Code extends Base
         # cannot be given an argument with a reference to `this`, as that would
         # be referencing `this` before calling `super`.
         unless child.variable.accessor
-          Block.wrap(child.args).traverseChildren yes, (node) =>
+          childArgs = child.args.filter (arg) ->
+            arg not instanceof Class and (arg not instanceof Code or arg.bound)
+          Block.wrap(childArgs).traverseChildren yes, (node) =>
             node.error "Can't call super with @params in derived class constructors" if node.this
         seenSuper = yes
         iterator child
@@ -2860,12 +2957,14 @@ exports.Param = class Param extends Base
   # `name` is the name of the parameter and `node` is the AST node corresponding
   # to that name.
   eachName: (iterator, name = @name) ->
-    atParam = (obj) => iterator "@#{obj.properties[0].name.value}", obj, @
+    atParam = (obj, originalObj = null) => iterator "@#{obj.properties[0].name.value}", obj, @, originalObj
     # * simple literals `foo`
     return iterator name.value, name, @ if name instanceof Literal
     # * at-params `@foo`
     return atParam name if name instanceof Value
     for obj in name.objects ? []
+      # Save original obj.
+      nObj = obj
       # * destructured parameter with default value
       if obj instanceof Assign and not obj.context?
         obj = obj.variable
@@ -2887,9 +2986,11 @@ exports.Param = class Param extends Base
           @eachName iterator, obj.base
         # * at-params within destructured parameters `{@foo}`
         else if obj.this
-          atParam obj
+          atParam obj, nObj
         # * simple destructured parameters {foo}
         else iterator obj.base.value, obj.base, @
+      else if obj instanceof Elision
+        obj
       else if obj not instanceof Expansion
         obj.error "illegal parameter #{obj.compile()}"
     return
@@ -2902,7 +3003,14 @@ exports.Param = class Param extends Base
       if parent instanceof Obj
         key = node
         key = node.properties[0].name if node.this
-        new Assign new Value(key), newNode, 'object'
+        # No need to assign a new variable for the destructured variable if the variable isn't reserved.
+        # Examples:
+        # `({@foo}) ->`  should compile to `({foo}) { this.foo = foo}`
+        # `foo = 1; ({@foo}) ->` should compile to `foo = 1; ({foo:foo1}) { this.foo = foo1 }`
+        if node.this and key.value is newNode.value
+          new Value newNode
+        else
+          new Assign new Value(key), newNode, 'object'
       else
         newNode
 
@@ -2946,6 +3054,28 @@ exports.Expansion = class Expansion extends Base
 
   eachName: (iterator) ->
 
+#### Elision
+
+# Array elision element (for example, [,a, , , b, , c, ,]).
+exports.Elision = class Elision extends Base
+
+  isAssignable: YES
+
+  shouldCache: NO
+
+  compileToFragments: (o, level) ->
+    fragment = super o, level
+    fragment.isElision = yes
+    fragment
+
+  compileNode: (o) ->
+    [@makeCode ', ']
+
+  asReference: (o) ->
+    this
+
+  eachName: (iterator) ->
+
 #### While
 
 # A while loop, the only sort of low-level loop exposed by CoffeeScript. From
@@ -3590,7 +3720,7 @@ exports.For = class For extends While
         body = Block.wrap [new If @guard, body] if @guard
     if @pattern
       body.expressions.unshift new Assign @name, if @from then new IdentifierLiteral kvar else new Literal "#{svar}[#{kvar}]"
-    defPartFragments = [].concat @makeCode(defPart), @pluckDirectCall(o, body)
+
     varPart = "\n#{idt1}#{namePart};" if namePart
     if @object
       forPartFragments = [@makeCode("#{kvar} in #{svar}")]
@@ -3601,9 +3731,7 @@ exports.For = class For extends While
     if bodyFragments and bodyFragments.length > 0
       bodyFragments = [].concat @makeCode('\n'), bodyFragments, @makeCode('\n')
 
-    fragments = []
-    if defPartFragments? and fragmentsToText(defPartFragments) isnt ''
-      fragments = fragments.concat defPartFragments
+    fragments = [@makeCode(defPart)]
     fragments.push @makeCode(resultPart) if resultPart
     fragments = fragments.concat @makeCode(@tab), @makeCode( 'for ('),
       forPartFragments, @makeCode(") {#{guardPart}#{varPart}"), bodyFragments,
@@ -3611,26 +3739,6 @@ exports.For = class For extends While
     fragments.push @makeCode(returnResult) if returnResult
     fragments
 
-  pluckDirectCall: (o, body) ->
-    defs = []
-    for expr, idx in body.expressions
-      expr = expr.unwrapAll()
-      continue unless expr instanceof Call
-      val = expr.variable?.unwrapAll()
-      continue unless (val instanceof Code) or
-                      (val instanceof Value and
-                      val.base?.unwrapAll() instanceof Code and
-                      val.properties.length is 1 and
-                      val.properties[0].name?.value in ['call', 'apply'])
-      fn    = val.base?.unwrapAll() or val
-      ref   = new IdentifierLiteral o.scope.freeVariable 'fn'
-      base  = new Value ref
-      if val.base
-        [val.base, base] = [base, val]
-      body.expressions[idx] = new Call base, expr.args
-      defs = defs.concat @makeCode(@tab), (new Assign(ref, fn).compileToFragments(o, LEVEL_TOP)), @makeCode(';\n')
-    defs
-
 #### Switch
 
 # A JavaScript *switch* statement. Converts into a returnable expression on-demand.

src/rewriter.coffee

@@ -263,6 +263,20 @@ exports.Rewriter = class Rewriter
             stack.pop()
         start = stack.pop()
 
+      inControlFlow = =>
+        seenFor = @findTagsBackwards(i, ['FOR']) and @findTagsBackwards(i, ['FORIN', 'FOROF', 'FORFROM'])
+        controlFlow = seenFor or @findTagsBackwards i, ['WHILE', 'UNTIL', 'LOOP', 'LEADING_WHEN']
+        return no unless controlFlow
+        isFunc = no
+        tagCurrentLine = token[2].first_line
+        @detectEnd i,
+          (token, i) -> token[0] in LINEBREAKS
+          (token, i) ->
+            [prevTag, ,{first_line}] = tokens[i - 1] || []
+            isFunc = tagCurrentLine is first_line and prevTag in ['->', '=>']
+          returnOnNegativeLevel: yes
+        isFunc
+
       # Recognize standard implicit calls like
       # f a, f() b, f? c, h[0] d etc.
       # Added support for spread dots on the left side: f ...a
@@ -271,7 +285,8 @@ exports.Rewriter = class Rewriter
          (nextTag in IMPLICIT_CALL or
          (nextTag is '...' and @tag(i + 2) in IMPLICIT_CALL and not @findTagsBackwards(i, ['INDEX_START', '['])) or
           nextTag in IMPLICIT_UNSPACED_CALL and
-          not nextToken.spaced and not nextToken.newLine)
+          not nextToken.spaced and not nextToken.newLine) and
+          not inControlFlow()
         tag = token[0] = 'FUNC_EXIST' if tag is '?'
         startImplicitCall i + 1
         return forward(2)
@@ -343,11 +358,14 @@ exports.Rewriter = class Rewriter
           stackItem[2].sameLine = no if isImplicitObject stackItem
 
       newLine = prevTag is 'OUTDENT' or prevToken.newLine
-      if tag in IMPLICIT_END or tag in CALL_CLOSERS and newLine
+      if tag in IMPLICIT_END or
+          (tag in CALL_CLOSERS and newLine) or
+          (tag in ['..', '...'] and @findTagsBackwards(i, ["INDEX_START"]))
         while inImplicit()
           [stackTag, stackIdx, {sameLine, startsLine}] = stackTop()
           # Close implicit calls when reached end of argument list
-          if inImplicitCall() and prevTag isnt ','
+          if inImplicitCall() and prevTag isnt ',' or
+              (prevTag is ',' and tag is 'TERMINATOR' and not nextTag?)
             endImplicitCall()
           # Close implicit objects such as:
           # return a: 1, b: 2 unless true
@@ -544,20 +562,49 @@ exports.Rewriter = class Rewriter
   # blocks are added.
   normalizeLines: ->
     starter = indent = outdent = null
+    leading_switch_when = null
+    leading_if_then = null
+    # Count `THEN` tags
+    ifThens = []
 
     condition = (token, i) ->
       token[1] isnt ';' and token[0] in SINGLE_CLOSERS and
       not (token[0] is 'TERMINATOR' and @tag(i + 1) in EXPRESSION_CLOSE) and
-      not (token[0] is 'ELSE' and starter isnt 'THEN') and
+      not (token[0] is 'ELSE' and
+           (starter isnt 'THEN' or (leading_if_then or leading_switch_when))) and
       not (token[0] in ['CATCH', 'FINALLY'] and starter in ['->', '=>']) or
       token[0] in CALL_CLOSERS and
       (@tokens[i - 1].newLine or @tokens[i - 1][0] is 'OUTDENT')
 
     action = (token, i) ->
+      ifThens.pop() if token[0] is 'ELSE' and starter is 'THEN'
       @tokens.splice (if @tag(i - 1) is ',' then i - 1 else i), 0, outdent
 
+    closeElseTag = (tokens, i) =>
+      tlen = ifThens.length
+      return i unless tlen > 0
+      lastThen = ifThens.pop()
+      [, outdentElse] = @indentation tokens[lastThen]
+      # Insert `OUTDENT` to close inner `IF`.
+      outdentElse[1] = tlen*2
+      tokens.splice(i, 0, outdentElse)
+      # Insert `OUTDENT` to close outer `IF`.
+      outdentElse[1] = 2
+      tokens.splice(i + 1, 0, outdentElse)
+      # Remove outdents from the end.
+      @detectEnd i + 2,
+        (token, i) -> token[0] in ['OUTDENT', 'TERMINATOR']
+        (token, i) ->
+            if @tag(i) is 'OUTDENT' and @tag(i + 1) is 'OUTDENT'
+              tokens.splice i, 2
+      i + 2
+
     @scanTokens (token, i, tokens) ->
       [tag] = token
+      conditionTag = tag in ['->', '=>'] and
+        @findTagsBackwards(i, ['IF', 'WHILE', 'FOR', 'UNTIL', 'SWITCH', 'WHEN', 'LEADING_WHEN', '[', 'INDEX_START']) and
+        not (@findTagsBackwards i, ['THEN', '..', '...'])
+
       if tag is 'TERMINATOR'
         if @tag(i + 1) is 'ELSE' and @tag(i - 1) isnt 'OUTDENT'
           tokens.splice i, 1, @indentation()...
@@ -574,10 +621,18 @@ exports.Rewriter = class Rewriter
         tokens.splice i + 1, 0, indent, outdent
         return 1
       if tag in SINGLE_LINERS and @tag(i + 1) isnt 'INDENT' and
-         not (tag is 'ELSE' and @tag(i + 1) is 'IF')
+         not (tag is 'ELSE' and @tag(i + 1) is 'IF') and
+         not conditionTag
         starter = tag
         [indent, outdent] = @indentation tokens[i]
         indent.fromThen   = true if starter is 'THEN'
+        if tag is 'THEN'
+          leading_switch_when = @findTagsBackwards(i, ['LEADING_WHEN']) and @tag(i + 1) is 'IF'
+          leading_if_then = @findTagsBackwards(i, ['IF']) and @tag(i + 1) is 'IF'
+        ifThens.push i if tag is 'THEN' and @findTagsBackwards(i, ['IF'])
+        # `ELSE` tag is not closed.
+        if tag is 'ELSE' and @tag(i - 1) isnt 'OUTDENT'
+          i = closeElseTag tokens, i
         tokens.splice i + 1, 0, indent
         @detectEnd i + 2, condition, action
         tokens.splice i, 1 if tag is 'THEN'

test/arrays.coffee

@@ -26,6 +26,94 @@ test "incorrect indentation without commas", ->
   ok result[0][0] is 'a'
   ok result[1]['b'] is 'c'
 
+# Elisions
+test "array elisions", ->
+  eq [,1].length, 2
+  eq [,,1,2,,].length, 5
+  arr = [1,,2]
+  eq arr.length, 3
+  eq arr[1], undefined
+  eq [,,].length, 2
+
+test "array elisions indentation and commas", ->
+  arr1 = [
+    , 1, 2, , , 3,
+    4, 5, 6
+    , , 8, 9,
+  ]
+  eq arr1.length, 12
+  eq arr1[5], 3
+  eq arr1[9], undefined
+  arr2 = [, , 1,
+    2, , 3,
+    , 4, 5
+    6
+    , , ,
+  ]
+  eq arr2.length, 12
+  eq arr2[8], 5
+  eq arr2[1], undefined
+
+test "array elisions destructuring", ->
+  arr = [1,2,3,4,5,6,7,8,9]
+  [,a] = arr
+  [,,,b] = arr
+  arrayEq [a,b], [2,4]
+  [,a,,b,,c,,,d] = arr
+  arrayEq [a,b,c,d], [2,4,6,9]
+  [
+    ,e,
+    ,f,
+    ,g,
+    ,,h] = arr
+  arrayEq [e,f,g,h], [2,4,6,9]
+
+test "array elisions destructuring with splats and expansions", ->
+  arr = [1,2,3,4,5,6,7,8,9]
+  [,a,,,b...] = arr
+  arrayEq [a,b], [2,[5,6,7,8,9]]
+  [,c,...,,d,,e] = arr
+  arrayEq [c,d,e], [2,7,9]
+  [...,f,,,g,,,] = arr
+  arrayEq [f,g], [4,7]
+
+test "array elisions as function parameters", ->
+  arr = [1,2,3,4,5,6,7,8,9]
+  foo = ([,a]) -> a
+  a = foo arr
+  eq a, 2
+  foo = ([,,,a]) -> a
+  a = foo arr
+  eq a, 4
+  foo = ([,a,,b,,c,,,d]) -> [a,b,c,d]
+  [a,b,c,d] = foo arr
+  arrayEq [a,b,c,d], [2,4,6,9]
+
+test "array elisions nested destructuring", ->
+  arr = [
+    1,
+    [2,3, [4,5,6, [7,8,9] ] ]
+  ]
+  [,a] = arr
+  arrayEq a[2][3], [7,8,9]
+  [,[,,[,b,,[,,c]]]] = arr
+  eq b, 5
+  eq c, 9
+  aobj = [
+    {},
+    {x: 2},
+    {},
+    [
+      {},
+      {},
+      {z:1, w:[1,2,4], p:3, q:4}
+      {},
+      {}
+    ]
+  ]
+  [,d,,[,,{w}]] = aobj
+  deepEqual d, {x:2}
+  arrayEq w, [1,2,4]
 
 # Splats in Array Literals
 

test/assignment.coffee

@@ -185,6 +185,17 @@ test "#4787 destructuring of objects within arrays", ->
   eq b, arr[1].b
   deepEqual {a, b}, arr[1]
 
+test "#4798 destructuring of objects with splat within arrays", ->
+  arr = [1, {a:1, b:2}]
+  [...,{a, r...}] = arr
+  eq a, 1
+  deepEqual r, {b:2}
+  [b, {q...}] = arr
+  eq b, 1
+  deepEqual q, arr[1]
+  eq q.b, r.b
+  eq q.a, a
+
 test "destructuring assignment with splats", ->
   a = {}; b = {}; c = {}; d = {}; e = {}
   [x,y...,z] = [a,b,c,d,e]
@@ -934,3 +945,43 @@ test "#4673: complex destructured object spread variables", ->
 
   {{g}...} = g: 1
   eq g, 1
+
+test "#4878: Compile error when using destructuring with a splat or expansion in an array", ->
+  arr = ['a', 'b', 'c', 'd']
+
+  f1 = (list) ->
+    [first, ..., last] = list
+
+  f2 = (list) ->
+    [first..., last] = list
+
+  f3 = (list) ->
+    ([first, ...] = list); first
+
+  f4 = (list) ->
+    ([first, ...rest] = list); rest
+
+  arrayEq f1(arr), arr
+  arrayEq f2(arr), arr
+  arrayEq f3(arr), 'a'
+  arrayEq f4(arr), ['b', 'c', 'd']
+
+  foo = (list) ->
+    ret =
+      if list?.length > 0
+        [first, ..., last] = list
+        [first, last]
+      else
+        []
+
+  arrayEq foo(arr), ['a', 'd']
+
+  bar = (list) ->
+    ret =
+      if list?.length > 0
+        [first, ...rest] = list
+        [first, rest]
+      else
+        []
+
+  arrayEq bar(arr), ['a', ['b', 'c', 'd']]

test/classes.coffee

@@ -1857,3 +1857,45 @@ test "#4724: backticked expression in a class body with hoisted member", ->
   a = new A
   eq 42, a.x
   eq 84, a.hoisted
+
+test "#4822: nested anonymous classes use non-conflicting variable names", ->
+  Class = class
+    @a: class
+      @b: 1
+
+  eq Class.a.b, 1
+
+test "#4827: executable class body wrappers have correct context", ->
+  test = ->
+    class @A
+    class @B extends @A
+      @property = 1
+
+  o = {}
+  test.call o
+  ok typeof o.A is typeof o.B is 'function'
+
+test "#4868: Incorrect ‘Can’t call super with @params’ error", ->
+  class A
+    constructor: (@func = ->) ->
+      @x = 1
+      @func()
+
+  class B extends A
+    constructor: ->
+      super -> @x = 2
+
+  a = new A
+  b = new B
+  eq 1, a.x
+  eq 2, b.x
+
+  class C
+    constructor: (@c = class) -> @c
+
+  class D extends C
+    constructor: ->
+      super class then constructor: (@a) -> @a = 3
+
+  d = new (new D).c
+  eq 3, d.a

test/comments.coffee

@@ -364,7 +364,7 @@ test "#3132: Place block-comments nicely", ->
 
     return DummyClass;
 
-  })();"""
+  }).call(this);"""
 
 test "#3638: Demand a whitespace after # symbol", ->
   eqJS """

test/compilation.coffee

@@ -170,3 +170,10 @@ test "using transpile from the Node API requires an object", ->
 test "transpile option applies to imported .coffee files", ->
   return if global.testingBrowser
   doesNotThrow -> transpile 'run', "import { getSep } from './test/importing/transpile_import'\ngetSep()"
+
+test "#3306: trailing comma in a function call in the last line", ->
+  eqJS '''
+  foo bar,
+  ''', '''
+  foo(bar);
+  '''

test/control_flow.coffee

@@ -484,3 +484,859 @@ test "#4267: lots of for-loops in the same scope", ->
       true
   """
   ok CoffeeScript.eval(code)
+
+# Test for issue #2342: Lexer: Inline `else` binds to wrong `if`/`switch`
+test "#2343: if / then / if / then / else", ->
+  a = b = yes
+  c = e = g = no
+  d = 1
+  f = 2
+  h = 3
+  i = 4
+
+  s = ->
+    if a
+      if b
+        if c
+          d
+        else
+          if e
+            f
+          else
+            if g
+              h
+            else
+              i
+
+  t = ->
+    if a then if b
+      if c then d
+      else if e
+        f
+      else if g
+        h
+      else
+        i
+
+  u = ->
+    if a then if b
+      if c then d else if e
+        f
+      else if g
+        h
+      else i
+
+  v = ->
+    if a then if b
+      if c then d else if e then f
+      else if g then h
+      else i
+
+  w = ->
+    if a then if b
+      if c then d
+      else if e
+          f
+        else
+          if g then h
+          else i
+
+  x = -> if a then if b then if c then d else if e then f else if g then h else i
+
+  y = -> if a then if b then (if c then d else (if e then f else (if g then h else i)))
+
+  eq 4, s()
+  eq 4, t()
+  eq 4, u()
+  eq 4, v()
+  eq 4, w()
+  eq 4, x()
+  eq 4, y()
+
+  c = yes
+  eq 1, s()
+  eq 1, t()
+  eq 1, u()
+  eq 1, v()
+  eq 1, w()
+  eq 1, x()
+  eq 1, y()
+
+  b = no
+  eq undefined, s()
+  eq undefined, t()
+  eq undefined, u()
+  eq undefined, v()
+  eq undefined, w()
+  eq undefined, x()
+  eq undefined, y()
+
+test "#2343: if / then / if / then / else / else", ->
+  a = b = yes
+  c = e = g = no
+  d = 1
+  f = 2
+  h = 3
+  i = 4
+  j = 5
+  k = 6
+
+  s = ->
+    if a
+      if b
+        if c
+          d
+        else
+          e
+          if e
+            f
+          else
+            if g
+              h
+            else
+              i
+      else
+        j
+    else
+      k
+
+  t = ->
+    if a
+      if b
+        if c then d
+        else if e
+          f
+        else if g
+          h
+        else
+          i
+      else
+        j
+    else
+      k
+
+  u = ->
+    if a
+      if b
+        if c then d else if e
+          f
+        else if g
+          h
+        else i
+      else j
+    else k
+
+  v = ->
+    if a
+      if b
+        if c then d else if e then f
+        else if g then h
+        else i
+      else j else k
+
+  w = ->
+    if a then if b
+        if c then d
+        else if e
+            f
+          else
+            if g then h
+            else i
+    else j else k
+
+  x = -> if a then if b then if c then d else if e then f else if g then h else i else j else k
+
+  y = -> if a then (if b then (if c then d else (if e then f else (if g then h else i))) else j) else k
+
+  eq 4, s()
+  eq 4, t()
+  eq 4, u()
+  eq 4, v()
+  eq 4, w()
+  eq 4, x()
+  eq 4, y()
+
+  c = yes
+  eq 1, s()
+  eq 1, t()
+  eq 1, u()
+  eq 1, v()
+  eq 1, w()
+  eq 1, x()
+  eq 1, y()
+
+  b = no
+  eq 5, s()
+  eq 5, t()
+  eq 5, u()
+  eq 5, v()
+  eq 5, w()
+  eq 5, x()
+  eq 5, y()
+
+  a = no
+  eq 6, s()
+  eq 6, t()
+  eq 6, u()
+  eq 6, v()
+  eq 6, w()
+  eq 6, x()
+  eq 6, y()
+
+
+test "#2343: switch / when / then / if / then / else", ->
+  a = b = yes
+  c = e = g = no
+  d = 1
+  f = 2
+  h = 3
+  i = 4
+
+  s = ->
+    switch
+      when a
+        if b
+          if c
+            d
+          else
+            if e
+              f
+            else
+              if g
+                h
+              else
+                i
+
+
+  t = ->
+    switch
+      when a then if b
+        if c then d
+        else if e
+          f
+        else if g
+          h
+        else
+          i
+
+  u = ->
+    switch
+      when a then if b then if c then d
+      else if e then f
+      else if g then h else i
+
+  v = ->
+    switch
+      when a then if b then if c then d else if e then f
+      else if g then h else i
+
+  w = ->
+    switch
+      when a then if b then if c then d else if e then f
+      else if g
+        h
+      else i
+
+  x = ->
+    switch
+     when a then if b then if c then d else if e then f else if g then h else i
+
+  y = -> switch
+    when a then if b then (if c then d else (if e then f else (if g then h else i)))
+
+  eq 4, s()
+  eq 4, t()
+  eq 4, u()
+  eq 4, v()
+  eq 4, w()
+  eq 4, x()
+  eq 4, y()
+
+  c = yes
+  eq 1, s()
+  eq 1, t()
+  eq 1, u()
+  eq 1, v()
+  eq 1, w()
+  eq 1, x()
+  eq 1, y()
+
+  b = no
+  eq undefined, s()
+  eq undefined, t()
+  eq undefined, u()
+  eq undefined, v()
+  eq undefined, w()
+  eq undefined, x()
+  eq undefined, y()
+
+test "#2343: switch / when / then / if / then / else / else", ->
+  a = b = yes
+  c = e = g = no
+  d = 1
+  f = 2
+  h = 3
+  i = 4
+
+  s = ->
+    switch
+      when a
+        if b
+          if c
+            d
+          else if e
+            f
+          else if g
+            h
+          else
+            i
+      else
+        0
+
+  t = ->
+    switch
+      when a
+        if b
+          if c then d
+          else if e
+            f
+          else if g
+            h
+          else i
+      else 0
+
+  u = ->
+    switch
+      when a
+        if b then if c
+            d
+          else if e
+            f
+          else if g
+            h
+          else i
+      else 0
+
+  v = ->
+    switch
+      when a
+        if b then if c then d
+        else if e
+          f
+        else if g
+          h
+        else i
+      else 0
+
+  w = ->
+    switch
+      when a
+        if b then if c then d
+        else if e then f
+        else if g then h
+        else i
+      else 0
+
+  x = ->
+    switch
+     when a
+       if b then if c then d else if e then f else if g then h else i
+     else 0
+
+  y = -> switch
+    when a
+      if b then (if c then d else (if e then f else (if g then h else i)))
+    else 0
+
+  eq 4, s()
+  eq 4, t()
+  eq 4, u()
+  eq 4, v()
+  eq 4, w()
+  eq 4, x()
+  eq 4, y()
+
+  c = yes
+  eq 1, s()
+  eq 1, t()
+  eq 1, u()
+  eq 1, v()
+  eq 1, w()
+  eq 1, x()
+  eq 1, y()
+
+  b = no
+  eq undefined, s()
+  eq undefined, t()
+  eq undefined, u()
+  eq undefined, v()
+  eq undefined, w()
+  eq undefined, x()
+  eq undefined, y()
+
+  b = yes
+  a = no
+  eq 0, s()
+  eq 0, t()
+  eq 0, u()
+  eq 0, v()
+  eq 0, w()
+  eq 0, x()
+  eq 0, y()
+
+test "#2343: switch / when / then / if / then / else / else / else", ->
+  a = b = yes
+  c = e = g = no
+  d = 1
+  f = 2
+  h = 3
+  i = 4
+  j = 5
+
+  s = ->
+    switch
+      when a
+        if b
+          if c
+            d
+          else if e
+            f
+          else if g
+            h
+          else
+            i
+        else
+          j
+      else
+        0
+
+  t = ->
+    switch
+      when a
+        if b
+          if c then d
+          else if e
+            f
+          else if g
+            h
+          else i
+        else
+          j
+      else 0
+
+  u = ->
+    switch
+      when a
+        if b
+          if c
+            d
+          else if e
+            f
+          else if g
+            h
+          else i
+        else j
+      else 0
+
+  v = ->
+    switch
+      when a
+        if b
+          if c then d
+          else if e
+            f
+          else if g then h
+          else i
+        else j
+      else 0
+
+  w = ->
+    switch
+      when a
+        if b
+          if c then d
+          else if e then f
+          else if g then h
+          else i
+        else j
+      else 0
+
+  x = ->
+    switch
+     when a
+       if b then if c then d else if e then f else if g then h else i else j
+     else 0
+
+  y = -> switch
+    when a
+      if b then (if c then d else (if e then f else (if g then h else i))) else j
+    else 0
+
+  eq 4, s()
+  eq 4, t()
+  eq 4, u()
+  eq 4, v()
+  eq 4, w()
+  eq 4, x()
+  eq 4, y()
+
+  c = yes
+  eq 1, s()
+  eq 1, t()
+  eq 1, u()
+  eq 1, v()
+  eq 1, w()
+  eq 1, x()
+  eq 1, y()
+
+  b = no
+  eq 5, s()
+  eq 5, t()
+  eq 5, u()
+  eq 5, v()
+  eq 5, w()
+  eq 5, x()
+  eq 5, y()
+
+  b = yes
+  a = no
+  eq 0, s()
+  eq 0, t()
+  eq 0, u()
+  eq 0, v()
+  eq 0, w()
+  eq 0, x()
+  eq 0, y()
+
+# Test for issue #3921: Inline function without parentheses used in condition fails to compile
+test "#3921: `if` & `unless`", ->
+  a = {}
+  eq a, if do -> no then undefined else a
+  a1 = undefined
+  if do -> yes
+    a1 = a
+  eq a, a1
+
+  b = {}
+  eq b, unless do -> no then b else undefined
+  b1 = undefined
+  unless do -> no
+    b1 = b
+  eq b, b1
+
+  c = 0
+  if (arg = undefined) -> yes then c++
+  eq 1, c
+  d = 0
+  if (arg = undefined) -> yes
+    d++
+  eq 1, d
+
+  answer = 'correct'
+  eq answer, if do -> 'wrong' then 'correct' else 'wrong'
+  eq answer, unless do -> no then 'correct' else 'wrong'
+  statm1 = undefined
+  if do -> 'wrong'
+    statm1 = 'correct'
+  eq answer, statm1
+  statm2 = undefined
+  unless do -> no
+    statm2 = 'correct'
+  eq answer, statm2
+
+test "#3921: `post if`", ->
+  a = {}
+  eq a, a unless do -> no
+  a1 = a if do -> yes
+  eq a, a1
+
+  c = 0
+  c++ if (arg = undefined) -> yes
+  eq 1, c
+  d = 0
+  d++ if (arg = undefined) -> yes
+  eq 1, d
+
+  answer = 'correct'
+  eq answer, 'correct' if do -> 'wrong'
+  eq answer, 'correct' unless do -> not 'wrong'
+  statm1 = undefined
+  statm1 = 'correct' if do -> 'wrong'
+  eq answer, statm1
+  statm2 = undefined
+  statm2 = 'correct' unless do -> not 'wrong'
+  eq answer, statm2
+
+test "Issue 3921: `while` & `until`", ->
+  i = 5
+  assert = (a) -> ok 5 > a > 0
+  result1 = while do (num = 1) -> i -= num
+    assert i
+    i
+  ok result1.join(' ') is '4 3 2 1'
+
+  j = 5
+  result2 = until do (num = 1) -> (j -= num) < 1
+    assert j
+    j
+  ok result2.join(' ') is '4 3 2 1'
+
+test "#3921: `switch`", ->
+  i = 1
+  a = switch do (m = 2) -> i * m
+    when 5 then "five"
+    when 4 then "four"
+    when 3 then "three"
+    when 2 then "two"
+    when 1 then "one"
+    else "none"
+  eq "two", a
+
+  j = 12
+  b = switch do (m = 3) -> j / m
+    when 5 then "five"
+    when 4 then "four"
+    when 3 then "three"
+    when 2 then "two"
+    when 1 then "one"
+    else "none"
+  eq "four", b
+
+  k = 20
+  c = switch do (m = 4) -> k / m
+    when 5 then "five"
+    when 4 then "four"
+    when 3 then "three"
+    when 2 then "two"
+    when 1 then "one"
+    else "none"
+  eq "five", c
+
+# Issue #3441: Parentheses wrapping expression throw invalid error in `then` clause
+test "#3441: `StatementLiteral` in parentheses", ->
+  i = 0
+  r1 = ((i++; break) while i < 10)
+  arrayEq r1, []
+
+  i = 0
+  r2 = ((i++; continue) while i < 10)
+  arrayEq r2, []
+
+  i = 0
+  r4 = while i < 10 then (i++; break)
+  arrayEq r4, []
+
+  i = 0
+  r5 = while i < 10 then (i++; continue)
+  arrayEq r5, []
+
+  arr = [0..9]
+  r6 = ((a; break) for a in arr)
+  arrayEq r6, []
+
+  r7 = ((a; continue) for a in arr)
+  arrayEq r7, []
+
+  r8 = for a in arr then (a; break)
+  arrayEq r8, []
+
+  r9 = for a in arr then (a; continue)
+  arrayEq r9, []
+
+# Issue #3909: backslash to break line in `for` loops throw syntax error
+test "#3909: backslash `for own ... of`", ->
+
+  obj = {a: 1, b: 2, c: 3}
+  arr = ['a', 'b', 'c']
+
+  x1 \
+    = ( key for own key of obj )
+  arrayEq x1, arr
+
+  x2 = \
+    ( key for own key of obj )
+  arrayEq x2, arr
+
+  x3 = ( \
+    key for own key of obj )
+  arrayEq x3, arr
+
+  x4 = ( key \
+    for own key of obj )
+  arrayEq x4, arr
+
+  x5 = ( key for own key of \
+    obj )
+  arrayEq x5, arr
+
+  x6 = ( key for own key of obj \
+    )
+  arrayEq x6, arr
+
+  x7 = ( key for \
+    own key of obj )
+  arrayEq x7, arr
+
+  x8 = ( key for own \
+    key of obj )
+  arrayEq x8, arr
+
+  x9 = ( key for own key \
+    of obj )
+  arrayEq x9, arr
+
+
+test "#3909: backslash `for ... of`", ->
+  obj = {a: 1, b: 2, c: 3}
+  arr = ['a', 'b', 'c']
+
+  x1 \
+    = ( key for key of obj )
+  arrayEq x1, arr
+
+  x2 = \
+    ( key for key of obj )
+  arrayEq x2, arr
+
+  x3 = ( \
+    key for key of obj )
+  arrayEq x3, arr
+
+  x4 = ( key \
+    for key of obj )
+  arrayEq x4, arr
+
+  x5 = ( key for key of \
+    obj )
+  arrayEq x5, arr
+
+  x6 = ( key for key of obj \
+    )
+  arrayEq x6, arr
+
+  x7 = ( key for \
+    key of obj )
+  arrayEq x7, arr
+
+  x8 = ( key for key \
+    of obj )
+  arrayEq x8, arr
+
+
+test "#3909: backslash `for ... in`", ->
+  arr = ['a', 'b', 'c']
+
+  x1 \
+    = ( key for key in arr )
+  arrayEq x1, arr
+
+  x2 = \
+    ( key for key in arr )
+  arrayEq x2, arr
+
+  x3 = ( \
+    key for key in arr )
+  arrayEq x3, arr
+
+  x4 = ( key \
+    for key in arr )
+  arrayEq x4, arr
+
+  x5 = ( key for key in \
+    arr )
+  arrayEq x5, arr
+
+  x6 = ( key for key in arr \
+    )
+  arrayEq x6, arr
+
+  x7 = ( key for \
+    key in arr )
+  arrayEq x7, arr
+
+  x8 = ( key for key \
+    in arr )
+  arrayEq x8, arr
+
+test "#4871: `else if` no longer output together ", ->
+   eqJS '''
+   if a then b else if c then d else if e then f else g
+   ''',
+   '''
+   if (a) {
+     b;
+   } else if (c) {
+     d;
+   } else if (e) {
+     f;
+   } else {
+     g;
+   }
+   '''
+
+   eqJS '''
+   if no
+     1
+   else if yes
+     2
+   ''',
+   '''
+   if (false) {
+     1;
+   } else if (true) {
+     2;
+   }
+   '''
+
+test "#4898: Lexer: backslash line continuation is inconsistent", ->
+  if ( \
+      false \
+      or \
+      true \
+    )
+    a = 42
+
+  eq a, 42
+
+  if ( \
+      false \
+      or \
+      true \
+  )
+    b = 42
+
+  eq b, 42
+
+  if ( \
+            false \
+         or \
+   true \
+  )
+    c = 42
+
+  eq c, 42
+
+  if \
+   false \
+        or \
+   true
+    d = 42
+
+  eq d, 42
+
+  if \
+              false or \
+  true
+    e = 42
+
+  eq e, 42
+
+  if \
+       false or \
+    true \
+       then \
+   f = 42 \
+   else
+     f = 24
+
+  eq f, 42

test/csx.coffee

@@ -742,3 +742,47 @@ test '#4686: comments inside interpolations that also contain CSX attributes', -
     </div>;
   '''
 
+# https://reactjs.org/blog/2017/11/28/react-v16.2.0-fragment-support.html
+test 'JSX fragments: empty fragment', ->
+  eqJS '''
+    <></>
+  ''', '''
+    <></>;
+  '''
+
+test 'JSX fragments: fragment with text nodes', ->
+  eqJS '''
+    <>
+      Some text.
+      <h2>A heading</h2>
+      More text.
+      <h2>Another heading</h2>
+      Even more text.
+    </>
+  ''', '''
+    <>
+      Some text.
+      <h2>A heading</h2>
+      More text.
+      <h2>Another heading</h2>
+      Even more text.
+    </>;
+  '''
+
+test 'JSX fragments: fragment with component nodes', ->
+  eqJS '''
+   Component = (props) =>
+     <Fragment>
+       <OtherComponent />
+       <OtherComponent />
+     </Fragment>
+  ''', '''
+    var Component;
+
+    Component = (props) => {
+      return <Fragment>
+        <OtherComponent />
+        <OtherComponent />
+      </Fragment>;
+    };
+  '''

test/error_messages.coffee

@@ -183,9 +183,9 @@ test "#1096: unexpected generated tokens", ->
     for i in [1]:
       1
   ''', '''
-    [stdin]:1:10: error: unexpected [
-    for i in [1]:
-             ^
+    [stdin]:2:4: error: unexpected end of input
+      1
+       ^
   '''
   # Unexpected regex
   assertErrorFormat '{/a/i: val}', '''
@@ -808,29 +808,8 @@ test "invalid numbers", ->
     ^^^
 '''
 
-test "unexpected object keys", ->
-  assertErrorFormat '''
-    {[[]]}
-  ''', '''
-    [stdin]:1:2: error: unexpected [
-    {[[]]}
-     ^
-  '''
-  assertErrorFormat '''
-    {[[]]: 1}
-  ''', '''
-    [stdin]:1:2: error: unexpected [
-    {[[]]: 1}
-     ^
-  '''
-  assertErrorFormat '''
-    [[]]: 1
-  ''', '''
-    [stdin]:1:1: error: unexpected [
-    [[]]: 1
-    ^
-  '''
 
+test "unexpected object keys", ->
   assertErrorFormat '''
     {(a + "b")}
   ''', '''
@@ -852,20 +831,6 @@ test "unexpected object keys", ->
     (a + "b"): 1
              ^
   '''
-  assertErrorFormat '''
-    a: 1, [[]]: 2
-  ''', '''
-    [stdin]:1:7: error: unexpected [
-    a: 1, [[]]: 2
-          ^
-  '''
-  assertErrorFormat '''
-    {a: 1, [[]]: 2}
-  ''', '''
-    [stdin]:1:8: error: unexpected [
-    {a: 1, [[]]: 2}
-           ^
-  '''
 
 test "invalid object keys", ->
   assertErrorFormat '''
@@ -1803,3 +1768,62 @@ test "#3098: suppressed newline should be unsuppressed by semicolon", ->
     a = ; 5
         ^
   '''
+
+test "#4811: '///' inside a heregex comment does not close the heregex", ->
+  assertErrorFormat '''
+   /// .* # comment ///
+  ''', '''
+  [stdin]:1:1: error: missing ///
+  /// .* # comment ///
+  ^^^
+  '''
+
+test "#3933: prevent implicit calls when cotrol flow is missing `THEN`", ->
+  assertErrorFormat '''
+    for a in b do ->
+  ''','''
+    [stdin]:1:12: error: unexpected do
+    for a in b do ->
+               ^^
+  '''
+
+  assertErrorFormat '''
+    for a in b ->
+  ''','''
+    [stdin]:1:12: error: unexpected ->
+    for a in b ->
+               ^^
+  '''
+
+  assertErrorFormat '''
+    for a in b do =>
+  ''','''
+    [stdin]:1:12: error: unexpected do
+    for a in b do =>
+               ^^
+  '''
+
+  assertErrorFormat '''
+    while a do ->
+  ''','''
+    [stdin]:1:9: error: unexpected do
+    while a do ->
+            ^^
+  '''
+
+  assertErrorFormat '''
+    until a do =>
+  ''','''
+    [stdin]:1:9: error: unexpected do
+    until a do =>
+            ^^
+  '''
+
+  assertErrorFormat '''
+    switch
+      when a ->
+  ''','''
+    [stdin]:2:10: error: unexpected ->
+      when a ->
+             ^^
+  '''

test/function_invocation.coffee

@@ -329,6 +329,15 @@ test "Simple Destructuring function arguments with same-named variables in scope
   eq f([2]), 2
   eq x, 1
 
+test "#4843: Bad output when assigning to @prop in destructuring assignment with defaults", ->
+  works = "maybe"
+  drinks = "beer"
+  class A
+    constructor: ({@works = 'no', @drinks = 'wine'}) ->
+  a = new A {works: 'yes', drinks: 'coffee'}
+  eq a.works, 'yes'
+  eq a.drinks, 'coffee'
+
 test "caching base value", ->
 
   obj =
@@ -795,7 +804,7 @@ test "get and set can be used as class method names", ->
   eq 4, B.get()
   eq 5, B.set()
 
-test "functions named get or set can be used without parentheses when attached to an object; #4524", ->
+test "#4524: functions named get or set can be used without parentheses when attached to an object", ->
   obj =
     get: (x) -> x + 2
     set: (x) -> x + 3
@@ -814,6 +823,8 @@ test "functions named get or set can be used without parentheses when attached t
 
   eq 12, obj.get 10
   eq 13, obj.set 10
+  eq 12, obj?.get 10
+  eq 13, obj?.set 10
 
   eq 14, a.get 10
   eq 15, a.set 10
@@ -836,3 +847,59 @@ test "functions named get or set can be used without parentheses when attached t
 
   eq 16, b.get value: @ten
   eq 17, b.set value: @ten
+
+test "#4836: functions named get or set can be used without parentheses when attached to this or @", ->
+  @get = (x) -> x + 2
+  @set = (x) -> x + 3
+  @a = 4
+
+  eq 12, this.get 10
+  eq 13, this.set 10
+  eq 12, this?.get 10
+  eq 13, this?.set 10
+  eq 6, this.get @a
+  eq 7, this.set @a
+  eq 6, this?.get @a
+  eq 7, this?.set @a
+
+  eq 12, @get 10
+  eq 13, @set 10
+  eq 12, @?.get 10
+  eq 13, @?.set 10
+  eq 6, @get @a
+  eq 7, @set @a
+  eq 6, @?.get @a
+  eq 7, @?.set @a
+
+test "#4852: functions named get or set can be used without parentheses when attached to this or @, with an argument of an implicit object", ->
+  @get = ({ x }) -> x + 2
+  @set = ({ x }) -> x + 3
+
+  eq 12, @get x: 10
+  eq 13, @set x: 10
+  eq 12, @?.get x: 10
+  eq 13, @?.set x: 10
+  eq 12, this?.get x: 10
+  eq 13, this?.set x: 10
+
+test "#4473: variable scope in chained calls", ->
+  obj =
+    foo: -> this
+    bar: (a) ->
+      a()
+      this
+
+  obj.foo(a = 1).bar(-> a = 2)
+  eq a, 2
+
+  obj.bar(-> b = 2).foo(b = 1)
+  eq b, 1
+
+  obj.foo(c = 1).bar(-> c = 2).foo(c = 3)
+  eq c, 3
+
+  obj.foo([d, e] = [1, 2]).bar(-> d = 4)
+  eq d, 4
+
+  obj.foo({f} = {f: 1}).bar(-> f = 5)
+  eq f, 5

test/invocation_argument_parsing.coffee

@@ -6,6 +6,8 @@ path = require 'path'
 # Get the folder containing the compiled `coffee` executable and make it the
 # PATH so that `#!/usr/bin/env coffee` resolves to our locally built file.
 coffeeBinFolder = path.dirname require.resolve '../bin/coffee'
+# For some reason, Windows requires `coffee` to be executed as `node coffee`.
+coffeeCommand = if isWindows() then 'node coffee' else 'coffee'
 spawnOptions =
   cwd: coffeeBinFolder
   encoding: 'utf8'
@@ -18,7 +20,7 @@ initialSpaceScript = require.resolve './importing/shebang_initial_space.coffee'
 extraArgsScript = require.resolve './importing/shebang_extra_args.coffee'
 initialSpaceExtraArgsScript = require.resolve './importing/shebang_initial_space_extra_args.coffee'
 
-test "parse arguments for shebang scripts correctly (on unix platforms)", ->
+test "parse arguments for shebang scripts correctly (on *nix platforms)", ->
   return if isWindows()
 
   stdout = execFileSync shebangScript, ['-abck'], spawnOptions
@@ -32,7 +34,7 @@ test "parse arguments for shebang scripts correctly (on unix platforms)", ->
   arrayEq expectedArgs, realArgs
 
 test "warn and remove -- if it is the second positional argument", ->
-  result = spawnSync 'coffee', [shebangScript, '--'], spawnOptions
+  result = spawnSync coffeeCommand, [shebangScript, '--'], spawnOptions
   stderr = result.stderr.toString()
   arrayEq JSON.parse(result.stdout), ['coffee', shebangScript]
   ok stderr.match /^coffee was invoked with '--'/m
@@ -40,7 +42,7 @@ test "warn and remove -- if it is the second positional argument", ->
   arrayEq JSON.parse(posArgs), [shebangScript, '--']
   ok result.status is 0
 
-  result = spawnSync 'coffee', ['-b', shebangScript, '--'], spawnOptions
+  result = spawnSync coffeeCommand, ['-b', shebangScript, '--'], spawnOptions
   stderr = result.stderr.toString()
   arrayEq JSON.parse(result.stdout), ['coffee', shebangScript]
   ok stderr.match /^coffee was invoked with '--'/m
@@ -49,7 +51,7 @@ test "warn and remove -- if it is the second positional argument", ->
   ok result.status is 0
 
   result = spawnSync(
-    'coffee', ['-b', shebangScript, '--', 'ANOTHER'], spawnOptions)
+    coffeeCommand, ['-b', shebangScript, '--', 'ANOTHER'], spawnOptions)
   stderr = result.stderr.toString()
   arrayEq JSON.parse(result.stdout), ['coffee', shebangScript, 'ANOTHER']
   ok stderr.match /^coffee was invoked with '--'/m
@@ -58,7 +60,7 @@ test "warn and remove -- if it is the second positional argument", ->
   ok result.status is 0
 
   result = spawnSync(
-    'coffee', ['--', initialSpaceScript, 'arg'], spawnOptions)
+    coffeeCommand, ['--', initialSpaceScript, 'arg'], spawnOptions)
   expectedArgs = ['coffee', initialSpaceScript, 'arg']
   realArgs = JSON.parse result.stdout
   arrayEq expectedArgs, realArgs
@@ -66,7 +68,7 @@ test "warn and remove -- if it is the second positional argument", ->
   ok result.status is 0
 
 test "warn about non-portable shebang lines", ->
-  result = spawnSync 'coffee', [extraArgsScript, 'arg'], spawnOptions
+  result = spawnSync coffeeCommand, [extraArgsScript, 'arg'], spawnOptions
   stderr = result.stderr.toString()
   arrayEq JSON.parse(result.stdout), ['coffee', extraArgsScript, 'arg']
   ok stderr.match /^The script to be run begins with a shebang line with more than one/m
@@ -77,14 +79,14 @@ test "warn about non-portable shebang lines", ->
   arrayEq JSON.parse(args), ['coffee', '--']
   ok result.status is 0
 
-  result = spawnSync 'coffee', [initialSpaceScript, 'arg'], spawnOptions
+  result = spawnSync coffeeCommand, [initialSpaceScript, 'arg'], spawnOptions
   stderr = result.stderr.toString()
   ok stderr is ''
   arrayEq JSON.parse(result.stdout), ['coffee', initialSpaceScript, 'arg']
   ok result.status is 0
 
   result = spawnSync(
-    'coffee', [initialSpaceExtraArgsScript, 'arg'], spawnOptions)
+    coffeeCommand, [initialSpaceExtraArgsScript, 'arg'], spawnOptions)
   stderr = result.stderr.toString()
   arrayEq JSON.parse(result.stdout), ['coffee', initialSpaceExtraArgsScript, 'arg']
   ok stderr.match /^The script to be run begins with a shebang line with more than one/m
@@ -97,7 +99,7 @@ test "warn about non-portable shebang lines", ->
 
 test "both warnings will be shown at once", ->
   result = spawnSync(
-    'coffee', [initialSpaceExtraArgsScript, '--', 'arg'], spawnOptions)
+    coffeeCommand, [initialSpaceExtraArgsScript, '--', 'arg'], spawnOptions)
   stderr = result.stderr.toString()
   arrayEq JSON.parse(result.stdout), ['coffee', initialSpaceExtraArgsScript, 'arg']
   ok stderr.match /^The script to be run begins with a shebang line with more than one/m

test/modules.coffee

@@ -853,3 +853,70 @@ test "#4491: import- and export-specific lexing should stop after import/export
 
     from('foo');
     """
+
+# Issue #4874: Backslash not supported in import or export statements
+test "#4874: backslash `import`", ->
+
+  eqJS """
+    import foo \
+        from 'lib'
+
+    foo a
+    """,
+  """
+    import foo from 'lib';
+
+    foo(a);
+    """
+
+  eqJS """
+    import \
+                    foo \
+        from \
+    'lib'
+
+    foo a
+    """,
+  """
+    import foo from 'lib';
+
+    foo(a);
+    """
+
+  eqJS """
+    import \
+          utilityBelt \
+    , {
+      each
+    } from \
+    'underscore'
+    """,
+  """
+    import utilityBelt, {
+      each
+    } from 'underscore';
+    """
+
+test "#4874: backslash `export`", ->
+  eqJS """
+    export \
+      * \
+            from \
+      'underscore'
+    """,
+  """
+    export * from 'underscore';
+    """
+
+  eqJS """
+    export \
+        { max, min } \
+              from \
+      'underscore'
+  """,
+  """
+    export {
+      max,
+      min
+    } from 'underscore';
+    """

test/objects.coffee

@@ -453,8 +453,7 @@ test 'inline implicit object literals within multiline implicit object literals'
   eq 0, x.b
   eq 0, x.a.aa
 
-test "object keys with interpolations", ->
-  # Simple cases.
+test "object keys with interpolations: simple cases", ->
   a = 'a'
   obj = "#{a}": yes
   eq obj.a, yes
@@ -465,7 +464,7 @@ test "object keys with interpolations", ->
   obj = {"#{5}"}
   eq obj[5], '5' # Note that the value is a string, just like the key.
 
-  # Commas in implicit object.
+test "object keys with interpolations: commas in implicit object", ->
   obj = "#{'a'}": 1, b: 2
   deepEqual obj, {a: 1, b: 2}
   obj = a: 1, "#{'b'}": 2
@@ -473,7 +472,7 @@ test "object keys with interpolations", ->
   obj = "#{'a'}": 1, "#{'b'}": 2
   deepEqual obj, {a: 1, b: 2}
 
-  # Commas in explicit object.
+test "object keys with interpolations: commas in explicit object", ->
   obj = {"#{'a'}": 1, b: 2}
   deepEqual obj, {a: 1, b: 2}
   obj = {a: 1, "#{'b'}": 2}
@@ -481,7 +480,7 @@ test "object keys with interpolations", ->
   obj = {"#{'a'}": 1, "#{'b'}": 2}
   deepEqual obj, {a: 1, b: 2}
 
-  # Commas after key with interpolation.
+test "object keys with interpolations: commas after key with interpolation", ->
   obj = {"#{'a'}": yes,}
   eq obj.a, yes
   obj = {
@@ -504,17 +503,17 @@ test "object keys with interpolations", ->
     "#{'c'}": 3, "#{'d'}": 4,
   deepEqual obj, {a: 1, b: 2, c: 3, d: 4}
 
-  # Key with interpolation mixed with `@prop`.
+test "object keys with interpolations: key with interpolation mixed with `@prop`", ->
   deepEqual (-> {@a, "#{'b'}": 2}).call(a: 1), {a: 1, b: 2}
 
-  # Evaluate only once.
+test "object keys with interpolations: evaluate only once", ->
   count = 0
-  b = -> count++; 'b'
-  obj = {"#{b()}"}
-  eq obj.b, 'b'
+  a = -> count++; 'a'
+  obj = {"#{a()}"}
+  eq obj.a, 'a'
   eq count, 1
 
-  # Evaluation order.
+test "object keys with interpolations: evaluation order", ->
   arr = []
   obj =
     a: arr.push 1
@@ -527,13 +526,13 @@ test "object keys with interpolations", ->
   arrayEq arr, [1..7]
   deepEqual obj, {a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7}
 
-  # Object starting with dynamic key.
+test "object keys with interpolations: object starting with dynamic key", ->
   obj =
     "#{'a'}": 1
     b: 2
   deepEqual obj, {a: 1, b: 2}
 
-  # Comments in implicit object.
+test "object keys with interpolations: comments in implicit object", ->
   obj =
     ### leading comment ###
     "#{'a'}": 1
@@ -564,7 +563,7 @@ test "object keys with interpolations", ->
   }
   deepEqual obj, {a: 1, b: 2, c: 3, d: 4, e: 5}
 
-  # A more complicated case.
+test "object keys with interpolations: more complicated case", ->
   obj = {
     "#{'interpolated'}":
       """
@@ -582,6 +581,212 @@ test "#4324: Shorthand after interpolated key", ->
   eq 1, obj[1]
   eq 2, obj.a
 
+test "computed property keys: simple cases", ->
+  a = 'a'
+  obj = [a]: yes
+  eq obj.a, yes
+  obj = {[a]: yes}
+  eq obj.a, yes
+  obj = {[a]}
+  eq obj.a, 'a'
+  obj = {[5]}
+  eq obj[5], 5
+  obj = {['5']}
+  eq obj['5'], '5'
+
+test "computed property keys: commas in implicit object", ->
+  obj = ['a']: 1, b: 2
+  deepEqual obj, {a: 1, b: 2}
+  obj = a: 1, ['b']: 2
+  deepEqual obj, {a: 1, b: 2}
+  obj = ['a']: 1, ['b']: 2
+  deepEqual obj, {a: 1, b: 2}
+
+test "computed property keys: commas in explicit object", ->
+  obj = {['a']: 1, b: 2}
+  deepEqual obj, {a: 1, b: 2}
+  obj = {a: 1, ['b']: 2}
+  deepEqual obj, {a: 1, b: 2}
+  obj = {['a']: 1, ['b']: 2}
+  deepEqual obj, {a: 1, b: 2}
+
+test "computed property keys: commas after key with interpolation", ->
+  obj = {['a']: yes,}
+  eq obj.a, yes
+  obj = {
+    ['a']: 1,
+    ['b']: 2,
+    ### herecomment ###
+    ['c']: 3,
+  }
+  deepEqual obj, {a: 1, b: 2, c: 3}
+  obj =
+    ['a']: 1,
+    ['b']: 2,
+    ### herecomment ###
+    ['c']: 3,
+  deepEqual obj, {a: 1, b: 2, c: 3}
+  obj =
+    ['a']: 1,
+    ['b']: 2,
+    ### herecomment ###
+    ['c']: 3, ['d']: 4,
+  deepEqual obj, {a: 1, b: 2, c: 3, d: 4}
+
+test "computed property keys: key with interpolation mixed with `@prop`", ->
+  deepEqual (-> {@a, ['b']: 2}).call(a: 1), {a: 1, b: 2}
+
+test "computed property keys: evaluate only once", ->
+  count = 0
+  a = -> count++; 'a'
+  obj = {[a()]}
+  eq obj.a, 'a'
+  eq count, 1
+
+test "computed property keys: evaluation order", ->
+  arr = []
+  obj =
+    a: arr.push 1
+    b: arr.push 2
+    ['c']: arr.push 3
+    ['d']: arr.push 4
+    e: arr.push 5
+    ['f']: arr.push 6
+    g: arr.push 7
+  arrayEq arr, [1..7]
+  deepEqual obj, {a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7}
+
+test "computed property keys: object starting with dynamic key", ->
+  obj =
+    ['a']: 1
+    b: 2
+  deepEqual obj, {a: 1, b: 2}
+
+test "computed property keys: comments in implicit object", ->
+  obj =
+    ### leading comment ###
+    ['a']: 1
+
+    ### middle ###
+
+    ['b']: 2
+    # regular comment
+    'c': 3
+    ### foo ###
+    d: 4
+    ['e']: 5
+  deepEqual obj, {a: 1, b: 2, c: 3, d: 4, e: 5}
+
+  obj = {
+    ### leading comment ###
+    ['a']: 1
+
+    ### middle ###
+
+    ['b']: 2
+    # regular comment
+    'c': 3
+    ### foo ###
+    d: 4
+    ['e']: 5
+  }
+  deepEqual obj, {a: 1, b: 2, c: 3, d: 4, e: 5}
+
+test "computed property keys: more complicated case", ->
+  obj = {
+    ['interpolated']:
+       ['nested']:
+         123: 456
+  }
+  deepEqual obj,
+    interpolated:
+      nested:
+        123: 456
+
+test "computed property keys: empty array as key", ->
+  o1 = { [[]] }
+  deepEqual o1, { [[]]: [] }
+  arrayEq o1[[]], []
+  o2 = { [[]]: 1 }
+  deepEqual o2, { [[]]: 1 }
+  eq o2[[]], 1
+  o3 = [[]]: 1
+  deepEqual o3, { [[]]: 1 }
+  deepEqual o3, { [[]]: 1 }
+  eq o3[[]], 1
+  o4 = a: 1, [[]]: 2
+  deepEqual o4, { a: 1, [[]]: 2 }
+  eq o4.a, 1,
+  eq o4[[]], 2
+  o5 = { a: 1, [[]]: 2 }
+  deepEqual o5, { a: 1, [[]]: 2 }
+  eq o5.a, 1,
+  eq o5[[]], 2
+
+test "computed property keys: shorthand after computed property key", ->
+  a = 2
+  obj = {[1]: 1, a}
+  eq 1, obj[1]
+  eq 2, obj.a
+
+test "computed property keys: shorthand computed property key", ->
+  a = 'b'
+  o = {[a]}
+  p = {a}
+  r = {['a']}
+  eq o.b, 'b'
+  eq p.a, o.b
+  eq r.a, 'a'
+
+  foo = -> "a"
+  obj = { [foo()] }
+  eq obj.a, 'a'
+
+test "computed property keys: arrays", ->
+  b = 'b'
+  f = (c) -> "#{c}1"
+  obj =
+    ['a']: [1, 2, 3]
+    [b]: [4, 5, 6]
+    [f(b)]: [7, 8, 9]
+  arrayEq obj.a, [1, 2, 3]
+  arrayEq obj.b, [4, 5, 6]
+  arrayEq obj.b1, [7, 8, 9]
+
+test "computed property keys: examples from developer.mozilla.org (Object initializer)", ->
+  i = 0
+  obj =
+    ['foo' + ++i]: i
+    ['foo' + ++i]: i
+    ['foo' + ++i]: i
+  eq obj.foo1, 1
+  eq obj.foo2, 2
+  eq obj.foo3, 3
+
+  param = 'size'
+  config =
+    [param]: 12,
+    ['mobile' + param.charAt(0).toUpperCase() + param.slice(1)]: 4
+  deepEqual config, {size: 12,  mobileSize: 4}
+
+test "computed property keys: [Symbol.iterator]", ->
+  obj =
+    [Symbol.iterator]: ->
+      yield "hello"
+      yield "world"
+  arrayEq [obj...], ['hello', 'world']
+
+test "computed property keys: Class property", ->
+  increment_method = "increment"
+  decrement_method = "decrement"
+  class Obs
+    constructor: (@count) ->
+    [increment_method]: -> @count += 1
+    [decrement_method]: -> @count -= 1
+  ob = new Obs 2
+  eq ob.increment(), 3
+  eq ob.decrement(), 2
+
 test "#1263: Braceless object return", ->
   fn = ->
     return

test/ranges.coffee

@@ -116,3 +116,129 @@ test "#1012 slices with arguments object", ->
 
 test "#1409: creating large ranges outside of a function body", ->
   CoffeeScript.eval '[0..100]'
+
+test "#2047: Infinite loop possible when `for` loop with `range` uses variables", ->
+  up = 1
+  down = -1
+  a = 1
+  b = 5
+
+  testRange = (arg) ->
+    [from, to, step, expectedResult] = arg
+    r = (x for x in [from..to] by step)
+    arrayEq r, expectedResult
+
+  testData = [
+    [1, 5, 1, [1..5]]
+    [1, 5, -1, []]
+    [1, 5, up, [1..5]]
+    [1, 5, down, []]
+
+    [a, 5, 1, [1..5]]
+    [a, 5, -1, []]
+    [a, 5, up, [1..5]]
+    [a, 5, down, []]
+
+    [1, b, 1, [1..5]]
+    [1, b, -1, []]
+    [1, b, up, [1..5]]
+    [1, b, down, []]
+
+    [a, b, 1, [1..5]]
+    [a, b, -1, []]
+    [a, b, up, [1..5]]
+    [a, b, down, []]
+
+    [5, 1, 1, []]
+    [5, 1, -1, [5..1]]
+    [5, 1, up, []]
+    [5, 1, down,  [5..1]]
+
+    [5, a, 1, []]
+    [5, a, -1, [5..1]]
+    [5, a, up, []]
+    [5, a, down, [5..1]]
+
+    [b, 1, 1, []]
+    [b, 1, -1, [5..1]]
+    [b, 1, up, []]
+    [b, 1, down, [5..1]]
+
+    [b, a, 1, []]
+    [b, a, -1, [5..1]]
+    [b, a, up, []]
+    [b, a, down, [5..1]]
+  ]
+
+  testRange d for d in testData
+
+test "#2047: from, to and step as variables", ->
+  up = 1
+  down = -1
+  a = 1
+  b = 5
+
+  r = (x for x in [a..b] by up)
+  arrayEq r, [1..5]
+
+  r = (x for x in [a..b] by down)
+  arrayEq r, []
+
+  r = (x for x in [b..a] by up)
+  arrayEq r, []
+
+  r = (x for x in [b..a] by down)
+  arrayEq r, [5..1]
+
+  a = 1
+  b = -1
+  step = 0
+  r = (x for x in [b..a] by step)
+  arrayEq r, []
+
+test "#4884: Range not declaring var for the 'i'", ->
+  'use strict'
+  [0..21].forEach (idx) ->
+    idx + 1
+
+  eq global.i, undefined
+
+test "#4889: `for` loop unexpected behavior", ->
+  n = 1
+  result = []
+  for i in [0..n]
+    result.push i
+    for j in [(i+1)..n]
+      result.push j
+
+  arrayEq result, [0,1,1,2,1]
+
+test "#4889: `for` loop unexpected behavior with `by 1` on second loop", ->
+  n = 1
+  result = []
+  for i in [0..n]
+    result.push i
+    for j in [(i+1)..n] by 1
+      result.push j
+
+  arrayEq result, [0,1,1]
+
+test "countdown example from docs", ->
+  countdown = (num for num in [10..1])
+  arrayEq countdown, [10,9,8,7,6,5,4,3,2,1]
+
+test "counting up when the range goes down returns an empty array", ->
+  countdown = (num for num in [10..1] by 1)
+  arrayEq countdown, []
+
+test "counting down when the range goes up returns an empty array", ->
+  countup = (num for num in [1..10] by -1)
+  arrayEq countup, []
+
+test "counting down by too much returns just the first value", ->
+  countdown = (num for num in [10..1] by -100)
+  arrayEq countdown, [10]
+
+test "counting up by too much returns just the first value", ->
+  countup = (num for num in [1..10] by 100)
+  arrayEq countup, [1]

test/regexps.coffee

@@ -313,3 +313,16 @@ test "#4248: Unicode code point escapes", ->
   """
     /a\\udab3\\uddef/;
   """
+
+test "#4811, heregex comments with ///", ->
+  eqJS """
+    ///
+      a | # comment with ///
+      b   # /// 'heregex' in comment will be consumed
+    ///
+  """,
+  """
+   // comment with ///
+   // /// 'heregex' in comment will be consumed
+   /a|b/;
+  """

test/slicing_and_splicing.coffee

@@ -165,3 +165,9 @@ test "#2953: methods on endpoints in assignment from array splice literal", ->
   delete Number.prototype.same
 
   arrayEq [0, 5, 9], list
+
+test "#1726: `Op` expression in property access causes unexpected results", ->
+  a = [0..2]
+  arrayEq a, a[(!1 in a)..]
+  arrayEq a, a[!1 in a..]
+  arrayEq a[(!1 in a)..], a[(!1 in a)..]