2.0.2 (#4758 )

* Give the notes about `super` and `this` their own section in the docs * 2.0.2 changelog * 2.0.2 release output * Rewrite
Fix #4756 : When moving comments from the children of an Existence, we need to search all its descendants, not just the immediate children (#4757 )
2026-01-13 16:57:54 -05:00 · 2017-10-26 18:29:45 -07:00 · 2017-10-25 22:15:40 -07:00 · 2017-10-25 22:15:05 -07:00 · 2017-10-19 06:56:59 -07:00 · 2017-10-18 17:22:02 -07:00
54 changed files with 1507 additions and 602 deletions
--- a/docs/v2/annotated-source/command.html
+++ b/docs/v2/annotated-source/command.html
@@ -295,6 +295,7 @@ Many flags cause us to divert before compiling anything. Flags passed after
            <div class="content"><div class='highlight'><pre>  replCliOpts = useGlobal: <span class="hljs-literal">yes</span>
  opts.prelude = makePrelude opts.<span class="hljs-built_in">require</span>       <span class="hljs-keyword">if</span> opts.<span class="hljs-built_in">require</span>
  replCliOpts.prelude = opts.prelude
+  replCliOpts.transpile = opts.transpile
  <span class="hljs-keyword">return</span> forkNode()                             <span class="hljs-keyword">if</span> opts.nodejs
  <span class="hljs-keyword">return</span> usage()                                <span class="hljs-keyword">if</span> opts.help
  <span class="hljs-keyword">return</span> version()                              <span class="hljs-keyword">if</span> opts.version
@@ -508,6 +509,9 @@ and write them back to <strong>stdout</strong>.</p>
            </div>
            
            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">compileStdio</span> = -&gt;</span>
+  <span class="hljs-keyword">if</span> opts.map
+    <span class="hljs-built_in">console</span>.error <span class="hljs-string">'--stdio and --map cannot be used together'</span>
+    process.exit <span class="hljs-number">1</span>
  buffers = []
  stdin = process.openStdin()
  stdin.<span class="hljs-literal">on</span> <span class="hljs-string">'data'</span>, <span class="hljs-function"><span class="hljs-params">(buffer)</span> -&gt;</span>
--- a/docs/v2/annotated-source/grammar.html
+++ b/docs/v2/annotated-source/grammar.html
@@ -650,7 +650,7 @@ of <strong>Block</strong> preceded by a function arrow, with an optional paramet
            </div>
            
            <div class="content"><div class='highlight'><pre>  Code: [
-    o <span class="hljs-string">'PARAM_START ParamList PARAM_END FuncGlyph Block'</span>, <span class="hljs-function">-&gt;</span> <span class="hljs-keyword">new</span> Code $<span class="hljs-number">2</span>, $<span class="hljs-number">5</span>, $<span class="hljs-number">4</span>
+    o <span class="hljs-string">'PARAM_START ParamList PARAM_END FuncGlyph Block'</span>, <span class="hljs-function">-&gt;</span> <span class="hljs-keyword">new</span> Code $<span class="hljs-number">2</span>, $<span class="hljs-number">5</span>, $<span class="hljs-number">4</span>, LOC(<span class="hljs-number">1</span>)(<span class="hljs-keyword">new</span> Literal $<span class="hljs-number">1</span>)
    o <span class="hljs-string">'FuncGlyph Block'</span>,                                 <span class="hljs-function">-&gt;</span> <span class="hljs-keyword">new</span> Code [], $<span class="hljs-number">2</span>, $<span class="hljs-number">1</span>
  ]</pre></div></div>
            
--- a/docs/v2/annotated-source/index.html
+++ b/docs/v2/annotated-source/index.html
@@ -274,6 +274,21 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
              <div class="pilwrap ">
                <a class="pilcrow" href="#section-10">&#182;</a>
              </div>
+              <p>Save the options for compiling child imports.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>  mainModule.options = options</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-11">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-11">&#182;</a>
+              </div>
              <p>Compile.</p>

            </div>
@@ -287,11 +302,11 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
        </li>
        
        
-        <li id="section-11">
+        <li id="section-12">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-11">&#182;</a>
+                <a class="pilcrow" href="#section-12">&#182;</a>
              </div>
              <p>Compile and evaluate a string of CoffeeScript (in a Node.js-like environment).
 The CoffeeScript REPL uses this to run the input.</p>
@@ -321,11 +336,11 @@ The CoffeeScript REPL uses this to run the input.</p>
        </li>
        
        
-        <li id="section-12">
+        <li id="section-13">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-12">&#182;</a>
+                <a class="pilcrow" href="#section-13">&#182;</a>
              </div>
              <p>define module/require only if they chose not to specify their own</p>

@@ -342,11 +357,11 @@ The CoffeeScript REPL uses this to run the input.</p>
        </li>
        
        
-        <li id="section-13">
+        <li id="section-14">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-13">&#182;</a>
+                <a class="pilcrow" href="#section-14">&#182;</a>
              </div>
              <p>use the same hack node currently uses for their own REPL</p>

@@ -368,11 +383,11 @@ CoffeeScript.register = <span class="hljs-function">-&gt;</span> <span class="hl
        </li>
        
        
-        <li id="section-14">
+        <li id="section-15">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-14">&#182;</a>
+                <a class="pilcrow" href="#section-15">&#182;</a>
              </div>
              <p>Throw error with deprecation warning when depending upon implicit <code>require.extensions</code> registration</p>

@@ -385,41 +400,43 @@ CoffeeScript.register = <span class="hljs-function">-&gt;</span> <span class="hl
      Use CoffeeScript.register() or require the coffeescript/register module to require <span class="hljs-subst">#{ext}</span> files.
      """</span>

-CoffeeScript._compileFile = <span class="hljs-function"><span class="hljs-params">(filename, sourceMap = <span class="hljs-literal">no</span>, inlineMap = <span class="hljs-literal">no</span>)</span> -&gt;</span>
+CoffeeScript._compileFile = <span class="hljs-function"><span class="hljs-params">(filename, options = {})</span> -&gt;</span>
  raw = fs.readFileSync filename, <span class="hljs-string">'utf8'</span></pre></div></div>
            
        </li>
        
        
-        <li id="section-15">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-15">&#182;</a>
-              </div>
-              <p>Strip the Unicode byte order mark, if this file begins with one.</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>  stripped = <span class="hljs-keyword">if</span> raw.charCodeAt(<span class="hljs-number">0</span>) <span class="hljs-keyword">is</span> <span class="hljs-number">0xFEFF</span> <span class="hljs-keyword">then</span> raw.substring <span class="hljs-number">1</span> <span class="hljs-keyword">else</span> raw
-
-  <span class="hljs-keyword">try</span>
-    answer = CoffeeScript.compile stripped, {
-      filename, sourceMap, inlineMap
-      sourceFiles: [filename]
-      literate: helpers.isLiterate filename
-    }
-  <span class="hljs-keyword">catch</span> err</pre></div></div>
-            
-        </li>
-        
-        
        <li id="section-16">
            <div class="annotation">
              
              <div class="pilwrap ">
                <a class="pilcrow" href="#section-16">&#182;</a>
              </div>
+              <p>Strip the Unicode byte order mark, if this file begins with one.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>  stripped = <span class="hljs-keyword">if</span> raw.charCodeAt(<span class="hljs-number">0</span>) <span class="hljs-keyword">is</span> <span class="hljs-number">0xFEFF</span> <span class="hljs-keyword">then</span> raw.substring <span class="hljs-number">1</span> <span class="hljs-keyword">else</span> raw
+
+  options = Object.assign {}, options,
+    filename: filename
+    literate: helpers.isLiterate filename
+    sourceFiles: [filename]
+    inlineMap: <span class="hljs-literal">yes</span> <span class="hljs-comment"># Always generate a source map, so that stack traces line up.</span>
+
+  <span class="hljs-keyword">try</span>
+    answer = CoffeeScript.compile stripped, options
+  <span class="hljs-keyword">catch</span> err</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-17">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-17">&#182;</a>
+              </div>
              <p>As the filename and code of a dynamically loaded file will be different
 from the original file compiled with CoffeeScript.run, add that
 information to error so it can be pretty-printed later.</p>
--- a/docs/v2/annotated-source/lexer.html
+++ b/docs/v2/annotated-source/lexer.html
@@ -372,7 +372,6 @@ though <code>is</code> means <code>===</code> otherwise.</p>
            
            <div class="content"><div class='highlight'><pre>    idLength = id.length
    poppedToken = <span class="hljs-literal">undefined</span>
-
    <span class="hljs-keyword">if</span> id <span class="hljs-keyword">is</span> <span class="hljs-string">'own'</span> <span class="hljs-keyword">and</span> @tag() <span class="hljs-keyword">is</span> <span class="hljs-string">'FOR'</span>
      @token <span class="hljs-string">'OWN'</span>, id
      <span class="hljs-keyword">return</span> id.length
@@ -382,14 +381,21 @@ though <code>is</code> means <code>===</code> otherwise.</p>
    <span class="hljs-keyword">if</span> id <span class="hljs-keyword">is</span> <span class="hljs-string">'as'</span> <span class="hljs-keyword">and</span> @seenImport
      <span class="hljs-keyword">if</span> @value() <span class="hljs-keyword">is</span> <span class="hljs-string">'*'</span>
        @tokens[@tokens.length - <span class="hljs-number">1</span>][<span class="hljs-number">0</span>] = <span class="hljs-string">'IMPORT_ALL'</span>
-      <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> @value() <span class="hljs-keyword">in</span> COFFEE_KEYWORDS
-        @tokens[@tokens.length - <span class="hljs-number">1</span>][<span class="hljs-number">0</span>] = <span class="hljs-string">'IDENTIFIER'</span>
+      <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> @value(<span class="hljs-literal">yes</span>) <span class="hljs-keyword">in</span> COFFEE_KEYWORDS
+        prev = @prev()
+        [prev[<span class="hljs-number">0</span>], prev[<span class="hljs-number">1</span>]] = [<span class="hljs-string">'IDENTIFIER'</span>, @value(<span class="hljs-literal">yes</span>)]
      <span class="hljs-keyword">if</span> @tag() <span class="hljs-keyword">in</span> [<span class="hljs-string">'DEFAULT'</span>, <span class="hljs-string">'IMPORT_ALL'</span>, <span class="hljs-string">'IDENTIFIER'</span>]
        @token <span class="hljs-string">'AS'</span>, id
        <span class="hljs-keyword">return</span> id.length
-    <span class="hljs-keyword">if</span> id <span class="hljs-keyword">is</span> <span class="hljs-string">'as'</span> <span class="hljs-keyword">and</span> @seenExport <span class="hljs-keyword">and</span> @tag() <span class="hljs-keyword">in</span> [<span class="hljs-string">'IDENTIFIER'</span>, <span class="hljs-string">'DEFAULT'</span>]
-      @token <span class="hljs-string">'AS'</span>, id
-      <span class="hljs-keyword">return</span> id.length
+    <span class="hljs-keyword">if</span> id <span class="hljs-keyword">is</span> <span class="hljs-string">'as'</span> <span class="hljs-keyword">and</span> @seenExport
+      <span class="hljs-keyword">if</span> @tag() <span class="hljs-keyword">in</span> [<span class="hljs-string">'IDENTIFIER'</span>, <span class="hljs-string">'DEFAULT'</span>]
+        @token <span class="hljs-string">'AS'</span>, id
+        <span class="hljs-keyword">return</span> id.length
+      <span class="hljs-keyword">if</span> @value(<span class="hljs-literal">yes</span>) <span class="hljs-keyword">in</span> COFFEE_KEYWORDS
+        prev = @prev()
+        [prev[<span class="hljs-number">0</span>], prev[<span class="hljs-number">1</span>]] = [<span class="hljs-string">'IDENTIFIER'</span>, @value(<span class="hljs-literal">yes</span>)]
+        @token <span class="hljs-string">'AS'</span>, id
+        <span class="hljs-keyword">return</span> id.length
    <span class="hljs-keyword">if</span> id <span class="hljs-keyword">is</span> <span class="hljs-string">'default'</span> <span class="hljs-keyword">and</span> @seenExport <span class="hljs-keyword">and</span> @tag() <span class="hljs-keyword">in</span> [<span class="hljs-string">'EXPORT'</span>, <span class="hljs-string">'AS'</span>]
      @token <span class="hljs-string">'DEFAULT'</span>, id
      <span class="hljs-keyword">return</span> id.length
@@ -455,7 +461,7 @@ 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">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>
        prevprev = @tokens[@tokens.length - <span class="hljs-number">2</span>]
@@ -466,7 +472,7 @@ what CoffeeScript would normally interpret as calls to functions named
    <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

-    <span class="hljs-keyword">unless</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'PROPERTY'</span>
+    <span class="hljs-keyword">unless</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'PROPERTY'</span> <span class="hljs-keyword">or</span> @exportSpecifierList
      <span class="hljs-keyword">if</span> id <span class="hljs-keyword">in</span> COFFEE_ALIASES
        alias = id
        id = COFFEE_ALIAS_MAP[id]
@@ -1968,9 +1974,12 @@ not specified, the length of <code>value</code> will be used.</p>

            </div>
            
-            <div class="content"><div class='highlight'><pre>  value: <span class="hljs-function">-&gt;</span>
+            <div class="content"><div class='highlight'><pre>  value: <span class="hljs-function"><span class="hljs-params">(useOrigin = <span class="hljs-literal">no</span>)</span> -&gt;</span>
    [..., token] = @tokens
-    token?[<span class="hljs-number">1</span>]</pre></div></div>
+    <span class="hljs-keyword">if</span> useOrigin <span class="hljs-keyword">and</span> token?.origin?
+      token.origin?[<span class="hljs-number">1</span>]
+    <span class="hljs-keyword">else</span>
+      token?[<span class="hljs-number">1</span>]</pre></div></div>
            
        </li>
        
--- a/docs/v2/annotated-source/nodes.html
+++ b/docs/v2/annotated-source/nodes.html
--- a/docs/v2/annotated-source/register.html
+++ b/docs/v2/annotated-source/register.html
@@ -137,7 +137,8 @@ path          = <span class="hljs-built_in">require</span> <span class="hljs-str
            </div>
            
            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">loadFile</span> = <span class="hljs-params">(<span class="hljs-built_in">module</span>, filename)</span> -&gt;</span>
-  answer = CoffeeScript._compileFile filename, <span class="hljs-literal">no</span>, <span class="hljs-literal">yes</span>
+  options = <span class="hljs-built_in">module</span>.options <span class="hljs-keyword">or</span> getRootModule(<span class="hljs-built_in">module</span>).options
+  answer = CoffeeScript._compileFile filename, options
  <span class="hljs-built_in">module</span>._compile answer, filename</pre></div></div>
            
        </li>
@@ -245,6 +246,22 @@ to fork both CoffeeScript files, and JavaScript files, directly.</p>
            
        </li>
        
+        
+        <li id="section-8">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-8">&#182;</a>
+              </div>
+              <p>Utility function to find the <code>options</code> object attached to the topmost module.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">getRootModule</span> = <span class="hljs-params">(<span class="hljs-built_in">module</span>)</span> -&gt;</span>
+  <span class="hljs-keyword">if</span> <span class="hljs-built_in">module</span>.parent <span class="hljs-keyword">then</span> getRootModule <span class="hljs-built_in">module</span>.parent <span class="hljs-keyword">else</span> <span class="hljs-built_in">module</span></pre></div></div>
+            
+        </li>
+        
    </ul>
  </div>
 </body>
--- a/docs/v2/annotated-source/repl.html
+++ b/docs/v2/annotated-source/repl.html
@@ -126,6 +126,7 @@ CoffeeScript = <span class="hljs-built_in">require</span> <span class="hljs-stri
 {merge, updateSyntaxError} = <span class="hljs-built_in">require</span> <span class="hljs-string">'./helpers'</span>

 sawSIGINT = <span class="hljs-literal">no</span>
+transpile = <span class="hljs-literal">no</span>

 replDefaults =
  prompt: <span class="hljs-string">'coffee&gt; '</span>,
@@ -268,7 +269,7 @@ Unwrap that too.</p>
              <div class="pilwrap ">
                <a class="pilcrow" href="#section-10">&#182;</a>
              </div>
-              <p>Wrap the expression in a closure to support top-level <code>await</code></p>
+              <p>Wrap the expression in a closure to support top-level <code>await</code>.</p>

            </div>
            
@@ -284,13 +285,14 @@ Unwrap that too.</p>
              <div class="pilwrap ">
                <a class="pilcrow" href="#section-11">&#182;</a>
              </div>
-              <p>Invoke the wrapping closure</p>
+              <p>Invoke the wrapping closure.</p>

            </div>
            
            <div class="content"><div class='highlight'><pre>      ast    = <span class="hljs-keyword">new</span> Block [<span class="hljs-keyword">new</span> Call ast]
      js     = ast.compile {bare: <span class="hljs-literal">yes</span>, locals: Object.keys(context), referencedVars, sharedScope: <span class="hljs-literal">yes</span>}
-      result = runInContext js, context, filename</pre></div></div>
+      <span class="hljs-keyword">if</span> transpile
+        js = transpile.transpile(js, transpile.options).code</pre></div></div>
            
        </li>
        
@@ -301,7 +303,24 @@ Unwrap that too.</p>
              <div class="pilwrap ">
                <a class="pilcrow" href="#section-12">&#182;</a>
              </div>
-              <p>Await an async result, if necessary</p>
+              <p>Strip <code>&quot;use strict&quot;</code>, to avoid an exception on assigning to
+undeclared variable <code>__</code>.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>        js = js.replace <span class="hljs-regexp">/^"use strict"|^'use strict'/</span>, <span class="hljs-string">''</span>
+      result = runInContext js, context, filename</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-13">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-13">&#182;</a>
+              </div>
+              <p>Await an async result, if necessary.</p>

            </div>
            
@@ -316,11 +335,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-13">
+        <li id="section-14">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-13">&#182;</a>
+                <a class="pilcrow" href="#section-14">&#182;</a>
              </div>
              <p>AST’s <code>compile</code> does not add source code information to syntax errors.</p>

@@ -341,11 +360,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-14">
+        <li id="section-15">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-14">&#182;</a>
+                <a class="pilcrow" href="#section-15">&#182;</a>
              </div>
              <p>Node 0.11.12 changed API, prompt is now _prompt.</p>

@@ -362,11 +381,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-15">
+        <li id="section-16">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-15">&#182;</a>
+                <a class="pilcrow" href="#section-16">&#182;</a>
              </div>
              <p>Proxy node’s line listener</p>

@@ -387,11 +406,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-16">
+        <li id="section-17">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-16">&#182;</a>
+                <a class="pilcrow" href="#section-17">&#182;</a>
              </div>
              <p>Handle Ctrl-v</p>

@@ -404,11 +423,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-17">
+        <li id="section-18">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-17">&#182;</a>
+                <a class="pilcrow" href="#section-18">&#182;</a>
              </div>
              <p>allow arbitrarily switching between modes any time before multiple lines are entered</p>

@@ -423,11 +442,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-18">
+        <li id="section-19">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-18">&#182;</a>
+                <a class="pilcrow" href="#section-19">&#182;</a>
              </div>
              <p>no-op unless the current line is empty</p>

@@ -438,11 +457,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-19">
+        <li id="section-20">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-19">&#182;</a>
+                <a class="pilcrow" href="#section-20">&#182;</a>
              </div>
              <p>eval, print, loop</p>

@@ -457,11 +476,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-20">
+        <li id="section-21">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-20">&#182;</a>
+                <a class="pilcrow" href="#section-21">&#182;</a>
              </div>
              <p>XXX: multiline hack</p>

@@ -479,11 +498,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-21">
+        <li id="section-22">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-21">&#182;</a>
+                <a class="pilcrow" href="#section-22">&#182;</a>
              </div>
              <p>Store and load command history from a file</p>

@@ -496,11 +515,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-22">
+        <li id="section-23">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-22">&#182;</a>
+                <a class="pilcrow" href="#section-23">&#182;</a>
              </div>
              <p>Get file info and at most maxSize of command history</p>

@@ -512,11 +531,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-23">
+        <li id="section-24">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-23">&#182;</a>
+                <a class="pilcrow" href="#section-24">&#182;</a>
              </div>
              <p>Read last <code>size</code> bytes from the file</p>

@@ -530,11 +549,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-24">
+        <li id="section-25">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-24">&#182;</a>
+                <a class="pilcrow" href="#section-25">&#182;</a>
              </div>
              <p>Set the history on the interpreter</p>

@@ -545,11 +564,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-25">
+        <li id="section-26">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-25">&#182;</a>
+                <a class="pilcrow" href="#section-26">&#182;</a>
              </div>
              <p>If the history file was truncated we should pop off a potential partial line</p>

@@ -560,11 +579,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-26">
+        <li id="section-27">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-26">&#182;</a>
+                <a class="pilcrow" href="#section-27">&#182;</a>
              </div>
              <p>Shift off the final blank newline</p>

@@ -582,11 +601,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-27">
+        <li id="section-28">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-27">&#182;</a>
+                <a class="pilcrow" href="#section-28">&#182;</a>
              </div>
              <p>Save the latest command in the file</p>

@@ -598,11 +617,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-28">
+        <li id="section-29">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-28">&#182;</a>
+                <a class="pilcrow" href="#section-29">&#182;</a>
              </div>
              <p>XXX: The SIGINT event from REPLServer is undocumented, so this is a bit fragile</p>

@@ -614,11 +633,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-29">
+        <li id="section-30">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-29">&#182;</a>
+                <a class="pilcrow" href="#section-30">&#182;</a>
              </div>
              <p>Add a command to show the history stack</p>

@@ -635,11 +654,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-30">
+        <li id="section-31">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-30">&#182;</a>
+                <a class="pilcrow" href="#section-31">&#182;</a>
              </div>
              <p>Node 0.11 changed API, a command such as ‘.help’ is now stored as ‘help’</p>

@@ -658,6 +677,44 @@ Unwrap that too.</p>

    CoffeeScript.register()
    process.argv = [<span class="hljs-string">'coffee'</span>].concat process.argv[<span class="hljs-number">2.</span>.]
+    <span class="hljs-keyword">if</span> opts.transpile
+      <span class="hljs-keyword">try</span>
+        transpile = {}
+        transpile.transpile = <span class="hljs-built_in">require</span>(<span class="hljs-string">'babel-core'</span>).transform
+      <span class="hljs-keyword">catch</span>
+        <span class="hljs-built_in">console</span>.error <span class="hljs-string">'''
+          To use --transpile with an interactive REPL, babel-core must be installed either in the current folder or globally:
+            npm install --save-dev babel-core
+          or
+            npm install --global babel-core
+          And you must save options to configure Babel in one of the places it looks to find its options.
+          See http://coffeescript.org/#transpilation
+        '''</span>
+        process.exit <span class="hljs-number">1</span>
+      transpile.options =
+        filename: path.resolve process.cwd(), <span class="hljs-string">'&lt;repl&gt;'</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-32">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-32">&#182;</a>
+              </div>
+              <p>Since the REPL compilation path is unique (in <code>eval</code> above), we need
+another way to get the <code>options</code> object attached to a module so that
+it knows later on whether it needs to be transpiled. In the case of
+the REPL, the only applicable option is <code>transpile</code>.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>      Module = <span class="hljs-built_in">require</span> <span class="hljs-string">'module'</span>
+      originalModuleLoad = Module::load
+      Module::load = <span class="hljs-function"><span class="hljs-params">(filename)</span> -&gt;</span>
+        @options = transpile: transpile.options
+        originalModuleLoad.call @, filename
    opts = merge replDefaults, opts
    repl = nodeREPL.start opts
    runInContext opts.prelude, repl.context, <span class="hljs-string">'prelude'</span> <span class="hljs-keyword">if</span> opts.prelude
@@ -668,11 +725,11 @@ Unwrap that too.</p>
        </li>
        
        
-        <li id="section-31">
+        <li id="section-33">
            <div class="annotation">
              
              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-31">&#182;</a>
+                <a class="pilcrow" href="#section-33">&#182;</a>
              </div>
              <p>Adapt help inherited from the node REPL</p>

--- a/docs/v2/annotated-source/rewriter.html
+++ b/docs/v2/annotated-source/rewriter.html
@@ -1596,8 +1596,8 @@ the node that becomes <code>StringWithInterpolations</code>, and therefore
            <div class="content"><div class='highlight'><pre>DISCARDED = [<span class="hljs-string">'('</span>, <span class="hljs-string">')'</span>, <span class="hljs-string">'['</span>, <span class="hljs-string">']'</span>, <span class="hljs-string">'{'</span>, <span class="hljs-string">'}'</span>, <span class="hljs-string">'.'</span>, <span class="hljs-string">'..'</span>, <span class="hljs-string">'...'</span>, <span class="hljs-string">','</span>, <span class="hljs-string">'='</span>, <span class="hljs-string">'++'</span>, <span class="hljs-string">'--'</span>, <span class="hljs-string">'?'</span>,
  <span class="hljs-string">'AS'</span>, <span class="hljs-string">'AWAIT'</span>, <span class="hljs-string">'CALL_START'</span>, <span class="hljs-string">'CALL_END'</span>, <span class="hljs-string">'DEFAULT'</span>, <span class="hljs-string">'ELSE'</span>, <span class="hljs-string">'EXTENDS'</span>, <span class="hljs-string">'EXPORT'</span>,
  <span class="hljs-string">'FORIN'</span>, <span class="hljs-string">'FOROF'</span>, <span class="hljs-string">'FORFROM'</span>, <span class="hljs-string">'IMPORT'</span>, <span class="hljs-string">'INDENT'</span>, <span class="hljs-string">'INDEX_SOAK'</span>, <span class="hljs-string">'LEADING_WHEN'</span>,
-  <span class="hljs-string">'OUTDENT'</span>, <span class="hljs-string">'PARAM_START'</span>, <span class="hljs-string">'PARAM_END'</span>, <span class="hljs-string">'REGEX_START'</span>, <span class="hljs-string">'REGEX_END'</span>, <span class="hljs-string">'RETURN'</span>,
-  <span class="hljs-string">'STRING_END'</span>, <span class="hljs-string">'THROW'</span>, <span class="hljs-string">'UNARY'</span>, <span class="hljs-string">'YIELD'</span>
+  <span class="hljs-string">'OUTDENT'</span>, <span class="hljs-string">'PARAM_END'</span>, <span class="hljs-string">'REGEX_START'</span>, <span class="hljs-string">'REGEX_END'</span>, <span class="hljs-string">'RETURN'</span>, <span class="hljs-string">'STRING_END'</span>, <span class="hljs-string">'THROW'</span>,
+  <span class="hljs-string">'UNARY'</span>, <span class="hljs-string">'YIELD'</span>
 ].concat IMPLICIT_UNSPACED_CALL.concat IMPLICIT_END.concat CALL_CLOSERS.concat CONTROL_IN_IMPLICIT</pre></div></div>
            
        </li>
--- a/docs/v2/annotated-source/scope.html
+++ b/docs/v2/annotated-source/scope.html
@@ -139,12 +139,14 @@ with external scopes.</p>
 as well as a reference to the <strong>Block</strong> node it belongs to, which is
 where it should declare its variables, a reference to the function that
 it belongs to, and a list of variables referenced in the source code
-and therefore should be avoided when generating variables.</p>
+and therefore should be avoided when generating variables. Also track comments
+that should be output as part of variable declarations.</p>

            </div>
            
            <div class="content"><div class='highlight'><pre>  constructor: <span class="hljs-function"><span class="hljs-params">(@parent, @expressions, @method, @referencedVars)</span> -&gt;</span>
    @variables = [{name: <span class="hljs-string">'arguments'</span>, type: <span class="hljs-string">'arguments'</span>}]
+    @comments  = {}
    @positions = {}
    @utilities = {} <span class="hljs-keyword">unless</span> @parent</pre></div></div>
            
--- a/docs/v2/browser-compiler/coffeescript.js
+++ b/docs/v2/browser-compiler/coffeescript.js
--- a/docs/v2/index.html
+++ b/docs/v2/index.html
@@ -619,6 +619,7 @@ div.CodeMirror-cursor {
        <a href="#breaking-changes-default-values" class="nav-link" data-action="sidebar-nav">Default Values</a>
        <a href="#breaking-changes-bound-generator-functions" class="nav-link" data-action="sidebar-nav">Bound Generator Functions</a>
        <a href="#breaking-changes-classes" class="nav-link" data-action="sidebar-nav">Classes</a>
+        <a href="#breaking-changes-super-this" class="nav-link" data-action="sidebar-nav"><code>super</code> and <code>this</code></a>
        <a href="#breaking-changes-super-extends" class="nav-link" data-action="sidebar-nav"><code>super</code> and <code>extends</code></a>
        <a href="#breaking-changes-jsx-and-the-less-than-and-greater-than-operators" class="nav-link" data-action="sidebar-nav">JSX and the <code>&lt;</code> and <code>&gt;</code> Operators</a>
        <a href="#breaking-changes-literate-coffeescript" class="nav-link" data-action="sidebar-nav">Literate CoffeeScript Parsing</a>
@@ -645,7 +646,7 @@ div.CodeMirror-cursor {
      <section id="overview">
        <p><strong>CoffeeScript is a little language that compiles into JavaScript.</strong> Underneath that awkward Java-esque patina, JavaScript has always had a gorgeous heart. CoffeeScript is an attempt to expose the good parts of JavaScript in a simple way.</p>
 <p>The golden rule of CoffeeScript is: <em>“It’s just JavaScript.”</em> The code compiles one-to-one into the equivalent JS, and there is no interpretation at runtime. You can use any existing JavaScript library seamlessly from CoffeeScript (and vice-versa). The compiled output is readable, pretty-printed, and tends to run as fast or faster than the equivalent handwritten JavaScript.</p>
-<p><strong>Latest Version:</strong> <a href="https://github.com/jashkenas/coffeescript/tarball/2.0.1">2.0.1</a></p>
+<p><strong>Latest Version:</strong> <a href="https://github.com/jashkenas/coffeescript/tarball/2.0.2">2.0.2</a></p>
 <blockquote class="uneditable-code-block"><pre><code class="language-bash"><span class="comment"># Install locally for a project:</span>
 npm install --save-dev coffeescript

@@ -4634,25 +4635,25 @@ fn = (str ###: string ###, obj ###: Obj ###) ###: string ### ->
    </div>
    <div class="col-md-6 javascript-output-column">
      <textarea class="javascript-output" id="type_annotations-js">// @flow
-var fn;
-
 /*::
 type Obj = {
  num: number,
 };
 */
+var fn;
+
 fn = function(str/*: string */, obj/*: Obj */)/*: string */ {
  return str + obj.num;
 };
 </textarea>
      <pre class="placeholder-code"><span class="cm-comment">// @flow</span>
-<span class="cm-keyword">var</span> <span class="cm-def">fn</span>;
-
 <span class="cm-comment">/*::</span>
 <span class="cm-comment">type Obj = {</span>
 <span class="cm-comment">  num: number,</span>
 <span class="cm-comment">};</span>
 <span class="cm-comment">*/</span>
+<span class="cm-keyword">var</span> <span class="cm-def">fn</span>;
+
 <span class="cm-variable">fn</span> <span class="cm-operator">=</span> <span class="cm-keyword">function</span>(<span class="cm-def">str</span><span class="cm-comment">/*: string */</span>, <span class="cm-def">obj</span><span class="cm-comment">/*: Obj */</span>)<span class="cm-comment">/*: string */</span> {
  <span class="cm-keyword">return</span> <span class="cm-variable-2">str</span> <span class="cm-operator">+</span> <span class="cm-variable-2">obj</span>.<span class="cm-property">num</span>;
 };
@@ -4820,7 +4821,7 @@ The CoffeeScript logo is available in SVG for use in presentations.</li>
        </section>
        <section id="annotated-source">
          <h2>Annotated Source</h2>
-<p>You can browse the CoffeeScript 2.0.1 source in readable, annotated form <a href="annotated-source/">here</a>. You can also jump directly to a particular source file:</p>
+<p>You can browse the CoffeeScript 2.0.2 source in readable, annotated form <a href="annotated-source/">here</a>. You can also jump directly to a particular source file:</p>
 <ul>
 <li><a href="annotated-source/grammar.html">Grammar Rules — src/grammar</a></li>
 <li><a href="annotated-source/lexer.html">Lexing Tokens — src/lexer</a></li>
@@ -5150,10 +5151,6 @@ f = function*() {
 <blockquote class="uneditable-code-block"><pre><code class="language-coffee">(<span class="class"><span class="keyword">class</span>)()</span>
 <span class="comment"># Throws a TypeError at runtime</span>
 </code></pre>
-</blockquote><p>Derived (extended) class <code>constructor</code>s cannot use <code>this</code> before calling <code>super</code>:</p>
-<blockquote class="uneditable-code-block"><pre><code class="language-coffee"><span class="class"><span class="keyword">class</span> <span class="title">B</span> <span class="keyword">extends</span> <span class="title">A</span></span>
-  constructor: <span class="function">-&gt;</span> <span class="keyword">this</span>  <span class="comment"># Throws a compiler error</span>
-</code></pre>
 </blockquote><p>ES2015 classes don’t allow bound (fat arrow) methods. The CoffeeScript compiler goes through some contortions to preserve support for them, but one thing that can’t be accommodated is calling a bound method before it is bound:</p>
 <blockquote class="uneditable-code-block"><pre><code class="language-coffee"><span class="class"><span class="keyword">class</span> <span class="title">Base</span></span>
  constructor: <span class="function">-&gt;</span>
@@ -5177,6 +5174,59 @@ f = function*() {
  @::[name] = <span class="function">-&gt;</span>  <span class="comment"># This will work; assigns to `A.prototype.method`</span>
 </code></pre>
 </blockquote>
+        </section>
+        <section id="breaking-changes-super-this">
+          <h3><code>super</code> and <code>this</code></h3>
+<p>In the constructor of a derived class (a class that <code>extends</code> another class), <code>this</code> cannot be used before calling <code>super</code>:</p>
+<blockquote class="uneditable-code-block"><pre><code class="language-coffee"><span class="class"><span class="keyword">class</span> <span class="title">B</span> <span class="keyword">extends</span> <span class="title">A</span></span>
+  constructor: <span class="function">-&gt;</span> <span class="keyword">this</span>  <span class="comment"># Throws a compiler error</span>
+</code></pre>
+</blockquote><p>This also means you cannot pass a reference to <code>this</code> as an argument to <code>super</code> in the constructor of a derived class:</p>
+<blockquote class="uneditable-code-block"><pre><code class="language-coffee"><span class="class"><span class="keyword">class</span> <span class="title">B</span> <span class="keyword">extends</span> <span class="title">A</span></span>
+  constructor: <span class="function"><span class="params">(@arg)</span> -&gt;</span>
+    <span class="keyword">super</span> @arg  <span class="comment"># Throws a compiler error</span>
+</code></pre>
+</blockquote><p>This is a limitation of ES2015 classes. As a workaround, assign to <code>this</code> after the <code>super</code> call:</p>
+<aside class="code-example container-fluid bg-ribbed-dark" data-example="breaking_change_super_this">
+  <div class="row">
+    <div class="col-md-6 coffeescript-input-column">
+      <textarea class="coffeescript-input" id="breaking_change_super_this-coffee">class B extends A
+  constructor: (arg) ->
+    super arg
+    @arg = arg
+</textarea>
+      <pre class="placeholder-code"><span class="cm-keyword">class</span> <span class="cm-variable">B</span> <span class="cm-keyword">extends</span> <span class="cm-variable">A</span>
+  <span class="cm-variable">constructor</span><span class="cm-punctuation">:</span> <span class="cm-punctuation">(</span><span class="cm-variable">arg</span><span class="cm-punctuation">)</span> <span class="cm-operator">-></span>
+    <span class="cm-variable">super</span> <span class="cm-variable">arg</span>
+    <span class="cm-property">@arg</span> <span class="cm-punctuation">=</span> <span class="cm-variable">arg</span>
+</pre>
+    </div>
+    <div class="col-md-6 javascript-output-column">
+      <textarea class="javascript-output" id="breaking_change_super_this-js">var B;
+
+B = class B extends A {
+  constructor(arg) {
+    super(arg);
+    this.arg = arg;
+  }
+
+};
+</textarea>
+      <pre class="placeholder-code"><span class="cm-keyword">var</span> <span class="cm-def">B</span>;
+
+<span class="cm-variable">B</span> <span class="cm-operator">=</span> <span class="cm-keyword">class</span> <span class="cm-def">B</span> <span class="cm-keyword">extends</span> <span class="cm-variable">A</span> {
+  <span class="cm-property">constructor</span>(<span class="cm-def">arg</span>) {
+    <span class="cm-keyword">super</span>(<span class="cm-variable-2">arg</span>);
+    <span class="cm-keyword">this</span>.<span class="cm-property">arg</span> <span class="cm-operator">=</span> <span class="cm-variable-2">arg</span>;
+  }
+
+};
+</pre>
+    </div>
+  </div>
+  
+</aside>
+
        </section>
        <section id="breaking-changes-super-extends">
          <h3><code>super</code> and <code>extends</code></h3>
@@ -5448,6 +5498,21 @@ x = <span class="number">2</span> + <span class="number">2</span>
      </section>
      <section id="changelog">
        <h2>Changelog</h2>
+<div class="anchor" id="2.0.2"></div>
+<h2 class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/2.0.1...2.0.2">2.0.2</a>
+  <span class="timestamp"> &mdash; <time datetime="2017-10-26">October 26, 2017</time></span>
+</h2><ul>
+<li><code>--transpile</code> now also applies to <code>require</code>d or <code>import</code>ed CoffeeScript files.</li>
+<li><code>--transpile</code> can be used with the REPL: <code>coffee --interactive --transpile</code>.</li>
+<li>Improvements to comments output that should now cover all of the <a href="https://flow.org/en/docs/types/comments/">Flow comment-based syntax</a>. Inline <code>###</code> comments near <a href="https://flow.org/en/docs/types/variables/">variable</a> initial assignments are now output in the variable declaration statement, and <code>###</code> comments near a <a href="https://flow.org/en/docs/types/generics/">class and method names</a> are now output where Flow expects them.</li>
+<li>Importing CoffeeScript keywords is now allowed, so long as they’re aliased: <code>import { and as andFn } from 'lib'</code>. (You could also do <code>import lib from 'lib'</code> and then reference <code>lib.and</code>.)</li>
+<li>Calls to functions named <code>get</code> and <code>set</code> no longer throw an error when given a bracketless object literal as an argument: <code>obj.set propertyName: propertyValue</code>.</li>
+<li>In the constructor of a derived class (a class that <code>extends</code> another class), you cannot call <code>super</code> with an argument that references <code>this</code>: <code>class Child extends Parent then constructor: (@arg) -&gt; super(@arg)</code>. This isn’t allowed in JavaScript, and now the CoffeeScript compiler will throw an error. Instead, assign to <code>this</code> after calling <code>super</code>: <code>(arg) -&gt; super(arg); @arg = arg</code>.</li>
+<li>Bugfix for incorrect output when backticked statements and hoisted expressions were both in the same class body. This allows a backticked line like <code>`field = 3`</code>, for people using the experimental <a href="https://github.com/tc39/proposal-class-fields">class fields</a> syntax, in the same class along with traditional class body expressions like <code>prop: 3</code> that CoffeeScript outputs as part of the class prototype.</li>
+<li>Bugfix for comments not output before a complex <code>?</code> operation, e.g. <code>@a ? b</code>.</li>
+<li>All tests now pass in Windows.</li>
+</ul>
 <div class="anchor" id="2.0.1"></div>
 <h2 class="header">
  <a href="https://github.com/jashkenas/coffeescript/compare/2.0.0...2.0.1">2.0.1</a>
--- a/docs/v2/test.html
+++ b/docs/v2/test.html
@@ -3544,6 +3544,15 @@ test "#4464: backticked expressions in class body", ->
  eq 42, b.x
  eq 84, b.y

+test "#4724: backticked expression in a class body with hoisted member", ->
+  class A
+    `get x() { return 42; }`
+    hoisted: 84
+
+  a = new A
+  eq 42, a.x
+  eq 84, a.hoisted
+
 </script>
 <script type="text/x-coffeescript" class="test" id="cluster">
 # Cluster Module
@@ -4540,6 +4549,153 @@ test "Flow comment-based syntax support", ->
    return str + num;
  };'''

+test "#4706: Flow comments around function parameters", ->
+  eqJS '''
+  identity = ###::<T>### (value ###: T ###) ###: T ### ->
+    value
+  ''', '''
+  var identity;
+
+  identity = function/*::<T>*/(value/*: T */)/*: T */ {
+    return value;
+  };'''
+
+test "#4706: Flow comments around function parameters", ->
+  eqJS '''
+  copy = arr.map(###:: <T> ###(item ###: T ###) ###: T ### => item)
+  ''', '''
+  var copy;
+
+  copy = arr.map(/*:: <T> */(item/*: T */)/*: T */ => {
+    return item;
+  });'''
+
+test "#4706: Flow comments after class name", ->
+  eqJS '''
+  class Container ###::<T> ###
+    method: ###::<U> ### () -> true
+  ''', '''
+  var Container;
+
+  Container = class Container/*::<T> */ {
+    method() {
+      return true;
+    }
+
+  };'''
+
+test "#4706: Identifiers with comments wrapped in parentheses remain wrapped", ->
+  eqJS '(arr ###: Array<number> ###)', '(arr/*: Array<number> */);'
+  eqJS 'other = (arr ###: any ###)', '''
+  var other;
+
+  other = (arr/*: any */);'''
+
+test "#4706: Flow comments before class methods", ->
+  eqJS '''
+  class Container
+    ###::
+    method: (number) => string;
+    method: (string) => number;
+    ###
+    method: -> true
+  ''', '''
+  var Container;
+
+  Container = class Container {
+    /*::
+    method: (number) => string;
+    method: (string) => number;
+    */
+    method() {
+      return true;
+    }
+
+  };'''
+
+test "#4706: Flow comments for class method params", ->
+  eqJS '''
+  class Container
+    method: (param ###: string ###) -> true
+  ''', '''
+  var Container;
+
+  Container = class Container {
+    method(param/*: string */) {
+      return true;
+    }
+
+  };'''
+
+test "#4706: Flow comments for class method returns", ->
+  eqJS '''
+  class Container
+    method: () ###: string ### -> true
+  ''', '''
+  var Container;
+
+  Container = class Container {
+    method()/*: string */ {
+      return true;
+    }
+
+  };'''
+
+test "#4706: Flow comments for function spread", ->
+  eqJS '''
+  method = (...rest ###: Array<string> ###) =>
+  ''', '''
+  var method;
+
+  method = (...rest/*: Array<string> */) => {};'''
+
+test "#4747: Flow comments for local variable declaration", ->
+  eqJS 'a ###: number ### = 1', '''
+  var a/*: number */;
+
+  a = 1;
+  '''
+
+test "#4747: Flow comments for local variable declarations", ->
+  eqJS '''
+  a ###: number ### = 1
+  b ###: string ### = 'c'
+  ''', '''
+  var a/*: number */, b/*: string */;
+
+  a = 1;
+
+  b = 'c';
+  '''
+
+test "#4747: Flow comments for local variable declarations with reassignment", ->
+  eqJS '''
+  a ###: number ### = 1
+  b ###: string ### = 'c'
+  a ### some other comment ### = 2
+  ''', '''
+  var a/*: number */, b/*: string */;
+
+  a = 1;
+
+  b = 'c';
+
+  a/* some other comment */ = 2;
+  '''
+
+test "#4756: Comment before ? operation", ->
+  eqJS '''
+  do ->
+    ### Comment ###
+    @foo ? 42
+  ''', '''
+  (function() {
+    var ref;
+    /* Comment */
+    return (ref = this.foo) != null ? ref : 42;
+  })();
+  '''
+
 </script>
 <script type="text/x-coffeescript" class="test" id="compilation">
 # Compilation
@@ -4711,6 +4867,10 @@ test "using transpile from the Node API requires an object", ->
  catch exception
    eq exception.message, 'The transpile option must be given an object with options to pass to Babel'

+test "transpile option applies to imported .coffee files", ->
+  return if global.testingBrowser
+  doesNotThrow -> transpile 'run', "import { getSep } from './test/importing/transpile_import'\ngetSep()"
+
 </script>
 <script type="text/x-coffeescript" class="test" id="comprehensions">
 # Comprehensions
@@ -6597,7 +6757,7 @@ if require?

    try
      assertErrorFormat """
-        require '#{tempFile}'
+        require '#{tempFile.replace /\\/g, '\\\\'}'
      """,
      """
        #{fs.realpathSync tempFile}:1:15: error: unexpected in
@@ -7871,6 +8031,20 @@ test "derived constructors can't use @params without calling super", ->
                                       ^^
  '''

+test "derived constructors can't call super with @params", ->
+  assertErrorFormat 'class extends A then constructor: (@a) -> super(@a)', '''
+    [stdin]:1:49: error: Can't call super with @params in derived class constructors
+    class extends A then constructor: (@a) -> super(@a)
+                                                    ^^
+  '''
+
+test "derived constructors can't call super with buried @params", ->
+  assertErrorFormat 'class extends A then constructor: (@a) -> super((=> @a)())', '''
+    [stdin]:1:53: error: Can't call super with @params in derived class constructors
+    class extends A then constructor: (@a) -> super((=> @a)())
+                                                        ^^
+  '''
+
 test "'super' is not allowed in constructor parameter defaults", ->
  assertErrorFormat 'class extends A then constructor: (a = super()) ->', '''
    [stdin]:1:40: error: 'super' is not allowed in constructor parameter defaults
@@ -9793,6 +9967,12 @@ test "functions named get or set can be used without parentheses when attached t

  a = new A()

+  class B
+    get: (x) -> x.value + 6
+    set: (x) -> x.value + 7
+
+  b = new B()
+
  eq 12, obj.get 10
  eq 13, obj.set 10

@@ -9812,6 +9992,11 @@ test "functions named get or set can be used without parentheses when attached t
  eq 12, obj.obj.get @ten
  eq 13, obj.obj.set @ten

+  eq 16, b.get value: 10
+  eq 17, b.set value: 10
+
+  eq 16, b.get value: @ten
+  eq 17, b.set value: @ten

 </script>
 <script type="text/x-coffeescript" class="test" id="functions">
@@ -11066,13 +11251,17 @@ test "heregex interpolation", ->
 return unless require?

 path = require 'path'
-{spawnSync, execFileSync} = require 'child_process'
+{ execFileSync, spawnSync } = require 'child_process'

-# Get directory containing the compiled `coffee` executable and prepend it to
-# the path so `#!/usr/bin/env coffee` resolves to our locally built file.
-coffeeBinDir = path.dirname require.resolve('../bin/coffee')
-patchedPath = "#{coffeeBinDir}:#{process.env.PATH}"
-patchedEnv = Object.assign {}, process.env, {PATH: patchedPath}
+# 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'
+spawnOptions =
+  cwd: coffeeBinFolder
+  encoding: 'utf8'
+  env:
+    PATH: coffeeBinFolder + (if isWindows() then ';' else ':') + process.env.PATH
+  shell: isWindows()

 shebangScript = require.resolve './importing/shebang.coffee'
 initialSpaceScript = require.resolve './importing/shebang_initial_space.coffee'
@@ -11082,18 +11271,18 @@ initialSpaceExtraArgsScript = require.resolve './importing/shebang_initial_space
 test "parse arguments for shebang scripts correctly (on unix platforms)", ->
  return if isWindows()

-  stdout = execFileSync shebangScript, ['-abck'], {env: patchedEnv}
+  stdout = execFileSync shebangScript, ['-abck'], spawnOptions
  expectedArgs = ['coffee', shebangScript, '-abck']
  realArgs = JSON.parse stdout
  arrayEq expectedArgs, realArgs

-  stdout = execFileSync initialSpaceScript, ['-abck'], {env: patchedEnv}
+  stdout = execFileSync initialSpaceScript, ['-abck'], spawnOptions
  expectedArgs = ['coffee', initialSpaceScript, '-abck']
  realArgs = JSON.parse stdout
  arrayEq expectedArgs, realArgs

 test "warn and remove -- if it is the second positional argument", ->
-  result = spawnSync 'coffee', [shebangScript, '--'], {env: patchedEnv}
+  result = spawnSync 'coffee', [shebangScript, '--'], spawnOptions
  stderr = result.stderr.toString()
  arrayEq JSON.parse(result.stdout), ['coffee', shebangScript]
  ok stderr.match /^coffee was invoked with '--'/m
@@ -11101,7 +11290,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, '--'], {env: patchedEnv}
+  result = spawnSync 'coffee', ['-b', shebangScript, '--'], spawnOptions
  stderr = result.stderr.toString()
  arrayEq JSON.parse(result.stdout), ['coffee', shebangScript]
  ok stderr.match /^coffee was invoked with '--'/m
