Documents do (x=1, y=2) -> syntax

Cakefile

@@ -5,12 +5,8 @@ CoffeeScript  = require './lib/coffee-script'
 {spawn, exec} = require 'child_process'
 
 # ANSI Terminal Colors.
-enableColors = no
-unless process.platform is 'win32'
-  enableColors = not process.env.NODE_DISABLE_COLORS
-
 bold = red = green = reset = ''
-if enableColors
+unless process.env.NODE_DISABLE_COLORS
   bold  = '\x1B[0;1m'
   red   = '\x1B[0;31m'
   green = '\x1B[0;32m'
@@ -27,11 +23,6 @@ header = """
    */
 """
 
-sources = [
-  'coffee-script', 'grammar', 'helpers'
-  'lexer', 'nodes', 'rewriter', 'scope'
-].map (filename) -> "src/#{filename}.coffee"
-
 # Run a CoffeeScript through our node/coffee interpreter.
 run = (args, cb) ->
   proc =         spawn 'node', ['bin/coffee'].concat(args)
@@ -141,25 +132,25 @@ task 'doc:underscore', 'rebuild the Underscore.coffee documentation page', ->
 
 task 'bench', 'quick benchmark of compilation time', ->
   {Rewriter} = require './lib/coffee-script/rewriter'
-  co     = sources.map((name) -> fs.readFileSync name).join '\n'
+  sources = ['coffee-script', 'grammar', 'helpers', 'lexer', 'nodes', 'rewriter']
+  coffee  = sources.map((name) -> fs.readFileSync "src/#{name}.coffee").join '\n'
+  litcoffee = fs.readFileSync("src/scope.litcoffee").toString()
   fmt    = (ms) -> " #{bold}#{ "   #{ms}".slice -4 }#{reset} ms"
   total  = 0
   now    = Date.now()
   time   = -> total += ms = -(now - now = Date.now()); fmt ms
-  tokens = CoffeeScript.tokens co, rewrite: false
+  tokens = CoffeeScript.tokens coffee, rewrite: no
+  littokens = CoffeeScript.tokens litcoffee, rewrite: no, literate: yes
+  tokens = tokens.concat(littokens)
   console.log "Lex    #{time()} (#{tokens.length} tokens)"
   tokens = new Rewriter().rewrite tokens
   console.log "Rewrite#{time()} (#{tokens.length} tokens)"
   nodes  = CoffeeScript.nodes tokens
   console.log "Parse  #{time()}"
-  js     = nodes.compile bare: true
+  js     = nodes.compile bare: yes
   console.log "Compile#{time()} (#{js.length} chars)"
   console.log "total  #{ fmt total }"
 
-task 'loc', 'count the lines of source code in the CoffeeScript compiler', ->
-  exec "cat #{ sources.join(' ') } | grep -v '^\\( *#\\|\\s*$\\)' | wc -l | tr -s ' '", (err, stdout) ->
-    console.log stdout.trim()
-
 
 # Run the CoffeeScript test suite.
 runTests = (CoffeeScript) ->

documentation/coffee/namespace.coffee

@@ -0,0 +1,8 @@
+name = 'Outer'
+
+do (name = 'Inner', somethingElse = undefined) ->
+  # alerts 'Inner'
+  alert(name)
+
+# alerts 'Outer'
+alert(name)

documentation/index.html.erb

@@ -446,13 +446,29 @@ Expressions
     <p>
       This behavior is effectively identical to Ruby's scope for local variables.
       Because you don't have direct access to the <tt>var</tt> keyword,
-      it's impossible to shadow an outer variable on purpose, you may only refer
-      to it. So be careful that you're not reusing the name of an external
+      be careful that you're not reusing the name of an external
       variable accidentally, if you're writing a deeply nested function.
     </p>
+    <p>
+      If you need to protect a variable from being reused, CoffeeScript
+      provides the <tt>do</tt> keyword, which immediately invokes a passed function.
+      The function's variables are declared as parameters, and values assigned to
+      the parameters will be bound within the function.
+    </p>
+    <%= code_for('namespace') %>
+    <p>
+      When using a <a href="#loops">loop</a> to generate functions, it's common to insert
+      a closure wrapper in order to ensure that loop variables are closed over,
+      and all the generated functions don't just share the final values. 
+    </p>
+    <p>
+      The <tt>do</tt> keyword helps again. Parameters without values will be
+      passed through.
+    </p>
+    <%= code_for('do') %>
     <p>
       Although suppressed within this documentation for clarity, all
