Use stdio option instead of customFds

#3862 changelog
variable names
jashkenas · dtaniwaki · jashkenas · jashkenas · sgentle · jashkenas
diff --git a/README b/README
@@ -1,50 +0,0 @@
-            {
-         }   }   {
-        {   {  }  }
-         }   }{  {
-        {  }{  }  }                    _____       __  __
-       { }{ }{  { }                   / ____|     / _|/ _|
-     .- { { }  { }} -.               | |     ___ | |_| |_ ___  ___
-    (  { } { } { } }  )              | |    / _ \|  _|  _/ _ \/ _ \
-    |`-..________ ..-'|              | |___| (_) | | | ||  __/  __/
-    |                 |               \_____\___/|_| |_| \___|\___|
-    |                 ;--.
-    |                (__  \            _____           _       _
-    |                 | )  )          / ____|         (_)     | |
-    |                 |/  /          | (___   ___ _ __ _ _ __ | |_
-    |                 (  /            \___ \ / __| '__| | '_ \| __|
-    |                 |/              ____) | (__| |  | | |_) | |_
-    |                 |              |_____/ \___|_|  |_| .__/ \__|
-     `-.._________..-'                                  | |
-                                                        |_|
-
-
-  CoffeeScript is a little language that compiles into JavaScript.
-
-  If you have the Node Package Manager installed:
-  npm install -g coffee-script
-  (Leave off the -g if you don't wish to install globally.)
-
-  Or, if you don't wish to use npm:
-  sudo bin/cake install
-
-  Execute a script:
-  coffee /path/to/script.coffee
-
-  Compile a script:
-  coffee -c /path/to/script.coffee
-
-  For documentation, usage, and examples, see:
-  http://coffeescript.org/
-
-  To suggest a feature, report a bug, or general discussion:
-  http://github.com/jashkenas/coffeescript/issues/
-
-  If you'd like to chat, drop by #coffeescript on Freenode IRC,
-  or on webchat.freenode.net.
-
-  The source repository:
-  git://github.com/jashkenas/coffeescript.git
-
-  Top 100 contributors are listed here:
-  http://github.com/jashkenas/coffeescript/contributors
diff --git a/README.md b/README.md
@@ -57,4 +57,6 @@ If you'd like to chat, drop by #coffeescript on Freenode IRC.
 
 The source repository: https://github.com/jashkenas/coffeescript.git
 
+Changelog: http://coffeescript.org/#changelog
+
 Our lovely and talented contributors are listed here: http://github.com/jashkenas/coffeescript/contributors
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "coffee-script",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "main": [
     "lib/coffee-script/coffee-script.js"
   ],
diff --git a/documentation/coffee/fat_arrow.coffee b/documentation/coffee/fat_arrow.coffee
@@ -2,5 +2,5 @@ Account = (customer, cart) ->
   @customer = customer
   @cart = cart
 
-  $('.shopping_cart').bind 'click', (event) =>
+  $('.shopping_cart').on 'click', (event) =>
     @customer.purchase @cart
diff --git a/documentation/docs/browser.html b/documentation/docs/browser.html
@@ -261,8 +261,9 @@
   <span class="hljs-keyword">for</span> script, i <span class="hljs-keyword">in</span> coffees
     <span class="hljs-keyword">do</span> <span class="hljs-function"><span class="hljs-params">(script, i)</span> -&gt;</span>
       options = <span class="hljs-attribute">literate</span>: script.type <span class="hljs-keyword">is</span> coffeetypes[<span class="hljs-number">1</span>]
-      <span class="hljs-keyword">if</span> script.src
-        CoffeeScript.load script.src,
+      source = script.src <span class="hljs-keyword">or</span> script.getAttribute(<span class="hljs-string">'data-src'</span>)
+      <span class="hljs-keyword">if</span> source
+        CoffeeScript.load source,
           <span class="hljs-function"><span class="hljs-params">(param)</span> -&gt;</span>
             coffees[i] = param
             execute()
diff --git a/documentation/docs/coffee-script.html b/documentation/docs/coffee-script.html
@@ -144,7 +144,7 @@
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.VERSION = <span class="hljs-string">'1.9.1'</span>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.VERSION = <span class="hljs-string">'1.9.2'</span>
 
 <span class="hljs-built_in">exports</span>.FILE_EXTENSIONS = [<span class="hljs-string">'.coffee'</span>, <span class="hljs-string">'.litcoffee'</span>, <span class="hljs-string">'.coffee.md'</span>]</pre></div></div>
             
diff --git a/documentation/docs/command.html b/documentation/docs/command.html
@@ -211,6 +211,7 @@
   [      <span class="hljs-string">'--no-header'</span>,       <span class="hljs-string">'suppress the "Generated by" header'</span>]
   [<span class="hljs-string">'-o'</span>, <span class="hljs-string">'--output [DIR]'</span>,    <span class="hljs-string">'set the output directory for compiled JavaScript'</span>]
   [<span class="hljs-string">'-p'</span>, <span class="hljs-string">'--print'</span>,           <span class="hljs-string">'print out the compiled JavaScript'</span>]
+  [<span class="hljs-string">'-r'</span>, <span class="hljs-string">'--require [MODULE*]'</span>, <span class="hljs-string">'require the given module before eval or REPL'</span>]
   [<span class="hljs-string">'-s'</span>, <span class="hljs-string">'--stdio'</span>,           <span class="hljs-string">'listen for and compile scripts over stdio'</span>]
   [<span class="hljs-string">'-l'</span>, <span class="hljs-string">'--literate'</span>,        <span class="hljs-string">'treat stdio as literate style coffee-script'</span>]
   [<span class="hljs-string">'-t'</span>, <span class="hljs-string">'--tokens'</span>,          <span class="hljs-string">'print out the tokens that the lexer/rewriter produce'</span>]
@@ -236,8 +237,7 @@
 sourceCode   = []
 notSources   = {}
 watchedDirs  = {}
-optionParser = <span class="hljs-literal">null</span>
-jsToSources  = {}</pre></div></div>
+optionParser = <span class="hljs-literal">null</span></pre></div></div>
             
         </li>
         
@@ -273,6 +273,8 @@
             </div>
             
             <div class="content"><div class='highlight'><pre>  replCliOpts = <span class="hljs-attribute">useGlobal</span>: <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
   <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
@@ -303,7 +305,14 @@
     '''</span>
   <span class="hljs-keyword">for</span> source <span class="hljs-keyword">in</span> opts.arguments
     source = path.resolve source
-    compilePath source, <span class="hljs-literal">yes</span>, source</pre></div></div>
+    compilePath source, <span class="hljs-literal">yes</span>, source
+
+<span class="hljs-function"><span class="hljs-title">makePrelude</span> = <span class="hljs-params">(requires)</span> -&gt;</span>
+  requires.map <span class="hljs-function"><span class="hljs-params">(<span class="hljs-built_in">module</span>)</span> -&gt;</span>
+    [_, name, <span class="hljs-built_in">module</span>] = match <span class="hljs-keyword">if</span> match = <span class="hljs-built_in">module</span>.match(<span class="hljs-regexp">/^(.*)=(.*)$/</span>)
+    name ||= helpers.baseFileName <span class="hljs-built_in">module</span>, <span class="hljs-literal">yes</span>, useWinPathSep
+    <span class="hljs-string">"<span class="hljs-subst">#{name}</span> = require('<span class="hljs-subst">#{<span class="hljs-built_in">module</span>}</span>')"</span>
+  .join <span class="hljs-string">';'</span></pre></div></div>
             
         </li>
         
@@ -395,6 +404,7 @@
       printLine CoffeeScript.nodes(t.input, t.options).toString().trim()
     <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> o.run
       CoffeeScript.register()
+      CoffeeScript.eval opts.prelude, t.options <span class="hljs-keyword">if</span> opts.prelude
       CoffeeScript.run t.input, t.options
     <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> o.join <span class="hljs-keyword">and</span> t.file <span class="hljs-keyword">isnt</span> o.join
       t.input = helpers.invertLiterate t.input <span class="hljs-keyword">if</span> helpers.isLiterate file
@@ -676,12 +686,6 @@
             <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">writeJs</span> = <span class="hljs-params">(base, sourcePath, js, jsPath, generatedSourceMap = <span class="hljs-literal">null</span>)</span> -&gt;</span>
   sourceMapPath = outputPath sourcePath, base, <span class="hljs-string">".js.map"</span>
   jsDir  = path.dirname jsPath
-  <span class="hljs-keyword">if</span> jsPath <span class="hljs-keyword">of</span> jsToSources
-      printLine <span class="hljs-string">"Error: The two following source files have the same output file:"</span>
-      printLine <span class="hljs-string">"    "</span> + jsToSources[jsPath]
-      printLine <span class="hljs-string">"    "</span> + sourcePath
-      process.exit <span class="hljs-number">1</span>
-  jsToSources[jsPath] = sourcePath
   <span class="hljs-function"><span class="hljs-title">compile</span> = -&gt;</span>
     <span class="hljs-keyword">if</span> opts.compile
       js = <span class="hljs-string">' '</span> <span class="hljs-keyword">if</span> js.length &lt;= <span class="hljs-number">0</span>
@@ -832,7 +836,7 @@
   p = spawn process.execPath, nodeArgs.concat(args),
     <span class="hljs-attribute">cwd</span>:        process.cwd()
     <span class="hljs-attribute">env</span>:        process.env
-    <span class="hljs-attribute">customFds</span>:  [<span class="hljs-number">0</span>, <span class="hljs-number">1</span>, <span class="hljs-number">2</span>]
+    <span class="hljs-attribute">stdio</span>:      [<span class="hljs-number">0</span>, <span class="hljs-number">1</span>, <span class="hljs-number">2</span>]
   p.<span class="hljs-literal">on</span> <span class="hljs-string">'exit'</span>, <span class="hljs-function"><span class="hljs-params">(code)</span> -&gt;</span> process.exit code</pre></div></div>
             
         </li>
diff --git a/documentation/docs/helpers.html b/documentation/docs/helpers.html
@@ -583,7 +583,7 @@
             </div>
             
             <div class="content"><div class='highlight'><pre>  <span class="hljs-keyword">if</span> process?
-    colorsEnabled = process.stdout.isTTY <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> process.env.NODE_DISABLE_COLORS
+    colorsEnabled = process.stdout?.isTTY <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> process.env?.NODE_DISABLE_COLORS
 
   <span class="hljs-keyword">if</span> <span class="hljs-property">@colorful</span> ? colorsEnabled
     <span class="hljs-function"><span class="hljs-title">colorize</span> = <span class="hljs-params">(str)</span> -&gt;</span> <span class="hljs-string">"\x1B[1;31m<span class="hljs-subst">#{str}</span>\x1B[0m"</span>
diff --git a/documentation/docs/lexer.html b/documentation/docs/lexer.html
@@ -484,7 +484,7 @@ <h2 id="tokenizers">Tokenizers</h2>
     {tokens, <span class="hljs-attribute">index</span>: end} = <span class="hljs-property">@matchWithInterpolations</span> regex, quote
     $ = tokens.length - <span class="hljs-number">1</span>
 
-    delimiter = quote[<span class="hljs-number">0</span>]
+    delimiter = quote.charAt(<span class="hljs-number">0</span>)
     <span class="hljs-keyword">if</span> heredoc</pre></div></div>
             
         </li>
@@ -1766,7 +1766,7 @@ <h2 id="constants">Constants</h2>
    | \\[^\n]         <span class="hljs-comment"># anything but newlines escaped</span>
    | \[              <span class="hljs-comment"># character class</span>
        (?: \\[^\n] | [^ \] \n \\ ] )*
-     ]
+     \]
   )*) (/)?
 ///</span>
 
diff --git a/documentation/docs/nodes.html b/documentation/docs/nodes.html
@@ -328,7 +328,7 @@ <h3 id="base">Base</h3>
         meth = <span class="hljs-string">'call'</span>
       func = <span class="hljs-keyword">new</span> Value func, [<span class="hljs-keyword">new</span> Access <span class="hljs-keyword">new</span> Literal meth]
     parts = (<span class="hljs-keyword">new</span> Call func, args).compileNode o
-    <span class="hljs-keyword">if</span> func.isGenerator
+    <span class="hljs-keyword">if</span> func.isGenerator <span class="hljs-keyword">or</span> func.base?.isGenerator
       parts.unshift <span class="hljs-property">@makeCode</span> <span class="hljs-string">"(yield* "</span>
       parts.push    <span class="hljs-property">@makeCode</span> <span class="hljs-string">")"</span>
     parts</pre></div></div>
diff --git a/documentation/docs/repl.html b/documentation/docs/repl.html
@@ -243,11 +243,7 @@
         <span class="hljs-keyword">new</span> Assign (<span class="hljs-keyword">new</span> Value <span class="hljs-keyword">new</span> Literal <span class="hljs-string">'_'</span>), ast, <span class="hljs-string">'='</span>
       ]
       js = ast.compile {<span class="hljs-attribute">bare</span>: <span class="hljs-literal">yes</span>, <span class="hljs-attribute">locals</span>: Object.keys(context), referencedVars}
-      result = <span class="hljs-keyword">if</span> context <span class="hljs-keyword">is</span> <span class="hljs-built_in">global</span>
-        vm.runInThisContext js, filename
-      <span class="hljs-keyword">else</span>
-        vm.runInContext js, context, filename
-      cb <span class="hljs-literal">null</span>, result
+      cb <span class="hljs-literal">null</span>, runInContext js, context, filename
     <span class="hljs-keyword">catch</span> err</pre></div></div>
             
         </li>
@@ -266,6 +262,12 @@
             <div class="content"><div class='highlight'><pre>      updateSyntaxError err, input
       cb err
 
+<span class="hljs-function"><span class="hljs-title">runInContext</span> = <span class="hljs-params">(js, context, filename)</span> -&gt;</span>
+  <span class="hljs-keyword">if</span> context <span class="hljs-keyword">is</span> <span class="hljs-built_in">global</span>
+    vm.runInThisContext js, filename
+  <span class="hljs-keyword">else</span>
+    vm.runInContext js, context, filename
+
 <span class="hljs-function"><span class="hljs-title">addMultilineHandler</span> = <span class="hljs-params">(repl)</span> -&gt;</span>
   {rli, inputStream, outputStream} = repl</pre></div></div>
             
@@ -576,6 +578,7 @@
     process.argv = [<span class="hljs-string">'coffee'</span>].concat process.argv[<span class="hljs-number">2.</span>.]
     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
     repl.<span class="hljs-literal">on</span> <span class="hljs-string">'exit'</span>,<span class="hljs-function"> -&gt;</span> repl.outputStream.write <span class="hljs-string">'\n'</span>
     addMultilineHandler repl
     addHistory repl, opts.historyFile, opts.historyMaxInputSize <span class="hljs-keyword">if</span> opts.historyFile</pre></div></div>
diff --git a/documentation/index.html.js b/documentation/index.html.js
@@ -110,7 +110,7 @@
 
     <p>
       <b>Latest Version:</b>
-      <a href="http://github.com/jashkenas/coffeescript/tarball/1.9.1">1.9.1</a>
+      <a href="http://github.com/jashkenas/coffeescript/tarball/1.9.2">1.9.2</a>
     </p>
 
     <pre>npm install -g coffee-script</pre>
@@ -806,7 +806,7 @@ Expressions
       it to the current value of <tt>this</tt>, right on the spot. This is helpful
       when using callback-based libraries like Prototype or jQuery, for creating
       iterator functions to pass to <tt>each</tt>, or event-handler functions
-      to use with <tt>bind</tt>. Functions created with the fat arrow are able to access
+      to use with <tt>on</tt>. Functions created with the fat arrow are able to access
       properties of the <tt>this</tt> where they're defined.
     </p>
     <%= codeFor('fat_arrow') %>
@@ -821,9 +821,9 @@ Expressions
       constructed.
     </p>
     <p>
-      CoffeeScript functions also support 
+      CoffeeScript functions also support
       <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function*">ES6 generator functions</a>
-      through the <tt>yield</tt> keyword. There's no <tt>function*(){}</tt> 
+      through the <tt>yield</tt> keyword. There's no <tt>function*(){}</tt>
       nonsense &mdash; a generator in CoffeeScript is simply a function that yields.
     </p>
     <%= codeFor('generators', 'ps.next().value') %>
@@ -1204,20 +1204,48 @@ Expressions
     </h2>
 
     <p>
+      <%= releaseHeader('2015-04-15', '1.9.2', '1.9.1') %>
+      <ul>
+        <li>
+          Fixed a <b>watch</b> mode error introduced in 1.9.1 when compiling
+          multiple files with the same filename.
+        </li>
+        <li>
+          Bugfix for <tt>yield</tt> around expressions containing
+          <tt>this</tt>.
+        </li>
+        <li>
+          Added a Ruby-style <tt>-r</tt> option to the REPL, which allows
+          requiring a module before execution with <tt>--eval</tt> or
+          <tt>--interactive</tt>.
+        </li>
+        <li>
+          In <tt>&lt;script type="text/coffeescript"&gt;</tt> tags, to avoid
+          possible duplicate browser requests for .coffee files, 
+          you can now use the <tt>data-src</tt> attribute instead of <tt>src</tt>.
+        </li>
+        <li>
+          Minor bug fixes for IE8, strict ES5 regular expressions and Browserify.
+        </li>
+      </ul>
+    </p>
+
+    <p>
       <%= releaseHeader('2015-02-18', '1.9.1', '1.9.0') %>
       <ul>
         <li>
-          Interpolation now works in object literal keys (again). You can use this to 
+          Interpolation now works in object literal keys (again). You can use this to
           dynamically name properties.
         </li>
         <li>
-          Internal compiler names no longer start with underscores. This makes
+          Internal compiler variable names no longer start with underscores. This makes
           the generated JavaScript a bit prettier, and also fixes an issue with
           the completely broken and ungodly way that AngularJS "parses" function
           arguments.
         </li>
         <li>
-          Fixed a few <tt>yield</tt>-related bugs.
+          Fixed a few <tt>yield</tt>-related edge cases with <tt>yield return</tt>
+          and <tt>yield throw</tt>.
         </li>
         <li>
           Minor bug fixes and various improvements to compiler error messages.
@@ -1230,10 +1258,10 @@ Expressions
       <ul>
         <li>
           CoffeeScript now supports ES6 generators. A generator is simply a function
-          that <tt>yield</tt>s. 
+          that <tt>yield</tt>s.
         </li>
         <li>
-          More robust parsing and improved error messages for strings and regexes — 
+          More robust parsing and improved error messages for strings and regexes —
           especially with respect to interpolation.
         </li>
         <li>
diff --git a/documentation/js/aliases.js b/documentation/js/aliases.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.9.1
+// Generated by CoffeeScript 1.9.2
 var volume, winner;
 
 if (ignition === true) {
diff --git a/documentation/js/array_comprehensions.js b/documentation/js/array_comprehensions.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.9.1
+// Generated by CoffeeScript 1.9.2
 var courses, dish, food, foods, i, j, k, l, len, len1, len2, ref;
 
 ref = ['toast', 'cheese', 'wine'];
diff --git a/documentation/js/block_comment.js b/documentation/js/block_comment.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.9.1
+// Generated by CoffeeScript 1.9.2
 
 /*
 SkinnyMochaHalfCaffScript Compiler v1.0
diff --git a/documentation/js/cake_tasks.js b/documentation/js/cake_tasks.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.9.1
+// Generated by CoffeeScript 1.9.2
 var fs;
 
 fs = require('fs');
diff --git a/documentation/js/chaining.js b/documentation/js/chaining.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.9.1
+// Generated by CoffeeScript 1.9.2
 $('body').click(function(e) {
   return $('.box').fadeIn('fast').addClass('.active');
 }).css('background', 'white');
diff --git a/documentation/js/classes.js b/documentation/js/classes.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.9.1
+// Generated by CoffeeScript 1.9.2
 var Animal, Horse, Snake, sam, tom,
   extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
   hasProp = {}.hasOwnProperty;
diff --git a/documentation/js/comparisons.js b/documentation/js/comparisons.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.9.1
+// Generated by CoffeeScript 1.9.2
 var cholesterol, healthy;
 
 cholesterol = 127;
diff --git a/documentation/js/conditionals.js b/documentation/js/conditionals.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.9.1
+// Generated by CoffeeScript 1.9.2
 var date, mood;
 
 if (singing) {
diff --git a/documentation/js/constructor_destructuring.js b/documentation/js/constructor_destructuring.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.9.1
+// Generated by CoffeeScript 1.9.2
 var Person, tim;
 
 Person = (function() {