@@ -11110,16 +11299,16 @@ test "warn and remove -- if it is the second positional argument", ->
  ok result.status is 0

  result = spawnSync(
-    'coffee', ['-b', shebangScript, '--', 'ANOTHER ONE'], {env: patchedEnv})
+    'coffee', ['-b', shebangScript, '--', 'ANOTHER'], spawnOptions)
  stderr = result.stderr.toString()
-  arrayEq JSON.parse(result.stdout), ['coffee', shebangScript, 'ANOTHER ONE']
+  arrayEq JSON.parse(result.stdout), ['coffee', shebangScript, 'ANOTHER']
  ok stderr.match /^coffee was invoked with '--'/m
  posArgs = stderr.match(/^The positional arguments were: (.*)$/m)[1]
-  arrayEq JSON.parse(posArgs), [shebangScript, '--', 'ANOTHER ONE']
+  arrayEq JSON.parse(posArgs), [shebangScript, '--', 'ANOTHER']
  ok result.status is 0

  result = spawnSync(
-    'coffee', ['--', initialSpaceScript, 'arg'], {env: patchedEnv})
+    'coffee', ['--', initialSpaceScript, 'arg'], spawnOptions)
  expectedArgs = ['coffee', initialSpaceScript, 'arg']
  realArgs = JSON.parse result.stdout
  arrayEq expectedArgs, realArgs