-      CoffeeScript output is wrapped in an anonymous function:
+      CoffeeScript output is wrapped in an immediately invoked function expression:
       <tt>(function(){ ... })();</tt> This safety wrapper, combined with the
       automatic generation of the <tt>var</tt> keyword, make it exceedingly difficult
       to pollute the global namespace by accident.
@@ -547,14 +563,6 @@ Expressions
       For readability, the <b>until</b> keyword is equivalent to <tt>while not</tt>,
       and the <b>loop</b> keyword is equivalent to <tt>while true</tt>.
     </p>
-    <p>
-      When using a JavaScript loop to generate functions, it's common to insert
-      a closure wrapper in order to ensure that loop variables are closed over,
-      and all the generated functions don't just share the final values. CoffeeScript
-      provides the <tt>do</tt> keyword, which immediately invokes a passed function,
-      forwarding any arguments.
-    </p>
-    <%= code_for('do') %>
 
     <p>
       <span id="slices" class="bookmark"></span>
@@ -970,7 +978,7 @@ Expressions
         is a reimagination of the excellent book
         <a href="http://eloquentjavascript.net/">Eloquent JavaScript</a>, as if
         it had been written in CoffeeScript instead. Covers language features
-        as well a the functional and object oriented programming styles. By
+        as well as the functional and object oriented programming styles. By
         <a href="https://github.com/autotelicum">E. Hoigaard</a>.
       </li>
       <li>
@@ -980,6 +988,12 @@ Expressions
         a fast-paced multiplayer word game, writing both the client-side and Node.js
         portions in CoffeeScript.
       </li>
+      <li>
+        <a href="http://ristrettolo.gy">CoffeeScript Ristretto</a>
+        is a deep dive into CoffeeScript's semantics from simple functions up through
+        closures, higher-order functions, objects, classes, combinators, and decorators.
+        By <a href="http://braythwayt.com/">Reg Braithwaite</a>.
+      </li>
     </ul>
 
     <h2>

lib/coffee-script/browser.js

@@ -1,4 +1,3 @@
-// Generated by CoffeeScript 1.5.0-pre
 (function() {
   var CoffeeScript, runScripts;
 
@@ -90,3 +89,5 @@
   }
 
 }).call(this);
+
+// Generated by CoffeeScript 1.5.0-pre

lib/coffee-script/cake.js

@@ -1,4 +1,3 @@
-// Generated by CoffeeScript 1.5.0-pre
 (function() {
   var CoffeeScript, cakefileDirectory, existsSync, fatalError, fs, helpers, missingTask, oparse, options, optparse, path, printTasks, switches, tasks;
 
@@ -111,3 +110,5 @@
   };
 
 }).call(this);
+
+// Generated by CoffeeScript 1.5.0-pre

lib/coffee-script/coffee-script.js

@@ -1,4 +1,3 @@
-// Generated by CoffeeScript 1.5.0-pre
 (function() {
   var Lexer, compile, ext, extensions, fs, lexer, loadFile, parser, path, vm, _i, _len,
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
@@ -37,7 +36,7 @@
   exports.helpers = require('./helpers');
 
   exports.compile = compile = function(code, options) {
-    var header, js, merge;
+    var footer, js, merge;
     if (options == null) {
       options = {};
     }
@@ -53,8 +52,8 @@
       }
       throw err;
     }
-    header = "Generated by CoffeeScript " + this.VERSION;
-    return "// " + header + "\n" + js;
+    footer = "Generated by CoffeeScript " + this.VERSION;
+    return "" + js + "\n// " + footer + "\n";
   };
 
   exports.tokens = function(code, options) {
@@ -168,3 +167,5 @@
   parser.yy = require('./nodes');
 
 }).call(this);
+
+// Generated by CoffeeScript 1.5.0-pre

lib/coffee-script/command.js