@@ -11127,7 +11316,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'], {env: patchedEnv}
+  result = spawnSync 'coffee', [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
@@ -11138,14 +11327,14 @@ test "warn about non-portable shebang lines", ->
  arrayEq JSON.parse(args), ['coffee', '--']
  ok result.status is 0

-  result = spawnSync 'coffee', [initialSpaceScript, 'arg'], {env: patchedEnv}
+  result = spawnSync 'coffee', [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'], {env: patchedEnv})
+    'coffee', [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
@@ -11158,7 +11347,7 @@ test "warn about non-portable shebang lines", ->

 test "both warnings will be shown at once", ->
  result = spawnSync(
-    'coffee', [initialSpaceExtraArgsScript, '--', 'arg'], {env: patchedEnv})
+    'coffee', [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
@@ -12655,7 +12844,6 @@ test "export default named member, within an object", ->
      bar
    };"""

-
 # Import and export in the same statement

 test "export an entire module's contents", ->
@@ -12679,18 +12867,21 @@ test "export as aliases members imported from another module", ->
    } from 'lib';"""

 test "export list can contain CoffeeScript keywords", ->
-  eqJS "export { unless } from 'lib'",
+  eqJS "export { unless, and } from 'lib'",
  """
    export {
-      unless
+      unless,
+      and
    } from 'lib';"""

 test "export list can contain CoffeeScript keywords when aliasing", ->
-  eqJS "export { when as bar, baz as unless } from 'lib'",
+  eqJS "export { when as bar, baz as unless, and as foo, booze as not } from 'lib'",
  """
    export {
      when as bar,
-      baz as unless
+      baz as unless,
+      and as foo,
+      booze as not
    } from 'lib';"""


@@ -12784,11 +12975,12 @@ test "`as` can be used as an alias name", ->

 test "CoffeeScript keywords can be used as imported names in import lists", ->
  eqJS """
-    import { unless as bar } from 'lib'
+    import { unless as bar, and as computedAnd } from 'lib'
    bar.barMethod()""",
  """
    import {
-      unless as bar
+      unless as bar,
+      and as computedAnd
    } from 'lib';

    bar.barMethod();"""
@@ -15020,6 +15212,10 @@ testRepl "#4604: wraps an async function", (input, output) ->
    eq '33', output.lastWrite()
  , 20

+testRepl "transpile REPL", (input, output) ->
+  input.emitLine 'require("./test/importing/transpile_import").getSep()'
+  eq "'#{path.sep.replace '\\', '\\\\'}'", output.lastWrite()
+
 process.on 'exit', ->
  try
    fs.unlinkSync historyFile
--- a/documentation/examples/breaking_change_super_this.coffee
+++ b/documentation/examples/breaking_change_super_this.coffee
@@ -0,0 +1,4 @@
+class B extends A
+  constructor: (arg) ->
+    super arg
+    @arg = arg
--- a/documentation/sections/breaking_changes_classes.md
+++ b/documentation/sections/breaking_changes_classes.md
@@ -9,13 +9,6 @@ Class constructors can’t be invoked without `new`:
 # Throws a TypeError at runtime
 ```

-Derived (extended) class `constructor`s cannot use `this` before calling `super`:
-
-```coffee
-class B extends A
-  constructor: -> this  # Throws a compiler error
-```
-
 ES2015 classes don’t allow bound (fat arrow) methods. The CoffeeScript compiler goes through some contortions to preserve support for them, but one thing that can’t be accommodated is calling a bound method before it is bound:

 ```coffee
--- a/documentation/sections/breaking_changes_super_this.md
+++ b/documentation/sections/breaking_changes_super_this.md
@@ -0,0 +1,20 @@
+### `super` and `this`
+
+In the constructor of a derived class (a class that `extends` another class), `this` cannot be used before calling `super`:
+
+```coffee
+class B extends A
+  constructor: -> this  # Throws a compiler error
+```
+This also means you cannot pass a reference to `this` as an argument to `super` in the constructor of a derived class:
+
+```coffee
+class B extends A
+  constructor: (@arg) ->
+    super @arg  # Throws a compiler error
+```
+This is a limitation of ES2015 classes. As a workaround, assign to `this` after the `super` call:
+
+```
+codeFor('breaking_change_super_this')
+```
--- a/documentation/sections/changelog.md
+++ b/documentation/sections/changelog.md
@@ -1,5 +1,18 @@
 ## Changelog

+```
+releaseHeader('2017-10-26', '2.0.2', '2.0.1')
+```
+*   `--transpile` now also applies to `require`d or `import`ed CoffeeScript files.
+*   `--transpile` can be used with the REPL: `coffee --interactive --transpile`.
+*   Improvements to comments output that should now cover all of the [Flow comment-based syntax](https://flow.org/en/docs/types/comments/). Inline `###` comments near [variable](https://flow.org/en/docs/types/variables/) initial assignments are now output in the variable declaration statement, and `###` comments near a [class and method names](https://flow.org/en/docs/types/generics/) are now output where Flow expects them.
+*   Importing CoffeeScript keywords is now allowed, so long as they’re aliased: `import { and as andFn } from 'lib'`. (You could also do `import lib from 'lib'` and then reference `lib.and`.)
+*   Calls to functions named `get` and `set` no longer throw an error when given a bracketless object literal as an argument: `obj.set propertyName: propertyValue`.
+*   In the constructor of a derived class (a class that `extends` another class), you cannot call `super` with an argument that references `this`: `class Child extends Parent then constructor: (@arg) -> super(@arg)`. This isn’t allowed in JavaScript, and now the CoffeeScript compiler will throw an error. Instead, assign to `this` after calling `super`: `(arg) -> super(arg); @arg = arg`.
+*   Bugfix for incorrect output when backticked statements and hoisted expressions were both in the same class body. This allows a backticked line like `` `field = 3` ``, for people using the experimental [class fields](https://github.com/tc39/proposal-class-fields) syntax, in the same class along with traditional class body expressions like `prop: 3` that CoffeeScript outputs as part of the class prototype.
+*   Bugfix for comments not output before a complex `?` operation, e.g. `@a ? b`.
+*   All tests now pass in Windows.
+
 ```
 releaseHeader('2017-09-26', '2.0.1', '2.0.0')
 ```
--- a/documentation/site/body.html
+++ b/documentation/site/body.html
@@ -187,6 +187,9 @@
        <section id="breaking-changes-classes">
          <%= htmlFor('breaking_changes_classes') %>
        </section>
+        <section id="breaking-changes-super-this">
+          <%= htmlFor('breaking_changes_super_this') %>
+        </section>
        <section id="breaking-changes-super-extends">
          <%= htmlFor('breaking_changes_super_extends') %>
        </section>
--- a/documentation/site/sidebar.html
+++ b/documentation/site/sidebar.html
@@ -71,6 +71,7 @@
        <a href="#breaking-changes-default-values" class="nav-link" data-action="sidebar-nav">Default Values</a>
        <a href="#breaking-changes-bound-generator-functions" class="nav-link" data-action="sidebar-nav">Bound Generator Functions</a>
        <a href="#breaking-changes-classes" class="nav-link" data-action="sidebar-nav">Classes</a>
+        <a href="#breaking-changes-super-this" class="nav-link" data-action="sidebar-nav"><code>super</code> and <code>this</code></a>
        <a href="#breaking-changes-super-extends" class="nav-link" data-action="sidebar-nav"><code>super</code> and <code>extends</code></a>
        <a href="#breaking-changes-jsx-and-the-less-than-and-greater-than-operators" class="nav-link" data-action="sidebar-nav">JSX and the <code>&lt;</code> and <code>&gt;</code> Operators</a>
        <a href="#breaking-changes-literate-coffeescript" class="nav-link" data-action="sidebar-nav">Literate CoffeeScript Parsing</a>
--- a/lib/coffeescript/browser.js
+++ b/lib/coffeescript/browser.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.2
 (function() {
  // This **Browser** compatibility layer extends core CoffeeScript functions
  // to make things work smoothly when compiling code directly in the browser.
--- a/lib/coffeescript/cake.js
+++ b/lib/coffeescript/cake.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.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))
--- a/lib/coffeescript/coffeescript.js
+++ b/lib/coffeescript/coffeescript.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.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
--- a/lib/coffeescript/command.js
+++ b/lib/coffeescript/command.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.2
 (function() {
  // The `coffee` utility. Handles command-line compilation of CoffeeScript
  // into various forms: saved into `.js` files or printed to stdout
@@ -92,6 +92,7 @@
      opts.prelude = makePrelude(opts.require);
    }
    replCliOpts.prelude = opts.prelude;
+    replCliOpts.transpile = opts.transpile;
    if (opts.nodejs) {
      return forkNode();
    }
@@ -303,6 +304,10 @@
  // and write them back to **stdout**.
  compileStdio = function() {
    var buffers, stdin;
+    if (opts.map) {
+      console.error('--stdio and --map cannot be used together');
+      process.exit(1);
+    }
    buffers = [];
    stdin = process.openStdin();
    stdin.on('data', function(buffer) {
--- a/lib/coffeescript/grammar.js
+++ b/lib/coffeescript/grammar.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.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
@@ -389,7 +389,8 @@
      function() {
        return new Code($2,
      $5,
-      $4);
+      $4,
+      LOC(1)(new Literal($1)));
      }),
      o('FuncGlyph Block',
      function() {
--- a/lib/coffeescript/helpers.js
+++ b/lib/coffeescript/helpers.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.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
--- a/lib/coffeescript/index.js
+++ b/lib/coffeescript/index.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.2
 (function() {
  // Node.js Implementation
  var CoffeeScript, ext, fn, fs, helpers, i, len, path, ref, universalCompile, vm,
@@ -53,6 +53,8 @@
    // Assign paths for node_modules loading
    dir = options.filename != null ? path.dirname(fs.realpathSync(options.filename)) : fs.realpathSync('.');
    mainModule.paths = require('module')._nodeModulePaths(dir);
+    // Save the options for compiling child imports.
+    mainModule.options = options;
    // Compile.
    if (!helpers.isCoffee(mainModule.filename) || require.extensions) {
      answer = CoffeeScript.compile(code, options);
@@ -147,19 +149,19 @@
    }
  }

-  CoffeeScript._compileFile = function(filename, sourceMap = false, inlineMap = false) {
+  CoffeeScript._compileFile = function(filename, options = {}) {
    var answer, err, raw, stripped;
    raw = fs.readFileSync(filename, 'utf8');
    // Strip the Unicode byte order mark, if this file begins with one.
    stripped = raw.charCodeAt(0) === 0xFEFF ? raw.substring(1) : raw;
+    options = Object.assign({}, options, {
+      filename: filename,
+      literate: helpers.isLiterate(filename),
+      sourceFiles: [filename],
+      inlineMap: true // Always generate a source map, so that stack traces line up.
+    });
    try {
-      answer = CoffeeScript.compile(stripped, {
-        filename,
-        sourceMap,
-        inlineMap,
-        sourceFiles: [filename],
-        literate: helpers.isLiterate(filename)
-      });
+      answer = CoffeeScript.compile(stripped, options);
    } catch (error) {
      err = error;
      // As the filename and code of a dynamically loaded file will be different
--- a/lib/coffeescript/lexer.js
+++ b/lib/coffeescript/lexer.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.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,
@@ -111,7 +111,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, regExSuper, regex, sup, tag, tagToken;
+      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;
      inCSXTag = this.atCSXTag();
      regex = inCSXTag ? CSX_ATTRIBUTE : IDENTIFIER;
      if (!(match = regex.exec(this.chunk))) {
@@ -132,19 +132,28 @@
      if (id === 'as' && this.seenImport) {
        if (this.value() === '*') {
          this.tokens[this.tokens.length - 1][0] = 'IMPORT_ALL';
-        } else if (ref = this.value(), indexOf.call(COFFEE_KEYWORDS, ref) >= 0) {
-          this.tokens[this.tokens.length - 1][0] = 'IDENTIFIER';
+        } else if (ref = this.value(true), indexOf.call(COFFEE_KEYWORDS, ref) >= 0) {
+          prev = this.prev();
+          [prev[0], prev[1]] = ['IDENTIFIER', this.value(true)];
        }
        if ((ref1 = this.tag()) === 'DEFAULT' || ref1 === 'IMPORT_ALL' || ref1 === 'IDENTIFIER') {
          this.token('AS', id);
          return id.length;
        }
      }
-      if (id === 'as' && this.seenExport && ((ref2 = this.tag()) === 'IDENTIFIER' || ref2 === 'DEFAULT')) {
-        this.token('AS', id);
-        return id.length;
+      if (id === 'as' && this.seenExport) {
+        if ((ref2 = this.tag()) === 'IDENTIFIER' || ref2 === 'DEFAULT') {
+          this.token('AS', id);
+          return id.length;
+        }
+        if (ref3 = this.value(true), indexOf.call(COFFEE_KEYWORDS, ref3) >= 0) {
+          prev = this.prev();
+          [prev[0], prev[1]] = ['IDENTIFIER', this.value(true)];
+          this.token('AS', id);
+          return id.length;
+        }
      }
-      if (id === 'default' && this.seenExport && ((ref3 = this.tag()) === 'EXPORT' || ref3 === 'AS')) {
+      if (id === 'default' && this.seenExport && ((ref4 = this.tag()) === 'EXPORT' || ref4 === 'AS')) {
        this.token('DEFAULT', id);
        return id.length;
      }
@@ -156,10 +165,10 @@
        return sup.length + 3;
      }
      prev = this.prev();
-      tag = colon || (prev != null) && (((ref4 = prev[0]) === '.' || ref4 === '?.' || ref4 === '::' || ref4 === '?::') || !prev.spaced && prev[0] === '@') ? 'PROPERTY' : 'IDENTIFIER';
+      tag = colon || (prev != null) && (((ref5 = prev[0]) === '.' || ref5 === '?.' || ref5 === '::' || ref5 === '?::') || !prev.spaced && prev[0] === '@') ? 'PROPERTY' : 'IDENTIFIER';
      if (tag === 'IDENTIFIER' && (indexOf.call(JS_KEYWORDS, id) >= 0 || indexOf.call(COFFEE_KEYWORDS, id) >= 0) && !(this.exportSpecifierList && indexOf.call(COFFEE_KEYWORDS, id) >= 0)) {
        tag = id.toUpperCase();
-        if (tag === 'WHEN' && (ref5 = this.tag(), indexOf.call(LINE_BREAK, ref5) >= 0)) {
+        if (tag === 'WHEN' && (ref6 = this.tag(), indexOf.call(LINE_BREAK, ref6) >= 0)) {
          tag = 'LEADING_WHEN';
        } else if (tag === 'FOR') {
          this.seenFor = true;
@@ -190,11 +199,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 && (ref6 = prev[0], indexOf.call(CALLABLE, ref6) >= 0) && /^[gs]et$/.test(prev[1])) {
+        if (prev.spaced && (ref7 = prev[0], indexOf.call(CALLABLE, ref7) >= 0) && /^[gs]et$/.test(prev[1]) && this.tokens[this.tokens.length - 2][0] !== '.') {
          this.error(`'${prev[1]}' cannot be used as a keyword, or as a function call without parentheses`, prev[2]);
        } else {
          prevprev = this.tokens[this.tokens.length - 2];
-          if (((ref7 = prev[0]) === '@' || ref7 === 'THIS') && prevprev && prevprev.spaced && /^[gs]et$/.test(prevprev[1]) && this.tokens[this.tokens.length - 3][0] !== '.') {
+          if (((ref8 = prev[0]) === '@' || ref8 === 'THIS') && prevprev && prevprev.spaced && /^[gs]et$/.test(prevprev[1]) && this.tokens[this.tokens.length - 3][0] !== '.') {
            this.error(`'${prevprev[1]}' cannot be used as a keyword, or as a function call without parentheses`, prevprev[2]);
          }
        }
@@ -204,7 +213,7 @@
          length: id.length
        });
      }
-      if (tag !== 'PROPERTY') {
+      if (!(tag === 'PROPERTY' || this.exportSpecifierList)) {
        if (indexOf.call(COFFEE_ALIASES, id) >= 0) {
          alias = id;
          id = COFFEE_ALIAS_MAP[id];
@@ -1275,10 +1284,14 @@
    }

    // Peek at the last value in the token stream.
-    value() {
-      var ref, token;
+    value(useOrigin = false) {
+      var ref, ref1, token;
      ref = this.tokens, token = ref[ref.length - 1];
-      return token != null ? token[1] : void 0;
+      if (useOrigin && ((token != null ? token.origin : void 0) != null)) {
+        return (ref1 = token.origin) != null ? ref1[1] : void 0;
+      } else {
+        return token != null ? token[1] : void 0;
+      }
    }

    // Get the previous token in the token stream.
--- a/lib/coffeescript/nodes.js
+++ b/lib/coffeescript/nodes.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.2
 (function() {
  // `nodes.coffee` contains all of the node classes for the syntax tree. Most
  // nodes are created as the result of actions in the [grammar](grammar.html),
@@ -237,6 +237,9 @@
            // `compileToFragments` method has logic for outputting comments.
            unshiftCommentFragment(commentFragment);
          } else {
+            if (fragments.length === 0) {
+              fragments.push(this.makeCode(''));
+            }
            if (commentFragment.unshift) {
              if ((base1 = fragments[0]).precedingComments == null) {
                base1.precedingComments = [];
@@ -701,17 +704,18 @@
        ref1 = this.expressions;
        for (index = j = 0, len1 = ref1.length; j < len1; index = ++j) {
          node = ref1[index];
-          node = node.unwrapAll();
+          if (node.hoisted) {
+            // This is a hoisted expression.
+            // We want to compile this and ignore the result.
+            node.compileToFragments(o);
+            continue;
+          }
          node = node.unfoldSoak(o) || node;
          if (node instanceof Block) {
            // This is a nested block. We don’t do anything special here like
            // enclose it in a new scope; we just compile the statements in this
            // block along with our own.
            compiledNodes.push(node.compileNode(o));
-          } else if (node.hoisted) {
-            // This is a hoisted expression.
-            // We want to compile this and ignore the result.
-            node.compileToFragments(o);
          } else if (top) {
            node.front = true;
            fragments = node.compileToFragments(o);
@@ -774,7 +778,7 @@
      // Compile the expressions body for the contents of a function, with
      // declarations of all inner variables pushed up to the top.
      compileWithDeclarations(o) {
-        var assigns, declars, exp, fragments, i, j, len1, post, ref1, rest, scope, spaced;
+        var assigns, declaredVariable, declaredVariables, declaredVariablesIndex, declars, exp, fragments, i, j, k, len1, len2, post, ref1, rest, scope, spaced;
        fragments = [];
        post = [];
        ref1 = this.expressions;
@@ -805,7 +809,17 @@
            }
            fragments.push(this.makeCode(`${this.tab}var `));
            if (declars) {
-              fragments.push(this.makeCode(scope.declaredVariables().join(', ')));
+              declaredVariables = scope.declaredVariables();
+              for (declaredVariablesIndex = k = 0, len2 = declaredVariables.length; k < len2; declaredVariablesIndex = ++k) {
+                declaredVariable = declaredVariables[declaredVariablesIndex];
+                fragments.push(this.makeCode(declaredVariable));
+                if (Object.prototype.hasOwnProperty.call(o.scope.comments, declaredVariable)) {
+                  fragments.push(...o.scope.comments[declaredVariable]);
+                }
+                if (declaredVariablesIndex !== declaredVariables.length - 1) {
+                  fragments.push(this.makeCode(', '));
+                }
+              }
            }
            if (assigns) {
              if (declars) {
@@ -1252,6 +1266,8 @@
          this[tag] = true;
        }
        this.isDefaultValue = isDefaultValue;
+        // If this is a `@foo =` assignment, if there are comments on `@` move them
+        // to be on `foo`.
        if (((ref1 = this.base) != null ? ref1.comments : void 0) && this.base instanceof ThisLiteral && (((ref2 = this.properties[0]) != null ? ref2.name : void 0) != null)) {
          moveComments(this.base, this.properties[0].name);
        }
@@ -1554,6 +1570,10 @@
          this.variable.error("literal is not a function");
        }
        this.csx = this.variable.base instanceof CSXTag;
+        // `@variable` never gets output as a result of this node getting created as
+        // part of `RegexWithInterpolations`, so for that case move any comments to
+        // the `args` property that gets passed into `RegexWithInterpolations` via
+        // the grammar.
        if (((ref1 = this.variable.base) != null ? ref1.value : void 0) === 'RegExp' && this.args.length !== 0) {
          moveComments(this.variable, this.args[0]);
        }
@@ -2501,7 +2521,7 @@
      }

      compileClassDeclaration(o) {
-        var ref1, result;
+        var ref1, ref2, result;
        if (this.externalCtor || this.boundMethods.length) {
          if (this.ctor == null) {
            this.ctor = this.makeDefaultConstructor();
@@ -2517,7 +2537,13 @@
        result = [];
        result.push(this.makeCode("class "));
        if (this.name) {
-          result.push(this.makeCode(`${this.name} `));
+          result.push(this.makeCode(this.name));
+        }
+        if (((ref2 = this.variable) != null ? ref2.comments : void 0) != null) {
+          this.compileCommentFragments(o, this.variable, result);
+        }
+        if (this.name) {
+          result.push(this.makeCode(' '));
        }
        if (this.parent) {
          result.push(this.makeCode('extends '), ...this.parent.compileToFragments(o), this.makeCode(' '));
@@ -3201,7 +3227,7 @@
            this.variable.error(`'${this.variable.compile(o)}' can't be assigned`);
          }
          varBase.eachName((name) => {
-            var message;
+            var commentFragments, commentsNode, message;
            if (typeof name.hasProperties === "function" ? name.hasProperties() : void 0) {
              return;
            }
@@ -3209,14 +3235,29 @@
            if (message) {
              name.error(message);
            }
-            // `moduleDeclaration` can be `'import'` or `'export'`
+            // `moduleDeclaration` can be `'import'` or `'export'`.
            this.checkAssignability(o, name);
            if (this.moduleDeclaration) {
              return o.scope.add(name.value, this.moduleDeclaration);
            } else if (this.param) {
              return o.scope.add(name.value, this.param === 'alwaysDeclare' ? 'var' : 'param');
            } else {
-              return o.scope.find(name.value);
+              o.scope.find(name.value);
+              // If this assignment identifier has one or more herecomments
+              // attached, output them as part of the declarations line (unless
+              // other herecomments are already staged there) for compatibility
+              // with Flow typing. Don’t do this if this assignment is for a
+              // class, e.g. `ClassName = class ClassName {`, as Flow requires
+              // the comment to be between the class name and the `{`.
+              if (name.comments && !o.scope.comments[name.value] && !(this.value instanceof Class) && name.comments.every(function(comment) {
+                return comment.here && !comment.multiline;
+              })) {
+                commentsNode = new IdentifierLiteral(name.value);
+                commentsNode.comments = name.comments;
+                commentFragments = [];
+                this.compileCommentFragments(o, commentsNode, commentFragments);
+                return o.scope.comments[name.value] = commentFragments;
+              }
            }
          });
        }
@@ -3649,10 +3690,11 @@
  // has no *children* -- they're within the inner scope.
  exports.Code = Code = (function() {
    class Code extends Base {
-      constructor(params, body, funcGlyph) {
+      constructor(params, body, funcGlyph, paramStart) {
        var ref1;
        super();
        this.funcGlyph = funcGlyph;
+        this.paramStart = paramStart;
        this.params = params || [];
        this.body = body || new Block;
        this.bound = ((ref1 = this.funcGlyph) != null ? ref1.glyph : void 0) === '=>';
@@ -3687,7 +3729,7 @@
      // parameters after the splat, they are declared via expressions in the
      // function body.
      compileNode(o) {
-        var answer, body, boundMethodCheck, comment, condition, exprs, generatedVariables, haveBodyParam, haveSplatParam, i, ifTrue, j, k, l, len1, len2, len3, m, methodScope, modifiers, name, param, paramNames, paramToAddToScope, params, paramsAfterSplat, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, scopeVariablesCount, signature, splatParamName, thisAssignments, wasEmpty;
+        var answer, body, boundMethodCheck, comment, condition, exprs, generatedVariables, haveBodyParam, haveSplatParam, i, ifTrue, j, k, l, len1, len2, len3, m, methodScope, modifiers, name, param, paramNames, paramToAddToScope, params, paramsAfterSplat, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, ref8, scopeVariablesCount, signature, splatParamName, thisAssignments, wasEmpty;
        if (this.ctor) {
          if (this.isAsync) {
            this.name.error('Class constructor may not be async');
@@ -3872,7 +3914,9 @@
          exprs.unshift(new Assign(new Value(new Arr([
            new Splat(new IdentifierLiteral(splatParamName)),
            ...((function() {
-              var k, len2, results;
+              var k,
+            len2,
+            results;
              results = [];
              for (k = 0, len2 = paramsAfterSplat.length; k < len2; k++) {
                param = paramsAfterSplat[k];
@@ -3909,6 +3953,11 @@
          modifiers.push('*');
        }
        signature = [this.makeCode('(')];
+        // Block comments between a function name and `(` get output between
+        // `function` and `(`.
+        if (((ref6 = this.paramStart) != null ? ref6.comments : void 0) != null) {
+          this.compileCommentFragments(o, this.paramStart, signature);
+        }
        for (i = k = 0, len2 = params.length; k < len2; i = ++k) {
          param = params[i];
          if (i !== 0) {
@@ -3929,10 +3978,10 @@
        }
        signature.push(this.makeCode(')'));
        // Block comments between `)` and `->`/`=>` get output between `)` and `{`.
-        if (((ref6 = this.funcGlyph) != null ? ref6.comments : void 0) != null) {
-          ref7 = this.funcGlyph.comments;
-          for (l = 0, len3 = ref7.length; l < len3; l++) {
-            comment = ref7[l];
+        if (((ref7 = this.funcGlyph) != null ? ref7.comments : void 0) != null) {
+          ref8 = this.funcGlyph.comments;
+          for (l = 0, len3 = ref8.length; l < len3; l++) {
+            comment = ref8[l];
            comment.unshift = false;
          }
          this.compileCommentFragments(o, this.funcGlyph, signature);
@@ -4035,13 +4084,23 @@
        return seenSuper;
      }

-      // Find all super calls in the given context node
-      // Returns `true` if `iterator` is called
+      // Find all super calls in the given context node;
+      // returns `true` if `iterator` is called.
      eachSuperCall(context, iterator) {
        var seenSuper;
        seenSuper = false;
        context.traverseChildren(true, (child) => {
          if (child instanceof SuperCall) {
+            // `super` in a constructor (the only `super` without an accessor)
+            // cannot be given an argument with a reference to `this`, as that would
+            // be referencing `this` before calling `super`.
+            if (!child.variable.accessor) {
+              Block.wrap(child.args).traverseChildren(true, (node) => {
+                if (node.this) {
+                  return node.error("Can't call super with @params in derived class constructors");
+                }
+              });
+            }
            seenSuper = true;
            iterator(child);
          } else if (child instanceof ThisLiteral && this.ctor === 'derived' && !seenSuper) {
@@ -4826,8 +4885,8 @@
        this.expression = expression1;
        this.comparisonTarget = onlyNotUndefined ? 'undefined' : 'null';
        salvagedComments = [];
-        this.expression.eachChild(function(child) {
-          var comment, j, k, len1, len2, ref1, ref2, ref3;
+        this.expression.traverseChildren(true, function(child) {
+          var comment, j, len1, ref1;
          if (child.comments) {
            ref1 = child.comments;
            for (j = 0, len1 = ref1.length; j < len1; j++) {
@@ -4836,17 +4895,7 @@
                salvagedComments.push(comment);
              }
            }
-            delete child.comments;
-          }
-          if ((ref2 = child.name) != null ? ref2.comments : void 0) {
-            ref3 = child.name.comments;
-            for (k = 0, len2 = ref3.length; k < len2; k++) {
-              comment = ref3[k];
-              if (indexOf.call(salvagedComments, comment) < 0) {
-                salvagedComments.push(comment);
-              }
-            }
-            return delete child.name.comments;
+            return delete child.comments;
          }
        });
        attachCommentsToNode(salvagedComments, this);
@@ -4906,14 +4955,22 @@
      }

      compileNode(o) {
-        var bare, expr, fragments;
+        var bare, expr, fragments, ref1, shouldWrapComment;
        expr = this.body.unwrap();
-        if (expr instanceof Value && expr.isAtomic() && !this.csxAttribute) {
+        // If these parentheses are wrapping an `IdentifierLiteral` followed by a
+        // block comment, output the parentheses (or put another way, don’t optimize
+        // away these redundant parentheses). This is because Flow requires
+        // parentheses in certain circumstances to distinguish identifiers followed
+        // by comment-based type annotations from JavaScript labels.
+        shouldWrapComment = (ref1 = expr.comments) != null ? ref1.some(function(comment) {
+          return comment.here && !comment.unshift && !comment.newLine;
+        }) : void 0;
+        if (expr instanceof Value && expr.isAtomic() && !this.csxAttribute && !shouldWrapComment) {
          expr.front = this.front;
          return expr.compileToFragments(o);
        }
        fragments = expr.compileToFragments(o, LEVEL_PAREN);
-        bare = o.level < LEVEL_OP && (expr instanceof Op || expr.unwrap() instanceof Call || (expr instanceof For && expr.returns)) && (o.level < LEVEL_COND || fragments.length <= 3);
+        bare = o.level < LEVEL_OP && !shouldWrapComment && (expr instanceof Op || expr.unwrap() instanceof Call || (expr instanceof For && expr.returns)) && (o.level < LEVEL_COND || fragments.length <= 3);
        if (this.csxAttribute) {
          return this.wrapInBraces(fragments);
        }
--- a/lib/coffeescript/optparse.js
+++ b/lib/coffeescript/optparse.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.2
 (function() {
  var LONG_FLAG, MULTI_FLAG, OPTIONAL, OptionParser, SHORT_FLAG, buildRule, buildRules, normalizeArguments, repeat,
    slice = [].slice;
--- a/lib/coffeescript/parser.js
+++ b/lib/coffeescript/parser.js
@@ -267,7 +267,8 @@ break;
 case 86:
 this.$ = yy.addDataToNode(yy, _$[$0-4], _$[$0])(new yy.Code($$[$0-3],
      $$[$0],
-      $$[$0-1]));
+      $$[$0-1],
+      yy.addDataToNode(yy, _$[$0-4])(new yy.Literal($$[$0-4]))));
 break;
 case 87:
 this.$ = yy.addDataToNode(yy, _$[$0-1], _$[$0])(new yy.Code([],
--- a/lib/coffeescript/register.js
+++ b/lib/coffeescript/register.js
@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.2
 (function() {
-  var CoffeeScript, Module, binary, child_process, ext, findExtension, fork, helpers, i, len, loadFile, path, ref;
+  var CoffeeScript, Module, binary, child_process, ext, findExtension, fork, getRootModule, helpers, i, len, loadFile, path, ref;

  CoffeeScript = require('./');

@@ -12,8 +12,9 @@

  // Load and run a CoffeeScript file for Node, stripping any `BOM`s.
  loadFile = function(module, filename) {
-    var answer;
-    answer = CoffeeScript._compileFile(filename, false, true);
+    var answer, options;
+    options = module.options || getRootModule(module).options;
+    answer = CoffeeScript._compileFile(filename, options);
    return module._compile(answer, filename);
  };

@@ -72,4 +73,13 @@
    };
  }

+  // Utility function to find the `options` object attached to the topmost module.
+  getRootModule = function(module) {
+    if (module.parent) {
+      return getRootModule(module.parent);
+    } else {
+      return module;
+    }
+  };
+
 }).call(this);
--- a/lib/coffeescript/repl.js
+++ b/lib/coffeescript/repl.js
@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.2
 (function() {
-  var CoffeeScript, addHistory, addMultilineHandler, fs, getCommandId, merge, nodeREPL, path, replDefaults, runInContext, sawSIGINT, updateSyntaxError, vm;
+  var CoffeeScript, addHistory, addMultilineHandler, fs, getCommandId, merge, nodeREPL, path, replDefaults, runInContext, sawSIGINT, transpile, updateSyntaxError, vm;

  fs = require('fs');

@@ -16,6 +16,8 @@

  sawSIGINT = false;

+  transpile = false;
+
  replDefaults = {
    prompt: 'coffee> ',
    historyFile: (function() {
@@ -57,10 +59,10 @@
        ast = CoffeeScript.nodes(tokens);
        // Add assignment to `__` variable to force the input to be an expression.
        ast = new Block([new Assign(new Value(new Literal('__')), ast, '=')]);
-        // Wrap the expression in a closure to support top-level `await`
+        // Wrap the expression in a closure to support top-level `await`.
        ast = new Code([], ast);
        isAsync = ast.isAsync;
-        // Invoke the wrapping closure
+        // Invoke the wrapping closure.
        ast = new Block([new Call(ast)]);
        js = ast.compile({
          bare: true,
@@ -68,8 +70,14 @@
          referencedVars,
          sharedScope: true
        });
+        if (transpile) {
+          js = transpile.transpile(js, transpile.options).code;
+          // Strip `"use strict"`, to avoid an exception on assigning to
+          // undeclared variable `__`.
+          js = js.replace(/^"use strict"|^'use strict'/, '');
+        }
        result = runInContext(js, context, filename);
-        // Await an async result, if necessary
+        // Await an async result, if necessary.
        if (isAsync) {
          result.then(function(resolvedResult) {
            if (!sawSIGINT) {
@@ -224,7 +232,7 @@

  module.exports = {
    start: function(opts = {}) {
-      var build, major, minor, repl;
+      var Module, build, major, minor, originalModuleLoad, repl;
      [major, minor, build] = process.versions.node.split('.').map(function(n) {
        return parseInt(n, 10);
      });
@@ -234,6 +242,30 @@
      }
      CoffeeScript.register();
      process.argv = ['coffee'].concat(process.argv.slice(2));
+      if (opts.transpile) {
+        try {
+          transpile = {};
+          transpile.transpile = require('babel-core').transform;
+        } catch (error) {
+          console.error('To use --transpile with an interactive REPL, babel-core must be installed either in the current folder or globally:\n  npm install --save-dev babel-core\nor\n  npm install --global babel-core\nAnd you must save options to configure Babel in one of the places it looks to find its options.\nSee http://coffeescript.org/#transpilation');
+          process.exit(1);
+        }
+        transpile.options = {
+          filename: path.resolve(process.cwd(), '<repl>')
+        };
+        // Since the REPL compilation path is unique (in `eval` above), we need
+        // another way to get the `options` object attached to a module so that
+        // it knows later on whether it needs to be transpiled. In the case of
+        // the REPL, the only applicable option is `transpile`.
+        Module = require('module');
+        originalModuleLoad = Module.prototype.load;
+        Module.prototype.load = function(filename) {
+          this.options = {
+            transpile: transpile.options
+          };
+          return originalModuleLoad.call(this, filename);
+        };
+      }
      opts = merge(replDefaults, opts);
      repl = nodeREPL.start(opts);
      if (opts.prelude) {
--- a/lib/coffeescript/rewriter.js
+++ b/lib/coffeescript/rewriter.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.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
@@ -944,6 +944,6 @@
  // `STRING_START` isn’t on this list because its `locationData` matches that of
  // the node that becomes `StringWithInterpolations`, and therefore
  // `addDataToNode` attaches `STRING_START`’s tokens to that node.
-  DISCARDED = ['(', ')', '[', ']', '{', '}', '.', '..', '...', ',', '=', '++', '--', '?', 'AS', 'AWAIT', 'CALL_START', 'CALL_END', 'DEFAULT', 'ELSE', 'EXTENDS', 'EXPORT', 'FORIN', 'FOROF', 'FORFROM', 'IMPORT', 'INDENT', 'INDEX_SOAK', 'LEADING_WHEN', 'OUTDENT', 'PARAM_START', 'PARAM_END', 'REGEX_START', 'REGEX_END', 'RETURN', 'STRING_END', 'THROW', 'UNARY', 'YIELD'].concat(IMPLICIT_UNSPACED_CALL.concat(IMPLICIT_END.concat(CALL_CLOSERS.concat(CONTROL_IN_IMPLICIT))));
+  DISCARDED = ['(', ')', '[', ']', '{', '}', '.', '..', '...', ',', '=', '++', '--', '?', 'AS', 'AWAIT', 'CALL_START', 'CALL_END', 'DEFAULT', 'ELSE', 'EXTENDS', 'EXPORT', 'FORIN', 'FOROF', 'FORFROM', 'IMPORT', 'INDENT', 'INDEX_SOAK', 'LEADING_WHEN', 'OUTDENT', 'PARAM_END', 'REGEX_START', 'REGEX_END', 'RETURN', 'STRING_END', 'THROW', 'UNARY', 'YIELD'].concat(IMPLICIT_UNSPACED_CALL.concat(IMPLICIT_END.concat(CALL_CLOSERS.concat(CONTROL_IN_IMPLICIT))));

 }).call(this);
--- a/lib/coffeescript/scope.js
+++ b/lib/coffeescript/scope.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.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
@@ -14,7 +14,8 @@
    // as well as a reference to the **Block** node it belongs to, which is
    // where it should declare its variables, a reference to the function that
    // it belongs to, and a list of variables referenced in the source code
-    // and therefore should be avoided when generating variables.
+    // and therefore should be avoided when generating variables. Also track comments
+    // that should be output as part of variable declarations.
    constructor(parent, expressions, method, referencedVars) {
      var ref, ref1;
      this.parent = parent;
@@ -27,6 +28,7 @@
          type: 'arguments'
        }
      ];
+      this.comments = {};
      this.positions = {};
      if (!this.parent) {
        this.utilities = {};
--- a/lib/coffeescript/sourcemap.js
+++ b/lib/coffeescript/sourcemap.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.0.1
+// Generated by CoffeeScript 2.0.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
@@ -47,18 +47,18 @@

  };

-  // SourceMap
-  // ---------
-
-  // Maps locations in a single generated JavaScript file back to locations in
-  // the original CoffeeScript source file.
-
-  // This is intentionally agnostic towards how a source map might be represented on
-  // disk. Once the compiler is ready to produce a "v3"-style source map, we can walk
-  // through the arrays of line and column buffer to produce it.
  SourceMap = (function() {
    var BASE64_CHARS, VLQ_CONTINUATION_BIT, VLQ_SHIFT, VLQ_VALUE_MASK;

+    // SourceMap
+    // ---------
+
+    // Maps locations in a single generated JavaScript file back to locations in
+    // the original CoffeeScript source file.
+
+    // This is intentionally agnostic towards how a source map might be represented on
+    // disk. Once the compiler is ready to produce a "v3"-style source map, we can walk
+    // through the arrays of line and column buffer to produce it.
    class SourceMap {
      constructor() {
        this.lines = [];
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "coffeescript",
-  "version": "2.0.0",
+  "version": "2.0.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
    "compiler"
  ],
  "author": "Jeremy Ashkenas",
-  "version": "2.0.1",
+  "version": "2.0.2",
  "license": "MIT",
  "engines": {
    "node": ">=6"
--- a/src/command.coffee
+++ b/src/command.coffee
@@ -92,6 +92,7 @@ exports.run = ->
  replCliOpts = useGlobal: yes
  opts.prelude = makePrelude opts.require       if opts.require
  replCliOpts.prelude = opts.prelude
+  replCliOpts.transpile = opts.transpile
  return forkNode()                             if opts.nodejs
  return usage()                                if opts.help
  return version()                              if opts.version
@@ -243,6 +244,9 @@ compileScript = (file, input, base = null) ->
 # Attach the appropriate listeners to compile scripts incoming over **stdin**,
 # and write them back to **stdout**.
 compileStdio = ->
+  if opts.map
+    console.error '--stdio and --map cannot be used together'
+    process.exit 1
  buffers = []
  stdin = process.openStdin()
  stdin.on 'data', (buffer) ->
--- a/src/grammar.coffee
+++ b/src/grammar.coffee
@@ -262,7 +262,7 @@ grammar =
  # The **Code** node is the function literal. It's defined by an indented block
  # of **Block** preceded by a function arrow, with an optional parameter list.
  Code: [
-    o 'PARAM_START ParamList PARAM_END FuncGlyph Block', -> new Code $2, $5, $4
+    o 'PARAM_START ParamList PARAM_END FuncGlyph Block', -> new Code $2, $5, $4, LOC(1)(new Literal $1)
    o 'FuncGlyph Block',                                 -> new Code [], $2, $1
  ]

--- a/src/index.coffee
+++ b/src/index.coffee
@@ -46,6 +46,9 @@ CoffeeScript.run = (code, options = {}) ->
    fs.realpathSync '.'
  mainModule.paths = require('module')._nodeModulePaths dir

+  # Save the options for compiling child imports.
+  mainModule.options = options
+
  # Compile.
  if not helpers.isCoffee(mainModule.filename) or require.extensions
    answer = CoffeeScript.compile code, options
@@ -104,17 +107,19 @@ if require.extensions
      Use CoffeeScript.register() or require the coffeescript/register module to require #{ext} files.
      """

-CoffeeScript._compileFile = (filename, sourceMap = no, inlineMap = no) ->
+CoffeeScript._compileFile = (filename, options = {}) ->
  raw = fs.readFileSync filename, 'utf8'
  # Strip the Unicode byte order mark, if this file begins with one.
  stripped = if raw.charCodeAt(0) is 0xFEFF then raw.substring 1 else raw

+  options = Object.assign {}, options,
+    filename: filename
+    literate: helpers.isLiterate filename
+    sourceFiles: [filename]
+    inlineMap: yes # Always generate a source map, so that stack traces line up.
+
  try
-    answer = CoffeeScript.compile stripped, {
-      filename, sourceMap, inlineMap
-      sourceFiles: [filename]
-      literate: helpers.isLiterate filename
-    }
+    answer = CoffeeScript.compile stripped, options
  catch err
    # As the filename and code of a dynamically loaded file will be different
    # from the original file compiled with CoffeeScript.run, add that
--- a/src/lexer.coffee
+++ b/src/lexer.coffee
@@ -116,7 +116,6 @@ exports.Lexer = class Lexer
    # Preserve length of id for location data
    idLength = id.length
    poppedToken = undefined
-
    if id is 'own' and @tag() is 'FOR'
      @token 'OWN', id
      return id.length
@@ -126,14 +125,21 @@ exports.Lexer = class Lexer
    if id is 'as' and @seenImport
      if @value() is '*'
        @tokens[@tokens.length - 1][0] = 'IMPORT_ALL'
-      else if @value() in COFFEE_KEYWORDS
-        @tokens[@tokens.length - 1][0] = 'IDENTIFIER'
+      else if @value(yes) in COFFEE_KEYWORDS
+        prev = @prev()
+        [prev[0], prev[1]] = ['IDENTIFIER', @value(yes)]
      if @tag() in ['DEFAULT', 'IMPORT_ALL', 'IDENTIFIER']
        @token 'AS', id
        return id.length
-    if id is 'as' and @seenExport and @tag() in ['IDENTIFIER', 'DEFAULT']
-      @token 'AS', id
-      return id.length
+    if id is 'as' and @seenExport
+      if @tag() in ['IDENTIFIER', 'DEFAULT']
+        @token 'AS', id
+        return id.length
+      if @value(yes) in COFFEE_KEYWORDS
+        prev = @prev()
+        [prev[0], prev[1]] = ['IDENTIFIER', @value(yes)]
+        @token 'AS', id
+        return id.length
    if id is 'default' and @seenExport and @tag() in ['EXPORT', 'AS']
      @token 'DEFAULT', id
      return id.length
@@ -186,7 +192,7 @@ 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])
+      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
        prevprev = @tokens[@tokens.length - 2]
@@ -197,7 +203,7 @@ exports.Lexer = class Lexer
    if tag is 'IDENTIFIER' and id in RESERVED
      @error "reserved word '#{id}'", length: id.length

-    unless tag is 'PROPERTY'
+    unless tag is 'PROPERTY' or @exportSpecifierList
      if id in COFFEE_ALIASES
        alias = id
        id = COFFEE_ALIAS_MAP[id]
@@ -965,9 +971,12 @@ exports.Lexer = class Lexer
    token?[0]

  # Peek at the last value in the token stream.
-  value: ->
+  value: (useOrigin = no) ->
    [..., token] = @tokens
-    token?[1]
+    if useOrigin and token?.origin?
+      token.origin?[1]
+    else
+      token?[1]

  # Get the previous token in the token stream.
  prev: ->
--- a/src/nodes.coffee
+++ b/src/nodes.coffee
@@ -179,6 +179,7 @@ exports.Base = class Base
        # `compileToFragments` method has logic for outputting comments.
        unshiftCommentFragment commentFragment
      else
+        fragments.push @makeCode '' if fragments.length is 0
        if commentFragment.unshift
          fragments[0].precedingComments ?= []
          fragments[0].precedingComments.push commentFragment
@@ -497,17 +498,17 @@ exports.Block = class Block extends Base
    compiledNodes = []

    for node, index in @expressions
-      node = node.unwrapAll()
+      if node.hoisted
+        # This is a hoisted expression.
+        # We want to compile this and ignore the result.
+        node.compileToFragments o
+        continue
      node = (node.unfoldSoak(o) or node)
      if node instanceof Block
        # This is a nested block. We don’t do anything special here like
        # enclose it in a new scope; we just compile the statements in this
        # block along with our own.
        compiledNodes.push node.compileNode o
-      else if node.hoisted
-        # This is a hoisted expression.
-        # We want to compile this and ignore the result.
-        node.compileToFragments o
      else if top
        node.front = yes
        fragments = node.compileToFragments o
@@ -570,7 +571,13 @@ exports.Block = class Block extends Base
        fragments.push @makeCode '\n' if i
        fragments.push @makeCode "#{@tab}var "
        if declars
-          fragments.push @makeCode scope.declaredVariables().join(', ')
+          declaredVariables = scope.declaredVariables()
+          for declaredVariable, declaredVariablesIndex in declaredVariables
+            fragments.push @makeCode declaredVariable
+            if Object::hasOwnProperty.call o.scope.comments, declaredVariable
+              fragments.push o.scope.comments[declaredVariable]...
+            if declaredVariablesIndex isnt declaredVariables.length - 1
+              fragments.push @makeCode ', '
        if assigns
          fragments.push @makeCode ",\n#{@tab + TAB}" if declars
          fragments.push @makeCode scope.assignedVariables().join(",\n#{@tab + TAB}")
@@ -1674,7 +1681,9 @@ exports.Class = class Class extends Base

    result = []
    result.push @makeCode "class "
-    result.push @makeCode "#{@name} " if @name
+    result.push @makeCode @name if @name
+    @compileCommentFragments o, @variable, result if @variable?.comments?
+    result.push @makeCode ' ' if @name
    result.push @makeCode('extends '), @parent.compileToFragments(o)..., @makeCode ' ' if @parent

    result.push @makeCode '{'
@@ -2153,7 +2162,7 @@ exports.Assign = class Assign extends Base
        message = isUnassignable name.value
        name.error message if message

-        # `moduleDeclaration` can be `'import'` or `'export'`
+        # `moduleDeclaration` can be `'import'` or `'export'`.
        @checkAssignability o, name
        if @moduleDeclaration
          o.scope.add name.value, @moduleDeclaration
@@ -2165,6 +2174,20 @@ exports.Assign = class Assign extends Base
              'param'
        else
          o.scope.find name.value
+          # If this assignment identifier has one or more herecomments
+          # attached, output them as part of the declarations line (unless
+          # other herecomments are already staged there) for compatibility
+          # with Flow typing. Don’t do this if this assignment is for a
+          # class, e.g. `ClassName = class ClassName {`, as Flow requires
+          # the comment to be between the class name and the `{`.
+          if name.comments and not o.scope.comments[name.value] and
+             @value not instanceof Class and
+             name.comments.every((comment) -> comment.here and not comment.multiline)
+            commentsNode = new IdentifierLiteral name.value
+            commentsNode.comments = name.comments
+            commentFragments = []
+            @compileCommentFragments o, commentsNode, commentFragments
+            o.scope.comments[name.value] = commentFragments

    if @value instanceof Code
      if @value.isStatic
@@ -2484,7 +2507,7 @@ exports.FuncGlyph = class FuncGlyph extends Base
 # When for the purposes of walking the contents of a function body, the Code
 # has no *children* -- they're within the inner scope.
 exports.Code = class Code extends Base
-  constructor: (params, body, @funcGlyph) ->
+  constructor: (params, body, @funcGlyph, @paramStart) ->
    super()

    @params      = params or []
@@ -2684,6 +2707,10 @@ exports.Code = class Code extends Base
      modifiers.push '*'

    signature = [@makeCode '(']
+    # Block comments between a function name and `(` get output between
+    # `function` and `(`.
+    if @paramStart?.comments?
+      @compileCommentFragments o, @paramStart, signature
    for param, i in params
      signature.push @makeCode ', ' if i isnt 0
      signature.push @makeCode '...' if haveSplatParam and i is params.length - 1
@@ -2756,13 +2783,19 @@ exports.Code = class Code extends Base

    seenSuper

-  # Find all super calls in the given context node
-  # Returns `true` if `iterator` is called
+  # Find all super calls in the given context node;
+  # returns `true` if `iterator` is called.
  eachSuperCall: (context, iterator) ->
    seenSuper = no

-    context.traverseChildren true, (child) =>
+    context.traverseChildren yes, (child) =>
      if child instanceof SuperCall
+        # `super` in a constructor (the only `super` without an accessor)
+        # 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) =>
+            node.error "Can't call super with @params in derived class constructors" if node.this
        seenSuper = yes
        iterator child
      else if child instanceof ThisLiteral and @ctor is 'derived' and not seenSuper
@@ -3282,15 +3315,11 @@ exports.Existence = class Existence extends Base
    super()
    @comparisonTarget = if onlyNotUndefined then 'undefined' else 'null'
    salvagedComments = []
-    @expression.eachChild (child) ->
+    @expression.traverseChildren yes, (child) ->
      if child.comments
        for comment in child.comments
          salvagedComments.push comment unless comment in salvagedComments
        delete child.comments
-      if child.name?.comments
-        for comment in child.name.comments
-          salvagedComments.push comment unless comment in salvagedComments
-        delete child.name.comments
    attachCommentsToNode salvagedComments, @
    moveComments @expression, @

@@ -3337,13 +3366,21 @@ exports.Parens = class Parens extends Base

  compileNode: (o) ->
    expr = @body.unwrap()
-    if expr instanceof Value and expr.isAtomic() and not @csxAttribute
+    # If these parentheses are wrapping an `IdentifierLiteral` followed by a
+    # block comment, output the parentheses (or put another way, don’t optimize
+    # away these redundant parentheses). This is because Flow requires
+    # parentheses in certain circumstances to distinguish identifiers followed
+    # by comment-based type annotations from JavaScript labels.
+    shouldWrapComment = expr.comments?.some(
+      (comment) -> comment.here and not comment.unshift and not comment.newLine)
+    if expr instanceof Value and expr.isAtomic() and not @csxAttribute and not shouldWrapComment
      expr.front = @front
      return expr.compileToFragments o
    fragments = expr.compileToFragments o, LEVEL_PAREN
-    bare = o.level < LEVEL_OP and (expr instanceof Op or expr.unwrap() instanceof Call or
-      (expr instanceof For and expr.returns)) and (o.level < LEVEL_COND or
-        fragments.length <= 3)
+    bare = o.level < LEVEL_OP and not shouldWrapComment and (
+        expr instanceof Op or expr.unwrap() instanceof Call or
+        (expr instanceof For and expr.returns)
+      ) and (o.level < LEVEL_COND or fragments.length <= 3)
    return @wrapInBraces fragments if @csxAttribute
    if bare then fragments else @wrapInParentheses fragments

--- a/src/register.coffee
+++ b/src/register.coffee
@@ -5,7 +5,8 @@ path          = require 'path'

 # Load and run a CoffeeScript file for Node, stripping any `BOM`s.
 loadFile = (module, filename) ->
-  answer = CoffeeScript._compileFile filename, no, yes
+  options = module.options or getRootModule(module).options
+  answer = CoffeeScript._compileFile filename, options
  module._compile answer, filename

 # If the installed version of Node supports `require.extensions`, register
@@ -48,3 +49,7 @@ if child_process
      args = [path].concat args
      path = binary
    fork path, args, options
+
+# Utility function to find the `options` object attached to the topmost module.
+getRootModule = (module) ->
+  if module.parent then getRootModule module.parent else module
--- a/src/repl.coffee
+++ b/src/repl.coffee
@@ -6,6 +6,7 @@ CoffeeScript = require './'
 {merge, updateSyntaxError} = require './helpers'

 sawSIGINT = no
+transpile = no

 replDefaults =
  prompt: 'coffee> ',
@@ -35,14 +36,19 @@ replDefaults =
      ast = CoffeeScript.nodes tokens
      # Add assignment to `__` variable to force the input to be an expression.
      ast = new Block [new Assign (new Value new Literal '__'), ast, '=']
-      # Wrap the expression in a closure to support top-level `await`
+      # Wrap the expression in a closure to support top-level `await`.
      ast     = new Code [], ast
      isAsync = ast.isAsync
-      # Invoke the wrapping closure
+      # Invoke the wrapping closure.
      ast    = new Block [new Call ast]
      js     = ast.compile {bare: yes, locals: Object.keys(context), referencedVars, sharedScope: yes}
+      if transpile
+        js = transpile.transpile(js, transpile.options).code
+        # Strip `"use strict"`, to avoid an exception on assigning to
+        # undeclared variable `__`.
+        js = js.replace /^"use strict"|^'use strict'/, ''
      result = runInContext js, context, filename
-      # Await an async result, if necessary
+      # Await an async result, if necessary.
      if isAsync
        result.then (resolvedResult) ->
          cb null, resolvedResult unless sawSIGINT
@@ -167,6 +173,31 @@ module.exports =

    CoffeeScript.register()
    process.argv = ['coffee'].concat process.argv[2..]
+    if opts.transpile
+      try
+        transpile = {}
+        transpile.transpile = require('babel-core').transform
+      catch
+        console.error '''
+          To use --transpile with an interactive REPL, babel-core must be installed either in the current folder or globally:
+            npm install --save-dev babel-core
+          or
+            npm install --global babel-core
+          And you must save options to configure Babel in one of the places it looks to find its options.
+          See http://coffeescript.org/#transpilation
+        '''
+        process.exit 1
+      transpile.options =
+        filename: path.resolve process.cwd(), '<repl>'
+      # Since the REPL compilation path is unique (in `eval` above), we need
+      # another way to get the `options` object attached to a module so that
+      # it knows later on whether it needs to be transpiled. In the case of
+      # the REPL, the only applicable option is `transpile`.
+      Module = require 'module'
+      originalModuleLoad = Module::load
+      Module::load = (filename) ->
+        @options = transpile: transpile.options
+        originalModuleLoad.call @, filename
    opts = merge replDefaults, opts
    repl = nodeREPL.start opts
    runInContext opts.prelude, repl.context, 'prelude' if opts.prelude
--- a/src/rewriter.coffee
+++ b/src/rewriter.coffee
@@ -693,6 +693,6 @@ CONTROL_IN_IMPLICIT = ['IF', 'TRY', 'FINALLY', 'CATCH', 'CLASS', 'SWITCH']
 DISCARDED = ['(', ')', '[', ']', '{', '}', '.', '..', '...', ',', '=', '++', '--', '?',
  'AS', 'AWAIT', 'CALL_START', 'CALL_END', 'DEFAULT', 'ELSE', 'EXTENDS', 'EXPORT',
  'FORIN', 'FOROF', 'FORFROM', 'IMPORT', 'INDENT', 'INDEX_SOAK', 'LEADING_WHEN',
-  'OUTDENT', 'PARAM_START', 'PARAM_END', 'REGEX_START', 'REGEX_END', 'RETURN',
-  'STRING_END', 'THROW', 'UNARY', 'YIELD'
+  'OUTDENT', 'PARAM_END', 'REGEX_START', 'REGEX_END', 'RETURN', 'STRING_END', 'THROW',
+  'UNARY', 'YIELD'
 ].concat IMPLICIT_UNSPACED_CALL.concat IMPLICIT_END.concat CALL_CLOSERS.concat CONTROL_IN_IMPLICIT
--- a/src/scope.litcoffee
+++ b/src/scope.litcoffee
@@ -11,10 +11,12 @@ Initialize a scope with its parent, for lookups up the chain,
 as well as a reference to the **Block** node it belongs to, which is
 where it should declare its variables, a reference to the function that
 it belongs to, and a list of variables referenced in the source code
-and therefore should be avoided when generating variables.
+and therefore should be avoided when generating variables. Also track comments
+that should be output as part of variable declarations.

      constructor: (@parent, @expressions, @method, @referencedVars) ->
        @variables = [{name: 'arguments', type: 'arguments'}]
+        @comments  = {}
        @positions = {}
        @utilities = {} unless @parent

--- a/test/classes.coffee
+++ b/test/classes.coffee
@@ -1848,3 +1848,12 @@ test "#4464: backticked expressions in class body", ->
  b = new B
  eq 42, b.x
  eq 84, b.y
+
+test "#4724: backticked expression in a class body with hoisted member", ->
+  class A
+    `get x() { return 42; }`
+    hoisted: 84
+
+  a = new A
+  eq 42, a.x
+  eq 84, a.hoisted
--- a/test/comments.coffee
+++ b/test/comments.coffee
@@ -973,3 +973,150 @@ test "Flow comment-based syntax support", ->
  fn = function(str/*: string */, num/*: number */)/*: string */ {
    return str + num;
  };'''
+
+test "#4706: Flow comments around function parameters", ->
+  eqJS '''
+  identity = ###::<T>### (value ###: T ###) ###: T ### ->
+    value
+  ''', '''
+  var identity;
+
+  identity = function/*::<T>*/(value/*: T */)/*: T */ {
+    return value;
+  };'''
+
+test "#4706: Flow comments around function parameters", ->
+  eqJS '''
+  copy = arr.map(###:: <T> ###(item ###: T ###) ###: T ### => item)
+  ''', '''
+  var copy;
+
+  copy = arr.map(/*:: <T> */(item/*: T */)/*: T */ => {
+    return item;
+  });'''
+
+test "#4706: Flow comments after class name", ->
+  eqJS '''
+  class Container ###::<T> ###
+    method: ###::<U> ### () -> true
+  ''', '''
+  var Container;
+
+  Container = class Container/*::<T> */ {
+    method() {
+      return true;
+    }
+
+  };'''
+
+test "#4706: Identifiers with comments wrapped in parentheses remain wrapped", ->
+  eqJS '(arr ###: Array<number> ###)', '(arr/*: Array<number> */);'
+  eqJS 'other = (arr ###: any ###)', '''
+  var other;
+
+  other = (arr/*: any */);'''
+
+test "#4706: Flow comments before class methods", ->
+  eqJS '''
+  class Container
+    ###::
+    method: (number) => string;
+    method: (string) => number;
+    ###
+    method: -> true
+  ''', '''
+  var Container;
+
+  Container = class Container {
+    /*::
+    method: (number) => string;
+    method: (string) => number;
+    */
+    method() {
+      return true;
+    }
+
+  };'''
+
+test "#4706: Flow comments for class method params", ->
+  eqJS '''
+  class Container
+    method: (param ###: string ###) -> true
+  ''', '''
+  var Container;
+
+  Container = class Container {
+    method(param/*: string */) {
+      return true;
+    }
+
+  };'''
+
+test "#4706: Flow comments for class method returns", ->
+  eqJS '''
+  class Container
+    method: () ###: string ### -> true
+  ''', '''
+  var Container;
+
+  Container = class Container {
+    method()/*: string */ {
+      return true;
+    }
+
+  };'''
+
+test "#4706: Flow comments for function spread", ->
+  eqJS '''
+  method = (...rest ###: Array<string> ###) =>
+  ''', '''
+  var method;
+
+  method = (...rest/*: Array<string> */) => {};'''
+
+test "#4747: Flow comments for local variable declaration", ->
+  eqJS 'a ###: number ### = 1', '''
+  var a/*: number */;
+
+  a = 1;
+  '''
+
+test "#4747: Flow comments for local variable declarations", ->
+  eqJS '''
+  a ###: number ### = 1
+  b ###: string ### = 'c'
+  ''', '''
+  var a/*: number */, b/*: string */;
+
+  a = 1;
+
+  b = 'c';
+  '''
+
+test "#4747: Flow comments for local variable declarations with reassignment", ->
+  eqJS '''
+  a ###: number ### = 1
+  b ###: string ### = 'c'
+  a ### some other comment ### = 2
+  ''', '''
+  var a/*: number */, b/*: string */;
+
+  a = 1;
+
+  b = 'c';
+
+  a/* some other comment */ = 2;
+  '''
+
+test "#4756: Comment before ? operation", ->
+  eqJS '''
+  do ->
+    ### Comment ###
+    @foo ? 42
+  ''', '''
+  (function() {
+    var ref;
+    /* Comment */
+    return (ref = this.foo) != null ? ref : 42;
+  })();
+  '''
--- a/test/compilation.coffee
+++ b/test/compilation.coffee
@@ -166,3 +166,7 @@ test "using transpile from the Node API requires an object", ->
    CoffeeScript.compile '', transpile: yes
  catch exception
    eq exception.message, 'The transpile option must be given an object with options to pass to Babel'
+
+test "transpile option applies to imported .coffee files", ->
+  return if global.testingBrowser
+  doesNotThrow -> transpile 'run', "import { getSep } from './test/importing/transpile_import'\ngetSep()"
--- a/test/error_messages.coffee
+++ b/test/error_messages.coffee
@@ -65,7 +65,7 @@ if require?

    try
      assertErrorFormat """
-        require '#{tempFile}'
+        require '#{tempFile.replace /\\/g, '\\\\'}'
      """,
      """
        #{fs.realpathSync tempFile}:1:15: error: unexpected in
@@ -1339,6 +1339,20 @@ test "derived constructors can't use @params without calling super", ->
                                       ^^
  '''

+test "derived constructors can't call super with @params", ->
+  assertErrorFormat 'class extends A then constructor: (@a) -> super(@a)', '''
+    [stdin]:1:49: error: Can't call super with @params in derived class constructors
+    class extends A then constructor: (@a) -> super(@a)
+                                                    ^^
+  '''
+
+test "derived constructors can't call super with buried @params", ->
+  assertErrorFormat 'class extends A then constructor: (@a) -> super((=> @a)())', '''
+    [stdin]:1:53: error: Can't call super with @params in derived class constructors
+    class extends A then constructor: (@a) -> super((=> @a)())
+                                                        ^^
+  '''
+
 test "'super' is not allowed in constructor parameter defaults", ->
  assertErrorFormat 'class extends A then constructor: (a = super()) ->', '''
    [stdin]:1:40: error: 'super' is not allowed in constructor parameter defaults
--- a/test/function_invocation.coffee
+++ b/test/function_invocation.coffee
@@ -806,6 +806,12 @@ test "functions named get or set can be used without parentheses when attached t

  a = new A()

+  class B
+    get: (x) -> x.value + 6
+    set: (x) -> x.value + 7
+
+  b = new B()
+
  eq 12, obj.get 10
  eq 13, obj.set 10

@@ -825,3 +831,8 @@ test "functions named get or set can be used without parentheses when attached t
  eq 12, obj.obj.get @ten
  eq 13, obj.obj.set @ten

+  eq 16, b.get value: 10
+  eq 17, b.set value: 10
+
+  eq 16, b.get value: @ten
+  eq 17, b.set value: @ten
--- a/test/importing/transpile_import.coffee
+++ b/test/importing/transpile_import.coffee
@@ -0,0 +1,3 @@
+import path from 'path'
+
+export getSep = -> path.sep
--- a/test/invocation_argument_parsing.coffee
+++ b/test/invocation_argument_parsing.coffee
@@ -1,13 +1,17 @@
 return unless require?

 path = require 'path'
-{spawnSync, execFileSync} = require 'child_process'
+{ execFileSync, spawnSync } = require 'child_process'

-# Get directory containing the compiled `coffee` executable and prepend it to
-# the path so `#!/usr/bin/env coffee` resolves to our locally built file.
-coffeeBinDir = path.dirname require.resolve('../bin/coffee')
-patchedPath = "#{coffeeBinDir}:#{process.env.PATH}"
-patchedEnv = Object.assign {}, process.env, {PATH: patchedPath}
+# 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'
+spawnOptions =
+  cwd: coffeeBinFolder
+  encoding: 'utf8'
+  env:
+    PATH: coffeeBinFolder + (if isWindows() then ';' else ':') + process.env.PATH
+  shell: isWindows()

 shebangScript = require.resolve './importing/shebang.coffee'
 initialSpaceScript = require.resolve './importing/shebang_initial_space.coffee'
@@ -17,18 +21,18 @@ initialSpaceExtraArgsScript = require.resolve './importing/shebang_initial_space
 test "parse arguments for shebang scripts correctly (on unix platforms)", ->
  return if isWindows()

-  stdout = execFileSync shebangScript, ['-abck'], {env: patchedEnv}
+  stdout = execFileSync shebangScript, ['-abck'], spawnOptions
  expectedArgs = ['coffee', shebangScript, '-abck']
  realArgs = JSON.parse stdout
  arrayEq expectedArgs, realArgs

-  stdout = execFileSync initialSpaceScript, ['-abck'], {env: patchedEnv}
+  stdout = execFileSync initialSpaceScript, ['-abck'], spawnOptions
  expectedArgs = ['coffee', initialSpaceScript, '-abck']
  realArgs = JSON.parse stdout
  arrayEq expectedArgs, realArgs

 test "warn and remove -- if it is the second positional argument", ->
-  result = spawnSync 'coffee', [shebangScript, '--'], {env: patchedEnv}
+  result = spawnSync 'coffee', [shebangScript, '--'], spawnOptions
  stderr = result.stderr.toString()
  arrayEq JSON.parse(result.stdout), ['coffee', shebangScript]
  ok stderr.match /^coffee was invoked with '--'/m
@@ -36,7 +40,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, '--'], {env: patchedEnv}
+  result = spawnSync 'coffee', ['-b', shebangScript, '--'], spawnOptions
  stderr = result.stderr.toString()
  arrayEq JSON.parse(result.stdout), ['coffee', shebangScript]
  ok stderr.match /^coffee was invoked with '--'/m
@@ -45,16 +49,16 @@ test "warn and remove -- if it is the second positional argument", ->
  ok result.status is 0

  result = spawnSync(
-    'coffee', ['-b', shebangScript, '--', 'ANOTHER ONE'], {env: patchedEnv})
+    'coffee', ['-b', shebangScript, '--', 'ANOTHER'], spawnOptions)
  stderr = result.stderr.toString()
-  arrayEq JSON.parse(result.stdout), ['coffee', shebangScript, 'ANOTHER ONE']
+  arrayEq JSON.parse(result.stdout), ['coffee', shebangScript, 'ANOTHER']
  ok stderr.match /^coffee was invoked with '--'/m
  posArgs = stderr.match(/^The positional arguments were: (.*)$/m)[1]
-  arrayEq JSON.parse(posArgs), [shebangScript, '--', 'ANOTHER ONE']
+  arrayEq JSON.parse(posArgs), [shebangScript, '--', 'ANOTHER']
  ok result.status is 0

  result = spawnSync(
-    'coffee', ['--', initialSpaceScript, 'arg'], {env: patchedEnv})
+    'coffee', ['--', initialSpaceScript, 'arg'], spawnOptions)
  expectedArgs = ['coffee', initialSpaceScript, 'arg']
  realArgs = JSON.parse result.stdout
  arrayEq expectedArgs, realArgs
@@ -62,7 +66,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'], {env: patchedEnv}
+  result = spawnSync 'coffee', [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
@@ -73,14 +77,14 @@ test "warn about non-portable shebang lines", ->
  arrayEq JSON.parse(args), ['coffee', '--']
  ok result.status is 0

-  result = spawnSync 'coffee', [initialSpaceScript, 'arg'], {env: patchedEnv}
+  result = spawnSync 'coffee', [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'], {env: patchedEnv})
+    'coffee', [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
@@ -93,7 +97,7 @@ test "warn about non-portable shebang lines", ->

 test "both warnings will be shown at once", ->
  result = spawnSync(
-    'coffee', [initialSpaceExtraArgsScript, '--', 'arg'], {env: patchedEnv})
+    'coffee', [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
--- a/test/modules.coffee
+++ b/test/modules.coffee
@@ -473,7 +473,6 @@ test "export default named member, within an object", ->
      bar
    };"""

-
 # Import and export in the same statement

 test "export an entire module's contents", ->
@@ -497,18 +496,21 @@ test "export as aliases members imported from another module", ->
    } from 'lib';"""

 test "export list can contain CoffeeScript keywords", ->
-  eqJS "export { unless } from 'lib'",
+  eqJS "export { unless, and } from 'lib'",
  """
    export {
-      unless
+      unless,
+      and
    } from 'lib';"""

 test "export list can contain CoffeeScript keywords when aliasing", ->
-  eqJS "export { when as bar, baz as unless } from 'lib'",
+  eqJS "export { when as bar, baz as unless, and as foo, booze as not } from 'lib'",
  """
    export {
      when as bar,
-      baz as unless
+      baz as unless,
+      and as foo,
+      booze as not
    } from 'lib';"""


@@ -602,11 +604,12 @@ test "`as` can be used as an alias name", ->

 test "CoffeeScript keywords can be used as imported names in import lists", ->
  eqJS """
-    import { unless as bar } from 'lib'
+    import { unless as bar, and as computedAnd } from 'lib'
    bar.barMethod()""",
  """
    import {
-      unless as bar
+      unless as bar,
+      and as computedAnd
    } from 'lib';

    bar.barMethod();"""
--- a/test/repl.coffee
+++ b/test/repl.coffee
@@ -122,6 +122,10 @@ testRepl "#4604: wraps an async function", (input, output) ->
    eq '33', output.lastWrite()
  , 20

+testRepl "transpile REPL", (input, output) ->
+  input.emitLine 'require("./test/importing/transpile_import").getSep()'
+  eq "'#{path.sep.replace '\\', '\\\\'}'", output.lastWrite()
+
 process.on 'exit', ->
  try
    fs.unlinkSync historyFile
Author	SHA1	Message	Date
Geoffrey Booth	cbc695b831	2.0.2 (#4758 ) * Give the notes about `super` and `this` their own section in the docs * 2.0.2 changelog * 2.0.2 release output * Rewrite	2017-10-26 18:29:45 -07:00
Geoffrey Booth	f3375e798c	Fix #4756 : When moving comments from the children of an Existence, we need to search all its descendants, not just the immediate children (#4757 )	2017-10-25 22:15:40 -07:00
Geoffrey Booth	e2308093e4	Fix #4752 : Error on calling super with @params in a derived class constructor (#4754 ) * Fix #4752: Error on calling super with @params in a derived class constructor * Catch calls to super with not-top-level @params	2017-10-25 22:15:05 -07:00
Geoffrey Booth	0dc4755920	Fix #4747 : Flow local variables (#4753 ) * Fix #4706: Comments before a PARAM_START token stay before that token * Simplify nodes * Add function-in-function test * Fix #4706: Comments after class name should go after the identifier that's after `class`, not the variable assigned to * Fix #4706: Top-level identifiers with trailing comments get wrapped in parentheses (around the comment too) so that Flow doesn't interpret it as a JavaScript label * Cleanup * If the source has parentheses wrapping an identifier followed by a block comment, output those parentheses rather than optimizing them away; this is a requirement of Flow, to distinguish from JavaScript labels * More tests for Flow comments * For local variables with trailing inline herecomments, output the comments up in the variable declarations line for Flow compatibility	2017-10-19 06:56:59 -07:00
Geoffrey Booth	6faa7f2b35	Fix #4706 : Flow generics (#4736 ) * Fix #4706: Comments before a PARAM_START token stay before that token * Simplify nodes * Add function-in-function test * Fix #4706: Comments after class name should go after the identifier that's after `class`, not the variable assigned to * Fix #4706: Top-level identifiers with trailing comments get wrapped in parentheses (around the comment too) so that Flow doesn't interpret it as a JavaScript label * Cleanup * If the source has parentheses wrapping an identifier followed by a block comment, output those parentheses rather than optimizing them away; this is a requirement of Flow, to distinguish from JavaScript labels * More tests for Flow comments	2017-10-18 17:22:02 -07:00
geebo	063c2d1f56	Fix import/export list bug with aliased keywords (#4744 )	2017-10-12 11:47:12 -07:00
Chris Connelly	4d4e47bfb2	Fix #4724 (#4737 ) The handling of hoisted nodes in class bodies was incorrect, as the node was being unwrapped before checking if it was hoisted, meaning nodes that should have been hoisted would be output normally. This affected `PassthroughLiteral`s as they were wrapped in a `Value`.	2017-10-07 11:32:43 -07:00
Geoffrey Booth	22fb31e317	Transpile REPL (#4729 ) * Fix #4725: apply transpile option to require’d .coffee files * Use the current module’s options if it has any, before going searching up the tree * Don’t mutate passed-in options object * If the REPL is run with `--transpile`, turn transpilation on for both the current REPL input and any files imported by that input * Use the command.coffee machinery for parsing arguments * Fix test for Windows	2017-10-04 17:50:25 -07:00
Geoffrey Booth	a2037e799f	Fix #4725 : apply transpile option to require’d .coffee files (#4728 ) * Fix #4725: apply transpile option to require’d .coffee files * Use the current module’s options if it has any, before going searching up the tree * Don’t mutate passed-in options object	2017-10-04 17:49:59 -07:00
Geoffrey Booth	694e69d872	Fix #4727 : Tests failing in Windows (#4731 ) * ? * ?? * Revert the coffee.EXE approach * Explicitly define the PATH to include only the folders we need * Get spawnSync working in Windows * Simplify test to be cross-platform	2017-10-02 22:19:32 -07:00
Matthew Ryan	bb2871fdde	Allow applying 'get'/'set' property to a bracketless object (#4730 )	2017-10-02 11:10:43 -07:00
Geoffrey Booth	08e00331dd	Fix #3440 : --stdio and --map don’t make sense to use together (#4721 )	2017-09-27 00:02:30 -07:00