@@ -1,6 +1,5 @@
-// Generated by CoffeeScript 1.5.0-pre
 (function() {
-  var BANNER, CoffeeScript, EventEmitter, SWITCHES, coffee_exts, compileJoin, compileOptions, compilePath, compileScript, compileStdio, exec, exists, forkNode, fs, helpers, hidden, joinTimeout, lint, loadRequires, notSources, optionParser, optparse, opts, outputPath, parseOptions, path, printLine, printTokens, printWarn, removeSource, sourceCode, sources, spawn, timeLog, unwatchDir, usage, version, wait, watch, watchDir, watchers, writeJs, _ref,
+  var BANNER, CoffeeScript, EventEmitter, SWITCHES, coffee_exts, compileJoin, compileOptions, compilePath, compileScript, compileStdio, exec, exists, forkNode, fs, helpers, hidden, joinTimeout, lint, notSources, optionParser, optparse, opts, outputPath, parseOptions, path, printLine, printTokens, printWarn, removeSource, sourceCode, sources, spawn, timeLog, unwatchDir, usage, version, wait, watch, watchDir, watchers, writeJs, _ref,
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   fs = require('fs');
@@ -35,7 +34,7 @@
 
   BANNER = 'Usage: coffee [options] path/to/script.coffee -- [args]\n\nIf called without options, `coffee` will run your script.';
 
-  SWITCHES = [['-b', '--bare', 'compile without a top-level function wrapper'], ['-c', '--compile', 'compile to JavaScript and save as .js files'], ['-e', '--eval', 'pass a string from the command line as input'], ['-h', '--help', 'display this help message'], ['-i', '--interactive', 'run an interactive CoffeeScript REPL'], ['-j', '--join [FILE]', 'concatenate the source CoffeeScript before compiling'], ['-l', '--lint', 'pipe the compiled JavaScript through JavaScript Lint'], ['-n', '--nodes', 'print out the parse tree that the parser produces'], ['--nodejs [ARGS]', 'pass options directly to the "node" binary'], ['-o', '--output [DIR]', 'set the output directory for compiled JavaScript'], ['-p', '--print', 'print out the compiled JavaScript'], ['-r', '--require [FILE*]', 'require a library before executing your script'], ['-s', '--stdio', 'listen for and compile scripts over stdio'], ['-t', '--tokens', 'print out the tokens that the lexer/rewriter produce'], ['-v', '--version', 'display the version number'], ['-w', '--watch', 'watch scripts for changes and rerun commands']];
+  SWITCHES = [['-b', '--bare', 'compile without a top-level function wrapper'], ['-c', '--compile', 'compile to JavaScript and save as .js files'], ['-e', '--eval', 'pass a string from the command line as input'], ['-h', '--help', 'display this help message'], ['-i', '--interactive', 'run an interactive CoffeeScript REPL'], ['-j', '--join [FILE]', 'concatenate the source CoffeeScript before compiling'], ['-l', '--lint', 'pipe the compiled JavaScript through JavaScript Lint'], ['-n', '--nodes', 'print out the parse tree that the parser produces'], ['--nodejs [ARGS]', 'pass options directly to the "node" binary'], ['-o', '--output [DIR]', 'set the output directory for compiled JavaScript'], ['-p', '--print', 'print out the compiled JavaScript'], ['-s', '--stdio', 'listen for and compile scripts over stdio'], ['-t', '--tokens', 'print out the tokens that the lexer/rewriter produce'], ['-v', '--version', 'display the version number'], ['-w', '--watch', 'watch scripts for changes and rerun commands']];
 
   opts = {};
 
@@ -63,9 +62,6 @@
     if (opts.version) {
       return version();
     }
-    if (opts.require) {
-      loadRequires();
-    }
     if (opts.interactive) {
       return require('./repl').start();
     }
@@ -84,7 +80,6 @@
     literals = opts.run ? sources.splice(1) : [];
     process.argv = process.argv.slice(0, 2).concat(literals);
     process.argv[0] = 'coffee';
-    process.execPath = require.main.filename;
     _results = [];
     for (_i = 0, _len = sources.length; _i < _len; _i++) {
       source = sources[_i];
@@ -100,7 +95,7 @@
         throw err;
       }
       if ((err != null ? err.code : void 0) === 'ENOENT') {
-        if (topLevel && (_ref1 = path.extname(source), __indexOf.call(coffee_exts, _ref1) < 0)) {
+        if (topLevel && source && (_ref1 = path.extname(source), __indexOf.call(coffee_exts, _ref1) < 0)) {
           source = sources[sources.indexOf(source)] = "" + source + ".coffee";
           return compilePath(source, topLevel, base);
         }
@@ -236,18 +231,6 @@
     }
   };
 
-  loadRequires = function() {
-    var realFilename, req, _i, _len, _ref1;
-    realFilename = module.filename;
-    module.filename = '.';
-    _ref1 = opts.require;
-    for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-      req = _ref1[_i];
-      require(req);
-    }
-    return module.filename = realFilename;
-  };
-
   watch = function(source, base) {
     var compile, compileTimeout, prevStats, rewatch, watchErr, watcher;
     prevStats = null;
@@ -507,3 +490,5 @@
   };
 
 }).call(this);
+
+// Generated by CoffeeScript 1.5.0-pre