#3942 -- revising changelog

1.9.2

CONTRIBUTING.md

@@ -1,9 +1,9 @@
 ## How to contribute to CoffeeScript
 
-* Before you open a ticket or send a pull request, [search](https://github.com/jashkenas/coffee-script/issues) for previous discussions about the same feature or issue. Add to the earlier ticket if you find one.
+* Before you open a ticket or send a pull request, [search](https://github.com/jashkenas/coffeescript/issues) for previous discussions about the same feature or issue. Add to the earlier ticket if you find one.
 
-* Before sending a pull request for a feature, be sure to have [tests](https://github.com/jashkenas/coffee-script/tree/master/test).
+* Before sending a pull request for a feature, be sure to have [tests](https://github.com/jashkenas/coffeescript/tree/master/test).
 
-* Use the same coding style as the rest of the [codebase](https://github.com/jashkenas/coffee-script/tree/master/src). If you're just getting started with CoffeeScript, there's a nice [style guide](https://github.com/polarmobile/coffeescript-style-guide).
+* Use the same coding style as the rest of the [codebase](https://github.com/jashkenas/coffeescript/tree/master/src). If you're just getting started with CoffeeScript, there's a nice [style guide](https://github.com/polarmobile/coffeescript-style-guide).
 
 * In your pull request, do not add documentation to `index.html` or re-build the minified `coffee-script.js` file. We'll do those things before cutting a new release.

Cakefile

@@ -65,6 +65,33 @@ codeFor = ->
     button = if executable then "<div class='minibutton ok' onclick='javascript: #{js};#{append}'>#{run}</div>" else ''
     "<div class='code'>#{cshtml}#{jshtml}#{script}#{load}#{button}<br class='clear' /></div>"
 
+monthNames = [
+  'January'
+  'February'
+  'March'
+  'April'
+  'May'
+  'June'
+  'July'
+  'August'
+  'September'
+  'October'
+  'November'
+  'December'
+]
+
+formatDate = (date) ->
+  date.replace /^(\d\d\d\d)-(\d\d)-(\d\d)$/, (match, $1, $2, $3) ->
+    "#{monthNames[$2 - 1]} #{+$3}, #{$1}"
+
+releaseHeader = (date, version, prevVersion) -> """
+  <div class="anchor" id="#{version}"></div>
+  <b class="header">
+    #{prevVersion and "<a href=\"https://github.com/jashkenas/coffeescript/compare/#{prevVersion}...#{version}\">#{version}</a>" or version}
+    <span class="timestamp"> &mdash; <time datetime="#{date}">#{formatDate date}</time></span>
+  </b>
+"""
+
 option '-p', '--prefix [DIR]', 'set the installation prefix for `cake install`'
 
 task 'install', 'install CoffeeScript into /usr/local (or --prefix)', (options) ->
@@ -77,7 +104,7 @@ task 'install', 'install CoffeeScript into /usr/local (or --prefix)', (options)
   console.log   "Linking 'coffee' to #{bin}/coffee"
   exec([
     "mkdir -p #{lib} #{bin}"
-    "cp -rf bin lib LICENSE README package.json src #{lib}"
+    "cp -rf bin lib LICENSE README.md package.json src #{lib}"
     "ln -sfn #{lib}/bin/coffee #{bin}/coffee"
     "ln -sfn #{lib}/bin/cake #{bin}/cake"
     "mkdir -p ~/.node_libraries"
@@ -146,21 +173,23 @@ task 'doc:site', 'watch and continually rebuild the documentation for the websit
 
   do renderIndex = ->
     codeSnippetCounter = 0
-    rendered = _.template fs.readFileSync(source, 'utf-8'), codeFor: codeFor()
+    rendered = _.template fs.readFileSync(source, 'utf-8'),
+      codeFor: codeFor()
+      releaseHeader: releaseHeader
     fs.writeFileSync 'index.html', rendered
     log "compiled", green, "#{source}"
 
-  fs.watchFile source, internal: 200, renderIndex
+  fs.watchFile source, interval: 200, renderIndex
   log "watching..." , green
 
 
 task 'doc:source', 'rebuild the internal documentation', ->
-  exec 'docco src/*.*coffee && cp -rf docs documentation && rm -r docs', (err) ->
+  exec 'node_modules/.bin/docco src/*.*coffee && cp -rf docs documentation && rm -r docs', (err) ->
     throw err if err
 
 
 task 'doc:underscore', 'rebuild the Underscore.coffee documentation page', ->
-  exec 'docco examples/underscore.coffee && cp -rf docs documentation && rm -r docs', (err) ->
+  exec 'node_modules/.bin/docco examples/underscore.coffee && cp -rf docs documentation && rm -r docs', (err) ->
     throw err if err
 
 task 'bench', 'quick benchmark of compilation time', ->
@@ -247,6 +276,12 @@ runTests = (CoffeeScript) ->
 
   # Run every test in the `test` folder, recording failures.
   files = fs.readdirSync 'test'
+
+  # Ignore generators test file if generators are not available
+  generatorsAreAvailable = '--harmony' in process.execArgv or
+    '--harmony-generators' in process.execArgv
+  files.splice files.indexOf('generators.coffee'), 1 if not generatorsAreAvailable
+
   for file in files when helpers.isCoffee file
     literate = helpers.isLiterate file
     currentFile = filename = path.join 'test', file

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2014 Jeremy Ashkenas
+Copyright (c) 2009-2015 Jeremy Ashkenas
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

README.md

@@ -18,33 +18,45 @@
      `-.._________..-'                                  | |
                                                         |_|
 
+CoffeeScript is a little language that compiles into JavaScript.
 
-  CoffeeScript is a little language that compiles into JavaScript.
+## Installation
 
-  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.)
+If you have the node package manager, npm, installed:
 
-  Or, if you don't wish to use npm:
-  sudo bin/cake install
+```shell
+npm install -g coffee-script
+```
 
-  Execute a script:
-  coffee /path/to/script.coffee
+Leave off the `-g` if you don't wish to install globally. If you don't wish to use npm:
 
-  Compile a script:
-  coffee -c /path/to/script.coffee
+```shell
+git clone https://github.com/jashkenas/coffeescript.git
+sudo coffeescript/bin/cake install
+```
 
-  For documentation, usage, and examples, see:
-  http://coffeescript.org/
+## Getting Started
 
-  To suggest a feature, report a bug, or general discussion:
-  http://github.com/jashkenas/coffee-script/issues/
+Execute a script:
 
-  If you'd like to chat, drop by #coffeescript on Freenode IRC,
-  or on webchat.freenode.net.
+```shell
+coffee /path/to/script.coffee
+```
 
-  The source repository:
-  git://github.com/jashkenas/coffee-script.git
+Compile a script:
 
-  Top 100 contributors are listed here:
-  http://github.com/jashkenas/coffee-script/contributors
+```shell
+coffee -c /path/to/script.coffee
+```
+
+For documentation, usage, and examples, see: http://coffeescript.org/
+
+To suggest a feature or report a bug: http://github.com/jashkenas/coffeescript/issues
+
+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

bower.json

@@ -0,0 +1,27 @@
+{
+  "name": "coffee-script",
+  "version": "1.9.2",
+  "main": [
+    "lib/coffee-script/coffee-script.js"
+  ],
+  "description": "Unfancy JavaScript",
+  "keywords": [
+    "javascript",
+    "language",
+    "coffeescript",
+    "compiler"
+  ],
+  "devDependencies": {
+    "uglify-js": "~2.2",
+    "jison": ">=0.2.0",
+    "highlight.js": "~8.0.0",
+    "underscore": "~1.5.2",
+    "docco": "~0.6.2"
+  },
+  "author": {
+    "name": "Jeremy Ashkenas"
+  },
+  "ignore": [
+    "test"
+  ]
+}

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

documentation/coffee/generators.coffee

@@ -0,0 +1,8 @@
+perfectSquares = ->
+  num = 0
+  loop
+    num += 1
+    yield num * num
+  return
+
+window.ps or= perfectSquares()

documentation/css/docs.css

@@ -81,14 +81,15 @@ code, pre, tt, textarea {
       padding-left: 0;
     }
 .timestamp {
-  font-size: 12px;
+  font-size: 11px;
   font-weight: normal;
-  color: black;
+  text-transform: uppercase;
+}
+div.anchor {
+  position: relative;
+  top: -90px;
+  margin: 0 0 -20px;
 }
-  .timestamp small {
-    font-size: 11px;
-    text-transform: uppercase;
-  }
 div.code {
   position: relative;
   background: #fff;
@@ -154,22 +155,6 @@ div.code {
     #logo img {
       margin: 5px 0 0 3px;
     }
-  #error {
-    position: absolute;
-    -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px;
-    -webkit-border-top-left-radius: 0; -moz-border-radius-topleft: 0; border-top-left-radius: 0;
-    -webkit-border-bottom-left-radius: 0; -moz-border-radius-bottomleft: 0; border-bottom-left-radius: 0;
-    right: 0px; top: 0px; left: 726px; bottom: 0;
-    padding: 0 0 0 15px;
-    background: #fdcdcc;
-    background: -webkit-gradient(linear, left top, left bottom, from(#ffedec), to(#ff9a95));
-    background: -moz-linear-gradient(top, #f8f8f8, #dadada);
-    color: #862322;
-    font-size: 10px;
-    line-height: 50px;
-    overflow: hidden;
-    text-transform: uppercase;
-  }
   .navigation {
     height: 50px;
     font-size: 11px;
@@ -321,6 +306,9 @@ div.code {
     margin-bottom: 0;
     top: 10px; left: 10px; right: 10px; bottom: 15px;
   }
+    #repl_results.error {
+      color: red
+    }
     #repl_source_wrap {
       margin-left: 5px;
       width: 47%; right: 50%;
@@ -383,3 +371,9 @@ div.code {
     background-image: url(../images/button_bg_dark.gif);
     text-shadow: none;
   }
+  .minibutton.error {
+     opacity: 0.5;
+     color: #600;
+     cursor: not-allowed;
+  }
+

documentation/docs/browser.html

@@ -16,78 +16,85 @@
           <a class="large" href="javascript:void(0);">Jump To &hellip;</a>
           <a class="small" href="javascript:void(0);">+</a>
           <div id="jump_wrapper">
-          <div id="jump_page">
-            
+          <div id="jump_page_wrapper">
+            <div id="jump_page">
               
-              <a class="source" href="browser.html">
-                browser.coffee
-              </a>
-            
+                
+                <a class="source" href="browser.html">
+                  browser.coffee
+                </a>
               
-              <a class="source" href="cake.html">
-                cake.coffee
-              </a>
-            
+                
+                <a class="source" href="cake.html">
+                  cake.coffee
+                </a>
               
-              <a class="source" href="coffee-script.html">
-                coffee-script.coffee
-              </a>
-            
+                
+                <a class="source" href="coffee-script.html">
+                  coffee-script.coffee
+                </a>
               
-              <a class="source" href="command.html">
-                command.coffee
-              </a>
-            
+                
+                <a class="source" href="command.html">
+                  command.coffee
+                </a>
               
-              <a class="source" href="grammar.html">
-                grammar.coffee
-              </a>
-            
+                
+                <a class="source" href="grammar.html">
+                  grammar.coffee
+                </a>
               
-              <a class="source" href="helpers.html">
-                helpers.coffee
-              </a>
-            
+                
+                <a class="source" href="helpers.html">
+                  helpers.coffee
+                </a>
               
-              <a class="source" href="index.html">
-                index.coffee
-              </a>
-            
+                
+                <a class="source" href="index.html">
+                  index.coffee
+                </a>
               
-              <a class="source" href="lexer.html">
-                lexer.coffee
-              </a>
-            
+                
+                <a class="source" href="lexer.html">
+                  lexer.coffee
+                </a>
               
-              <a class="source" href="nodes.html">
-                nodes.coffee
-              </a>
-            
+                
+                <a class="source" href="nodes.html">
+                  nodes.coffee
+                </a>
               
-              <a class="source" href="optparse.html">
-                optparse.coffee
-              </a>
-            
+                
+                <a class="source" href="optparse.html">
+                  optparse.coffee
+                </a>
               
-              <a class="source" href="repl.html">
-                repl.coffee
-              </a>
-            
+                
+                <a class="source" href="register.html">
+                  register.coffee
+                </a>
               
-              <a class="source" href="rewriter.html">
-                rewriter.coffee
-              </a>
-            
+                
+                <a class="source" href="repl.html">
+                  repl.coffee
+                </a>
               
-              <a class="source" href="scope.html">
-                scope.litcoffee
-              </a>
-            
+                
+                <a class="source" href="rewriter.html">
+                  rewriter.coffee
+                </a>
               
-              <a class="source" href="sourcemap.html">
-                sourcemap.litcoffee
-              </a>
-            
+                
+                <a class="source" href="scope.html">
+                  scope.litcoffee
+                </a>
+              
+                
+                <a class="source" href="sourcemap.html">
+                  sourcemap.litcoffee
+                </a>
+              
+            </div>
           </div>
         </li>
       </ul>
@@ -111,14 +118,13 @@
               <p>This <strong>Browser</strong> compatibility layer extends core CoffeeScript functions
 to make things work smoothly when compiling code directly in the browser.
 We add support for loading remote Coffee scripts via <strong>XHR</strong>, and
-<code>text/coffeescript</code> script tags, source maps via data-URLs, and so on.
-</p>
+<code>text/coffeescript</code> script tags, source maps via data-URLs, and so on.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>
-CoffeeScript = require <span class="string">'./coffee-script'</span>
-CoffeeScript.require = require
+CoffeeScript = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffee-script'</span>
+CoffeeScript.<span class="hljs-built_in">require</span> = <span class="hljs-built_in">require</span>
 compile = CoffeeScript.compile</pre></div></div>
             
         </li>
@@ -130,13 +136,12 @@ compile = CoffeeScript.compile</pre></div></div>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-2">&#182;</a>
               </div>
-              <p>Use standard JavaScript <code>eval</code> to eval code.
-</p>
+              <p>Use standard JavaScript <code>eval</code> to eval code.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>CoffeeScript.<span class="function"><span class="title">eval</span></span> = (code, options = {}) -&gt;
-  options.bare ?= <span class="literal">on</span>
+            <div class="content"><div class='highlight'><pre>CoffeeScript.<span class="hljs-function"><span class="hljs-title">eval</span> = <span class="hljs-params">(code, options = {})</span> -&gt;</span>
+  options.bare ?= <span class="hljs-literal">on</span>
   eval compile code, options</pre></div></div>
             
         </li>
@@ -148,14 +153,13 @@ compile = CoffeeScript.compile</pre></div></div>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-3">&#182;</a>
               </div>
-              <p>Running code does not provide access to this scope.
-</p>
+              <p>Running code does not provide access to this scope.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>CoffeeScript.<span class="function"><span class="title">run</span></span> = (code, options = {}) -&gt;
-  options.bare = <span class="literal">on</span>
-  options.shiftLine = <span class="literal">on</span>
+            <div class="content"><div class='highlight'><pre>CoffeeScript.<span class="hljs-function"><span class="hljs-title">run</span> = <span class="hljs-params">(code, options = {})</span> -&gt;</span>
+  options.bare = <span class="hljs-literal">on</span>
+  options.shiftLine = <span class="hljs-literal">on</span>
   Function(compile code, options)()</pre></div></div>
             
         </li>
@@ -167,12 +171,11 @@ compile = CoffeeScript.compile</pre></div></div>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
-              <p>If we&#39;re not in a browser environment, we&#39;re finished with the public API.
-</p>
+              <p>If we’re not in a browser environment, we’re finished with the public API.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="keyword">return</span> <span class="keyword">unless</span> window?</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">return</span> <span class="hljs-keyword">unless</span> <span class="hljs-built_in">window</span>?</pre></div></div>
             
         </li>
         
@@ -183,19 +186,18 @@ compile = CoffeeScript.compile</pre></div></div>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-5">&#182;</a>
               </div>
-              <p>Include source maps where possible. If we&#39;ve got a base64 encoder, a
-JSON serializer, and tools for escaping unicode characters, we&#39;re good to go.
-Ported from <a href="https://developer.mozilla.org/en-US/docs/DOM/window.btoa">https://developer.mozilla.org/en-US/docs/DOM/window.btoa</a>
-</p>
+              <p>Include source maps where possible. If we’ve got a base64 encoder, a
+JSON serializer, and tools for escaping unicode characters, we’re good to go.
+Ported from <a href="https://developer.mozilla.org/en-US/docs/DOM/window.btoa">https://developer.mozilla.org/en-US/docs/DOM/window.btoa</a></p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="keyword">if</span> btoa? <span class="keyword">and</span> JSON? <span class="keyword">and</span> unescape? <span class="keyword">and</span> encodeURIComponent?
-  <span class="function"><span class="title">compile</span></span> = (code, options = {}) -&gt;
-    options.sourceMap = <span class="literal">true</span>
-    options.inline = <span class="literal">true</span>
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">if</span> btoa? <span class="hljs-keyword">and</span> JSON? <span class="hljs-keyword">and</span> unescape? <span class="hljs-keyword">and</span> encodeURIComponent?
+  <span class="hljs-function"><span class="hljs-title">compile</span> = <span class="hljs-params">(code, options = {})</span> -&gt;</span>
+    options.sourceMap = <span class="hljs-literal">true</span>
+    options.inline = <span class="hljs-literal">true</span>
     {js, v3SourceMap} = CoffeeScript.compile code, options
-    <span class="string">"<span class="subst">#{js}</span>\n//@ sourceMappingURL=data:application/json;base64,<span class="subst">#{btoa unescape encodeURIComponent v3SourceMap}</span>\n//@ sourceURL=coffeescript"</span></pre></div></div>
+    <span class="hljs-string">"<span class="hljs-subst">#{js}</span>\n//# sourceMappingURL=data:application/json;base64,<span class="hljs-subst">#{btoa unescape encodeURIComponent v3SourceMap}</span>\n//# sourceURL=coffeescript"</span></pre></div></div>
             
         </li>
         
@@ -206,27 +208,27 @@ Ported from <a href="https://developer.mozilla.org/en-US/docs/DOM/window.btoa">h
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-6">&#182;</a>
               </div>
-              <p>Load a remote script from the current domain via XHR.
-</p>
+              <p>Load a remote script from the current domain via XHR.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>CoffeeScript.<span class="function"><span class="title">load</span></span> = (url, callback, options = {}) -&gt;
+            <div class="content"><div class='highlight'><pre>CoffeeScript.<span class="hljs-function"><span class="hljs-title">load</span> = <span class="hljs-params">(url, callback, options = {}, hold = <span class="hljs-literal">false</span>)</span> -&gt;</span>
   options.sourceFiles = [url]
-  xhr = <span class="keyword">if</span> window.ActiveXObject
-    <span class="keyword">new</span> window.ActiveXObject(<span class="string">'Microsoft.XMLHTTP'</span>)
-  <span class="keyword">else</span>
-    <span class="keyword">new</span> window.XMLHttpRequest()
-  xhr.open <span class="string">'GET'</span>, url, <span class="literal">true</span>
-  xhr.overrideMimeType <span class="string">'text/plain'</span> <span class="keyword">if</span> <span class="string">'overrideMimeType'</span> <span class="keyword">of</span> xhr
-  xhr.<span class="function"><span class="title">onreadystatechange</span></span> = -&gt;
-    <span class="keyword">if</span> xhr.readyState <span class="keyword">is</span> <span class="number">4</span>
-      <span class="keyword">if</span> xhr.status <span class="keyword">in</span> [<span class="number">0</span>, <span class="number">200</span>]
-        CoffeeScript.run xhr.responseText, options
-      <span class="keyword">else</span>
-        <span class="keyword">throw</span> <span class="keyword">new</span> Error <span class="string">"Could not load <span class="subst">#{url}</span>"</span>
-      callback() <span class="keyword">if</span> callback
-  xhr.send <span class="literal">null</span></pre></div></div>
+  xhr = <span class="hljs-keyword">if</span> <span class="hljs-built_in">window</span>.ActiveXObject
+    <span class="hljs-keyword">new</span> <span class="hljs-built_in">window</span>.ActiveXObject(<span class="hljs-string">'Microsoft.XMLHTTP'</span>)
+  <span class="hljs-keyword">else</span>
+    <span class="hljs-keyword">new</span> <span class="hljs-built_in">window</span>.XMLHttpRequest()
+  xhr.open <span class="hljs-string">'GET'</span>, url, <span class="hljs-literal">true</span>
+  xhr.overrideMimeType <span class="hljs-string">'text/plain'</span> <span class="hljs-keyword">if</span> <span class="hljs-string">'overrideMimeType'</span> <span class="hljs-keyword">of</span> xhr
+  xhr.<span class="hljs-function"><span class="hljs-title">onreadystatechange</span> = -&gt;</span>
+    <span class="hljs-keyword">if</span> xhr.readyState <span class="hljs-keyword">is</span> <span class="hljs-number">4</span>
+      <span class="hljs-keyword">if</span> xhr.status <span class="hljs-keyword">in</span> [<span class="hljs-number">0</span>, <span class="hljs-number">200</span>]
+        param = [xhr.responseText, options]
+        CoffeeScript.run param... <span class="hljs-keyword">unless</span> hold
+      <span class="hljs-keyword">else</span>
+        <span class="hljs-keyword">throw</span> <span class="hljs-keyword">new</span> Error <span class="hljs-string">"Could not load <span class="hljs-subst">#{url}</span>"</span>
+      callback param <span class="hljs-keyword">if</span> callback
+  xhr.send <span class="hljs-literal">null</span></pre></div></div>
             
         </li>
         
@@ -239,29 +241,39 @@ Ported from <a href="https://developer.mozilla.org/en-US/docs/DOM/window.btoa">h
               </div>
               <p>Activate CoffeeScript in the browser by having it compile and evaluate
 all script tags with a content-type of <code>text/coffeescript</code>.
-This happens on page load.
-</p>
+This happens on page load.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="function"><span class="title">runScripts</span></span> = -&gt;
-  scripts = window.document.getElementsByTagName <span class="string">'script'</span>
-  coffeetypes = [<span class="string">'text/coffeescript'</span>, <span class="string">'text/literate-coffeescript'</span>]
-  coffees = (s <span class="keyword">for</span> s <span class="keyword">in</span> scripts <span class="keyword">when</span> s.type <span class="keyword">in</span> coffeetypes)
-  index = <span class="number">0</span>
-  length = coffees.length
-  <span class="keyword">do</span> <span class="function"><span class="title">execute</span></span> = -&gt;
-    script = coffees[index++]
-    mediatype = script?.type
-    <span class="keyword">if</span> mediatype <span class="keyword">in</span> coffeetypes
-      options = {literate: mediatype <span class="keyword">is</span> <span class="string">'text/literate-coffeescript'</span>}
-      <span class="keyword">if</span> script.src
-        CoffeeScript.load script.src, execute, options
-      <span class="keyword">else</span>
-        options.sourceFiles = [<span class="string">'embedded'</span>]
-        CoffeeScript.run script.innerHTML, options
-        execute()
-  <span class="literal">null</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">runScripts</span> = -&gt;</span>
+  scripts = <span class="hljs-built_in">window</span>.<span class="hljs-built_in">document</span>.getElementsByTagName <span class="hljs-string">'script'</span>
+  coffeetypes = [<span class="hljs-string">'text/coffeescript'</span>, <span class="hljs-string">'text/literate-coffeescript'</span>]
+  coffees = (s <span class="hljs-keyword">for</span> s <span class="hljs-keyword">in</span> scripts <span class="hljs-keyword">when</span> s.type <span class="hljs-keyword">in</span> coffeetypes)
+  index = <span class="hljs-number">0</span>
+
+  <span class="hljs-function"><span class="hljs-title">execute</span> = -&gt;</span>
+    param = coffees[index]
+    <span class="hljs-keyword">if</span> param <span class="hljs-keyword">instanceof</span> Array
+      CoffeeScript.run param...
+      index++
+      execute()
+
+  <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>]
+      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()
+          options
+          <span class="hljs-literal">true</span>
+      <span class="hljs-keyword">else</span>
+        options.sourceFiles = [<span class="hljs-string">'embedded'</span>]
+        coffees[i] = [script.innerHTML, options]
+
+  execute()</pre></div></div>
             
         </li>
         
@@ -272,15 +284,14 @@ This happens on page load.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-8">&#182;</a>
               </div>
-              <p>Listen for window load, both in decent browsers and in IE.
-</p>
+              <p>Listen for window load, both in decent browsers and in IE.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="keyword">if</span> window.addEventListener
-  window.addEventListener <span class="string">'DOMContentLoaded'</span>, runScripts, <span class="literal">no</span>
-<span class="keyword">else</span>
-  window.attachEvent <span class="string">'onload'</span>, runScripts</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">if</span> <span class="hljs-built_in">window</span>.addEventListener
+  <span class="hljs-built_in">window</span>.addEventListener <span class="hljs-string">'DOMContentLoaded'</span>, runScripts, <span class="hljs-literal">no</span>
+<span class="hljs-keyword">else</span>
+  <span class="hljs-built_in">window</span>.attachEvent <span class="hljs-string">'onload'</span>, runScripts</pre></div></div>
             
         </li>
         

documentation/docs/cake.html

@@ -16,78 +16,85 @@
           <a class="large" href="javascript:void(0);">Jump To &hellip;</a>
           <a class="small" href="javascript:void(0);">+</a>
           <div id="jump_wrapper">
-          <div id="jump_page">
-            
+          <div id="jump_page_wrapper">
+            <div id="jump_page">
               
-              <a class="source" href="browser.html">
-                browser.coffee
-              </a>
-            
+                
+                <a class="source" href="browser.html">
+                  browser.coffee
+                </a>
               
-              <a class="source" href="cake.html">
-                cake.coffee
-              </a>
-            
+                
+                <a class="source" href="cake.html">
+                  cake.coffee
+                </a>
               
-              <a class="source" href="coffee-script.html">
-                coffee-script.coffee
-              </a>
-            
+                
+                <a class="source" href="coffee-script.html">
+                  coffee-script.coffee
+                </a>
               
-              <a class="source" href="command.html">
-                command.coffee
-              </a>
-            
+                
+                <a class="source" href="command.html">
+                  command.coffee
+                </a>
               
-              <a class="source" href="grammar.html">
-                grammar.coffee
-              </a>
-            
+                
+                <a class="source" href="grammar.html">
+                  grammar.coffee
+                </a>
               
-              <a class="source" href="helpers.html">
-                helpers.coffee
-              </a>
-            
+                
+                <a class="source" href="helpers.html">
+                  helpers.coffee
+                </a>
               
-              <a class="source" href="index.html">
-                index.coffee
-              </a>
-            
+                
+                <a class="source" href="index.html">
+                  index.coffee
+                </a>
               
-              <a class="source" href="lexer.html">
-                lexer.coffee
-              </a>
-            
+                
+                <a class="source" href="lexer.html">
+                  lexer.coffee
+                </a>
               
-              <a class="source" href="nodes.html">
-                nodes.coffee
-              </a>
-            
+                
+                <a class="source" href="nodes.html">
+                  nodes.coffee
+                </a>
               
-              <a class="source" href="optparse.html">
-                optparse.coffee
-              </a>
-            
+                
+                <a class="source" href="optparse.html">
+                  optparse.coffee
+                </a>
               
-              <a class="source" href="repl.html">
-                repl.coffee
-              </a>
-            
+                
+                <a class="source" href="register.html">
+                  register.coffee
+                </a>
               
-              <a class="source" href="rewriter.html">
-                rewriter.coffee
-              </a>
-            
+                
+                <a class="source" href="repl.html">
+                  repl.coffee
+                </a>
               
-              <a class="source" href="scope.html">
-                scope.litcoffee
-              </a>
-            
+                
+                <a class="source" href="rewriter.html">
+                  rewriter.coffee
+                </a>
               
-              <a class="source" href="sourcemap.html">
-                sourcemap.litcoffee
-              </a>
-            
+                
+                <a class="source" href="scope.html">
+                  scope.litcoffee
+                </a>
+              
+                
+                <a class="source" href="sourcemap.html">
+                  sourcemap.litcoffee
+                </a>
+              
+            </div>
           </div>
         </li>
       </ul>
@@ -111,12 +118,9 @@
               <p><code>cake</code> is a simplified version of <a href="http://www.gnu.org/software/make/">Make</a>
 (<a href="http://rake.rubyforge.org/">Rake</a>, <a href="http://github.com/280north/jake">Jake</a>)
 for CoffeeScript. You define tasks with names and descriptions in a Cakefile,
-and can call them from the command line, or invoke them from other tasks.
-
-</p>
+and can call them from the command line, or invoke them from other tasks.</p>
 <p>Running <code>cake</code> with no arguments will print out a list of all the tasks in the
-current directory&#39;s Cakefile.
-</p>
+current directory’s Cakefile.</p>
 
             </div>
             
@@ -129,18 +133,15 @@ current directory&#39;s Cakefile.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-2">&#182;</a>
               </div>
-              <p>External dependencies.
-</p>
+              <p>External dependencies.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>fs           = require <span class="string">'fs'</span>
-path         = require <span class="string">'path'</span>
-helpers      = require <span class="string">'./helpers'</span>
-optparse     = require <span class="string">'./optparse'</span>
-CoffeeScript = require <span class="string">'./coffee-script'</span>
-
-existsSync   = fs.existsSync <span class="keyword">or</span> path.existsSync</pre></div></div>
+            <div class="content"><div class='highlight'><pre>fs           = <span class="hljs-built_in">require</span> <span class="hljs-string">'fs'</span>
+path         = <span class="hljs-built_in">require</span> <span class="hljs-string">'path'</span>
+helpers      = <span class="hljs-built_in">require</span> <span class="hljs-string">'./helpers'</span>
+optparse     = <span class="hljs-built_in">require</span> <span class="hljs-string">'./optparse'</span>
+CoffeeScript = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffee-script'</span></pre></div></div>
             
         </li>
         
@@ -151,15 +152,11 @@ existsSync   = fs.existsSync <span class="keyword">or</span> path.existsSync</pr
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-3">&#182;</a>
               </div>
-              <p>Keep track of the list of defined tasks, the accepted options, and so on.
-</p>
+              <p>Register .coffee extension</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>tasks     = {}
-options   = {}
-switches  = []
-oparse    = <span class="literal">null</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>CoffeeScript.register()</pre></div></div>
             
         </li>
         
@@ -170,12 +167,14 @@ oparse    = <span class="literal">null</span></pre></div></div>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
-              <p>Mixin the top-level Cake functions for Cakefiles to use directly.
-</p>
+              <p>Keep track of the list of defined tasks, the accepted options, and so on.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>helpers.extend global,</pre></div></div>
+            <div class="content"><div class='highlight'><pre>tasks     = {}
+options   = {}
+switches  = []
+oparse    = <span class="hljs-literal">null</span></pre></div></div>
             
         </li>
         
@@ -186,15 +185,11 @@ oparse    = <span class="literal">null</span></pre></div></div>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-5">&#182;</a>
               </div>
-              <p>Define a Cake task with a short name, an optional sentence description,
-and the function to run as the action itself.
-</p>
+              <p>Mixin the top-level Cake functions for Cakefiles to use directly.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  task: (name, description, action) -&gt;
-    [action, description] = [description, action] <span class="keyword">unless</span> action
-    tasks[name] = {name, description, action}</pre></div></div>
+            <div class="content"><div class='highlight'><pre>helpers.extend <span class="hljs-built_in">global</span>,</pre></div></div>
             
         </li>
         
@@ -205,15 +200,14 @@ and the function to run as the action itself.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-6">&#182;</a>
               </div>
-              <p>Define an option that the Cakefile accepts. The parsed options hash,
-containing all of the command-line options passed, will be made available
-as the first argument to the action.
-</p>
+              <p>Define a Cake task with a short name, an optional sentence description,
+and the function to run as the action itself.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  option: (letter, flag, description) -&gt;
-    switches.push [letter, flag, description]</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">task</span>: <span class="hljs-function"><span class="hljs-params">(name, description, action)</span> -&gt;</span>
+    [action, description] = [description, action] <span class="hljs-keyword">unless</span> action
+    tasks[name] = {name, description, action}</pre></div></div>
             
         </li>
         
@@ -224,14 +218,14 @@ as the first argument to the action.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-7">&#182;</a>
               </div>
-              <p>Invoke another task in the current Cakefile.
-</p>
+              <p>Define an option that the Cakefile accepts. The parsed options hash,
+containing all of the command-line options passed, will be made available
+as the first argument to the action.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  invoke: (name) -&gt;
-    missingTask name <span class="keyword">unless</span> tasks[name]
-    tasks[name].action options</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">option</span>: <span class="hljs-function"><span class="hljs-params">(letter, flag, description)</span> -&gt;</span>
+    switches.push [letter, flag, description]</pre></div></div>
             
         </li>
         
@@ -242,26 +236,13 @@ as the first argument to the action.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-8">&#182;</a>
               </div>
-              <p>Run <code>cake</code>. Executes all of the tasks you pass, in order. Note that Node&#39;s
-asynchrony may cause tasks to execute in a different order than you&#39;d expect.
-If no tasks are passed, print the help screen. Keep a reference to the
-original directory name, when running Cake tasks from subdirectories.
-</p>
+              <p>Invoke another task in the current Cakefile.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">run</span></span> = -&gt;
-  global.__originalDirname = fs.realpathSync <span class="string">'.'</span>
-  process.chdir cakefileDirectory __originalDirname
-  args = process.argv[<span class="number">2.</span>.]
-  CoffeeScript.run fs.readFileSync(<span class="string">'Cakefile'</span>).toString(), filename: <span class="string">'Cakefile'</span>
-  oparse = <span class="keyword">new</span> optparse.OptionParser switches
-  <span class="keyword">return</span> printTasks() <span class="keyword">unless</span> args.length
-  <span class="keyword">try</span>
-    options = oparse.parse(args)
-  <span class="keyword">catch</span> e
-    <span class="keyword">return</span> fatalError <span class="string">"<span class="subst">#{e}</span>"</span>
-  invoke arg <span class="keyword">for</span> arg <span class="keyword">in</span> options.arguments</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">invoke</span>: <span class="hljs-function"><span class="hljs-params">(name)</span> -&gt;</span>
+    missingTask name <span class="hljs-keyword">unless</span> tasks[name]
+    tasks[name].action options</pre></div></div>
             
         </li>
         
@@ -272,21 +253,25 @@ original directory name, when running Cake tasks from subdirectories.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-9">&#182;</a>
               </div>
-              <p>Display the list of Cake tasks in a format similar to <code>rake -T</code>
-</p>
+              <p>Run <code>cake</code>. Executes all of the tasks you pass, in order. Note that Node’s
+asynchrony may cause tasks to execute in a different order than you’d expect.
+If no tasks are passed, print the help screen. Keep a reference to the
+original directory name, when running Cake tasks from subdirectories.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="function"><span class="title">printTasks</span></span> = -&gt;
-  relative = path.relative <span class="keyword">or</span> path.resolve
-  cakefilePath = path.join relative(__originalDirname, process.cwd()), <span class="string">'Cakefile'</span>
-  console.log <span class="string">"<span class="subst">#{cakefilePath}</span> defines the following tasks:\n"</span>
-  <span class="keyword">for</span> name, task <span class="keyword">of</span> tasks
-    spaces = <span class="number">20</span> - name.length
-    spaces = <span class="keyword">if</span> spaces &gt; <span class="number">0</span> <span class="keyword">then</span> Array(spaces + <span class="number">1</span>).join(<span class="string">' '</span>) <span class="keyword">else</span> <span class="string">''</span>
-    desc   = <span class="keyword">if</span> task.description <span class="keyword">then</span> <span class="string">"# <span class="subst">#{task.description}</span>"</span> <span class="keyword">else</span> <span class="string">''</span>
-    console.log <span class="string">"cake <span class="subst">#{name}</span><span class="subst">#{spaces}</span> <span class="subst">#{desc}</span>"</span>
-  console.log oparse.help() <span class="keyword">if</span> switches.length</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">run</span> = -&gt;</span>
+  <span class="hljs-built_in">global</span>.__originalDirname = fs.realpathSync <span class="hljs-string">'.'</span>
+  process.chdir cakefileDirectory __originalDirname
+  args = process.argv[<span class="hljs-number">2.</span>.]
+  CoffeeScript.run fs.readFileSync(<span class="hljs-string">'Cakefile'</span>).toString(), <span class="hljs-attribute">filename</span>: <span class="hljs-string">'Cakefile'</span>
+  oparse = <span class="hljs-keyword">new</span> optparse.OptionParser switches
+  <span class="hljs-keyword">return</span> printTasks() <span class="hljs-keyword">unless</span> args.length
+  <span class="hljs-keyword">try</span>
+    options = oparse.parse(args)
+  <span class="hljs-keyword">catch</span> e
+    <span class="hljs-keyword">return</span> fatalError <span class="hljs-string">"<span class="hljs-subst">#{e}</span>"</span>
+  invoke arg <span class="hljs-keyword">for</span> arg <span class="hljs-keyword">in</span> options.arguments</pre></div></div>
             
         </li>
         
@@ -297,17 +282,20 @@ original directory name, when running Cake tasks from subdirectories.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-10">&#182;</a>
               </div>
-              <p>Print an error and exit when attempting to use an invalid task/option.
-</p>
+              <p>Display the list of Cake tasks in a format similar to <code>rake -T</code></p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="function"><span class="title">fatalError</span></span> = (message) -&gt;
-  console.error message + <span class="string">'\n'</span>
-  console.log <span class="string">'To see a list of all tasks/options, run "cake"'</span>
-  process.exit <span class="number">1</span>
-
-<span class="function"><span class="title">missingTask</span></span> = (task) -&gt; fatalError <span class="string">"No such task: <span class="subst">#{task}</span>"</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">printTasks</span> = -&gt;</span>
+  relative = path.relative <span class="hljs-keyword">or</span> path.resolve
+  cakefilePath = path.join relative(__originalDirname, process.cwd()), <span class="hljs-string">'Cakefile'</span>
+  <span class="hljs-built_in">console</span>.log <span class="hljs-string">"<span class="hljs-subst">#{cakefilePath}</span> defines the following tasks:\n"</span>
+  <span class="hljs-keyword">for</span> name, task <span class="hljs-keyword">of</span> tasks
+    spaces = <span class="hljs-number">20</span> - name.length
+    spaces = <span class="hljs-keyword">if</span> spaces &gt; <span class="hljs-number">0</span> <span class="hljs-keyword">then</span> Array(spaces + <span class="hljs-number">1</span>).join(<span class="hljs-string">' '</span>) <span class="hljs-keyword">else</span> <span class="hljs-string">''</span>
+    desc   = <span class="hljs-keyword">if</span> task.description <span class="hljs-keyword">then</span> <span class="hljs-string">"# <span class="hljs-subst">#{task.description}</span>"</span> <span class="hljs-keyword">else</span> <span class="hljs-string">''</span>
+    <span class="hljs-built_in">console</span>.log <span class="hljs-string">"cake <span class="hljs-subst">#{name}</span><span class="hljs-subst">#{spaces}</span> <span class="hljs-subst">#{desc}</span>"</span>
+  <span class="hljs-built_in">console</span>.log oparse.help() <span class="hljs-keyword">if</span> switches.length</pre></div></div>
             
         </li>
         
@@ -318,17 +306,36 @@ original directory name, when running Cake tasks from subdirectories.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-11">&#182;</a>
               </div>
-              <p>When <code>cake</code> is invoked, search in the current and all parent directories
-to find the relevant Cakefile.
-</p>
+              <p>Print an error and exit when attempting to use an invalid task/option.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="function"><span class="title">cakefileDirectory</span></span> = (dir) -&gt;
-  <span class="keyword">return</span> dir <span class="keyword">if</span> existsSync path.join dir, <span class="string">'Cakefile'</span>
-  parent = path.normalize path.join dir, <span class="string">'..'</span>
-  <span class="keyword">return</span> cakefileDirectory parent <span class="keyword">unless</span> parent <span class="keyword">is</span> dir
-  <span class="keyword">throw</span> <span class="keyword">new</span> Error <span class="string">"Cakefile not found in <span class="subst">#{process.cwd()}</span>"</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">fatalError</span> = <span class="hljs-params">(message)</span> -&gt;</span>
+  <span class="hljs-built_in">console</span>.error message + <span class="hljs-string">'\n'</span>
+  <span class="hljs-built_in">console</span>.log <span class="hljs-string">'To see a list of all tasks/options, run "cake"'</span>
+  process.exit <span class="hljs-number">1</span>
+
+<span class="hljs-function"><span class="hljs-title">missingTask</span> = <span class="hljs-params">(task)</span> -&gt;</span> fatalError <span class="hljs-string">"No such task: <span class="hljs-subst">#{task}</span>"</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-12">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-12">&#182;</a>
+              </div>
+              <p>When <code>cake</code> is invoked, search in the current and all parent directories
+to find the relevant Cakefile.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">cakefileDirectory</span> = <span class="hljs-params">(dir)</span> -&gt;</span>
+  <span class="hljs-keyword">return</span> dir <span class="hljs-keyword">if</span> fs.existsSync path.join dir, <span class="hljs-string">'Cakefile'</span>
+  parent = path.normalize path.join dir, <span class="hljs-string">'..'</span>
+  <span class="hljs-keyword">return</span> cakefileDirectory parent <span class="hljs-keyword">unless</span> parent <span class="hljs-keyword">is</span> dir
+  <span class="hljs-keyword">throw</span> <span class="hljs-keyword">new</span> Error <span class="hljs-string">"Cakefile not found in <span class="hljs-subst">#{process.cwd()}</span>"</span></pre></div></div>
             
         </li>
         

documentation/docs/docco.css

@@ -21,11 +21,11 @@
 }
 
 @font-face {
-    font-family: 'novecento-bold';
-    src: url('public/fonts/novecento-bold.eot');
-    src: url('public/fonts/novecento-bold.eot?#iefix') format('embedded-opentype'),
-         url('public/fonts/novecento-bold.woff') format('woff'),
-         url('public/fonts/novecento-bold.ttf') format('truetype');
+    font-family: 'roboto-black';
+    src: url('public/fonts/roboto-black.eot');
+    src: url('public/fonts/roboto-black.eot?#iefix') format('embedded-opentype'),
+         url('public/fonts/roboto-black.woff') format('woff'),
+         url('public/fonts/roboto-black.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 }
@@ -67,7 +67,7 @@ h1, h2, h3, h4, h5, h6 {
   color: #112233;
   line-height: 1em;
   font-weight: normal;
-  font-family: "novecento-bold";
+  font-family: "roboto-black";
   text-transform: uppercase;
   margin: 30px 0 15px 0;
 }
@@ -75,10 +75,13 @@ h1, h2, h3, h4, h5, h6 {
 h1 {
   margin-top: 40px;
 }
+h2 {
+  font-size: 1.26em;
+}
 
 hr {
   border: 0;
-  background: 1px solid #ddd;
+  background: 1px #ddd;
   height: 1px;
   margin: 20px 0;
 }
@@ -180,9 +183,18 @@ ul.sections > li > div {
   display: block;
 }
 
+#jump_page_wrapper{
+  position: fixed;
+  right: 0;
+  top: 0;
+  bottom: 0;
+}
+
 #jump_page {
   padding: 5px 0 3px;
   margin: 0 0 25px 25px;
+  max-height: 100%;
+  overflow: auto;
 }
 
 #jump_page .source {
@@ -213,7 +225,6 @@ ul.sections > li > div {
   }
 
   ul.sections > li > div.content {
-    background: #f5f5ff;
     overflow-x:auto;
     -webkit-box-shadow: inset 0 0 5px #e5e5ee;
     box-shadow: inset 0 0 5px #e5e5ee;
@@ -314,7 +325,6 @@ ul.sections > li > div {
   ul.sections > li > div.content {
     padding: 13px;
     vertical-align: top;
-    background: #f5f5ff;
     border: none;
     -webkit-box-shadow: none;
     box-shadow: none;
@@ -384,126 +394,125 @@ pre code {
   background: #f8f8ff
 }
 
-pre .comment,
-pre .template_comment,
-pre .diff .header,
-pre .javadoc {
+pre .hljs-comment,
+pre .hljs-template_comment,
+pre .hljs-diff .hljs-header,
+pre .hljs-javadoc {
   color: #408080;
   font-style: italic
 }
 
-pre .keyword,
-pre .assignment,
-pre .literal,
-pre .css .rule .keyword,
-pre .winutils,
-pre .javascript .title,
-pre .lisp .title,
-pre .subst,
-pre .reserved {
+pre .hljs-keyword,
+pre .hljs-assignment,
+pre .hljs-literal,
+pre .hljs-css .hljs-rule .hljs-keyword,
+pre .hljs-winutils,
+pre .hljs-javascript .hljs-title,
+pre .hljs-lisp .hljs-title,
+pre .hljs-subst {
   color: #954121;
   /*font-weight: bold*/
 }
 
-pre .number,
-pre .hexcolor {
+pre .hljs-number,
+pre .hljs-hexcolor {
   color: #40a070
 }
 
-pre .string,
-pre .tag .value,
-pre .phpdoc,
-pre .tex .formula {
+pre .hljs-string,
+pre .hljs-tag .hljs-value,
+pre .hljs-phpdoc,
+pre .hljs-tex .hljs-formula {
   color: #219161;
 }
 
-pre .title,
-pre .id {
+pre .hljs-title,
+pre .hljs-id {
   color: #19469D;
 }
-pre .params {
+pre .hljs-params {
   color: #00F;
 }
 
-pre .javascript .title,
-pre .lisp .title,
-pre .subst {
+pre .hljs-javascript .hljs-title,
+pre .hljs-lisp .hljs-title,
+pre .hljs-subst {
   font-weight: normal
 }
 
-pre .class .title,
-pre .haskell .label,
-pre .tex .command {
+pre .hljs-class .hljs-title,
+pre .hljs-haskell .hljs-label,
+pre .hljs-tex .hljs-command {
   color: #458;
   font-weight: bold
 }
 
-pre .tag,
-pre .tag .title,
-pre .rules .property,
-pre .django .tag .keyword {
+pre .hljs-tag,
+pre .hljs-tag .hljs-title,
+pre .hljs-rules .hljs-property,
+pre .hljs-django .hljs-tag .hljs-keyword {
   color: #000080;
   font-weight: normal
 }
 
-pre .attribute,
-pre .variable,
-pre .instancevar,
-pre .lisp .body {
+pre .hljs-attribute,
+pre .hljs-variable,
+pre .hljs-instancevar,
+pre .hljs-lisp .hljs-body {
   color: #008080
 }
 
-pre .regexp {
+pre .hljs-regexp {
   color: #B68
 }
 
-pre .class {
+pre .hljs-class {
   color: #458;
   font-weight: bold
 }
 
-pre .symbol,
-pre .ruby .symbol .string,
-pre .ruby .symbol .keyword,
-pre .ruby .symbol .keymethods,
-pre .lisp .keyword,
-pre .tex .special,
-pre .input_number {
+pre .hljs-symbol,
+pre .hljs-ruby .hljs-symbol .hljs-string,
+pre .hljs-ruby .hljs-symbol .hljs-keyword,
+pre .hljs-ruby .hljs-symbol .hljs-keymethods,
+pre .hljs-lisp .hljs-keyword,
+pre .hljs-tex .hljs-special,
+pre .hljs-input_number {
   color: #990073
 }
 
-pre .builtin,
-pre .constructor,
-pre .built_in,
-pre .lisp .title {
+pre .hljs-builtin,
+pre .hljs-constructor,
+pre .hljs-built_in,
+pre .hljs-lisp .hljs-title {
   color: #0086b3
 }
 
-pre .preprocessor,
-pre .pi,
-pre .doctype,
-pre .shebang,
-pre .cdata {
+pre .hljs-preprocessor,
+pre .hljs-pi,
+pre .hljs-doctype,
+pre .hljs-shebang,
+pre .hljs-cdata {
   color: #999;
   font-weight: bold
 }
 
-pre .deletion {
+pre .hljs-deletion {
   background: #fdd
 }
 
-pre .addition {
+pre .hljs-addition {
   background: #dfd
 }
 
-pre .diff .change {
+pre .hljs-diff .hljs-change {
   background: #0086b3
 }
 
-pre .chunk {
+pre .hljs-chunk {
   color: #aaa
 }
 
-pre .tex .formula {
+pre .hljs-tex .hljs-formula {
   opacity: 0.5;
 }

documentation/docs/helpers.html

@@ -16,78 +16,85 @@
           <a class="large" href="javascript:void(0);">Jump To &hellip;</a>
           <a class="small" href="javascript:void(0);">+</a>
           <div id="jump_wrapper">
-          <div id="jump_page">
-            
+          <div id="jump_page_wrapper">
+            <div id="jump_page">
               
-              <a class="source" href="browser.html">
-                browser.coffee
-              </a>
-            
+                
+                <a class="source" href="browser.html">
+                  browser.coffee
+                </a>
               
-              <a class="source" href="cake.html">
-                cake.coffee
-              </a>
-            
+                
+                <a class="source" href="cake.html">
+                  cake.coffee
+                </a>
               
-              <a class="source" href="coffee-script.html">
-                coffee-script.coffee
-              </a>
-            
+                
+                <a class="source" href="coffee-script.html">
+                  coffee-script.coffee
+                </a>
               
-              <a class="source" href="command.html">
-                command.coffee
-              </a>
-            
+                
+                <a class="source" href="command.html">
+                  command.coffee
+                </a>
               
-              <a class="source" href="grammar.html">
-                grammar.coffee
-              </a>
-            
+                
+                <a class="source" href="grammar.html">
+                  grammar.coffee
+                </a>
               
-              <a class="source" href="helpers.html">
-                helpers.coffee
-              </a>
-            
+                
+                <a class="source" href="helpers.html">
+                  helpers.coffee
+                </a>
               
-              <a class="source" href="index.html">
-                index.coffee
-              </a>
-            
+                
+                <a class="source" href="index.html">
+                  index.coffee
+                </a>
               
-              <a class="source" href="lexer.html">
-                lexer.coffee
-              </a>
-            
+                
+                <a class="source" href="lexer.html">
+                  lexer.coffee
+                </a>
               
-              <a class="source" href="nodes.html">
-                nodes.coffee
-              </a>
-            
+                
+                <a class="source" href="nodes.html">
+                  nodes.coffee
+                </a>
               
-              <a class="source" href="optparse.html">
-                optparse.coffee
-              </a>
-            
+                
+                <a class="source" href="optparse.html">
+                  optparse.coffee
+                </a>
               
-              <a class="source" href="repl.html">
-                repl.coffee
-              </a>
-            
+                
+                <a class="source" href="register.html">
+                  register.coffee
+                </a>
               
-              <a class="source" href="rewriter.html">
-                rewriter.coffee
-              </a>
-            
+                
+                <a class="source" href="repl.html">
+                  repl.coffee
+                </a>
               
-              <a class="source" href="scope.html">
-                scope.litcoffee
-              </a>
-            
+                
+                <a class="source" href="rewriter.html">
+                  rewriter.coffee
+                </a>
               
-              <a class="source" href="sourcemap.html">
-                sourcemap.litcoffee
-              </a>
-            
+                
+                <a class="source" href="scope.html">
+                  scope.litcoffee
+                </a>
+              
+                
+                <a class="source" href="sourcemap.html">
+                  sourcemap.litcoffee
+                </a>
+              
+            </div>
           </div>
         </li>
       </ul>
@@ -108,10 +115,9 @@
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-1">&#182;</a>
               </div>
-              <p>This file contains the common helper functions that we&#39;d like to share among
+              <p>This file contains the common helper functions that we’d like to share among
 the <strong>Lexer</strong>, <strong>Rewriter</strong>, and the <strong>Nodes</strong>. Merge objects, flatten
-arrays, count characters, that sort of thing.
-</p>
+arrays, count characters, that sort of thing.</p>
 
             </div>
             
@@ -124,13 +130,12 @@ arrays, count characters, that sort of thing.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-2">&#182;</a>
               </div>
-              <p>Peek at the beginning of a given string to see if it matches a sequence.
-</p>
+              <p>Peek at the beginning of a given string to see if it matches a sequence.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">starts</span></span> = (string, literal, start) -&gt;
-  literal <span class="keyword">is</span> string.substr start, literal.length</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">starts</span> = <span class="hljs-params">(string, literal, start)</span> -&gt;</span>
+  literal <span class="hljs-keyword">is</span> string.substr start, literal.length</pre></div></div>
             
         </li>
         
@@ -141,14 +146,13 @@ arrays, count characters, that sort of thing.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-3">&#182;</a>
               </div>
-              <p>Peek at the end of a given string to see if it matches a sequence.
-</p>
+              <p>Peek at the end of a given string to see if it matches a sequence.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">ends</span></span> = (string, literal, back) -&gt;
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">ends</span> = <span class="hljs-params">(string, literal, back)</span> -&gt;</span>
   len = literal.length
-  literal <span class="keyword">is</span> string.substr string.length - len - (back <span class="keyword">or</span> <span class="number">0</span>), len</pre></div></div>
+  literal <span class="hljs-keyword">is</span> string.substr string.length - len - (back <span class="hljs-keyword">or</span> <span class="hljs-number">0</span>), len</pre></div></div>
             
         </li>
         
@@ -159,12 +163,11 @@ arrays, count characters, that sort of thing.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
-              <p>Repeat a string <code>n</code> times.
-</p>
+              <p>Repeat a string <code>n</code> times.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.repeat = <span class="function"><span class="title">repeat</span></span> = (str, n) -&gt;</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.repeat = <span class="hljs-function"><span class="hljs-title">repeat</span> = <span class="hljs-params">(str, n)</span> -&gt;</span></pre></div></div>
             
         </li>
         
@@ -175,15 +178,14 @@ arrays, count characters, that sort of thing.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-5">&#182;</a>
               </div>
-              <p>Use clever algorithm to have O(log(n)) string concatenation operations.
-</p>
+              <p>Use clever algorithm to have O(log(n)) string concatenation operations.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  res = <span class="string">''</span>
-  <span class="keyword">while</span> n &gt; <span class="number">0</span>
-    res += str <span class="keyword">if</span> n &amp; <span class="number">1</span>
-    n &gt;&gt;&gt;= <span class="number">1</span>
+            <div class="content"><div class='highlight'><pre>  res = <span class="hljs-string">''</span>
+  <span class="hljs-keyword">while</span> n &gt; <span class="hljs-number">0</span>
+    res += str <span class="hljs-keyword">if</span> n &amp; <span class="hljs-number">1</span>
+    n &gt;&gt;&gt;= <span class="hljs-number">1</span>
     str += str
   res</pre></div></div>
             
@@ -196,13 +198,12 @@ arrays, count characters, that sort of thing.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-6">&#182;</a>
               </div>
-              <p>Trim out all falsy values from an array.
-</p>
+              <p>Trim out all falsy values from an array.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">compact</span></span> = (array) -&gt;
-  item <span class="keyword">for</span> item <span class="keyword">in</span> array <span class="keyword">when</span> item</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">compact</span> = <span class="hljs-params">(array)</span> -&gt;</span>
+  item <span class="hljs-keyword">for</span> item <span class="hljs-keyword">in</span> array <span class="hljs-keyword">when</span> item</pre></div></div>
             
         </li>
         
@@ -213,15 +214,14 @@ arrays, count characters, that sort of thing.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-7">&#182;</a>
               </div>
-              <p>Count the number of occurrences of a string in a string.
-</p>
+              <p>Count the number of occurrences of a string in a string.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">count</span></span> = (string, substr) -&gt;
-  num = pos = <span class="number">0</span>
-  <span class="keyword">return</span> <span class="number">1</span>/<span class="number">0</span> <span class="keyword">unless</span> substr.length
-  num++ <span class="keyword">while</span> pos = <span class="number">1</span> + string.indexOf substr, pos
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">count</span> = <span class="hljs-params">(string, substr)</span> -&gt;</span>
+  num = pos = <span class="hljs-number">0</span>
+  <span class="hljs-keyword">return</span> <span class="hljs-number">1</span>/<span class="hljs-number">0</span> <span class="hljs-keyword">unless</span> substr.length
+  num++ <span class="hljs-keyword">while</span> pos = <span class="hljs-number">1</span> + string.indexOf substr, pos
   num</pre></div></div>
             
         </li>
@@ -235,12 +235,11 @@ arrays, count characters, that sort of thing.
               </div>
               <p>Merge objects, returning a fresh copy with attributes from both sides.
 Used every time <code>Base#compile</code> is called, to allow properties in the
-options hash to propagate down the tree without polluting other branches.
-</p>
+options hash to propagate down the tree without polluting other branches.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">merge</span></span> = (options, overrides) -&gt;
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">merge</span> = <span class="hljs-params">(options, overrides)</span> -&gt;</span>
   extend (extend {}, options), overrides</pre></div></div>
             
         </li>
@@ -252,13 +251,12 @@ options hash to propagate down the tree without polluting other branches.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-9">&#182;</a>
               </div>
-              <p>Extend a source object with the properties of another object (shallow copy).
-</p>
+              <p>Extend a source object with the properties of another object (shallow copy).</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>extend = exports.<span class="function"><span class="title">extend</span></span> = (object, properties) -&gt;
-  <span class="keyword">for</span> key, val <span class="keyword">of</span> properties
+            <div class="content"><div class='highlight'><pre>extend = <span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">extend</span> = <span class="hljs-params">(object, properties)</span> -&gt;</span>
+  <span class="hljs-keyword">for</span> key, val <span class="hljs-keyword">of</span> properties
     object[key] = val
   object</pre></div></div>
             
@@ -272,17 +270,16 @@ options hash to propagate down the tree without polluting other branches.
                 <a class="pilcrow" href="#section-10">&#182;</a>
               </div>
               <p>Return a flattened version of an array.
-Handy for getting a list of <code>children</code> from the nodes.
-</p>
+Handy for getting a list of <code>children</code> from the nodes.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.flatten = <span class="function"><span class="title">flatten</span></span> = (array) -&gt;
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.flatten = <span class="hljs-function"><span class="hljs-title">flatten</span> = <span class="hljs-params">(array)</span> -&gt;</span>
   flattened = []
-  <span class="keyword">for</span> element <span class="keyword">in</span> array
-    <span class="keyword">if</span> element <span class="keyword">instanceof</span> Array
+  <span class="hljs-keyword">for</span> element <span class="hljs-keyword">in</span> array
+    <span class="hljs-keyword">if</span> element <span class="hljs-keyword">instanceof</span> Array
       flattened = flattened.concat flatten element
-    <span class="keyword">else</span>
+    <span class="hljs-keyword">else</span>
       flattened.push element
   flattened</pre></div></div>
             
@@ -296,14 +293,13 @@ Handy for getting a list of <code>children</code> from the nodes.
                 <a class="pilcrow" href="#section-11">&#182;</a>
               </div>
               <p>Delete a key from an object, returning the value. Useful when a node is
-looking for a particular method in an options hash.
-</p>
+looking for a particular method in an options hash.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">del</span></span> = (obj, key) -&gt;
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">del</span> = <span class="hljs-params">(obj, key)</span> -&gt;</span>
   val =  obj[key]
-  <span class="keyword">delete</span> obj[key]
+  <span class="hljs-keyword">delete</span> obj[key]
   val</pre></div></div>
             
         </li>
@@ -315,12 +311,13 @@ looking for a particular method in an options hash.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-12">&#182;</a>
               </div>
-              <p>Gets the last item of an array(-like) object.
-</p>
+              <p>Typical Array::some</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.last = <span class="function"><span class="title">last</span></span> = (array, back) -&gt; array[array.length - (back <span class="keyword">or</span> <span class="number">0</span>) - <span class="number">1</span>]</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.some = <span class="hljs-attribute">Array</span>::some ? <span class="hljs-function"><span class="hljs-params">(fn)</span> -&gt;</span>
+  <span class="hljs-keyword">return</span> <span class="hljs-literal">true</span> <span class="hljs-keyword">for</span> e <span class="hljs-keyword">in</span> <span class="hljs-keyword">this</span> <span class="hljs-keyword">when</span> fn e
+  <span class="hljs-literal">false</span></pre></div></div>
             
         </li>
         
@@ -331,14 +328,22 @@ looking for a particular method in an options hash.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-13">&#182;</a>
               </div>
-              <p>Typical Array::some
-</p>
+              <p>Simple function for inverting Literate CoffeeScript code by putting the
+documentation in comments, producing a string of CoffeeScript code that
+can be compiled “normally”.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.some = Array::some ? (fn) -&gt;
-  <span class="keyword">return</span> <span class="literal">true</span> <span class="keyword">for</span> e <span class="keyword">in</span> <span class="keyword">this</span> <span class="keyword">when</span> fn e
-  <span class="literal">false</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">invertLiterate</span> = <span class="hljs-params">(code)</span> -&gt;</span>
+  maybe_code = <span class="hljs-literal">true</span>
+  lines = <span class="hljs-keyword">for</span> line <span class="hljs-keyword">in</span> code.split(<span class="hljs-string">'\n'</span>)
+    <span class="hljs-keyword">if</span> maybe_code <span class="hljs-keyword">and</span> <span class="hljs-regexp">/^([ ]{4}|[ ]{0,3}\t)/</span>.test line
+      line
+    <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> maybe_code = <span class="hljs-regexp">/^\s*$/</span>.test line
+      line
+    <span class="hljs-keyword">else</span>
+      <span class="hljs-string">'# '</span> + line
+  lines.join <span class="hljs-string">'\n'</span></pre></div></div>
             
         </li>
         
@@ -349,23 +354,19 @@ looking for a particular method in an options hash.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-14">&#182;</a>
               </div>
-              <p>Simple function for inverting Literate CoffeeScript code by putting the
-documentation in comments, producing a string of CoffeeScript code that
-can be compiled &quot;normally&quot;.
-</p>
+              <p>Merge two jison-style location data objects together.
+If <code>last</code> is not provided, this will simply return <code>first</code>.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">invertLiterate</span></span> = (code) -&gt;
-  maybe_code = <span class="literal">true</span>
-  lines = <span class="keyword">for</span> line <span class="keyword">in</span> code.split(<span class="string">'\n'</span>)
-    <span class="keyword">if</span> maybe_code <span class="keyword">and</span> <span class="regexp">/^([ ]{4}|[ ]{0,3}\t)/</span>.test line
-      line
-    <span class="keyword">else</span> <span class="keyword">if</span> maybe_code = <span class="regexp">/^\s*$/</span>.test line
-      line
-    <span class="keyword">else</span>
-      <span class="string">'# '</span> + line
-  lines.join <span class="string">'\n'</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">buildLocationData</span> = <span class="hljs-params">(first, last)</span> -&gt;</span>
+  <span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> last
+    first
+  <span class="hljs-keyword">else</span>
+    <span class="hljs-attribute">first_line</span>: first.first_line
+    <span class="hljs-attribute">first_column</span>: first.first_column
+    <span class="hljs-attribute">last_line</span>: last.last_line
+    <span class="hljs-attribute">last_column</span>: last.last_column</pre></div></div>
             
         </li>
         
@@ -376,20 +377,18 @@ can be compiled &quot;normally&quot;.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-15">&#182;</a>
               </div>
-              <p>Merge two jison-style location data objects together.
-If <code>last</code> is not provided, this will simply return <code>first</code>.
-</p>
+              <p>This returns a function which takes an object as a parameter, and if that
+object is an AST node, updates that object’s locationData.
+The object is returned either way.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="function"><span class="title">buildLocationData</span></span> = (first, last) -&gt;
-  <span class="keyword">if</span> <span class="keyword">not</span> last
-    first
-  <span class="keyword">else</span>
-    first_line: first.first_line
-    first_column: first.first_column
-    last_line: last.last_line
-    last_column: last.last_column</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">addLocationDataFn</span> = <span class="hljs-params">(first, last)</span> -&gt;</span>
+  <span class="hljs-function"><span class="hljs-params">(obj)</span> -&gt;</span>
+    <span class="hljs-keyword">if</span> ((<span class="hljs-keyword">typeof</span> obj) <span class="hljs-keyword">is</span> <span class="hljs-string">'object'</span>) <span class="hljs-keyword">and</span> (!!obj[<span class="hljs-string">'updateLocationDataIfMissing'</span>])
+      obj.updateLocationDataIfMissing buildLocationData(first, last)
+
+    <span class="hljs-keyword">return</span> obj</pre></div></div>
             
         </li>
         
@@ -400,19 +399,20 @@ If <code>last</code> is not provided, this will simply return <code>first</code>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-16">&#182;</a>
               </div>
-              <p>This returns a function which takes an object as a parameter, and if that
-object is an AST node, updates that object&#39;s locationData.
-The object is returned either way.
-</p>
+              <p>Convert jison location data to a string.
+<code>obj</code> can be a token, or a locationData.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">addLocationDataFn</span></span> = (first, last) -&gt;
-    (obj) -&gt;
-      <span class="keyword">if</span> ((<span class="keyword">typeof</span> obj) <span class="keyword">is</span> <span class="string">'object'</span>) <span class="keyword">and</span> (!!obj[<span class="string">'updateLocationDataIfMissing'</span>])
-        obj.updateLocationDataIfMissing buildLocationData(first, last)
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">locationDataToString</span> = <span class="hljs-params">(obj)</span> -&gt;</span>
+  <span class="hljs-keyword">if</span> (<span class="hljs-string">"2"</span> <span class="hljs-keyword">of</span> obj) <span class="hljs-keyword">and</span> (<span class="hljs-string">"first_line"</span> <span class="hljs-keyword">of</span> obj[<span class="hljs-number">2</span>]) <span class="hljs-keyword">then</span> locationData = obj[<span class="hljs-number">2</span>]
+  <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> <span class="hljs-string">"first_line"</span> <span class="hljs-keyword">of</span> obj <span class="hljs-keyword">then</span> locationData = obj
 
-      <span class="keyword">return</span> obj</pre></div></div>
+  <span class="hljs-keyword">if</span> locationData
+    <span class="hljs-string">"<span class="hljs-subst">#{locationData.first_line + <span class="hljs-number">1</span>}</span>:<span class="hljs-subst">#{locationData.first_column + <span class="hljs-number">1</span>}</span>-"</span> +
+    <span class="hljs-string">"<span class="hljs-subst">#{locationData.last_line + <span class="hljs-number">1</span>}</span>:<span class="hljs-subst">#{locationData.last_column + <span class="hljs-number">1</span>}</span>"</span>
+  <span class="hljs-keyword">else</span>
+    <span class="hljs-string">"No location data"</span></pre></div></div>
             
         </li>
         
@@ -423,21 +423,19 @@ The object is returned either way.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-17">&#182;</a>
               </div>
-              <p>Convert jison location data to a string.
-<code>obj</code> can be a token, or a locationData.
-</p>
+              <p>A <code>.coffee.md</code> compatible version of <code>basename</code>, that returns the file sans-extension.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">locationDataToString</span></span> = (obj) -&gt;
-    <span class="keyword">if</span> (<span class="string">"2"</span> <span class="keyword">of</span> obj) <span class="keyword">and</span> (<span class="string">"first_line"</span> <span class="keyword">of</span> obj[<span class="number">2</span>]) <span class="keyword">then</span> locationData = obj[<span class="number">2</span>]
-    <span class="keyword">else</span> <span class="keyword">if</span> <span class="string">"first_line"</span> <span class="keyword">of</span> obj <span class="keyword">then</span> locationData = obj
-
-    <span class="keyword">if</span> locationData
-      <span class="string">"<span class="subst">#{locationData.first_line + <span class="number">1</span>}</span>:<span class="subst">#{locationData.first_column + <span class="number">1</span>}</span>-"</span> +
-      <span class="string">"<span class="subst">#{locationData.last_line + <span class="number">1</span>}</span>:<span class="subst">#{locationData.last_column + <span class="number">1</span>}</span>"</span>
-    <span class="keyword">else</span>
-      <span class="string">"No location data"</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">baseFileName</span> = <span class="hljs-params">(file, stripExt = <span class="hljs-literal">no</span>, useWinPathSep = <span class="hljs-literal">no</span>)</span> -&gt;</span>
+  pathSep = <span class="hljs-keyword">if</span> useWinPathSep <span class="hljs-keyword">then</span> <span class="hljs-regexp">/\\|\//</span> <span class="hljs-keyword">else</span> <span class="hljs-regexp">/\/</span>/
+  parts = file.split(pathSep)
+  file = parts[parts.length - <span class="hljs-number">1</span>]
+  <span class="hljs-keyword">return</span> file <span class="hljs-keyword">unless</span> stripExt <span class="hljs-keyword">and</span> file.indexOf(<span class="hljs-string">'.'</span>) &gt;= <span class="hljs-number">0</span>
+  parts = file.split(<span class="hljs-string">'.'</span>)
+  parts.pop()
+  parts.pop() <span class="hljs-keyword">if</span> parts[parts.length - <span class="hljs-number">1</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'coffee'</span> <span class="hljs-keyword">and</span> parts.length &gt; <span class="hljs-number">1</span>
+  parts.join(<span class="hljs-string">'.'</span>)</pre></div></div>
             
         </li>
         
@@ -448,20 +446,11 @@ The object is returned either way.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-18">&#182;</a>
               </div>
-              <p>A <code>.coffee.md</code> compatible version of <code>basename</code>, that returns the file sans-extension.
-</p>
+              <p>Determine if a filename represents a CoffeeScript file.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">baseFileName</span></span> = (file, stripExt = <span class="literal">no</span>, useWinPathSep = <span class="literal">no</span>) -&gt;
-  pathSep = <span class="keyword">if</span> useWinPathSep <span class="keyword">then</span> <span class="regexp">/\\|\// else /\//</span>
-  parts = file.split(pathSep)
-  file = parts[parts.length - <span class="number">1</span>]
-  <span class="keyword">return</span> file <span class="keyword">unless</span> stripExt
-  parts = file.split(<span class="string">'.'</span>)
-  parts.pop()
-  parts.pop() <span class="keyword">if</span> parts[parts.length - <span class="number">1</span>] <span class="keyword">is</span> <span class="string">'coffee'</span> <span class="keyword">and</span> parts.length &gt; <span class="number">1</span>
-  parts.join(<span class="string">'.'</span>)</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">isCoffee</span> = <span class="hljs-params">(file)</span> -&gt;</span> <span class="hljs-regexp">/\.((lit)?coffee|coffee\.md)$/</span>.test file</pre></div></div>
             
         </li>
         
@@ -472,12 +461,11 @@ The object is returned either way.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-19">&#182;</a>
               </div>
-              <p>Determine if a filename represents a CoffeeScript file.
-</p>
+              <p>Determine if a filename represents a Literate CoffeeScript file.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">isCoffee</span></span> = (file) -&gt; <span class="regexp">/\.((lit)?coffee|coffee\.md)$/</span>.test file</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">isLiterate</span> = <span class="hljs-params">(file)</span> -&gt;</span> <span class="hljs-regexp">/\.(litcoffee|coffee\.md)$/</span>.test file</pre></div></div>
             
         </li>
         
@@ -488,12 +476,17 @@ The object is returned either way.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-20">&#182;</a>
               </div>
-              <p>Determine if a filename represents a Literate CoffeeScript file.
-</p>
+              <p>Throws a SyntaxError from a given location.
+The error’s <code>toString</code> will return an error message following the “standard”
+format <filename>:<line>:<col>: <message> plus the line with the error and a
+marker showing where the error is.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">isLiterate</span></span> = (file) -&gt; <span class="regexp">/\.(litcoffee|coffee\.md)$/</span>.test file</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">throwSyntaxError</span> = <span class="hljs-params">(message, location)</span> -&gt;</span>
+  error = <span class="hljs-keyword">new</span> SyntaxError message
+  error.location = location
+  error.toString = syntaxErrorToString</pre></div></div>
             
         </li>
         
@@ -504,18 +497,15 @@ The object is returned either way.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-21">&#182;</a>
               </div>
-              <p>Throws a SyntaxError with a source file location data attached to it in a
-property called <code>location</code>.
-</p>
+              <p>Instead of showing the compiler’s stacktrace, show our custom error message
+(this is useful when the error bubbles up in Node.js applications that
+compile CoffeeScript for example).</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">throwSyntaxError</span></span> = (message, location) -&gt;
-  location.last_line ?= location.first_line
-  location.last_column ?= location.first_column
-  error = <span class="keyword">new</span> SyntaxError message
-  error.location = location
-  <span class="keyword">throw</span> error</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  error.stack = error.toString()
+
+  <span class="hljs-keyword">throw</span> error</pre></div></div>
             
         </li>
         
@@ -526,20 +516,12 @@ property called <code>location</code>.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-22">&#182;</a>
               </div>
-              <p>Creates a nice error message like, following the &quot;standard&quot; format
-</p>
-<p><filename>:<line>:<col>: <message> plus the line with the error and a marker
-showing where the error is.
-</p>
+              <p>Update a compiler SyntaxError with source code information if it didn’t have
+it already.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.<span class="function"><span class="title">prettyErrorMessage</span></span> = (error, fileName, code, useColors) -&gt;
-  <span class="keyword">return</span> error.stack <span class="keyword">or</span> <span class="string">"<span class="subst">#{error}</span>"</span> <span class="keyword">unless</span> error.location
-
-  {first_line, first_column, last_line, last_column} = error.location
-  codeLine = code.split(<span class="string">'\n'</span>)[first_line]
-  start    = first_column</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">updateSyntaxError</span> = <span class="hljs-params">(error, code, filename)</span> -&gt;</span></pre></div></div>
             
         </li>
         
@@ -550,24 +532,26 @@ showing where the error is.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-23">&#182;</a>
               </div>
-              <p>Show only the first line on multi-line errors.
-</p>
+              <p>Avoid screwing up the <code>stack</code> property of other errors (i.e. possible bugs).</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  end      = <span class="keyword">if</span> first_line <span class="keyword">is</span> last_line <span class="keyword">then</span> last_column + <span class="number">1</span> <span class="keyword">else</span> codeLine.length
-  marker   = repeat(<span class="string">' '</span>, start) + repeat(<span class="string">'^'</span>, end - start)
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-keyword">if</span> error.toString <span class="hljs-keyword">is</span> syntaxErrorToString
+    error.code <span class="hljs-keyword">or</span>= code
+    error.filename <span class="hljs-keyword">or</span>= filename
+    error.stack = error.toString()
+  error
 
-  <span class="keyword">if</span> useColors
-    <span class="function"><span class="title">colorize</span></span>  = (str) -&gt; <span class="string">"\x1B[1;31m<span class="subst">#{str}</span>\x1B[0m"</span>
-    codeLine = codeLine[...start] + colorize(codeLine[start...end]) + codeLine[end..]
-    marker    = colorize marker
+<span class="hljs-function"><span class="hljs-title">syntaxErrorToString</span> = -&gt;</span>
+  <span class="hljs-keyword">return</span> <span class="hljs-attribute">Error</span>::toString.call @ <span class="hljs-keyword">unless</span> <span class="hljs-property">@code</span> <span class="hljs-keyword">and</span> <span class="hljs-property">@location</span>
 
-  message = <span class="string">"""
-  <span class="subst">#{fileName}</span>:<span class="subst">#{first_line + <span class="number">1</span>}</span>:<span class="subst">#{first_column + <span class="number">1</span>}</span>: error: <span class="subst">#{error.message}</span>
-  <span class="subst">#{codeLine}</span>
-  <span class="subst">#{marker}</span>
-            """</span></pre></div></div>
+  {first_line, first_column, last_line, last_column} = <span class="hljs-property">@location</span>
+  last_line ?= first_line
+  last_column ?= first_column
+
+  filename = <span class="hljs-property">@filename</span> <span class="hljs-keyword">or</span> <span class="hljs-string">'[stdin]'</span>
+  codeLine = <span class="hljs-property">@code</span>.split(<span class="hljs-string">'\n'</span>)[first_line]
+  start    = first_column</pre></div></div>
             
         </li>
         
@@ -578,14 +562,47 @@ showing where the error is.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-24">&#182;</a>
               </div>
-              <p>Uncomment to add stacktrace.
-message += &quot;\n#{error.stack}&quot;
-</p>
+              <p>Show only the first line on multi-line errors.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  message</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  end      = <span class="hljs-keyword">if</span> first_line <span class="hljs-keyword">is</span> last_line <span class="hljs-keyword">then</span> last_column + <span class="hljs-number">1</span> <span class="hljs-keyword">else</span> codeLine.length
+  marker   = codeLine[...start].replace(<span class="hljs-regexp">/[^\s]/g</span>, <span class="hljs-string">' '</span>) + repeat(<span class="hljs-string">'^'</span>, end - start)</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-25">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-25">&#182;</a>
+              </div>
+              <p>Check to see if we’re running on a color-enabled TTY.</p>
+
+            </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
+
+  <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>
+    codeLine = codeLine[...start] + colorize(codeLine[start...end]) + codeLine[end..]
+    marker   = colorize marker
+
+  <span class="hljs-string">"""
+    <span class="hljs-subst">#{filename}</span>:<span class="hljs-subst">#{first_line + <span class="hljs-number">1</span>}</span>:<span class="hljs-subst">#{first_column + <span class="hljs-number">1</span>}</span>: error: <span class="hljs-subst">#{<span class="hljs-property">@message</span>}</span>
+    <span class="hljs-subst">#{codeLine}</span>
+    <span class="hljs-subst">#{marker}</span>
+  """</span>
+
+<span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">nameWhitespaceCharacter</span> = <span class="hljs-params">(string)</span> -&gt;</span>
+  <span class="hljs-keyword">switch</span> string
+    <span class="hljs-keyword">when</span> <span class="hljs-string">' '</span> <span class="hljs-keyword">then</span> <span class="hljs-string">'space'</span>
+    <span class="hljs-keyword">when</span> <span class="hljs-string">'\n'</span> <span class="hljs-keyword">then</span> <span class="hljs-string">'newline'</span>
+    <span class="hljs-keyword">when</span> <span class="hljs-string">'\r'</span> <span class="hljs-keyword">then</span> <span class="hljs-string">'carriage return'</span>
+    <span class="hljs-keyword">when</span> <span class="hljs-string">'\t'</span> <span class="hljs-keyword">then</span> <span class="hljs-string">'tab'</span>
+    <span class="hljs-keyword">else</span> string</pre></div></div>
             
         </li>
         

documentation/docs/index.html

@@ -16,78 +16,85 @@
           <a class="large" href="javascript:void(0);">Jump To &hellip;</a>
           <a class="small" href="javascript:void(0);">+</a>
           <div id="jump_wrapper">
-          <div id="jump_page">
-            
+          <div id="jump_page_wrapper">
+            <div id="jump_page">
               
-              <a class="source" href="browser.html">
-                browser.coffee
-              </a>
-            
+                
+                <a class="source" href="browser.html">
+                  browser.coffee
+                </a>
               
-              <a class="source" href="cake.html">
-                cake.coffee
-              </a>
-            
+                
+                <a class="source" href="cake.html">
+                  cake.coffee
+                </a>
               
-              <a class="source" href="coffee-script.html">
-                coffee-script.coffee
-              </a>
-            
+                
+                <a class="source" href="coffee-script.html">
+                  coffee-script.coffee
+                </a>
               
-              <a class="source" href="command.html">
-                command.coffee
-              </a>
-            
+                
+                <a class="source" href="command.html">
+                  command.coffee
+                </a>
               
-              <a class="source" href="grammar.html">
-                grammar.coffee
-              </a>
-            
+                
+                <a class="source" href="grammar.html">
+                  grammar.coffee
+                </a>
               
-              <a class="source" href="helpers.html">
-                helpers.coffee
-              </a>
-            
+                
+                <a class="source" href="helpers.html">
+                  helpers.coffee
+                </a>
               
-              <a class="source" href="index.html">
-                index.coffee
-              </a>
-            
+                
+                <a class="source" href="index.html">
+                  index.coffee
+                </a>
               
-              <a class="source" href="lexer.html">
-                lexer.coffee
-              </a>
-            
+                
+                <a class="source" href="lexer.html">
+                  lexer.coffee
+                </a>
               
-              <a class="source" href="nodes.html">
-                nodes.coffee
-              </a>
-            
+                
+                <a class="source" href="nodes.html">
+                  nodes.coffee
+                </a>
               
-              <a class="source" href="optparse.html">
-                optparse.coffee
-              </a>
-            
+                
+                <a class="source" href="optparse.html">
+                  optparse.coffee
+                </a>
               
-              <a class="source" href="repl.html">
-                repl.coffee
-              </a>
-            
+                
+                <a class="source" href="register.html">
+                  register.coffee
+                </a>
               
-              <a class="source" href="rewriter.html">
-                rewriter.coffee
-              </a>
-            
+                
+                <a class="source" href="repl.html">
+                  repl.coffee
+                </a>
               
-              <a class="source" href="scope.html">
-                scope.litcoffee
-              </a>
-            
+                
+                <a class="source" href="rewriter.html">
+                  rewriter.coffee
+                </a>
               
-              <a class="source" href="sourcemap.html">
-                sourcemap.litcoffee
-              </a>
-            
+                
+                <a class="source" href="scope.html">
+                  scope.litcoffee
+                </a>
+              
+                
+                <a class="source" href="sourcemap.html">
+                  sourcemap.litcoffee
+                </a>
+              
+            </div>
           </div>
         </li>
       </ul>
@@ -108,12 +115,11 @@
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-1">&#182;</a>
               </div>
-              <p>Loader for CoffeeScript as a Node.js library.
-</p>
+              <p>Loader for CoffeeScript as a Node.js library.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports[key] = val <span class="keyword">for</span> key, val <span class="keyword">of</span> require <span class="string">'./coffee-script'</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>[key] = val <span class="hljs-keyword">for</span> key, val <span class="hljs-keyword">of</span> <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffee-script'</span></pre></div></div>
             
         </li>
         

documentation/docs/optparse.html

@@ -16,78 +16,85 @@
           <a class="large" href="javascript:void(0);">Jump To &hellip;</a>
           <a class="small" href="javascript:void(0);">+</a>
           <div id="jump_wrapper">
-          <div id="jump_page">
-            
+          <div id="jump_page_wrapper">
+            <div id="jump_page">
               
-              <a class="source" href="browser.html">
-                browser.coffee
-              </a>
-            
+                
+                <a class="source" href="browser.html">
+                  browser.coffee
+                </a>
               
-              <a class="source" href="cake.html">
-                cake.coffee
-              </a>
-            
+                
+                <a class="source" href="cake.html">
+                  cake.coffee
+                </a>
               
-              <a class="source" href="coffee-script.html">
-                coffee-script.coffee
-              </a>
-            
+                
+                <a class="source" href="coffee-script.html">
+                  coffee-script.coffee
+                </a>
               
-              <a class="source" href="command.html">
-                command.coffee
-              </a>
-            
+                
+                <a class="source" href="command.html">
+                  command.coffee
+                </a>
               
-              <a class="source" href="grammar.html">
-                grammar.coffee
-              </a>
-            
+                
+                <a class="source" href="grammar.html">
+                  grammar.coffee
+                </a>
               
-              <a class="source" href="helpers.html">
-                helpers.coffee
-              </a>
-            
+                
+                <a class="source" href="helpers.html">
+                  helpers.coffee
+                </a>
               
-              <a class="source" href="index.html">
-                index.coffee
-              </a>
-            
+                
+                <a class="source" href="index.html">
+                  index.coffee
+                </a>
               
-              <a class="source" href="lexer.html">
-                lexer.coffee
-              </a>
-            
+                
+                <a class="source" href="lexer.html">
+                  lexer.coffee
+                </a>
               
-              <a class="source" href="nodes.html">
-                nodes.coffee
-              </a>
-            
+                
+                <a class="source" href="nodes.html">
+                  nodes.coffee
+                </a>
               
-              <a class="source" href="optparse.html">
-                optparse.coffee
-              </a>
-            
+                
+                <a class="source" href="optparse.html">
+                  optparse.coffee
+                </a>
               
-              <a class="source" href="repl.html">
-                repl.coffee
-              </a>
-            
+                
+                <a class="source" href="register.html">
+                  register.coffee
+                </a>
               
-              <a class="source" href="rewriter.html">
-                rewriter.coffee
-              </a>
-            
+                
+                <a class="source" href="repl.html">
+                  repl.coffee
+                </a>
               
-              <a class="source" href="scope.html">
-                scope.litcoffee
-              </a>
-            
+                
+                <a class="source" href="rewriter.html">
+                  rewriter.coffee
+                </a>
               
-              <a class="source" href="sourcemap.html">
-                sourcemap.litcoffee
-              </a>
-            
+                
+                <a class="source" href="scope.html">
+                  scope.litcoffee
+                </a>
+              
+                
+                <a class="source" href="sourcemap.html">
+                  sourcemap.litcoffee
+                </a>
+              
+            </div>
           </div>
         </li>
       </ul>
@@ -111,7 +118,7 @@
               
             </div>
             
-            <div class="content"><div class='highlight'><pre>{repeat} = require <span class="string">'./helpers'</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>{repeat} = <span class="hljs-built_in">require</span> <span class="hljs-string">'./helpers'</span></pre></div></div>
             
         </li>
         
@@ -123,18 +130,15 @@
                 <a class="pilcrow" href="#section-2">&#182;</a>
               </div>
               <p>A simple <strong>OptionParser</strong> class to parse option flags from the command-line.
-Use it like so:
-
-</p>
-<pre><code>parser  = new OptionParser switches, helpBanner
-options = parser.parse process.argv</code></pre>
-<p>The first non-option is considered to be the start of the file (and file
-option) list, and all subsequent arguments are left unparsed.
-</p>
+Use it like so:</p>
+<pre><code>parser  = <span class="hljs-keyword">new</span> OptionParser switches, helpBanner
+options = parser.parse process.argv
+</code></pre><p>The first non-option is considered to be the start of the file (and file
+option) list, and all subsequent arguments are left unparsed.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>exports.OptionParser = <span class="class"><span class="keyword">class</span> <span class="title">OptionParser</span></span></pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.OptionParser = <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">OptionParser</span></span></pre></div></div>
             
         </li>
         
@@ -145,17 +149,14 @@ option) list, and all subsequent arguments are left unparsed.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-3">&#182;</a>
               </div>
-              <p>Initialize with a list of valid options, in the form:
-
-</p>
-<pre><code>[short-flag, long-flag, description]</code></pre>
-<p>Along with an an optional banner for the usage help.
-</p>
+              <p>Initialize with a list of valid options, in the form:</p>
+<pre><code>[short-flag, long-flag, description]
+</code></pre><p>Along with an an optional banner for the usage help.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  constructor: (rules, <span class="property">@banner</span>) -&gt;
-    <span class="property">@rules</span> = buildRules rules</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">constructor</span>: <span class="hljs-function"><span class="hljs-params">(rules, <span class="hljs-property">@banner</span>)</span> -&gt;</span>
+    <span class="hljs-property">@rules</span> = buildRules rules</pre></div></div>
             
         </li>
         
@@ -171,25 +172,24 @@ specified options, and return it. Options after the first non-option
 argument are treated as arguments. <code>options.arguments</code> will be an array
 containing the remaining arguments. This is a simpler API than many option
 parsers that allow you to attach callback actions for every flag. Instead,
-you&#39;re responsible for interpreting the options object.
-</p>
+you’re responsible for interpreting the options object.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  parse: (args) -&gt;
-    options = arguments: []
-    skippingArgument = <span class="literal">no</span>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">parse</span>: <span class="hljs-function"><span class="hljs-params">(args)</span> -&gt;</span>
+    options = <span class="hljs-attribute">arguments</span>: []
+    skippingArgument = <span class="hljs-literal">no</span>
     originalArgs = args
     args = normalizeArguments args
-    <span class="keyword">for</span> arg, i <span class="keyword">in</span> args
-      <span class="keyword">if</span> skippingArgument
-        skippingArgument = <span class="literal">no</span>
-        <span class="keyword">continue</span>
-      <span class="keyword">if</span> arg <span class="keyword">is</span> <span class="string">'--'</span>
-        pos = originalArgs.indexOf <span class="string">'--'</span>
-        options.arguments = options.arguments.concat originalArgs[(pos + <span class="number">1</span>)..]
-        <span class="keyword">break</span>
-      isOption = !!(arg.match(LONG_FLAG) <span class="keyword">or</span> arg.match(SHORT_FLAG))</pre></div></div>
+    <span class="hljs-keyword">for</span> arg, i <span class="hljs-keyword">in</span> args
+      <span class="hljs-keyword">if</span> skippingArgument
+        skippingArgument = <span class="hljs-literal">no</span>
+        <span class="hljs-keyword">continue</span>
+      <span class="hljs-keyword">if</span> arg <span class="hljs-keyword">is</span> <span class="hljs-string">'--'</span>
+        pos = originalArgs.indexOf <span class="hljs-string">'--'</span>
+        options.arguments = options.arguments.concat originalArgs[(pos + <span class="hljs-number">1</span>)..]
+        <span class="hljs-keyword">break</span>
+      isOption = !!(arg.match(LONG_FLAG) <span class="hljs-keyword">or</span> arg.match(SHORT_FLAG))</pre></div></div>
             
         </li>
         
@@ -201,25 +201,24 @@ you&#39;re responsible for interpreting the options object.
                 <a class="pilcrow" href="#section-5">&#182;</a>
               </div>
               <p>the CS option parser is a little odd; options after the first
-non-option argument are treated as non-option arguments themselves
-</p>
+non-option argument are treated as non-option arguments themselves</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      seenNonOptionArg = options.arguments.length &gt; <span class="number">0</span>
-      <span class="keyword">unless</span> seenNonOptionArg
-        matchedRule = <span class="literal">no</span>
-        <span class="keyword">for</span> rule <span class="keyword">in</span> <span class="property">@rules</span>
-          <span class="keyword">if</span> rule.shortFlag <span class="keyword">is</span> arg <span class="keyword">or</span> rule.longFlag <span class="keyword">is</span> arg
-            value = <span class="literal">true</span>
-            <span class="keyword">if</span> rule.hasArgument
-              skippingArgument = <span class="literal">yes</span>
-              value = args[i + <span class="number">1</span>]
-            options[rule.name] = <span class="keyword">if</span> rule.isList <span class="keyword">then</span> (options[rule.name] <span class="keyword">or</span> []).concat value <span class="keyword">else</span> value
-            matchedRule = <span class="literal">yes</span>
-            <span class="keyword">break</span>
-        <span class="keyword">throw</span> <span class="keyword">new</span> Error <span class="string">"unrecognized option: <span class="subst">#{arg}</span>"</span> <span class="keyword">if</span> isOption <span class="keyword">and</span> <span class="keyword">not</span> matchedRule
-      <span class="keyword">if</span> seenNonOptionArg <span class="keyword">or</span> <span class="keyword">not</span> isOption
+            <div class="content"><div class='highlight'><pre>      seenNonOptionArg = options.arguments.length &gt; <span class="hljs-number">0</span>
+      <span class="hljs-keyword">unless</span> seenNonOptionArg
+        matchedRule = <span class="hljs-literal">no</span>
+        <span class="hljs-keyword">for</span> rule <span class="hljs-keyword">in</span> <span class="hljs-property">@rules</span>
+          <span class="hljs-keyword">if</span> rule.shortFlag <span class="hljs-keyword">is</span> arg <span class="hljs-keyword">or</span> rule.longFlag <span class="hljs-keyword">is</span> arg
+            value = <span class="hljs-literal">true</span>
+            <span class="hljs-keyword">if</span> rule.hasArgument
+              skippingArgument = <span class="hljs-literal">yes</span>
+              value = args[i + <span class="hljs-number">1</span>]
+            options[rule.name] = <span class="hljs-keyword">if</span> rule.isList <span class="hljs-keyword">then</span> (options[rule.name] <span class="hljs-keyword">or</span> []).concat value <span class="hljs-keyword">else</span> value
+            matchedRule = <span class="hljs-literal">yes</span>
+            <span class="hljs-keyword">break</span>
+        <span class="hljs-keyword">throw</span> <span class="hljs-keyword">new</span> Error <span class="hljs-string">"unrecognized option: <span class="hljs-subst">#{arg}</span>"</span> <span class="hljs-keyword">if</span> isOption <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> matchedRule
+      <span class="hljs-keyword">if</span> seenNonOptionArg <span class="hljs-keyword">or</span> <span class="hljs-keyword">not</span> isOption
         options.arguments.push arg
     options</pre></div></div>
             
@@ -233,20 +232,19 @@ non-option argument are treated as non-option arguments themselves
                 <a class="pilcrow" href="#section-6">&#182;</a>
               </div>
               <p>Return the help text for this <strong>OptionParser</strong>, listing and describing all
-of the valid options, for <code>--help</code> and such.
-</p>
+of the valid options, for <code>--help</code> and such.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  help: -&gt;
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">help</span>:<span class="hljs-function"> -&gt;</span>
     lines = []
-    lines.unshift <span class="string">"<span class="subst">#{@banner}</span>\n"</span> <span class="keyword">if</span> <span class="property">@banner</span>
-    <span class="keyword">for</span> rule <span class="keyword">in</span> <span class="property">@rules</span>
-      spaces  = <span class="number">15</span> - rule.longFlag.length
-      spaces  = <span class="keyword">if</span> spaces &gt; <span class="number">0</span> <span class="keyword">then</span> repeat <span class="string">' '</span>, spaces <span class="keyword">else</span> <span class="string">''</span>
-      letPart = <span class="keyword">if</span> rule.shortFlag <span class="keyword">then</span> rule.shortFlag + <span class="string">', '</span> <span class="keyword">else</span> <span class="string">'    '</span>
-      lines.push <span class="string">'  '</span> + letPart + rule.longFlag + spaces + rule.description
-    <span class="string">"\n<span class="subst">#{ lines.join('\n') }</span>\n"</span></pre></div></div>
+    lines.unshift <span class="hljs-string">"<span class="hljs-subst">#{<span class="hljs-property">@banner</span>}</span>\n"</span> <span class="hljs-keyword">if</span> <span class="hljs-property">@banner</span>
+    <span class="hljs-keyword">for</span> rule <span class="hljs-keyword">in</span> <span class="hljs-property">@rules</span>
+      spaces  = <span class="hljs-number">15</span> - rule.longFlag.length
+      spaces  = <span class="hljs-keyword">if</span> spaces &gt; <span class="hljs-number">0</span> <span class="hljs-keyword">then</span> repeat <span class="hljs-string">' '</span>, spaces <span class="hljs-keyword">else</span> <span class="hljs-string">''</span>
+      letPart = <span class="hljs-keyword">if</span> rule.shortFlag <span class="hljs-keyword">then</span> rule.shortFlag + <span class="hljs-string">', '</span> <span class="hljs-keyword">else</span> <span class="hljs-string">'    '</span>
+      lines.push <span class="hljs-string">'  '</span> + letPart + rule.longFlag + spaces + rule.description
+    <span class="hljs-string">"\n<span class="hljs-subst">#{ lines.join(<span class="hljs-string">'\n'</span>) }</span>\n"</span></pre></div></div>
             
         </li>
         
@@ -254,10 +252,10 @@ of the valid options, for <code>--help</code> and such.
         <li id="section-7">
             <div class="annotation">
               
-              <div class="pilwrap for-h2">
+              <div class="pilwrap ">
                 <a class="pilcrow" href="#section-7">&#182;</a>
               </div>
-              <h2>Helpers</h2>
+              <h2 id="helpers">Helpers</h2>
 
             </div>
             
@@ -282,15 +280,14 @@ of the valid options, for <code>--help</code> and such.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-9">&#182;</a>
               </div>
-              <p>Regex matchers for option flags.
-</p>
+              <p>Regex matchers for option flags.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>LONG_FLAG  = <span class="regexp">/^(--\w[\w\-]*)/</span>
-SHORT_FLAG = <span class="regexp">/^(-\w)$/</span>
-MULTI_FLAG = <span class="regexp">/^-(\w{2,})/</span>
-OPTIONAL   = <span class="regexp">/\[(\w+(\*?))\]/</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>LONG_FLAG  = <span class="hljs-regexp">/^(--\w[\w\-]*)/</span>
+SHORT_FLAG = <span class="hljs-regexp">/^(-\w)$/</span>
+MULTI_FLAG = <span class="hljs-regexp">/^-(\w{2,})/</span>
+OPTIONAL   = <span class="hljs-regexp">/\[(\w+(\*?))\]/</span></pre></div></div>
             
         </li>
         
@@ -302,14 +299,13 @@ OPTIONAL   = <span class="regexp">/\[(\w+(\*?))\]/</span></pre></div></div>
                 <a class="pilcrow" href="#section-10">&#182;</a>
               </div>
               <p>Build and return the list of option rules. If the optional <em>short-flag</em> is
-unspecified, leave it out by padding with <code>null</code>.
-</p>
+unspecified, leave it out by padding with <code>null</code>.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="function"><span class="title">buildRules</span></span> = (rules) -&gt;
-  <span class="keyword">for</span> tuple <span class="keyword">in</span> rules
-    tuple.unshift <span class="literal">null</span> <span class="keyword">if</span> tuple.length &lt; <span class="number">3</span>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">buildRules</span> = <span class="hljs-params">(rules)</span> -&gt;</span>
+  <span class="hljs-keyword">for</span> tuple <span class="hljs-keyword">in</span> rules
+    tuple.unshift <span class="hljs-literal">null</span> <span class="hljs-keyword">if</span> tuple.length &lt; <span class="hljs-number">3</span>
     buildRule tuple...</pre></div></div>
             
         </li>
@@ -322,21 +318,20 @@ unspecified, leave it out by padding with <code>null</code>.
                 <a class="pilcrow" href="#section-11">&#182;</a>
               </div>
               <p>Build a rule from a <code>-o</code> short flag, a <code>--output [DIR]</code> long flag, and the
-description of what the option does.
-</p>
+description of what the option does.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="function"><span class="title">buildRule</span></span> = (shortFlag, longFlag, description, options = {}) -&gt;
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">buildRule</span> = <span class="hljs-params">(shortFlag, longFlag, description, options = {})</span> -&gt;</span>
   match     = longFlag.match(OPTIONAL)
-  longFlag  = longFlag.match(LONG_FLAG)[<span class="number">1</span>]
+  longFlag  = longFlag.match(LONG_FLAG)[<span class="hljs-number">1</span>]
   {
-    name:         longFlag.substr <span class="number">2</span>
-    shortFlag:    shortFlag
-    longFlag:     longFlag
-    description:  description
-    hasArgument:  !!(match <span class="keyword">and</span> match[<span class="number">1</span>])
-    isList:       !!(match <span class="keyword">and</span> match[<span class="number">2</span>])
+    <span class="hljs-attribute">name</span>:         longFlag.substr <span class="hljs-number">2</span>
+    <span class="hljs-attribute">shortFlag</span>:    shortFlag
+    <span class="hljs-attribute">longFlag</span>:     longFlag
+    <span class="hljs-attribute">description</span>:  description
+    <span class="hljs-attribute">hasArgument</span>:  !!(match <span class="hljs-keyword">and</span> match[<span class="hljs-number">1</span>])
+    <span class="hljs-attribute">isList</span>:       !!(match <span class="hljs-keyword">and</span> match[<span class="hljs-number">2</span>])
   }</pre></div></div>
             
         </li>
@@ -349,18 +344,17 @@ description of what the option does.
                 <a class="pilcrow" href="#section-12">&#182;</a>
               </div>
               <p>Normalize arguments by expanding merged flags into multiple flags. This allows
-you to have <code>-wl</code> be the same as <code>--watch --lint</code>.
-</p>
+you to have <code>-wl</code> be the same as <code>--watch --lint</code>.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="function"><span class="title">normalizeArguments</span></span> = (args) -&gt;
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">normalizeArguments</span> = <span class="hljs-params">(args)</span> -&gt;</span>
   args = args[..]
   result = []
-  <span class="keyword">for</span> arg <span class="keyword">in</span> args
-    <span class="keyword">if</span> match = arg.match MULTI_FLAG
-      result.push <span class="string">'-'</span> + l <span class="keyword">for</span> l <span class="keyword">in</span> match[<span class="number">1</span>].split <span class="string">''</span>
-    <span class="keyword">else</span>
+  <span class="hljs-keyword">for</span> arg <span class="hljs-keyword">in</span> args
+    <span class="hljs-keyword">if</span> match = arg.match MULTI_FLAG
+      result.push <span class="hljs-string">'-'</span> + l <span class="hljs-keyword">for</span> l <span class="hljs-keyword">in</span> match[<span class="hljs-number">1</span>].split <span class="hljs-string">''</span>
+    <span class="hljs-keyword">else</span>
       result.push arg
   result</pre></div></div>
             

documentation/docs/register.html

@@ -0,0 +1,251 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+  <title>register.coffee</title>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width, target-densitydpi=160dpi, initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+  <link rel="stylesheet" media="all" href="docco.css" />
+</head>
+<body>
+  <div id="container">
+    <div id="background"></div>
+    
+      <ul id="jump_to">
+        <li>
+          <a class="large" href="javascript:void(0);">Jump To &hellip;</a>
+          <a class="small" href="javascript:void(0);">+</a>
+          <div id="jump_wrapper">
+          <div id="jump_page_wrapper">
+            <div id="jump_page">
+              
+                
+                <a class="source" href="browser.html">
+                  browser.coffee
+                </a>
+              
+                
+                <a class="source" href="cake.html">
+                  cake.coffee
+                </a>
+              
+                
+                <a class="source" href="coffee-script.html">
+                  coffee-script.coffee
+                </a>
+              
+                
+                <a class="source" href="command.html">
+                  command.coffee
+                </a>
+              
+                
+                <a class="source" href="grammar.html">
+                  grammar.coffee
+                </a>
+              
+                
+                <a class="source" href="helpers.html">
+                  helpers.coffee
+                </a>
+              
+                
+                <a class="source" href="index.html">
+                  index.coffee
+                </a>
+              
+                
+                <a class="source" href="lexer.html">
+                  lexer.coffee
+                </a>
+              
+                
+                <a class="source" href="nodes.html">
+                  nodes.coffee
+                </a>
+              
+                
+                <a class="source" href="optparse.html">
+                  optparse.coffee
+                </a>
+              
+                
+                <a class="source" href="register.html">
+                  register.coffee
+                </a>
+              
+                
+                <a class="source" href="repl.html">
+                  repl.coffee
+                </a>
+              
+                
+                <a class="source" href="rewriter.html">
+                  rewriter.coffee
+                </a>
+              
+                
+                <a class="source" href="scope.html">
+                  scope.litcoffee
+                </a>
+              
+                
+                <a class="source" href="sourcemap.html">
+                  sourcemap.litcoffee
+                </a>
+              
+            </div>
+          </div>
+        </li>
+      </ul>
+    
+    <ul class="sections">
+        
+          <li id="title">
+              <div class="annotation">
+                  <h1>register.coffee</h1>
+              </div>
+          </li>
+        
+        
+        
+        <li id="section-1">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-1">&#182;</a>
+              </div>
+              
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>CoffeeScript  = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffee-script'</span>
+child_process = <span class="hljs-built_in">require</span> <span class="hljs-string">'child_process'</span>
+helpers       = <span class="hljs-built_in">require</span> <span class="hljs-string">'./helpers'</span>
+path          = <span class="hljs-built_in">require</span> <span class="hljs-string">'path'</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-2">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-2">&#182;</a>
+              </div>
+              <p>Load and run a CoffeeScript file for Node, stripping any <code>BOM</code>s.</p>
+
+            </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">false</span>
+  <span class="hljs-built_in">module</span>._compile answer, filename</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-3">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-3">&#182;</a>
+              </div>
+              <p>If the installed version of Node supports <code>require.extensions</code>, register
+CoffeeScript as an extension.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">if</span> <span class="hljs-built_in">require</span>.extensions
+  <span class="hljs-keyword">for</span> ext <span class="hljs-keyword">in</span> CoffeeScript.FILE_EXTENSIONS
+    <span class="hljs-built_in">require</span>.extensions[ext] = loadFile</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-4">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-4">&#182;</a>
+              </div>
+              <p>Patch Node’s module loader to be able to handle multi-dot extensions.
+This is a horrible thing that should not be required.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>  Module = <span class="hljs-built_in">require</span> <span class="hljs-string">'module'</span>
+
+  <span class="hljs-function"><span class="hljs-title">findExtension</span> = <span class="hljs-params">(filename)</span> -&gt;</span>
+    extensions = path.basename(filename).split <span class="hljs-string">'.'</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-5">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-5">&#182;</a>
+              </div>
+              <p>Remove the initial dot from dotfiles.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    extensions.shift() <span class="hljs-keyword">if</span> extensions[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">''</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-6">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-6">&#182;</a>
+              </div>
+              <p>Start with the longest possible extension and work our way shortwards.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    <span class="hljs-keyword">while</span> extensions.shift()
+      curExtension = <span class="hljs-string">'.'</span> + extensions.join <span class="hljs-string">'.'</span>
+      <span class="hljs-keyword">return</span> curExtension <span class="hljs-keyword">if</span> Module._extensions[curExtension]
+    <span class="hljs-string">'.js'</span>
+
+  <span class="hljs-attribute">Module</span>::<span class="hljs-function"><span class="hljs-title">load</span> = <span class="hljs-params">(filename)</span> -&gt;</span>
+    <span class="hljs-property">@filename</span> = filename
+    <span class="hljs-property">@paths</span> = Module._nodeModulePaths path.dirname filename
+    extension = findExtension filename
+    Module._extensions[extension](<span class="hljs-keyword">this</span>, filename)
+    <span class="hljs-property">@loaded</span> = <span class="hljs-literal">true</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-7">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-7">&#182;</a>
+              </div>
+              <p>If we’re on Node, patch <code>child_process.fork</code> so that Coffee scripts are able
+to fork both CoffeeScript files, and JavaScript files, directly.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">if</span> child_process
+  {fork} = child_process
+  binary = <span class="hljs-built_in">require</span>.resolve <span class="hljs-string">'../../bin/coffee'</span>
+  child_process.<span class="hljs-function"><span class="hljs-title">fork</span> = <span class="hljs-params">(path, args, options)</span> -&gt;</span>
+    <span class="hljs-keyword">if</span> helpers.isCoffee path
+      <span class="hljs-keyword">unless</span> Array.isArray args
+        options = args <span class="hljs-keyword">or</span> {}
+        args = []
+      args = [path].concat args
+      path = binary
+    fork path, args, options</pre></div></div>
+            
+        </li>
+        
+    </ul>
+  </div>
+</body>
+</html>

documentation/docs/repl.html

@@ -16,78 +16,85 @@
           <a class="large" href="javascript:void(0);">Jump To &hellip;</a>
           <a class="small" href="javascript:void(0);">+</a>
           <div id="jump_wrapper">
-          <div id="jump_page">
-            
+          <div id="jump_page_wrapper">
+            <div id="jump_page">
               
-              <a class="source" href="browser.html">
-                browser.coffee
-              </a>
-            
+                
+                <a class="source" href="browser.html">
+                  browser.coffee
+                </a>
               
-              <a class="source" href="cake.html">
-                cake.coffee
-              </a>
-            
+                
+                <a class="source" href="cake.html">
+                  cake.coffee
+                </a>
               
-              <a class="source" href="coffee-script.html">
-                coffee-script.coffee
-              </a>
-            
+                
+                <a class="source" href="coffee-script.html">
+                  coffee-script.coffee
+                </a>
               
-              <a class="source" href="command.html">
-                command.coffee
-              </a>
-            
+                
+                <a class="source" href="command.html">
+                  command.coffee
+                </a>
               
-              <a class="source" href="grammar.html">
-                grammar.coffee
-              </a>
-            
+                
+                <a class="source" href="grammar.html">
+                  grammar.coffee
+                </a>
               
-              <a class="source" href="helpers.html">
-                helpers.coffee
-              </a>
-            
+                
+                <a class="source" href="helpers.html">
+                  helpers.coffee
+                </a>
               
-              <a class="source" href="index.html">
-                index.coffee
-              </a>
-            
+                
+                <a class="source" href="index.html">
+                  index.coffee
+                </a>
               
-              <a class="source" href="lexer.html">
-                lexer.coffee
-              </a>
-            
+                
+                <a class="source" href="lexer.html">
+                  lexer.coffee
+                </a>
               
-              <a class="source" href="nodes.html">
-                nodes.coffee
-              </a>
-            
+                
+                <a class="source" href="nodes.html">
+                  nodes.coffee
+                </a>
               
-              <a class="source" href="optparse.html">
-                optparse.coffee
-              </a>
-            
+                
+                <a class="source" href="optparse.html">
+                  optparse.coffee
+                </a>
               
-              <a class="source" href="repl.html">
-                repl.coffee
-              </a>
-            
+                
+                <a class="source" href="register.html">
+                  register.coffee
+                </a>
               
-              <a class="source" href="rewriter.html">
-                rewriter.coffee
-              </a>
-            
+                
+                <a class="source" href="repl.html">
+                  repl.coffee
+                </a>
               
-              <a class="source" href="scope.html">
-                scope.litcoffee
-              </a>
-            
+                
+                <a class="source" href="rewriter.html">
+                  rewriter.coffee
+                </a>
               
-              <a class="source" href="sourcemap.html">
-                sourcemap.litcoffee
-              </a>
-            
+                
+                <a class="source" href="scope.html">
+                  scope.litcoffee
+                </a>
+              
+                
+                <a class="source" href="sourcemap.html">
+                  sourcemap.litcoffee
+                </a>
+              
+            </div>
           </div>
         </li>
       </ul>
@@ -111,18 +118,18 @@
               
             </div>
             
-            <div class="content"><div class='highlight'><pre>fs = require <span class="string">'fs'</span>
-path = require <span class="string">'path'</span>
-vm = require <span class="string">'vm'</span>
-nodeREPL = require <span class="string">'repl'</span>
-CoffeeScript = require <span class="string">'./coffee-script'</span>
-{merge, prettyErrorMessage} = require <span class="string">'./helpers'</span>
+            <div class="content"><div class='highlight'><pre>fs = <span class="hljs-built_in">require</span> <span class="hljs-string">'fs'</span>
+path = <span class="hljs-built_in">require</span> <span class="hljs-string">'path'</span>
+vm = <span class="hljs-built_in">require</span> <span class="hljs-string">'vm'</span>
+nodeREPL = <span class="hljs-built_in">require</span> <span class="hljs-string">'repl'</span>
+CoffeeScript = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffee-script'</span>
+{merge, updateSyntaxError} = <span class="hljs-built_in">require</span> <span class="hljs-string">'./helpers'</span>
 
 replDefaults =
-  prompt: <span class="string">'coffee&gt; '</span>,
-  historyFile: path.join process.env.HOME, <span class="string">'.coffee_history'</span> <span class="keyword">if</span> process.env.HOME
-  historyMaxInputSize: <span class="number">10240</span>
-  eval: (input, context, filename, cb) -&gt;</pre></div></div>
+  <span class="hljs-attribute">prompt</span>: <span class="hljs-string">'coffee&gt; '</span>,
+  <span class="hljs-attribute">historyFile</span>: path.join process.env.HOME, <span class="hljs-string">'.coffee_history'</span> <span class="hljs-keyword">if</span> process.env.HOME
+  <span class="hljs-attribute">historyMaxInputSize</span>: <span class="hljs-number">10240</span>
+  <span class="hljs-attribute">eval</span>: <span class="hljs-function"><span class="hljs-params">(input, context, filename, cb)</span> -&gt;</span></pre></div></div>
             
         </li>
         
@@ -133,12 +140,11 @@ replDefaults =
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-2">&#182;</a>
               </div>
-              <p>XXX: multiline hack.
-</p>
+              <p>XXX: multiline hack.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>    input = input.replace <span class="regexp">/\uFF00/g</span>, <span class="string">'\n'</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>    input = input.replace <span class="hljs-regexp">/\uFF00/g</span>, <span class="hljs-string">'\n'</span></pre></div></div>
             
         </li>
         
@@ -149,13 +155,12 @@ replDefaults =
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-3">&#182;</a>
               </div>
-              <p>Node&#39;s REPL sends the input ending with a newline and then wrapped in
-parens. Unwrap all that.
-</p>
+              <p>Node’s REPL sends the input ending with a newline and then wrapped in
+parens. Unwrap all that.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>    input = input.replace <span class="regexp">/^\(([\s\S]*)\n\)$/m</span>, <span class="string">'$1'</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>    input = input.replace <span class="hljs-regexp">/^\(([\s\S]*)\n\)$/m</span>, <span class="hljs-string">'$1'</span></pre></div></div>
             
         </li>
         
@@ -166,14 +171,13 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
-              <p>Require AST nodes to do some AST manipulation.
-</p>
+              <p>Require AST nodes to do some AST manipulation.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>    {Block, Assign, Value, Literal} = require <span class="string">'./nodes'</span>
+            <div class="content"><div class='highlight'><pre>    {Block, Assign, Value, Literal} = <span class="hljs-built_in">require</span> <span class="hljs-string">'./nodes'</span>
 
-    <span class="keyword">try</span></pre></div></div>
+    <span class="hljs-keyword">try</span></pre></div></div>
             
         </li>
         
@@ -184,12 +188,11 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-5">&#182;</a>
               </div>
-              <p>Generate the AST of the clean input.
-</p>
+              <p>Tokenize the clean input.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      ast = CoffeeScript.nodes input</pre></div></div>
+            <div class="content"><div class='highlight'><pre>      tokens = CoffeeScript.tokens input</pre></div></div>
             
         </li>
         
@@ -200,27 +203,13 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-6">&#182;</a>
               </div>
-              <p>Add assignment to <code>_</code> variable to force the input to be an expression.
-</p>
+              <p>Collect referenced variable names just like in <code>CoffeeScript.compile</code>.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      ast = <span class="keyword">new</span> Block [
-        <span class="keyword">new</span> Assign (<span class="keyword">new</span> Value <span class="keyword">new</span> Literal <span class="string">'_'</span>), ast, <span class="string">'='</span>
-      ]
-      js = ast.compile bare: <span class="literal">yes</span>, locals: Object.keys(context)
-      cb <span class="literal">null</span>, vm.runInContext(js, context, filename)
-    <span class="keyword">catch</span> err
-      cb prettyErrorMessage(err, filename, input, <span class="literal">yes</span>)
-
-<span class="function"><span class="title">addMultilineHandler</span></span> = (repl) -&gt;
-  {rli, inputStream, outputStream} = repl
-
-  multiline =
-    enabled: <span class="literal">off</span>
-    initialPrompt: repl.prompt.replace <span class="regexp">/^[^&gt; ]*/, (x) -&gt; x.replace /./g</span>, <span class="string">'-'</span>
-    prompt: repl.prompt.replace <span class="regexp">/^[^&gt; ]*&gt;?/, (x) -&gt; x.replace /./g</span>, <span class="string">'.'</span>
-    buffer: <span class="string">''</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>      referencedVars = (
+        token[<span class="hljs-number">1</span>] <span class="hljs-keyword">for</span> token <span class="hljs-keyword">in</span> tokens <span class="hljs-keyword">when</span> token.variable
+      )</pre></div></div>
             
         </li>
         
@@ -231,21 +220,11 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-7">&#182;</a>
               </div>
-              <p>Proxy node&#39;s line listener
-</p>
+              <p>Generate the AST of the tokens.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  nodeLineListener = rli.listeners(<span class="string">'line'</span>)[<span class="number">0</span>]
-  rli.removeListener <span class="string">'line'</span>, nodeLineListener
-  rli.<span class="literal">on</span> <span class="string">'line'</span>, (cmd) -&gt;
-    <span class="keyword">if</span> multiline.enabled
-      multiline.buffer += <span class="string">"<span class="subst">#{cmd}</span>\n"</span>
-      rli.setPrompt multiline.prompt
-      rli.prompt <span class="literal">true</span>
-    <span class="keyword">else</span>
-      nodeLineListener cmd
-    <span class="keyword">return</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>      ast = CoffeeScript.nodes tokens</pre></div></div>
             
         </li>
         
@@ -256,14 +235,16 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-8">&#182;</a>
               </div>
-              <p>Handle Ctrl-v
-</p>
+              <p>Add assignment to <code>_</code> variable to force the input to be an expression.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  inputStream.<span class="literal">on</span> <span class="string">'keypress'</span>, (char, key) -&gt;
-    <span class="keyword">return</span> <span class="keyword">unless</span> key <span class="keyword">and</span> key.ctrl <span class="keyword">and</span> <span class="keyword">not</span> key.meta <span class="keyword">and</span> <span class="keyword">not</span> key.shift <span class="keyword">and</span> key.name <span class="keyword">is</span> <span class="string">'v'</span>
-    <span class="keyword">if</span> multiline.enabled</pre></div></div>
+            <div class="content"><div class='highlight'><pre>      ast = <span class="hljs-keyword">new</span> Block [
+        <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}
+      cb <span class="hljs-literal">null</span>, runInContext js, context, filename
+    <span class="hljs-keyword">catch</span> err</pre></div></div>
             
         </li>
         
@@ -274,16 +255,21 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-9">&#182;</a>
               </div>
-              <p>allow arbitrarily switching between modes any time before multiple lines are entered
-</p>
+              <p>AST’s <code>compile</code> does not add source code information to syntax errors.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="keyword">unless</span> multiline.buffer.match <span class="regexp">/\n/</span>
-        multiline.enabled = <span class="keyword">not</span> multiline.enabled
-        rli.setPrompt repl.prompt
-        rli.prompt <span class="literal">true</span>
-        <span class="keyword">return</span></pre></div></div>
+            <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>
             
         </li>
         
@@ -294,12 +280,17 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-10">&#182;</a>
               </div>
-              <p>no-op unless the current line is empty
-</p>
+              <p>Node 0.11.12 changed API, prompt is now _prompt.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="keyword">return</span> <span class="keyword">if</span> rli.line? <span class="keyword">and</span> <span class="keyword">not</span> rli.line.match <span class="regexp">/^\s*$/</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  origPrompt = repl._prompt ? repl.prompt
+
+  multiline =
+    <span class="hljs-attribute">enabled</span>: <span class="hljs-literal">off</span>
+    <span class="hljs-attribute">initialPrompt</span>: origPrompt.replace <span class="hljs-regexp">/^[^&gt; ]*/</span>, <span class="hljs-function"><span class="hljs-params">(x)</span> -&gt;</span> x.replace <span class="hljs-regexp">/./g</span>, <span class="hljs-string">'-'</span>
+    <span class="hljs-attribute">prompt</span>: origPrompt.replace <span class="hljs-regexp">/^[^&gt; ]*&gt;?/</span>, <span class="hljs-function"><span class="hljs-params">(x)</span> -&gt;</span> x.replace <span class="hljs-regexp">/./g</span>, <span class="hljs-string">'.'</span>
+    <span class="hljs-attribute">buffer</span>: <span class="hljs-string">''</span></pre></div></div>
             
         </li>
         
@@ -310,16 +301,21 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-11">&#182;</a>
               </div>
-              <p>eval, print, loop
-</p>
+              <p>Proxy node’s line listener</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      multiline.enabled = <span class="keyword">not</span> multiline.enabled
-      rli.line = <span class="string">''</span>
-      rli.cursor = <span class="number">0</span>
-      rli.output.cursorTo <span class="number">0</span>
-      rli.output.clearLine <span class="number">1</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  nodeLineListener = rli.listeners(<span class="hljs-string">'line'</span>)[<span class="hljs-number">0</span>]
+  rli.removeListener <span class="hljs-string">'line'</span>, nodeLineListener
+  rli.<span class="hljs-literal">on</span> <span class="hljs-string">'line'</span>, <span class="hljs-function"><span class="hljs-params">(cmd)</span> -&gt;</span>
+    <span class="hljs-keyword">if</span> multiline.enabled
+      multiline.buffer += <span class="hljs-string">"<span class="hljs-subst">#{cmd}</span>\n"</span>
+      rli.setPrompt multiline.prompt
+      rli.prompt <span class="hljs-literal">true</span>
+    <span class="hljs-keyword">else</span>
+      rli.setPrompt origPrompt
+      nodeLineListener cmd
+    <span class="hljs-keyword">return</span></pre></div></div>
             
         </li>
         
@@ -330,19 +326,13 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-12">&#182;</a>
               </div>
-              <p>XXX: multiline hack
-</p>
+              <p>Handle Ctrl-v</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      multiline.buffer = multiline.buffer.replace <span class="regexp">/\n/g</span>, <span class="string">'\uFF00'</span>
-      rli.emit <span class="string">'line'</span>, multiline.buffer
-      multiline.buffer = <span class="string">''</span>
-    <span class="keyword">else</span>
-      multiline.enabled = <span class="keyword">not</span> multiline.enabled
-      rli.setPrompt multiline.initialPrompt
-      rli.prompt <span class="literal">true</span>
-    <span class="keyword">return</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  inputStream.<span class="hljs-literal">on</span> <span class="hljs-string">'keypress'</span>, <span class="hljs-function"><span class="hljs-params">(char, key)</span> -&gt;</span>
+    <span class="hljs-keyword">return</span> <span class="hljs-keyword">unless</span> key <span class="hljs-keyword">and</span> key.ctrl <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> key.meta <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> key.shift <span class="hljs-keyword">and</span> key.name <span class="hljs-keyword">is</span> <span class="hljs-string">'v'</span>
+    <span class="hljs-keyword">if</span> multiline.enabled</pre></div></div>
             
         </li>
         
@@ -353,14 +343,15 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-13">&#182;</a>
               </div>
-              <p>Store and load command history from a file
-</p>
+              <p>allow arbitrarily switching between modes any time before multiple lines are entered</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="function"><span class="title">addHistory</span></span> = (repl, filename, maxSize) -&gt;
-  lastLine = <span class="literal">null</span>
-  <span class="keyword">try</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>      <span class="hljs-keyword">unless</span> multiline.buffer.match <span class="hljs-regexp">/\n/</span>
+        multiline.enabled = <span class="hljs-keyword">not</span> multiline.enabled
+        rli.setPrompt origPrompt
+        rli.prompt <span class="hljs-literal">true</span>
+        <span class="hljs-keyword">return</span></pre></div></div>
             
         </li>
         
@@ -371,13 +362,11 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-14">&#182;</a>
               </div>
-              <p>Get file info and at most maxSize of command history
-</p>
+              <p>no-op unless the current line is empty</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>    stat = fs.statSync filename
-    size = Math.min maxSize, stat.size</pre></div></div>
+            <div class="content"><div class='highlight'><pre>      <span class="hljs-keyword">return</span> <span class="hljs-keyword">if</span> rli.line? <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> rli.line.match <span class="hljs-regexp">/^\s*$/</span></pre></div></div>
             
         </li>
         
@@ -388,14 +377,15 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-15">&#182;</a>
               </div>
-              <p>Read last <code>size</code> bytes from the file
-</p>
+              <p>eval, print, loop</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>    readFd = fs.openSync filename, <span class="string">'r'</span>
-    buffer = <span class="keyword">new</span> Buffer(size)
-    fs.readSync readFd, buffer, <span class="number">0</span>, size, stat.size - size</pre></div></div>
+            <div class="content"><div class='highlight'><pre>      multiline.enabled = <span class="hljs-keyword">not</span> multiline.enabled
+      rli.line = <span class="hljs-string">''</span>
+      rli.cursor = <span class="hljs-number">0</span>
+      rli.output.cursorTo <span class="hljs-number">0</span>
+      rli.output.clearLine <span class="hljs-number">1</span></pre></div></div>
             
         </li>
         
@@ -406,12 +396,18 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-16">&#182;</a>
               </div>
-              <p>Set the history on the interpreter
-</p>
+              <p>XXX: multiline hack</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>    repl.rli.history = buffer.toString().split(<span class="string">'\n'</span>).reverse()</pre></div></div>
+            <div class="content"><div class='highlight'><pre>      multiline.buffer = multiline.buffer.replace <span class="hljs-regexp">/\n/g</span>, <span class="hljs-string">'\uFF00'</span>
+      rli.emit <span class="hljs-string">'line'</span>, multiline.buffer
+      multiline.buffer = <span class="hljs-string">''</span>
+    <span class="hljs-keyword">else</span>
+      multiline.enabled = <span class="hljs-keyword">not</span> multiline.enabled
+      rli.setPrompt multiline.initialPrompt
+      rli.prompt <span class="hljs-literal">true</span>
+    <span class="hljs-keyword">return</span></pre></div></div>
             
         </li>
         
@@ -422,12 +418,13 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-17">&#182;</a>
               </div>
-              <p>If the history file was truncated we should pop off a potential partial line
-</p>
+              <p>Store and load command history from a file</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>    repl.rli.history.pop() <span class="keyword">if</span> stat.size &gt; maxSize</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">addHistory</span> = <span class="hljs-params">(repl, filename, maxSize)</span> -&gt;</span>
+  lastLine = <span class="hljs-literal">null</span>
+  <span class="hljs-keyword">try</span></pre></div></div>
             
         </li>
         
@@ -438,19 +435,12 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-18">&#182;</a>
               </div>
-              <p>Shift off the final blank newline
-</p>
+              <p>Get file info and at most maxSize of command history</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>    repl.rli.history.shift() <span class="keyword">if</span> repl.rli.history[<span class="number">0</span>] <span class="keyword">is</span> <span class="string">''</span>
-    repl.rli.historyIndex = -<span class="number">1</span>
-    lastLine = repl.rli.history[<span class="number">0</span>]
-
-  fd = fs.openSync filename, <span class="string">'a'</span>
-
-  repl.rli.addListener <span class="string">'line'</span>, (code) -&gt;
-    <span class="keyword">if</span> code <span class="keyword">and</span> code.length <span class="keyword">and</span> code <span class="keyword">isnt</span> <span class="string">'.history'</span> <span class="keyword">and</span> lastLine <span class="keyword">isnt</span> code</pre></div></div>
+            <div class="content"><div class='highlight'><pre>    stat = fs.statSync filename
+    size = Math.min maxSize, stat.size</pre></div></div>
             
         </li>
         
@@ -461,15 +451,13 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-19">&#182;</a>
               </div>
-              <p>Save the latest command in the file
-</p>
+              <p>Read last <code>size</code> bytes from the file</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      fs.write fd, <span class="string">"<span class="subst">#{code}</span>\n"</span>
-      lastLine = code
-
-  repl.rli.<span class="literal">on</span> <span class="string">'exit'</span>, -&gt; fs.close fd</pre></div></div>
+            <div class="content"><div class='highlight'><pre>    readFd = fs.openSync filename, <span class="hljs-string">'r'</span>
+    buffer = <span class="hljs-keyword">new</span> Buffer(size)
+    fs.readSync readFd, buffer, <span class="hljs-number">0</span>, size, stat.size - size</pre></div></div>
             
         </li>
         
@@ -480,30 +468,135 @@ parens. Unwrap all that.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-20">&#182;</a>
               </div>
-              <p>Add a command to show the history stack
-</p>
+              <p>Set the history on the interpreter</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  repl.commands[<span class="string">'.history'</span>] =
-    help: <span class="string">'Show command history'</span>
-    action: -&gt;
-      repl.outputStream.write <span class="string">"<span class="subst">#{repl.rli.history[..].reverse().join '\n'}</span>\n"</span>
+            <div class="content"><div class='highlight'><pre>    repl.rli.history = buffer.toString().split(<span class="hljs-string">'\n'</span>).reverse()</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-21">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-21">&#182;</a>
+              </div>
+              <p>If the history file was truncated we should pop off a potential partial line</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    repl.rli.history.pop() <span class="hljs-keyword">if</span> stat.size &gt; maxSize</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-22">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-22">&#182;</a>
+              </div>
+              <p>Shift off the final blank newline</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    repl.rli.history.shift() <span class="hljs-keyword">if</span> repl.rli.history[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">''</span>
+    repl.rli.historyIndex = -<span class="hljs-number">1</span>
+    lastLine = repl.rli.history[<span class="hljs-number">0</span>]
+
+  fd = fs.openSync filename, <span class="hljs-string">'a'</span>
+
+  repl.rli.addListener <span class="hljs-string">'line'</span>, <span class="hljs-function"><span class="hljs-params">(code)</span> -&gt;</span>
+    <span class="hljs-keyword">if</span> code <span class="hljs-keyword">and</span> code.length <span class="hljs-keyword">and</span> code <span class="hljs-keyword">isnt</span> <span class="hljs-string">'.history'</span> <span class="hljs-keyword">and</span> lastLine <span class="hljs-keyword">isnt</span> code</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-23">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-23">&#182;</a>
+              </div>
+              <p>Save the latest command in the file</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>      fs.write fd, <span class="hljs-string">"<span class="hljs-subst">#{code}</span>\n"</span>
+      lastLine = code
+
+  repl.rli.<span class="hljs-literal">on</span> <span class="hljs-string">'exit'</span>,<span class="hljs-function"> -&gt;</span> fs.close fd</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-24">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-24">&#182;</a>
+              </div>
+              <p>Add a command to show the history stack</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>  repl.commands[getCommandId(repl, <span class="hljs-string">'history'</span>)] =
+    <span class="hljs-attribute">help</span>: <span class="hljs-string">'Show command history'</span>
+    <span class="hljs-attribute">action</span>:<span class="hljs-function"> -&gt;</span>
+      repl.outputStream.write <span class="hljs-string">"<span class="hljs-subst">#{repl.rli.history[..].reverse().join <span class="hljs-string">'\n'</span>}</span>\n"</span>
       repl.displayPrompt()
 
-module.exports =
-  start: (opts = {}) -&gt;
-    [major, minor, build] = process.versions.node.split(<span class="string">'.'</span>).map (n) -&gt; parseInt(n)
+<span class="hljs-function"><span class="hljs-title">getCommandId</span> = <span class="hljs-params">(repl, commandName)</span> -&gt;</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-25">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-25">&#182;</a>
+              </div>
+              <p>Node 0.11 changed API, a command such as ‘.help’ is now stored as ‘help’</p>
 
-    <span class="keyword">if</span> major <span class="keyword">is</span> <span class="number">0</span> <span class="keyword">and</span> minor &lt; <span class="number">8</span>
-      console.warn <span class="string">"Node 0.8.0+ required for CoffeeScript REPL"</span>
-      process.exit <span class="number">1</span>
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>  commandsHaveLeadingDot = repl.commands[<span class="hljs-string">'.help'</span>]?
+  <span class="hljs-keyword">if</span> commandsHaveLeadingDot <span class="hljs-keyword">then</span> <span class="hljs-string">".<span class="hljs-subst">#{commandName}</span>"</span> <span class="hljs-keyword">else</span> commandName
 
+<span class="hljs-built_in">module</span>.<span class="hljs-built_in">exports</span> =
+  <span class="hljs-attribute">start</span>: <span class="hljs-function"><span class="hljs-params">(opts = {})</span> -&gt;</span>
+    [major, minor, build] = process.versions.node.split<span class="hljs-function"><span class="hljs-params">(<span class="hljs-string">'.'</span>)</span>.<span class="hljs-title">map</span> <span class="hljs-params">(n)</span> -&gt;</span> parseInt(n)
+
+    <span class="hljs-keyword">if</span> major <span class="hljs-keyword">is</span> <span class="hljs-number">0</span> <span class="hljs-keyword">and</span> minor &lt; <span class="hljs-number">8</span>
+      <span class="hljs-built_in">console</span>.warn <span class="hljs-string">"Node 0.8.0+ required for CoffeeScript REPL"</span>
+      process.exit <span class="hljs-number">1</span>
+
+    CoffeeScript.register()
+    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
-    repl.<span class="literal">on</span> <span class="string">'exit'</span>, -&gt; repl.outputStream.write <span class="string">'\n'</span>
+    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="keyword">if</span> opts.historyFile
+    addHistory repl, opts.historyFile, opts.historyMaxInputSize <span class="hljs-keyword">if</span> opts.historyFile</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-26">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-26">&#182;</a>
+              </div>
+              <p>Adapt help inherited from the node REPL</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    repl.commands[getCommandId(repl, <span class="hljs-string">'load'</span>)].help = <span class="hljs-string">'Load code from a file into this REPL session'</span>
     repl</pre></div></div>
             
         </li>

documentation/docs/scope.html

@@ -16,78 +16,85 @@
           <a class="large" href="javascript:void(0);">Jump To &hellip;</a>
           <a class="small" href="javascript:void(0);">+</a>
           <div id="jump_wrapper">
-          <div id="jump_page">
-            
+          <div id="jump_page_wrapper">
+            <div id="jump_page">
               
-              <a class="source" href="browser.html">
-                browser.coffee
-              </a>
-            
+                
+                <a class="source" href="browser.html">
+                  browser.coffee
+                </a>
               
-              <a class="source" href="cake.html">
-                cake.coffee
-              </a>
-            
+                
+                <a class="source" href="cake.html">
+                  cake.coffee
+                </a>
               
-              <a class="source" href="coffee-script.html">
-                coffee-script.coffee
-              </a>
-            
+                
+                <a class="source" href="coffee-script.html">
+                  coffee-script.coffee
+                </a>
               
-              <a class="source" href="command.html">
-                command.coffee
-              </a>
-            
+                
+                <a class="source" href="command.html">
+                  command.coffee
+                </a>
               
-              <a class="source" href="grammar.html">
-                grammar.coffee
-              </a>
-            
+                
+                <a class="source" href="grammar.html">
+                  grammar.coffee
+                </a>
               
-              <a class="source" href="helpers.html">
-                helpers.coffee
-              </a>
-            
+                
+                <a class="source" href="helpers.html">
+                  helpers.coffee
+                </a>
               
-              <a class="source" href="index.html">
-                index.coffee
-              </a>
-            
+                
+                <a class="source" href="index.html">
+                  index.coffee
+                </a>
               
-              <a class="source" href="lexer.html">
-                lexer.coffee
-              </a>
-            
+                
+                <a class="source" href="lexer.html">
+                  lexer.coffee
+                </a>
               
-              <a class="source" href="nodes.html">
-                nodes.coffee
-              </a>
-            
+                
+                <a class="source" href="nodes.html">
+                  nodes.coffee
+                </a>
               
-              <a class="source" href="optparse.html">
-                optparse.coffee
-              </a>
-            
+                
+                <a class="source" href="optparse.html">
+                  optparse.coffee
+                </a>
               
-              <a class="source" href="repl.html">
-                repl.coffee
-              </a>
-            
+                
+                <a class="source" href="register.html">
+                  register.coffee
+                </a>
               
-              <a class="source" href="rewriter.html">
-                rewriter.coffee
-              </a>
-            
+                
+                <a class="source" href="repl.html">
+                  repl.coffee
+                </a>
               
-              <a class="source" href="scope.html">
-                scope.litcoffee
-              </a>
-            
+                
+                <a class="source" href="rewriter.html">
+                  rewriter.coffee
+                </a>
               
-              <a class="source" href="sourcemap.html">
-                sourcemap.litcoffee
-              </a>
-            
+                
+                <a class="source" href="scope.html">
+                  scope.litcoffee
+                </a>
+              
+                
+                <a class="source" href="sourcemap.html">
+                  sourcemap.litcoffee
+                </a>
+              
+            </div>
           </div>
         </li>
       </ul>
@@ -113,11 +120,12 @@ generate code, you create a tree of scopes in the same shape as the nested
 function bodies. Each scope knows about the variables declared within it,
 and has a reference to its parent enclosing scope. In this way, we know which
 variables are new and need to be declared with <code>var</code>, and which are shared
-with external scopes.
-</p>
+with external scopes.</p>
 
             </div>
             
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.Scope = <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Scope</span></span></pre></div></div>
+            
         </li>
         
         
@@ -127,15 +135,18 @@ with external scopes.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-2">&#182;</a>
               </div>
-              <p>Import the helpers we plan to use.
-</p>
+              <p>Initialize a scope with its parent, for lookups up the chain,
+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>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-{extend, last} = require <span class="string">'./helpers'</span>
-
-exports.Scope = <span class="class"><span class="keyword">class</span> <span class="title">Scope</span></span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">constructor</span>: <span class="hljs-function"><span class="hljs-params">(<span class="hljs-property">@parent</span>, <span class="hljs-property">@expressions</span>, <span class="hljs-property">@method</span>, <span class="hljs-property">@referencedVars</span>)</span> -&gt;</span>
+    <span class="hljs-property">@variables</span> = [{<span class="hljs-attribute">name</span>: <span class="hljs-string">'arguments'</span>, <span class="hljs-attribute">type</span>: <span class="hljs-string">'arguments'</span>}]
+    <span class="hljs-property">@positions</span> = {}
+    <span class="hljs-property">@utilities</span> = {} <span class="hljs-keyword">unless</span> <span class="hljs-property">@parent</span></pre></div></div>
             
         </li>
         
@@ -146,13 +157,11 @@ exports.Scope = <span class="class"><span class="keyword">class</span> <span cla
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-3">&#182;</a>
               </div>
-              <p>The <code>root</code> is the top-level <strong>Scope</strong> object for a given file.
-</p>
+              <p>The <code>@root</code> is the top-level <strong>Scope</strong> object for a given file.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  <span class="property">@root</span>: <span class="literal">null</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>    <span class="hljs-property">@root</span> = <span class="hljs-property">@parent</span>?.root ? <span class="hljs-keyword">this</span></pre></div></div>
             
         </li>
         
@@ -163,19 +172,16 @@ exports.Scope = <span class="class"><span class="keyword">class</span> <span cla
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
-              <p>Initialize a scope with its parent, for lookups up the chain,
-as well as a reference to the <strong>Block</strong> node it belongs to, which is
-where it should declare its variables, and a reference to the function that
-it belongs to.
-</p>
+              <p>Adds a new variable or overrides an existing one.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  constructor: (<span class="property">@parent</span>, <span class="property">@expressions</span>, <span class="property">@method</span>) -&gt;
-    <span class="property">@variables</span> = [{name: <span class="string">'arguments'</span>, type: <span class="string">'arguments'</span>}]
-    <span class="property">@positions</span> = {}
-    Scope.root = <span class="keyword">this</span> <span class="keyword">unless</span> <span class="property">@parent</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">add</span>: <span class="hljs-function"><span class="hljs-params">(name, type, immediate)</span> -&gt;</span>
+    <span class="hljs-keyword">return</span> <span class="hljs-property">@parent</span>.add name, type, immediate <span class="hljs-keyword">if</span> <span class="hljs-property">@shared</span> <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> immediate
+    <span class="hljs-keyword">if</span> <span class="hljs-attribute">Object</span>::hasOwnProperty.call <span class="hljs-property">@positions</span>, name
+      <span class="hljs-property">@variables</span>[<span class="hljs-property">@positions</span>[name]].type = type
+    <span class="hljs-keyword">else</span>
+      <span class="hljs-property">@positions</span>[name] = <span class="hljs-property">@variables</span>.push({name, type}) - <span class="hljs-number">1</span></pre></div></div>
             
         </li>
         
@@ -186,18 +192,17 @@ it belongs to.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-5">&#182;</a>
               </div>
-              <p>Adds a new variable or overrides an existing one.
-</p>
+              <p>When <code>super</code> is called, we need to find the name of the current method we’re
+in, so that we know how to invoke the same method of the parent class. This
+can get complicated if super is being called from an inner function.
+<code>namedMethod</code> will walk up the scope tree until it either finds the first
+function object that has a name filled in, or bottoms out.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  add: (name, type, immediate) -&gt;
-    <span class="keyword">return</span> <span class="property">@parent</span>.add name, type, immediate <span class="keyword">if</span> <span class="property">@shared</span> <span class="keyword">and</span> <span class="keyword">not</span> immediate
-    <span class="keyword">if</span> Object::hasOwnProperty.call <span class="property">@positions</span>, name
-      <span class="property">@variables</span>[<span class="property">@positions</span>[name]].type = type
-    <span class="keyword">else</span>
-      <span class="property">@positions</span>[name] = <span class="property">@variables</span>.push({name, type}) - <span class="number">1</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">namedMethod</span>:<span class="hljs-function"> -&gt;</span>
+    <span class="hljs-keyword">return</span> <span class="hljs-property">@method</span> <span class="hljs-keyword">if</span> <span class="hljs-property">@method</span>?.name <span class="hljs-keyword">or</span> !<span class="hljs-property">@parent</span>
+    <span class="hljs-property">@parent</span>.namedMethod()</pre></div></div>
             
         </li>
         
@@ -208,19 +213,15 @@ it belongs to.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-6">&#182;</a>
               </div>
-              <p>When <code>super</code> is called, we need to find the name of the current method we&#39;re
-in, so that we know how to invoke the same method of the parent class. This
-can get complicated if super is being called from an inner function.
-<code>namedMethod</code> will walk up the scope tree until it either finds the first
-function object that has a name filled in, or bottoms out.
-</p>
+              <p>Look up a variable name in lexical scope, and declare it if it does not
+already exist.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  namedMethod: -&gt;
-    <span class="keyword">return</span> <span class="property">@method</span> <span class="keyword">if</span> <span class="property">@method</span>?.name <span class="keyword">or</span> !<span class="property">@parent</span>
-    <span class="property">@parent</span>.namedMethod()</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">find</span>: <span class="hljs-function"><span class="hljs-params">(name)</span> -&gt;</span>
+    <span class="hljs-keyword">return</span> <span class="hljs-literal">yes</span> <span class="hljs-keyword">if</span> <span class="hljs-property">@check</span> name
+    <span class="hljs-property">@add</span> name, <span class="hljs-string">'var'</span>
+    <span class="hljs-literal">no</span></pre></div></div>
             
         </li>
         
@@ -231,17 +232,14 @@ function object that has a name filled in, or bottoms out.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-7">&#182;</a>
               </div>
-              <p>Look up a variable name in lexical scope, and declare it if it does not
-already exist.
-</p>
+              <p>Reserve a variable name as originating from a function parameter for this
+scope. No <code>var</code> required for internal references.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  find: (name) -&gt;
-    <span class="keyword">return</span> <span class="literal">yes</span> <span class="keyword">if</span> <span class="property">@check</span> name
-    <span class="property">@add</span> name, <span class="string">'var'</span>
-    <span class="literal">no</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">parameter</span>: <span class="hljs-function"><span class="hljs-params">(name)</span> -&gt;</span>
+    <span class="hljs-keyword">return</span> <span class="hljs-keyword">if</span> <span class="hljs-property">@shared</span> <span class="hljs-keyword">and</span> <span class="hljs-property">@parent</span>.check name, <span class="hljs-literal">yes</span>
+    <span class="hljs-property">@add</span> name, <span class="hljs-string">'param'</span></pre></div></div>
             
         </li>
         
@@ -252,16 +250,13 @@ already exist.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-8">&#182;</a>
               </div>
-              <p>Reserve a variable name as originating from a function parameter for this
-scope. No <code>var</code> required for internal references.
-</p>
+              <p>Just check to see if a variable has already been declared, without reserving,
+walks up to the root scope.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  parameter: (name) -&gt;
-    <span class="keyword">return</span> <span class="keyword">if</span> <span class="property">@shared</span> <span class="keyword">and</span> <span class="property">@parent</span>.check name, <span class="literal">yes</span>
-    <span class="property">@add</span> name, <span class="string">'param'</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">check</span>: <span class="hljs-function"><span class="hljs-params">(name)</span> -&gt;</span>
+    !!(<span class="hljs-property">@type</span>(name) <span class="hljs-keyword">or</span> <span class="hljs-property">@parent</span>?.check(name))</pre></div></div>
             
         </li>
         
@@ -272,15 +267,15 @@ scope. No <code>var</code> required for internal references.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-9">&#182;</a>
               </div>
-              <p>Just check to see if a variable has already been declared, without reserving,
-walks up to the root scope.
-</p>
+              <p>Generate a temporary variable name at the given index.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  check: (name) -&gt;
-    !!(<span class="property">@type</span>(name) <span class="keyword">or</span> <span class="property">@parent</span>?.check(name))</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">temporary</span>: <span class="hljs-function"><span class="hljs-params">(name, index, single=<span class="hljs-literal">false</span>)</span> -&gt;</span>
+    <span class="hljs-keyword">if</span> single
+      (index + parseInt name, <span class="hljs-number">36</span>).toString(<span class="hljs-number">36</span>).replace <span class="hljs-regexp">/\d/g</span>, <span class="hljs-string">'a'</span>
+    <span class="hljs-keyword">else</span>
+      name + (index <span class="hljs-keyword">or</span> <span class="hljs-string">''</span>)</pre></div></div>
             
         </li>
         
@@ -291,17 +286,13 @@ walks up to the root scope.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-10">&#182;</a>
               </div>
-              <p>Generate a temporary variable name at the given index.
-</p>
+              <p>Gets the type of a variable.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  temporary: (name, index) -&gt;
-    <span class="keyword">if</span> name.length &gt; <span class="number">1</span>
-      <span class="string">'_'</span> + name + <span class="keyword">if</span> index &gt; <span class="number">1</span> <span class="keyword">then</span> index - <span class="number">1</span> <span class="keyword">else</span> <span class="string">''</span>
-    <span class="keyword">else</span>
-      <span class="string">'_'</span> + (index + parseInt name, <span class="number">36</span>).toString(<span class="number">36</span>).replace <span class="regexp">/\d/g</span>, <span class="string">'a'</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">type</span>: <span class="hljs-function"><span class="hljs-params">(name)</span> -&gt;</span>
+    <span class="hljs-keyword">return</span> v.type <span class="hljs-keyword">for</span> v <span class="hljs-keyword">in</span> <span class="hljs-property">@variables</span> <span class="hljs-keyword">when</span> v.name <span class="hljs-keyword">is</span> name
+    <span class="hljs-literal">null</span></pre></div></div>
             
         </li>
         
@@ -312,15 +303,19 @@ walks up to the root scope.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-11">&#182;</a>
               </div>
-              <p>Gets the type of a variable.
-</p>
+              <p>If we need to store an intermediate result, find an available name for a
+compiler-generated variable. <code>_var</code>, <code>_var2</code>, and so on…</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  type: (name) -&gt;
-    <span class="keyword">return</span> v.type <span class="keyword">for</span> v <span class="keyword">in</span> <span class="property">@variables</span> <span class="keyword">when</span> v.name <span class="keyword">is</span> name
-    <span class="literal">null</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">freeVariable</span>: <span class="hljs-function"><span class="hljs-params">(name, options={})</span> -&gt;</span>
+    index = <span class="hljs-number">0</span>
+    <span class="hljs-keyword">loop</span>
+      temp = <span class="hljs-property">@temporary</span> name, index, options.single
+      <span class="hljs-keyword">break</span> <span class="hljs-keyword">unless</span> <span class="hljs-property">@check</span>(temp) <span class="hljs-keyword">or</span> temp <span class="hljs-keyword">in</span> <span class="hljs-property">@root</span>.referencedVars
+      index++
+    <span class="hljs-property">@add</span> temp, <span class="hljs-string">'var'</span>, <span class="hljs-literal">yes</span> <span class="hljs-keyword">if</span> options.reserve ? <span class="hljs-literal">true</span>
+    temp</pre></div></div>
             
         </li>
         
@@ -331,18 +326,14 @@ walks up to the root scope.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-12">&#182;</a>
               </div>
-              <p>If we need to store an intermediate result, find an available name for a
-compiler-generated variable. <code>_var</code>, <code>_var2</code>, and so on...
-</p>
+              <p>Ensure that an assignment is made at the top of this scope
+(or at the top-level scope, if requested).</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  freeVariable: (name, reserve=<span class="literal">true</span>) -&gt;
-    index = <span class="number">0</span>
-    index++ <span class="keyword">while</span> <span class="property">@check</span>((temp = <span class="property">@temporary</span> name, index))
-    <span class="property">@add</span> temp, <span class="string">'var'</span>, <span class="literal">yes</span> <span class="keyword">if</span> reserve
-    temp</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">assign</span>: <span class="hljs-function"><span class="hljs-params">(name, value)</span> -&gt;</span>
+    <span class="hljs-property">@add</span> name, {value, <span class="hljs-attribute">assigned</span>: <span class="hljs-literal">yes</span>}, <span class="hljs-literal">yes</span>
+    <span class="hljs-property">@hasAssignments</span> = <span class="hljs-literal">yes</span></pre></div></div>
             
         </li>
         
@@ -353,16 +344,12 @@ compiler-generated variable. <code>_var</code>, <code>_var2</code>, and so on...
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-13">&#182;</a>
               </div>
-              <p>Ensure that an assignment is made at the top of this scope
-(or at the top-level scope, if requested).
-</p>
+              <p>Does this scope have any declared variables?</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  assign: (name, value) -&gt;
-    <span class="property">@add</span> name, {value, assigned: <span class="literal">yes</span>}, <span class="literal">yes</span>
-    <span class="property">@hasAssignments</span> = <span class="literal">yes</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">hasDeclarations</span>:<span class="hljs-function"> -&gt;</span>
+    !!<span class="hljs-property">@declaredVariables</span>().length</pre></div></div>
             
         </li>
         
@@ -373,14 +360,12 @@ compiler-generated variable. <code>_var</code>, <code>_var2</code>, and so on...
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-14">&#182;</a>
               </div>
-              <p>Does this scope have any declared variables?
-</p>
+              <p>Return the list of variables first declared in this scope.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  hasDeclarations: -&gt;
-    !!<span class="property">@declaredVariables</span>().length</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">declaredVariables</span>:<span class="hljs-function"> -&gt;</span>
+    (v.name <span class="hljs-keyword">for</span> v <span class="hljs-keyword">in</span> <span class="hljs-property">@variables</span> <span class="hljs-keyword">when</span> v.type <span class="hljs-keyword">is</span> <span class="hljs-string">'var'</span>).sort()</pre></div></div>
             
         </li>
         
@@ -391,37 +376,13 @@ compiler-generated variable. <code>_var</code>, <code>_var2</code>, and so on...
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-15">&#182;</a>
               </div>
-              <p>Return the list of variables first declared in this scope.
-</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>
-  declaredVariables: -&gt;
-    realVars = []
-    tempVars = []
-    <span class="keyword">for</span> v <span class="keyword">in</span> <span class="property">@variables</span> <span class="keyword">when</span> v.type <span class="keyword">is</span> <span class="string">'var'</span>
-      (<span class="keyword">if</span> v.name.charAt(<span class="number">0</span>) <span class="keyword">is</span> <span class="string">'_'</span> <span class="keyword">then</span> tempVars <span class="keyword">else</span> realVars).push v.name
-    realVars.sort().concat tempVars.sort()</pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-16">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-16">&#182;</a>
-              </div>
               <p>Return the list of assignments that are supposed to be made at the top
-of this scope.
-</p>
+of this scope.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  assignedVariables: -&gt;
-    <span class="string">"<span class="subst">#{v.name}</span> = <span class="subst">#{v.type.value}</span>"</span> <span class="keyword">for</span> v <span class="keyword">in</span> <span class="property">@variables</span> <span class="keyword">when</span> v.type.assigned</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">assignedVariables</span>:<span class="hljs-function"> -&gt;</span>
+    <span class="hljs-string">"<span class="hljs-subst">#{v.name}</span> = <span class="hljs-subst">#{v.type.value}</span>"</span> <span class="hljs-keyword">for</span> v <span class="hljs-keyword">in</span> <span class="hljs-property">@variables</span> <span class="hljs-keyword">when</span> v.type.assigned</pre></div></div>
             
         </li>
         

documentation/docs/sourcemap.html

@@ -16,78 +16,85 @@
           <a class="large" href="javascript:void(0);">Jump To &hellip;</a>
           <a class="small" href="javascript:void(0);">+</a>
           <div id="jump_wrapper">
-          <div id="jump_page">
-            
+          <div id="jump_page_wrapper">
+            <div id="jump_page">
               
-              <a class="source" href="browser.html">
-                browser.coffee
-              </a>
-            
+                
+                <a class="source" href="browser.html">
+                  browser.coffee
+                </a>
               
-              <a class="source" href="cake.html">
-                cake.coffee
-              </a>
-            
+                
+                <a class="source" href="cake.html">
+                  cake.coffee
+                </a>
               
-              <a class="source" href="coffee-script.html">
-                coffee-script.coffee
-              </a>
-            
+                
+                <a class="source" href="coffee-script.html">
+                  coffee-script.coffee
+                </a>
               
-              <a class="source" href="command.html">
-                command.coffee
-              </a>
-            
+                
+                <a class="source" href="command.html">
+                  command.coffee
+                </a>
               
-              <a class="source" href="grammar.html">
-                grammar.coffee
-              </a>
-            
+                
+                <a class="source" href="grammar.html">
+                  grammar.coffee
+                </a>
               
-              <a class="source" href="helpers.html">
-                helpers.coffee
-              </a>
-            
+                
+                <a class="source" href="helpers.html">
+                  helpers.coffee
+                </a>
               
-              <a class="source" href="index.html">
-                index.coffee
-              </a>
-            
+                
+                <a class="source" href="index.html">
+                  index.coffee
+                </a>
               
-              <a class="source" href="lexer.html">
-                lexer.coffee
-              </a>
-            
+                
+                <a class="source" href="lexer.html">
+                  lexer.coffee
+                </a>
               
-              <a class="source" href="nodes.html">
-                nodes.coffee
-              </a>
-            
+                
+                <a class="source" href="nodes.html">
+                  nodes.coffee
+                </a>
               
-              <a class="source" href="optparse.html">
-                optparse.coffee
-              </a>
-            
+                
+                <a class="source" href="optparse.html">
+                  optparse.coffee
+                </a>
               
-              <a class="source" href="repl.html">
-                repl.coffee
-              </a>
-            
+                
+                <a class="source" href="register.html">
+                  register.coffee
+                </a>
               
-              <a class="source" href="rewriter.html">
-                rewriter.coffee
-              </a>
-            
+                
+                <a class="source" href="repl.html">
+                  repl.coffee
+                </a>
               
-              <a class="source" href="scope.html">
-                scope.litcoffee
-              </a>
-            
+                
+                <a class="source" href="rewriter.html">
+                  rewriter.coffee
+                </a>
               
-              <a class="source" href="sourcemap.html">
-                sourcemap.litcoffee
-              </a>
-            
+                
+                <a class="source" href="scope.html">
+                  scope.litcoffee
+                </a>
+              
+                
+                <a class="source" href="sourcemap.html">
+                  sourcemap.litcoffee
+                </a>
+              
+            </div>
           </div>
         </li>
       </ul>
@@ -110,9 +117,14 @@
               </div>
               <p>Source maps allow JavaScript runtimes to match running JavaScript back to
 the original source code that corresponds to it. This can be minified
-JavaScript, but in our case, we&#39;re concerned with mapping pretty-printed
-JavaScript back to CoffeeScript.
-</p>
+JavaScript, but in our case, we’re concerned with mapping pretty-printed
+JavaScript back to CoffeeScript.</p>
+<p>In order to produce maps, we must keep track of positions (line number, column number)
+that originated every node in the syntax tree, and be able to generate a
+<a href="https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit">map file</a>
+— which is a compact, VLQ-encoded representation of the JSON serialization
+of this information — to write out alongside the generated JavaScript.</p>
+<h2 id="linemap">LineMap</h2>
 
             </div>
             
@@ -125,25 +137,34 @@ JavaScript back to CoffeeScript.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-2">&#182;</a>
               </div>
-              <p>In order to produce maps, we must keep track of positions (line number, column number)
-that originated every node in the syntax tree, and be able to generate a
-<a href="https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit">map file</a>
-— which is a compact, VLQ-encoded representation of the JSON serialization
-of this information — to write out alongside the generated JavaScript.
-</p>
+              <p>A <strong>LineMap</strong> object keeps track of information about original line and column
+positions for a single line of output JavaScript code.
+<strong>SourceMaps</strong> are implemented in terms of <strong>LineMaps</strong>.</p>
 
             </div>
             
+            <div class="content"><div class='highlight'><pre><span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">LineMap</span></span>
+  <span class="hljs-attribute">constructor</span>: <span class="hljs-function"><span class="hljs-params">(<span class="hljs-property">@line</span>)</span> -&gt;</span>
+    <span class="hljs-property">@columns</span> = []
+
+  <span class="hljs-attribute">add</span>: <span class="hljs-function"><span class="hljs-params">(column, [sourceLine, sourceColumn], options={})</span> -&gt;</span>
+    <span class="hljs-keyword">return</span> <span class="hljs-keyword">if</span> <span class="hljs-property">@columns</span>[column] <span class="hljs-keyword">and</span> options.noReplace
+    <span class="hljs-property">@columns</span>[column] = {<span class="hljs-attribute">line</span>: <span class="hljs-property">@line</span>, column, sourceLine, sourceColumn}
+
+  <span class="hljs-attribute">sourceLocation</span>: <span class="hljs-function"><span class="hljs-params">(column)</span> -&gt;</span>
+    column-- <span class="hljs-keyword">until</span> (mapping = <span class="hljs-property">@columns</span>[column]) <span class="hljs-keyword">or</span> (column &lt;= <span class="hljs-number">0</span>)
+    mapping <span class="hljs-keyword">and</span> [mapping.sourceLine, mapping.sourceColumn]</pre></div></div>
+            
         </li>
         
         
         <li id="section-3">
             <div class="annotation">
               
-              <div class="pilwrap for-h2">
+              <div class="pilwrap ">
                 <a class="pilcrow" href="#section-3">&#182;</a>
               </div>
-              <h2>LineMap</h2>
+              <h2 id="sourcemap">SourceMap</h2>
 
             </div>
             
@@ -156,9 +177,18 @@ of this information — to write out alongside the generated JavaScript.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
-              
+              <p>Maps locations in a single generated JavaScript file back to locations in
+the original CoffeeScript source file.</p>
+<p>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.</p>
+
             </div>
             
+            <div class="content"><div class='highlight'><pre><span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">SourceMap</span></span>
+  <span class="hljs-attribute">constructor</span>:<span class="hljs-function"> -&gt;</span>
+    <span class="hljs-property">@lines</span> = []</pre></div></div>
+            
         </li>
         
         
@@ -168,25 +198,17 @@ of this information — to write out alongside the generated JavaScript.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-5">&#182;</a>
               </div>
-              <p>A <strong>LineMap</strong> object keeps track of information about original line and column
-positions for a single line of output JavaScript code.
-<strong>SourceMaps</strong> are implemented in terms of <strong>LineMaps</strong>.
-</p>
+              <p>Adds a mapping to this SourceMap. <code>sourceLocation</code> and <code>generatedLocation</code>
+are both <code>[line, column]</code> arrays. If <code>options.noReplace</code> is true, then if there
+is already a mapping for the specified <code>line</code> and <code>column</code>, this will have no
+effect.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-<span class="class"><span class="keyword">class</span> <span class="title">LineMap</span></span>
-  constructor: (<span class="property">@line</span>) -&gt;
-    <span class="property">@columns</span> = []
-
-  add: (column, [sourceLine, sourceColumn], options={}) -&gt;
-    <span class="keyword">return</span> <span class="keyword">if</span> <span class="property">@columns</span>[column] <span class="keyword">and</span> options.noReplace
-    <span class="property">@columns</span>[column] = {line: <span class="property">@line</span>, column, sourceLine, sourceColumn}
-
-  sourceLocation: (column) -&gt;
-    column-- <span class="keyword">until</span> (mapping = <span class="property">@columns</span>[column]) <span class="keyword">or</span> (column &lt;= <span class="number">0</span>)
-    mapping <span class="keyword">and</span> [mapping.sourceLine, mapping.sourceColumn]</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">add</span>: <span class="hljs-function"><span class="hljs-params">(sourceLocation, generatedLocation, options = {})</span> -&gt;</span>
+    [line, column] = generatedLocation
+    lineMap = (<span class="hljs-property">@lines</span>[line] <span class="hljs-keyword">or</span>= <span class="hljs-keyword">new</span> LineMap(line))
+    lineMap.add column, sourceLocation, options</pre></div></div>
             
         </li>
         
@@ -194,13 +216,18 @@ positions for a single line of output JavaScript code.
         <li id="section-6">
             <div class="annotation">
               
-              <div class="pilwrap for-h2">
+              <div class="pilwrap ">
                 <a class="pilcrow" href="#section-6">&#182;</a>
               </div>
-              <h2>SourceMap</h2>
+              <p>Look up the original position of a given <code>line</code> and <code>column</code> in the generated
+code.</p>
 
             </div>
             
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">sourceLocation</span>: <span class="hljs-function"><span class="hljs-params">([line, column])</span> -&gt;</span>
+    line-- <span class="hljs-keyword">until</span> (lineMap = <span class="hljs-property">@lines</span>[line]) <span class="hljs-keyword">or</span> (line &lt;= <span class="hljs-number">0</span>)
+    lineMap <span class="hljs-keyword">and</span> lineMap.sourceLocation column</pre></div></div>
+            
         </li>
         
         
@@ -210,7 +237,8 @@ positions for a single line of output JavaScript code.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-7">&#182;</a>
               </div>
-              
+              <h2 id="v3-sourcemap-generation">V3 SourceMap Generation</h2>
+
             </div>
             
         </li>
@@ -222,12 +250,29 @@ positions for a single line of output JavaScript code.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-8">&#182;</a>
               </div>
-              <p>Maps locations in a single generated JavaScript file back to locations in
-the original CoffeeScript source file.
-</p>
+              <p>Builds up a V3 source map, returning the generated JSON as a string.
+<code>options.sourceRoot</code> may be used to specify the sourceRoot written to the source
+map.  Also, <code>options.sourceFiles</code> and <code>options.generatedFile</code> may be passed to
+set “sources” and “file”, respectively.</p>
 
             </div>
             
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">generate</span>: <span class="hljs-function"><span class="hljs-params">(options = {}, code = <span class="hljs-literal">null</span>)</span> -&gt;</span>
+    writingline       = <span class="hljs-number">0</span>
+    lastColumn        = <span class="hljs-number">0</span>
+    lastSourceLine    = <span class="hljs-number">0</span>
+    lastSourceColumn  = <span class="hljs-number">0</span>
+    needComma         = <span class="hljs-literal">no</span>
+    buffer            = <span class="hljs-string">""</span>
+
+    <span class="hljs-keyword">for</span> lineMap, lineNumber <span class="hljs-keyword">in</span> <span class="hljs-property">@lines</span> <span class="hljs-keyword">when</span> lineMap
+      <span class="hljs-keyword">for</span> mapping <span class="hljs-keyword">in</span> lineMap.columns <span class="hljs-keyword">when</span> mapping
+        <span class="hljs-keyword">while</span> writingline &lt; mapping.line
+          lastColumn = <span class="hljs-number">0</span>
+          needComma = <span class="hljs-literal">no</span>
+          buffer += <span class="hljs-string">";"</span>
+          writingline++</pre></div></div>
+            
         </li>
         
         
@@ -237,17 +282,13 @@ the original CoffeeScript source file.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-9">&#182;</a>
               </div>
-              <p>This is intentionally agnostic towards how a source map might be represented on
-disk. Once the compiler is ready to produce a &quot;v3&quot;-style source map, we can walk
-through the arrays of line and column buffer to produce it.
-</p>
+              <p>Write a comma if we’ve already written a segment on this line.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-<span class="class"><span class="keyword">class</span> <span class="title">SourceMap</span></span>
-  constructor: -&gt;
-    <span class="property">@lines</span> = []</pre></div></div>
+            <div class="content"><div class='highlight'><pre>        <span class="hljs-keyword">if</span> needComma
+          buffer += <span class="hljs-string">","</span>
+          needComma = <span class="hljs-literal">no</span></pre></div></div>
             
         </li>
         
@@ -258,19 +299,15 @@ through the arrays of line and column buffer to produce it.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-10">&#182;</a>
               </div>
-              <p>Adds a mapping to this SourceMap. <code>sourceLocation</code> and <code>generatedLocation</code>
-are both <code>[line, column]</code> arrays. If <code>options.noReplace</code> is true, then if there
-is already a mapping for the specified <code>line</code> and <code>column</code>, this will have no
-effect.
-</p>
+              <p>Write the next segment. Segments can be 1, 4, or 5 values.  If just one, then it
+is a generated column which doesn’t match anything in the source code.</p>
+<p>The starting column in the generated source, relative to any previous recorded
+column for the current line:</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  add: (sourceLocation, generatedLocation, options = {}) -&gt;
-    [line, column] = generatedLocation
-    lineMap = (<span class="property">@lines</span>[line] <span class="keyword">or</span>= <span class="keyword">new</span> LineMap(line))
-    lineMap.add column, sourceLocation, options</pre></div></div>
+            <div class="content"><div class='highlight'><pre>        buffer += <span class="hljs-property">@encodeVlq</span> mapping.column - lastColumn
+        lastColumn = mapping.column</pre></div></div>
             
         </li>
         
@@ -281,16 +318,11 @@ effect.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-11">&#182;</a>
               </div>
-              <p>Look up the original position of a given <code>line</code> and <code>column</code> in the generated
-code.
-</p>
+              <p>The index into the list of sources:</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  sourceLocation: ([line, column]) -&gt;
-    line-- <span class="keyword">until</span> (lineMap = <span class="property">@lines</span>[line]) <span class="keyword">or</span> (line &lt;= <span class="number">0</span>)
-    lineMap <span class="keyword">and</span> lineMap.sourceLocation column</pre></div></div>
+            <div class="content"><div class='highlight'><pre>        buffer += <span class="hljs-property">@encodeVlq</span> <span class="hljs-number">0</span></pre></div></div>
             
         </li>
         
@@ -298,13 +330,16 @@ code.
         <li id="section-12">
             <div class="annotation">
               
-              <div class="pilwrap for-h2">
+              <div class="pilwrap ">
                 <a class="pilcrow" href="#section-12">&#182;</a>
               </div>
-              <h2>V3 SourceMap Generation</h2>
+              <p>The starting line in the original source, relative to the previous source line.</p>
 
             </div>
             
+            <div class="content"><div class='highlight'><pre>        buffer += <span class="hljs-property">@encodeVlq</span> mapping.sourceLine - lastSourceLine
+        lastSourceLine = mapping.sourceLine</pre></div></div>
+            
         </li>
         
         
@@ -314,9 +349,14 @@ code.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-13">&#182;</a>
               </div>
-              
+              <p>The starting column in the original source, relative to the previous column.</p>
+
             </div>
             
+            <div class="content"><div class='highlight'><pre>        buffer += <span class="hljs-property">@encodeVlq</span> mapping.sourceColumn - lastSourceColumn
+        lastSourceColumn = mapping.sourceColumn
+        needComma = <span class="hljs-literal">yes</span></pre></div></div>
+            
         </li>
         
         
@@ -326,30 +366,21 @@ code.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-14">&#182;</a>
               </div>
-              <p>Builds up a V3 source map, returning the generated JSON as a string.
-<code>options.sourceRoot</code> may be used to specify the sourceRoot written to the source
-map.  Also, <code>options.sourceFiles</code> and <code>options.generatedFile</code> may be passed to
-set &quot;sources&quot; and &quot;file&quot;, respectively.
-</p>
+              <p>Produce the canonical JSON object format for a “v3” source map.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  generate: (options = {}, code = <span class="literal">null</span>) -&gt;
-    writingline       = <span class="number">0</span>
-    lastColumn        = <span class="number">0</span>
-    lastSourceLine    = <span class="number">0</span>
-    lastSourceColumn  = <span class="number">0</span>
-    needComma         = <span class="literal">no</span>
-    buffer            = <span class="string">""</span>
+            <div class="content"><div class='highlight'><pre>    v3 =
+      <span class="hljs-attribute">version</span>:    <span class="hljs-number">3</span>
+      <span class="hljs-attribute">file</span>:       options.generatedFile <span class="hljs-keyword">or</span> <span class="hljs-string">''</span>
+      <span class="hljs-attribute">sourceRoot</span>: options.sourceRoot <span class="hljs-keyword">or</span> <span class="hljs-string">''</span>
+      <span class="hljs-attribute">sources</span>:    options.sourceFiles <span class="hljs-keyword">or</span> [<span class="hljs-string">''</span>]
+      <span class="hljs-attribute">names</span>:      []
+      <span class="hljs-attribute">mappings</span>:   buffer
 
-    <span class="keyword">for</span> lineMap, lineNumber <span class="keyword">in</span> <span class="property">@lines</span> <span class="keyword">when</span> lineMap
-      <span class="keyword">for</span> mapping <span class="keyword">in</span> lineMap.columns <span class="keyword">when</span> mapping
-        <span class="keyword">while</span> writingline &lt; mapping.line
-          lastColumn = <span class="number">0</span>
-          needComma = <span class="literal">no</span>
-          buffer += <span class="string">";"</span>
-          writingline++</pre></div></div>
+    v3.sourcesContent = [code] <span class="hljs-keyword">if</span> options.inline
+
+    JSON.stringify v3, <span class="hljs-literal">null</span>, <span class="hljs-number">2</span></pre></div></div>
             
         </li>
         
@@ -360,16 +391,10 @@ set &quot;sources&quot; and &quot;file&quot;, respectively.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-15">&#182;</a>
               </div>
-              <p>Write a comma if we&#39;ve already written a segment on this line.
-</p>
+              <h2 id="base64-vlq-encoding">Base64 VLQ Encoding</h2>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-        <span class="keyword">if</span> needComma
-          buffer += <span class="string">","</span>
-          needComma = <span class="literal">no</span></pre></div></div>
-            
         </li>
         
         
@@ -379,12 +404,21 @@ set &quot;sources&quot; and &quot;file&quot;, respectively.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-16">&#182;</a>
               </div>
-              <p>Write the next segment. Segments can be 1, 4, or 5 values.  If just one, then it
-is a generated column which doesn&#39;t match anything in the source code.
-</p>
+              <p>Note that SourceMap VLQ encoding is “backwards”.  MIDI-style VLQ encoding puts
+the most-significant-bit (MSB) from the original value into the MSB of the VLQ
+encoded value (see <a href="http://en.wikipedia.org/wiki/File:Uintvar_coding.svg">Wikipedia</a>).
+SourceMap VLQ does things the other way around, with the least significat four
+bits of the original value encoded into the first byte of the VLQ encoded value.</p>
 
             </div>
             
+            <div class="content"><div class='highlight'><pre>  VLQ_SHIFT            = <span class="hljs-number">5</span>
+  VLQ_CONTINUATION_BIT = <span class="hljs-number">1</span> &lt;&lt; VLQ_SHIFT             <span class="hljs-comment"># 0010 0000</span>
+  VLQ_VALUE_MASK       = VLQ_CONTINUATION_BIT - <span class="hljs-number">1</span>   <span class="hljs-comment"># 0001 1111</span>
+
+  <span class="hljs-attribute">encodeVlq</span>: <span class="hljs-function"><span class="hljs-params">(value)</span> -&gt;</span>
+    answer = <span class="hljs-string">''</span></pre></div></div>
+            
         </li>
         
         
@@ -394,15 +428,11 @@ is a generated column which doesn&#39;t match anything in the source code.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-17">&#182;</a>
               </div>
-              <p>The starting column in the generated source, relative to any previous recorded
-column for the current line:
-</p>
+              <p>Least significant bit represents the sign.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-        buffer += <span class="property">@encodeVlq</span> mapping.column - lastColumn
-        lastColumn = mapping.column</pre></div></div>
+            <div class="content"><div class='highlight'><pre>    signBit = <span class="hljs-keyword">if</span> value &lt; <span class="hljs-number">0</span> <span class="hljs-keyword">then</span> <span class="hljs-number">1</span> <span class="hljs-keyword">else</span> <span class="hljs-number">0</span></pre></div></div>
             
         </li>
         
@@ -413,13 +443,11 @@ column for the current line:
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-18">&#182;</a>
               </div>
-              <p>The index into the list of sources:
-</p>
+              <p>The next bits are the actual value.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-        buffer += <span class="property">@encodeVlq</span> <span class="number">0</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>    valueToEncode = (Math.abs(value) &lt;&lt; <span class="hljs-number">1</span>) + signBit</pre></div></div>
             
         </li>
         
@@ -430,14 +458,17 @@ column for the current line:
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-19">&#182;</a>
               </div>
-              <p>The starting line in the original source, relative to the previous source line.
-</p>
+              <p>Make sure we encode at least one character, even if valueToEncode is 0.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-        buffer += <span class="property">@encodeVlq</span> mapping.sourceLine - lastSourceLine
-        lastSourceLine = mapping.sourceLine</pre></div></div>
+            <div class="content"><div class='highlight'><pre>    <span class="hljs-keyword">while</span> valueToEncode <span class="hljs-keyword">or</span> <span class="hljs-keyword">not</span> answer
+      nextChunk = valueToEncode &amp; VLQ_VALUE_MASK
+      valueToEncode = valueToEncode &gt;&gt; VLQ_SHIFT
+      nextChunk |= VLQ_CONTINUATION_BIT <span class="hljs-keyword">if</span> valueToEncode
+      answer += <span class="hljs-property">@encodeBase64</span> nextChunk
+
+    answer</pre></div></div>
             
         </li>
         
@@ -448,16 +479,10 @@ column for the current line:
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-20">&#182;</a>
               </div>
-              <p>The starting column in the original source, relative to the previous column.
-</p>
+              <h2 id="regular-base64-encoding">Regular Base64 Encoding</h2>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-        buffer += <span class="property">@encodeVlq</span> mapping.sourceColumn - lastSourceColumn
-        lastSourceColumn = mapping.sourceColumn
-        needComma = <span class="literal">yes</span></pre></div></div>
-            
         </li>
         
         
@@ -467,23 +492,13 @@ column for the current line:
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-21">&#182;</a>
               </div>
-              <p>Produce the canonical JSON object format for a &quot;v3&quot; source map.
-</p>
-
+              
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-    v3 =
-      version:    <span class="number">3</span>
-      file:       options.generatedFile <span class="keyword">or</span> <span class="string">''</span>
-      sourceRoot: options.sourceRoot <span class="keyword">or</span> <span class="string">''</span>
-      sources:    options.sourceFiles <span class="keyword">or</span> [<span class="string">''</span>]
-      names:      []
-      mappings:   buffer
+            <div class="content"><div class='highlight'><pre>  BASE64_CHARS = <span class="hljs-string">'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'</span>
 
-    v3.sourcesContent = [code] <span class="keyword">if</span> options.inline
-
-    JSON.stringify v3, <span class="literal">null</span>, <span class="number">2</span></pre></div></div>
+  <span class="hljs-attribute">encodeBase64</span>: <span class="hljs-function"><span class="hljs-params">(value)</span> -&gt;</span>
+    BASE64_CHARS[value] <span class="hljs-keyword">or</span> <span class="hljs-keyword">throw</span> <span class="hljs-keyword">new</span> Error <span class="hljs-string">"Cannot Base64 encode value: <span class="hljs-subst">#{value}</span>"</span></pre></div></div>
             
         </li>
         
@@ -491,152 +506,14 @@ column for the current line:
         <li id="section-22">
             <div class="annotation">
               
-              <div class="pilwrap for-h2">
+              <div class="pilwrap ">
                 <a class="pilcrow" href="#section-22">&#182;</a>
               </div>
-              <h2>Base64 VLQ Encoding</h2>
+              <p>Our API for source maps is just the <code>SourceMap</code> class.</p>
 
             </div>
             
-        </li>
-        
-        
-        <li id="section-23">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-23">&#182;</a>
-              </div>
-              
-            </div>
-            
-        </li>
-        
-        
-        <li id="section-24">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-24">&#182;</a>
-              </div>
-              <p>Note that SourceMap VLQ encoding is &quot;backwards&quot;.  MIDI-style VLQ encoding puts
-the most-significant-bit (MSB) from the original value into the MSB of the VLQ
-encoded value (see <a href="http://en.wikipedia.org/wiki/File:Uintvar_coding.svg">Wikipedia</a>).
-SourceMap VLQ does things the other way around, with the least significat four
-bits of the original value encoded into the first byte of the VLQ encoded value.
-</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>
-  VLQ_SHIFT            = <span class="number">5</span>
-  VLQ_CONTINUATION_BIT = <span class="number">1</span> &lt;&lt; VLQ_SHIFT             <span class="comment"># 0010 0000</span>
-  VLQ_VALUE_MASK       = VLQ_CONTINUATION_BIT - <span class="number">1</span>   <span class="comment"># 0001 1111</span>
-
-  encodeVlq: (value) -&gt;
-    answer = <span class="string">''</span></pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-25">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-25">&#182;</a>
-              </div>
-              <p>Least significant bit represents the sign.
-</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>    signBit = <span class="keyword">if</span> value &lt; <span class="number">0</span> <span class="keyword">then</span> <span class="number">1</span> <span class="keyword">else</span> <span class="number">0</span></pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-26">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-26">&#182;</a>
-              </div>
-              <p>The next bits are the actual value.
-</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>    valueToEncode = (Math.abs(value) &lt;&lt; <span class="number">1</span>) + signBit</pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-27">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-27">&#182;</a>
-              </div>
-              <p>Make sure we encode at least one character, even if valueToEncode is 0.
-</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>    <span class="keyword">while</span> valueToEncode <span class="keyword">or</span> <span class="keyword">not</span> answer
-      nextChunk = valueToEncode &amp; VLQ_VALUE_MASK
-      valueToEncode = valueToEncode &gt;&gt; VLQ_SHIFT
-      nextChunk |= VLQ_CONTINUATION_BIT <span class="keyword">if</span> valueToEncode
-      answer += <span class="property">@encodeBase64</span> nextChunk
-
-    answer</pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-28">
-            <div class="annotation">
-              
-              <div class="pilwrap for-h2">
-                <a class="pilcrow" href="#section-28">&#182;</a>
-              </div>
-              <h2>Regular Base64 Encoding</h2>
-
-            </div>
-            
-        </li>
-        
-        
-        <li id="section-29">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-29">&#182;</a>
-              </div>
-              
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>
-  BASE64_CHARS = <span class="string">'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'</span>
-
-  encodeBase64: (value) -&gt;
-    BASE64_CHARS[value] <span class="keyword">or</span> <span class="keyword">throw</span> <span class="keyword">new</span> Error <span class="string">"Cannot Base64 encode value: <span class="subst">#{value}</span>"</span></pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-30">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-30">&#182;</a>
-              </div>
-              <p>Our API for source maps is just the <code>SourceMap</code> class.
-</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>
-module.exports = SourceMap</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">module</span>.<span class="hljs-built_in">exports</span> = SourceMap</pre></div></div>
             
         </li>
         

documentation/images/just_logo.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-76 212 458 369" enable-background="new -76 212 458 369" xml:space="preserve">
+<title>CoffeeScript Logo</title>
+<g>
+	<g>
+		<path fill="#28334C" d="M106,228.6c0.5,2.3-0.9,4.4-5,6.5c-5.5-3.1-16.9-4.4-26.7-3.5c-10.4,0.9-19.4,4.2-17.9,11.3
+			c1.5,7.1,11.7,11,29.5,9.5c43.6-3.8,43.4-33.3,107.4-39c49.8-4.4,77.8,11,81.8,29.7c3.1,14.7-9.1,28.6-45.2,31.8
+			c-32,2.8-50.7-5.6-52.6-14.6c-1-4.5,1.8-11.3,17.2-13.1c1.5,7,10.6,14.4,31.1,12.6c14.8-1.3,27.6-6.6,25.9-14.9
+			c-1.8-8.6-17.7-13.7-42.6-11.5c-50.7,4.5-63.2,32.5-106.8,36.3c-30.8,2.7-55.9-8.5-59.4-25.1c-1.3-6.1-1.4-21,31.2-23.9
+			C91,219.2,104.6,222.2,106,228.6L106,228.6z M-56.4,402.5c-14.3,18-20.4,38.8-19.2,59.2c1.2,20.4,11.4,37.1,26.9,50.2
+			C-32,525-14,528.6,6.4,525c7.8-1.2,16.7-5.3,24.5-7.8c-16.7,0-31-5.3-44.9-16.7c-15.5-11.4-25.7-26.9-28.2-46.1
+			c-3.7-18,0-34.7,10.2-49c11.4-14.3,25.7-22,44.9-24.5c19.2-1.2,35.9,3.7,52.6,15.5c-3.7-5.3-9-9-14.3-14.3
+			c-16.7-11.4-34.7-16.7-56.7-11.4C-25.4,374.3-42.2,384.5-56.4,402.5z M167.2,306.2c-53.9,0-101.6-5.3-136.3-13.1
+			c-37.1-9-56.7-19.2-56.7-32.2c0-5.3,2.4-10.2,10.2-15.5c-23.3,9-35.9,16.7-35.9,28.2c1.2,13.1,22,25.7,64.5,35.9
+			c40,10.2,91.4,15.5,153,15.5c62.8,0,113-5.3,153-15.5c42.4-10.2,62.8-23.3,62.8-35.9c0-9-9-18-25.7-24.5c3.7,2.4,6.5,6.5,6.5,11.4
+			c0,13.1-19.2,23.3-57.9,32.2C268.7,300.9,222.6,306.2,167.2,306.2L167.2,306.2z M320.2,342.1c-40,9-91.4,15.5-153,15.5
+			c-62.8,0-114.2-6.5-154.2-15.5c-35.9-9-55.1-19.2-61.6-29.4c6.5,44.9,22,87.3,42.4,124.8c15.5,23.3,31,43.7,46.1,65.7
+			c6.5,13.1,11.4,25.7,14.3,38.8c10.2,14.3,24.5,23.3,42.4,28.2c22,7.8,44.9,11.4,68.1,10.2h2.4c23.3,1.2,47.7-2.4,70.6-10.2
+			c16.7-5.3,31-14.3,41.2-28.2h1.2c2.4-13.1,6.5-25.7,13.1-38.8c15.5-22,31-42.4,46.1-65.7c20.4-37.1,34.7-79.6,42.4-124.8
+			C374,324.1,354.8,334.3,320.2,342.1L320.2,342.1z"/>
+	</g>
+</g>
+</svg>

documentation/images/logo.svg

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-22 347 566 100" enable-background="new -22 347 566 100" xml:space="preserve">
+<title>CoffeeScript Logo</title>
+<g>
+	<g>
+		<path id="Shape" fill="#28334C" d="M21.7,351.1c0.1,0.6-0.2,1.1-1.2,1.6c-1.3-0.7-4.1-1.1-6.4-0.9c-2.5,0.2-4.6,1-4.3,2.7
+			c0.4,1.7,2.8,2.7,7.1,2.3c10.5-0.9,10.4-8,25.8-9.4c12-1.1,18.7,2.6,19.6,7.1c0.7,3.5-2.2,6.9-10.9,7.6
+			c-7.7,0.7-12.2-1.4-12.6-3.5c-0.2-1.1,0.4-2.7,4.1-3.1c0.4,1.7,2.5,3.5,7.5,3c3.6-0.3,6.6-1.6,6.2-3.6c-0.4-2.1-4.2-3.3-10.2-2.8
+			c-12.2,1.1-15.2,7.8-25.6,8.7c-7.4,0.7-13.4-2-14.2-6c-0.3-1.5-0.3-5,7.5-5.7C18.1,348.8,21.3,349.5,21.7,351.1z M-17.3,392.9
+			c-3.4,4.3-4.9,9.3-4.6,14.2c0.3,4.9,2.7,8.9,6.5,12c4,3.1,8.3,4,13.2,3.1c1.9-0.3,4-1.3,5.9-1.9c-4,0-7.4-1.3-10.8-4
+			c-3.7-2.7-6.2-6.5-6.8-11.1c-0.9-4.3,0-8.3,2.4-11.8c2.7-3.4,6.2-5.3,10.8-5.9c4.6-0.3,8.6,0.9,12.6,3.7c-0.9-1.3-2.2-2.2-3.4-3.4
+			c-4-2.7-8.3-4-13.6-2.7C-9.9,386.1-13.9,388.6-17.3,392.9z M36.3,369.8c-12.9,0-24.4-1.3-32.7-3.1c-8.9-2.2-13.6-4.6-13.6-7.7
+			c0-1.3,0.6-2.4,2.4-3.7c-5.6,2.2-8.6,4-8.6,6.8c0.3,3.1,5.3,6.2,15.5,8.6c9.6,2.4,21.9,3.7,36.7,3.7c15.1,0,27.1-1.3,36.7-3.7
+			c10.2-2.4,15.1-5.6,15.1-8.6c0-2.2-2.2-4.3-6.2-5.9c0.9,0.6,1.6,1.6,1.6,2.7c0,3.1-4.6,5.6-13.9,7.7
+			C60.7,368.5,49.7,369.8,36.3,369.8z M73.1,378.4c-9.6,2.2-21.9,3.7-36.7,3.7c-15.1,0-27.4-1.6-37-3.7c-8.6-2.2-13.2-4.6-14.8-7.1
+			c1.6,10.8,5.3,21,10.2,30c3.7,5.6,7.4,10.5,11.1,15.8c1.6,3.1,2.7,6.2,3.4,9.3c2.4,3.4,5.9,5.6,10.2,6.8
+			c5.3,1.9,10.8,2.7,16.4,2.4h0.6c5.6,0.3,11.5-0.6,16.9-2.4c4-1.3,7.4-3.4,9.9-6.8h0.3c0.6-3.1,1.6-6.2,3.1-9.3
+			c3.7-5.3,7.4-10.2,11.1-15.8c4.9-8.9,8.3-19.1,10.2-30C86,374.1,81.4,376.5,73.1,378.4z"/>
+		<g>
+			<path fill="#28334C" d="M179.3,408.5c-4.8,12.1-17.6,16.9-25.9,16.9c-13.4,0-19.9-6-19.9-22.3c0-16.5,7.9-47.3,31.7-47.3
+				c8.5,0,15.2,3.3,15.2,12.1c0,4.8-1.8,8.3-6.4,8.3c-1.5,0-3.4-0.4-5.2-2.4c2.2-1.1,4.2-4.9,4.2-8.3c0-2.9-1.5-5.6-5.6-5.6
+				c-10,0-18.9,23.9-18.9,42.4c0,8.3,2.2,14.2,10.9,14.2c7.1,0,13.5-3.4,17.7-9.1L179.3,408.5z M212.2,392.2c0.4,0.2,0.7,0.2,1,0.2
+				c4.2,0,10.1-2.7,14-5.5l0.8,2.4c-3.4,3.7-9.5,6.5-16.1,7.5c-1.5,16.8-10.6,27.3-21.7,27.3c-8.4,0-14.5-4-14.5-14.4
+				c0-10.5,6.2-32.2,24.9-32.2C208.4,377.8,212.2,382.8,212.2,392.2z M204.5,397.2c-1.9-0.5-2.4-2-2.4-3.8c0-2.5,1.2-4.2,2.8-4.9
+				c-0.2-3.8-1.1-5.3-3.4-5.3c-6.5,0-12,16.6-12,25.6c0,6,1.2,7.3,4.6,7.3C198.3,416.2,203,408.1,204.5,397.2L204.5,397.2z
+				 M197.9,436.9c0-8.3,7.1-11,15.8-13.6l10.9-51.9c2.7-13,10.6-15.5,16.5-15.5c4.1,0,8,2.2,9.7,5.7c3.6-4.6,8.4-5.7,12.4-5.7
+				c5.6,0,10.8,3.9,10.8,9.8c0,1.5-0.1,2.6-0.3,3.7h-4.3c0.1-0.9,0.2-1.7,0.2-2.4c0-2.1-1.7-3.1-3.4-3.1c-2,0-4.8,1.1-6.2,7.1
+				l-1.7,7.4h9.1l-0.8,3.6h-9l-10.3,49.1c-2.7,13-10.6,15.5-16.5,15.5c-5.2,0-8.3-2.3-9.8-5.7c-3.5,4.6-8.3,5.7-12.3,5.7
+				C203.1,446.7,197.9,442.8,197.9,436.9L197.9,436.9z M207,438.7c1.9,0,4.2-1.8,5.4-7.1l1.1-5.3c-5.7,2-10.1,4.4-10.1,9.4
+				C203.4,436.9,205.1,438.7,207,438.7z M228.7,438.7c1.9,0,4.2-1.8,5.4-7.1l2.2-10.4l-9.4,1.8l-1.8,8.3c-0.5,2.1-1.1,4-1.8,5.6
+				C224.2,438.2,226.3,438.7,228.7,438.7L228.7,438.7z M227.3,420.7l9.4-1.7l7.7-36.8h-9L227.3,420.7L227.3,420.7z M243.9,364
+				c-2,0-4.8,1.1-6.2,7.1l-1.7,7.4h9l2.1-9.5c0.2-0.7,0.2-1.3,0.2-2C247.4,365,245.8,364,243.9,364z M281.8,417
+				c7.1,0,11.6-4,16.1-9.2h3.1c-5.2,8.3-12.9,16.8-25,16.8c-8.5,0-14.2-4.2-14.2-14.5c0-10.5,5.9-32.3,24.6-32.3
+				c8.1,0,10,4.2,10,8.7c0,10.5-10,18.5-20.9,19.2c-0.1,1.3-0.2,2.5-0.2,3.6C275.3,415.5,277.5,417,281.8,417z M287.1,382.6
+				c-4.6,0-9.1,9.7-10.9,18.7c7-0.5,13.2-7.4,13.2-15C289.4,384.1,288.9,382.6,287.1,382.6L287.1,382.6z M315.7,416
+				c3.4,0,7.8-2.3,10.8-4.8c-2,10.4-8.4,13.4-15.8,13.4c-8.4,0-14.1-4.2-14.1-14.5c0-10.5,5.9-32.3,24.6-32.3c8.1,0,10,4.2,10,8.7
+				c0,10.6-10,18.5-20.9,19.2c-0.1,0.9-0.2,2-0.2,2.7C310.1,414.1,312.6,416,315.7,416z M321.9,382.6c-4.5,0-9.1,10.1-11,18.7
+				c7.1-0.4,13.3-7.3,13.3-15C324.2,384.1,323.6,382.6,321.9,382.6z M373.2,375.9c-1.7,0-3-0.6-4.2-1.9c2.4-1.5,4.1-4.8,4.1-7.8
+				c0-3.1-1.8-6.1-6.8-6.1s-8.3,2.8-8.3,8.2c0,13.3,20.5,15.2,20.5,34.8c0,15.3-12.3,22.7-25.6,22.7c-10.4,0-19.3-4.5-19.3-15.7
+				c0-9.8,7-14.9,13.3-14.9c3.1,0,7.7,1.3,8,6c-4.9,0-10.7,2.3-10.7,8.5c0,4.5,2.9,8.7,8.7,8.7c6.1,0,10.6-4.4,10.6-12
+				c0-15.6-18.6-21.1-18.6-34.5c0-9.5,9.3-16.3,21-16.3c4.3,0,14.6,0.9,14.6,10.9C380.6,372,377.7,375.9,373.2,375.9L373.2,375.9z
+				 M409.4,386.2c0-2.3-0.8-3.7-2.5-3.7c-5.7,0-11.7,16.6-11.7,26.7c0,6.2,2.2,7.6,6.6,7.6c7.1,0,11.6-4,16.1-9.2h3.1
+				c-5.2,8.3-12.9,16.8-25,16.8c-8.5,0-14.2-4.2-14.2-14.5c0-10.6,6-32.3,24.5-32.3c8.1,0,10.1,4.2,10.1,8.3c0,4.4-2.2,6.7-4.8,6.7
+				c-1,0-2.1-0.4-3.1-1.1C409,389.6,409.4,387.9,409.4,386.2z M437.1,378.6l-1.2,5.7c3.1-2.7,6.7-5.7,11-5.7c4.1,0,6.3,3.3,6.3,6.9
+				c0,3.1-2.1,6.7-6.6,6.7c-5.1,0-2.5-6-5.3-6c-2.7,0-4.4,1.4-6.7,3.4l-7.2,34.6h-13.1l9.6-45.4L437.1,378.6L437.1,378.6z
+				 M471.3,378.6l-6.6,30.9c-0.3,1.2-0.4,2.1-0.4,2.9c0,2.5,1.2,3.3,3.7,3.3c3.5,0,6.9-3.4,8.1-8h3.8c-5.2,14.8-14.2,16.8-19.1,16.8
+				c-5.5,0-9.7-3.2-9.7-10.9c0-1.8,0.3-3.7,0.7-5.9l6.2-29.2C458,378.5,471.3,378.6,471.3,378.6z M467.2,359.2c4,0,7.2,3.2,7.2,7.2
+				s-3.2,7.1-7.2,7.1s-7.1-3.1-7.1-7.1C460,362.4,463.3,359.2,467.2,359.2z M496.3,375.2l-1.5,6.9c2.6-2.3,6.1-3.9,10.7-3.9
+				c6.2,0,11.1,3.5,11.1,14.4c0,12.2-4.7,32.1-22.3,32.1c-4.5,0-6.8-1.6-7.7-3.2l-4.7,22.1l-13.7,3.2l15.2-71.5
+				C483.4,375.3,496.3,375.2,496.3,375.2z M504.1,392.2c0-7-2.9-7.5-4.5-7.5c-2,0-4.5,1.6-6.3,4.4l-5.4,25.5c0.4,1,1.4,2.1,3.4,2.1
+				C501,416.7,504.1,400.8,504.1,392.2z M531.9,409.5c-0.3,1.1-0.5,2.2-0.5,3.1c0,1.9,0.7,3.2,3.1,3.2c0.7,0,1.7,0,2.4-0.3
+				c-2.5,7.8-6.6,8.9-9.6,8.9c-6.4,0-9.1-4.4-9.1-10.3c0-1.6,0.2-3.1,0.6-4.8l5.8-27.2h-3l0.7-3.6h3L528,366l13.4-1.9
+				c0,0-1.4,6.2-3.1,14.4h5.5l-0.7,3.6h-5.5L531.9,409.5z"/>
+		</g>
+	</g>
+</g>
+</svg>

documentation/index.html.js

@@ -34,7 +34,7 @@
         <a href="#operators">Operators and Aliases</a>
         <a href="#classes">Classes, Inheritance, and Super</a>
         <a href="#destructuring">Destructuring Assignment</a>
-        <a href="#fat-arrow">Function Binding</a>
+        <a href="#fat-arrow">Bound and Generator Functions</a>
         <a href="#embedded">Embedded JavaScript</a>
         <a href="#switch">Switch and Try/Catch</a>
         <a href="#comparisons">Chained Comparisons</a>
@@ -87,7 +87,6 @@
         <a href="documentation/docs/sourcemap.html">Source Maps &mdash; src/sourcemap</a>
       </div>
     </div>
-    <div id="error" style="display:none;"></div>
   </div>
 
   <div class="container">
@@ -111,11 +110,10 @@
 
     <p>
       <b>Latest Version:</b>
-      <a href="http://github.com/jashkenas/coffee-script/tarball/1.7.0">1.7.0</a>
+      <a href="http://github.com/jashkenas/coffeescript/tarball/1.9.2">1.9.2</a>
     </p>
 
-    <pre>
-sudo npm install -g coffee-script</pre>
+    <pre>npm install -g coffee-script</pre>
 
     <h2>
       <span id="overview" class="bookmark"></span>
@@ -144,28 +142,31 @@ sudo npm install -g coffee-script</pre>
 
     <p>
       To install, first make sure you have a working copy of the latest stable version of
-      <a href="http://nodejs.org/">Node.js</a>, and <a href="http://npmjs.org">npm</a>
-      (the Node Package Manager). You can then install CoffeeScript with npm:
+      <a href="http://nodejs.org/">Node.js</a>. You can then install CoffeeScript globally
+      with <a href="http://npmjs.org">npm</a>:
     </p>
 
     <pre>
 npm install -g coffee-script</pre>
 
     <p>
-      (Leave off the <tt>-g</tt> if you don't wish to install globally.)
+      When you need CoffeeScript as a dependency, install it locally:
     </p>
 
+    <pre>
+npm install --save coffee-script</pre>
+
     <p>
       If you'd prefer to install the latest <b>master</b> version of CoffeeScript, you
       can clone the CoffeeScript
-      <a href="http://github.com/jashkenas/coffee-script">source repository</a>
+      <a href="http://github.com/jashkenas/coffeescript">source repository</a>
       from GitHub, or download
-      <a href="http://github.com/jashkenas/coffee-script/tarball/master">the source</a> directly.
-      To install the lastest master CoffeeScript compiler with npm:
+      <a href="http://github.com/jashkenas/coffeescript/tarball/master">the source</a> directly.
+      To install the latest master CoffeeScript compiler with npm:
     </p>
 
 <pre>
-npm install -g http://github.com/jashkenas/coffee-script/tarball/master</pre>
+npm install -g jashkenas/coffeescript</pre>
 
     <p>
       Or, if you want to install to <tt>/usr/local</tt>, and don't want to use
@@ -351,7 +352,7 @@ Expressions
       Just for kicks, a little bit of the compiler is currently implemented in this fashion:
       See it
       <a href="https://gist.github.com/jashkenas/3fc3c1a8b1009c00d9df">as a document</a>,
-      <a href="https://raw.github.com/jashkenas/coffee-script/master/src/scope.litcoffee">raw</a>,
+      <a href="https://raw.github.com/jashkenas/coffeescript/master/src/scope.litcoffee">raw</a>,
       and <a href="http://cl.ly/LxEu">properly highlighted in a text editor</a>.
     </p>
 
@@ -706,7 +707,7 @@ Expressions
     <%= codeFor('soaks') %>
     <p>
       Soaking up nulls is similar to Ruby's
-      <a href="http://andand.rubyforge.org/">andand gem</a>, and to the
+      <a href="https://rubygems.org/gems/andand">andand gem</a>, and to the
       <a href="http://groovy.codehaus.org/Operators#Operators-SafeNavigationOperator%28%3F.%29">safe navigation operator</a>
       in Groovy.
     </p>
@@ -775,7 +776,7 @@ Expressions
       Destructuring assignment can be used with any depth of array and object nesting,
       to help pull out deeply nested properties.
     </p>
-    <%= codeFor('object_extraction', '"name + "-" + street"') %>
+    <%= codeFor('object_extraction', 'name + "-" + street') %>
     <p>
       Destructuring assignment can even be combined with splats.
     </p>
@@ -783,7 +784,7 @@ Expressions
     <p>
       Expansion can be used to retrieve elements from the end of an array without having to assign the rest of its values. It works in function parameter lists as well.
     </p>
-    <%= codeFor('expansion', '"first + " " + last"') %>
+    <%= codeFor('expansion', 'first + " " + last') %>
     <p>
       Destructuring assignment is also useful when combined with class constructors
       to assign properties to your instance from an options object passed to the constructor.
@@ -792,7 +793,7 @@ Expressions
 
     <p>
       <span id="fat-arrow" class="bookmark"></span>
-      <b class="header">Function binding</b>
+      <b class="header">Bound Functions, Generator Functions</b>
       In JavaScript, the <tt>this</tt> keyword is dynamically scoped to mean the
       object that the current function is attached to. If you pass a function as
       a callback or attach it to a different object, the original value of <tt>this</tt>
@@ -805,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') %>
@@ -819,6 +820,13 @@ Expressions
       be automatically bound to each instance of the class when the instance is
       constructed.
     </p>
+    <p>
+      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>
+      nonsense &mdash; a generator in CoffeeScript is simply a function that yields.
+    </p>
+    <%= codeFor('generators', 'ps.next().value') %>
 
     <p>
       <span id="embedded" class="bookmark"></span>
@@ -1032,7 +1040,7 @@ Expressions
         size (Rails, Node).
       </li>
       <li>
-        <a href="http://ristrettolo.gy">CoffeeScript Ristretto</a>
+        <a href="https://leanpub.com/coffeescript-ristretto/read">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>.
@@ -1044,14 +1052,18 @@ Expressions
       </li>
       <li>
         <a href="http://www.packtpub.com/coffeescript-application-development/book">CoffeeScript Application Development</a>
-        is a new book from Packt Publishing that introduces CoffeeScript while
+        from Packt, introduces CoffeeScript while
         walking through the process of building a demonstration web application.
       </li>
       <li>
         <a href="http://www.manning.com/lee/">CoffeeScript in Action</a>
-        is a new book from Manning Publications that covers CoffeeScript syntax, composition techniques
+        from Manning Publications, covers CoffeeScript syntax, composition techniques
         and application development.
       </li>
+      <li>
+        <a href="http://www.dpunkt.de/buecher/4021/coffeescript.html">CoffeeScript: Die Alternative zu JavaScript</a>
+        from dpunkt.verlag, is the first CoffeeScript book in Deutsch.
+      </li>
     </ul>
 
     <h2>
@@ -1082,7 +1094,7 @@ Expressions
     </h2>
 
     <p>
-      The <a href="https://github.com/languages/coffeescript">best list of
+      The <a href="https://github.com/trending?l=coffeescript&amp;since=monthly">best list of
       open-source CoffeeScript examples</a> can be found on GitHub. But just
       to throw out few more:
     </p>
@@ -1114,8 +1126,8 @@ Expressions
         the Bolo tank game for modern browsers.
       </li>
       <li>
-        <b>josh</b>'s <a href="http://josh.github.com/nack/">nack</a>, a Node.js-powered
-        <a href="http://rack.rubyforge.org/">Rack</a> server.
+        <b>github</b>'s <a href="https://atom.io/">Atom</a>,
+        a hackable text editor built on web technologies.
       </li>
     </ul>
 
@@ -1125,7 +1137,7 @@ Expressions
 
     <ul>
       <li>
-        <a href="http://github.com/jashkenas/coffee-script/">Source Code</a><br />
+        <a href="http://github.com/jashkenas/coffeescript/">Source Code</a><br />
         Use <tt>bin/coffee</tt> to test your changes,<br />
         <tt>bin/cake test</tt> to run the test suite,<br />
         <tt>bin/cake build</tt> to rebuild the CoffeeScript compiler, and <br />
@@ -1138,7 +1150,7 @@ Expressions
         they pass, there's a good chance you've made a successful change.
       </li>
       <li>
-        <a href="http://github.com/jashkenas/coffee-script/issues">CoffeeScript Issues</a><br />
+        <a href="http://github.com/jashkenas/coffeescript/issues">CoffeeScript Issues</a><br />
         Bug reports, feature proposals, and ideas for changes to the language belong here.
       </li>
       <li>
@@ -1146,15 +1158,15 @@ Expressions
         If you'd like to ask a question, the mailing list is a good place to get help.
       </li>
       <li>
-        <a href="http://github.com/jashkenas/coffee-script/wiki">The CoffeeScript Wiki</a><br />
+        <a href="http://github.com/jashkenas/coffeescript/wiki">The CoffeeScript Wiki</a><br />
         If you've ever learned a neat CoffeeScript tip or trick, or ran into a gotcha &mdash; share it on the wiki.
         The wiki also serves as a directory of handy
-        <a href="http://github.com/jashkenas/coffee-script/wiki/Text-editor-plugins">text editor extensions</a>,
-        <a href="http://github.com/jashkenas/coffee-script/wiki/Web-framework-plugins">web framework plugins</a>,
-        and general <a href="http://github.com/jashkenas/coffee-script/wiki/Build-tools">CoffeeScript build tools</a>.
+        <a href="http://github.com/jashkenas/coffeescript/wiki/Text-editor-plugins">text editor extensions</a>,
+        <a href="http://github.com/jashkenas/coffeescript/wiki/Web-framework-plugins">web framework plugins</a>,
+        and general <a href="http://github.com/jashkenas/coffeescript/wiki/Build-tools">CoffeeScript build tools</a>.
       </li>
       <li>
-        <a href="http://github.com/jashkenas/coffee-script/wiki/FAQ">The FAQ</a><br />
+        <a href="http://github.com/jashkenas/coffeescript/wiki/FAQ">The FAQ</a><br />
         Perhaps your CoffeeScript-related question has been asked before. Check the FAQ first.
       </li>
       <li>
@@ -1165,7 +1177,7 @@ Expressions
         point for converting simple scripts.
       </li>
       <li>
-        <a href="https://github.com/jashkenas/coffee-script/downloads">High-Rez Logo</a><br />
+        <a href="https://github.com/jashkenas/coffeescript/downloads">High-Rez Logo</a><br />
         The CoffeeScript logo is available in Illustrator, EPS and PSD formats, for use
         in presentations.
       </li>
@@ -1192,10 +1204,129 @@ Expressions
     </h2>
 
     <p>
-      <b class="header" style="margin-top: 20px;">
-        <a href="https://github.com/jashkenas/coffee-script/compare/1.6.3...1.7.0">1.7.0</a>
-        <span class="timestamp"> &ndash; <small>January 28, 2014</small></span>
-      </b>
+      <%= 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
+          dynamically name properties.
+        </li>
+        <li>
+          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 edge cases with <tt>yield return</tt>
+          and <tt>yield throw</tt>.
+        </li>
+        <li>
+          Minor bug fixes and various improvements to compiler error messages.
+        </li>
+      </ul>
+    </p>
+
+    <p>
+      <%= releaseHeader('2015-01-29', '1.9.0', '1.8.0') %>
+      <ul>
+        <li>
+          CoffeeScript now supports ES6 generators. A generator is simply a function
+          that <tt>yield</tt>s.
+        </li>
+        <li>
+          More robust parsing and improved error messages for strings and regexes —
+          especially with respect to interpolation.
+        </li>
+        <li>
+          Changed strategy for the generation of internal compiler variable names.
+          Note that this means that <tt>@example</tt> function parameters are no longer
+          available as naked <tt>example</tt> variables within the function body.
+        </li>
+        <li>
+          Fixed REPL compatibility with latest versions of Node and Io.js.
+        </li>
+        <li>
+          Various minor bug fixes.
+        </li>
+      </ul>
+    </p>
+
+    <p>
+      <%= releaseHeader('2014-08-26', '1.8.0', '1.7.1') %>
+      <ul>
+        <li>
+          The <tt>--join</tt> option of the CLI is now deprecated.
+        </li>
+        <li>
+          Source maps now use <tt>.js.map</tt> as file extension, instead of just <tt>.map</tt>.
+        </li>
+        <li>
+          The CLI now exits with the exit code 1 when it fails to write a file to disk.
+        </li>
+        <li>
+          The compiler no longer crashes on unterminated, single-quoted strings.
+        </li>
+        <li>
+          Fixed location data for string interpolations, which made source maps out of sync.
+        </li>
+        <li>
+          The error marker in error messages is now correctly positioned if the code is indented with tabs.
+        </li>
+        <li>
+          Fixed a slight formatting error in CoffeeScript’s source map-patched stack traces.
+        </li>
+        <li>
+          The <tt>%%</tt> operator now coerces its right operand only once.
+        </li>
+        <li>
+          It is now possible to require CoffeeScript files from Cakefiles without having to register the compiler first.
+        </li>
+        <li>
+          The CoffeeScript REPL is now exported and can be required using <tt>require 'coffee-script/repl'</tt>.
+        </li>
+        <li>
+          Fixes for the REPL in Node 0.11.
+        </li>
+      </ul>
+    </p>
+
+    <p>
+      <%= releaseHeader('2014-01-29', '1.7.1', '1.7.0') %>
+      <ul>
+        <li>
+          Fixed a typo that broke node module lookup when running a script directly with the <tt>coffee</tt> binary.
+        </li>
+      </ul>
+    </p>
+    <p>
+      <%= releaseHeader('2014-01-28', '1.7.0', '1.6.3') %>
       <ul>
         <li>
           When requiring CoffeeScript files in Node you must now explicitly register the compiler. This can be done with <tt>require 'coffee-script/register'</tt> or <tt>CoffeeScript.register()</tt>. Also for configuration such as Mocha's, use <b>coffee-script/register</b>.
@@ -1219,7 +1350,7 @@ Expressions
           Closing brackets can now be indented and therefore no longer cause unexpected error.
         </li>
         <li>
-          Several breaking compilation fixes. Non-callable literals (strings, numbers etc.) don't compile in a call now and multiple postfix conditionals compile properly. Postfix conditionals and loops always bind object literals. Conditional assignment compiles properly in subexpressions. <tt>super</tt> is disallowed outside of methods and works correctly inside <tt>for</tt> loops. 
+          Several breaking compilation fixes. Non-callable literals (strings, numbers etc.) don't compile in a call now and multiple postfix conditionals compile properly. Postfix conditionals and loops always bind object literals. Conditional assignment compiles properly in subexpressions. <tt>super</tt> is disallowed outside of methods and works correctly inside <tt>for</tt> loops.
         </li>
         <li>
           Formatting of compiled block comments has been improved.
@@ -1233,10 +1364,7 @@ Expressions
       </ul>
     </p>
     <p>
-      <b class="header" style="margin-top: 20px;">
-        <a href="https://github.com/jashkenas/coffee-script/compare/1.6.2...1.6.3">1.6.3</a>
-        <span class="timestamp"> &ndash; <small>June 2, 2013</small></span>
-      </b>
+      <%= releaseHeader('2013-06-02', '1.6.3', '1.6.2') %>
       <ul>
         <li>
           The CoffeeScript REPL now remembers your history between sessions.
@@ -1262,10 +1390,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">
-        <a href="https://github.com/jashkenas/coffee-script/compare/1.6.1...1.6.2">1.6.2</a>
-        <span class="timestamp"> &ndash; <small>March 18, 2013</small></span>
-      </b>
+      <%= releaseHeader('2013-03-18', '1.6.2', '1.6.1') %>
       <ul>
         <li>
           Source maps have been used to provide automatic line-mapping when
@@ -1291,10 +1416,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">
-        <a href="https://github.com/jashkenas/coffee-script/compare/1.5.0...1.6.1">1.6.1</a>
-        <span class="timestamp"> &ndash; <small>March 5, 2013</small></span>
-      </b>
+      <%= releaseHeader('2013-03-05', '1.6.1', '1.5.0') %>
       <ul>
         <li>
           First release of <a href="#source-maps">source maps</a>. Pass the
@@ -1320,10 +1442,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">
-        <a href="https://github.com/jashkenas/coffee-script/compare/1.4.0...1.5.0">1.5.0</a>
-        <span class="timestamp"> &ndash; <small>Feb 25, 2013</small></span>
-      </b>
+      <%= releaseHeader('2013-02-25', '1.5.0', '1.4.0') %>
       <ul>
         <li>
           First release of <a href="#literate">Literate CoffeeScript</a>.
@@ -1348,10 +1467,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">
-        <a href="https://github.com/jashkenas/coffee-script/compare/1.3.3...1.4.0">1.4.0</a>
-        <span class="timestamp"> &ndash; <small>Oct 23, 2012</small></span>
-      </b>
+      <%= releaseHeader('2012-10-23', '1.4.0', '1.3.3') %>
       <ul>
         <li>
           The CoffeeScript compiler now strips Microsoft's UTF-8 BOM if it
@@ -1369,15 +1485,12 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">
-        <a href="https://github.com/jashkenas/coffee-script/compare/1.3.1...1.3.3">1.3.3</a>
-        <span class="timestamp"> &ndash; <small>May 15, 2012</small></span>
-      </b>
+      <%= releaseHeader('2012-05-15', '1.3.3', '1.3.1') %>
       <ul>
         <li>
           Due to the new semantics of JavaScript's strict mode, CoffeeScript no
           longer guarantees that constructor functions have names in all runtimes.
-          See <a href="https://github.com/jashkenas/coffee-script/issues/2052">#2052</a>
+          See <a href="https://github.com/jashkenas/coffeescript/issues/2052">#2052</a>
           for discussion.
         </li>
         <li>
@@ -1398,10 +1511,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">
-        <a href="https://github.com/jashkenas/coffee-script/compare/1.2.0...1.3.1">1.3.1</a>
-        <span class="timestamp"> &ndash; <small>April 10, 2012</small></span>
-      </b>
+      <%= releaseHeader('2012-04-10', '1.3.1', '1.2.0') %>
       <ul>
         <li>
           CoffeeScript now enforces all of JavaScript's <b>Strict Mode</b> early syntax
@@ -1410,7 +1520,7 @@ Expressions
           a function definition, deleting naked variables, setting the value of
           <tt>eval</tt> or <tt>arguments</tt>, and more.
           See a full discussion at
-          <a href="https://github.com/jashkenas/coffee-script/issues/1547">#1547</a>.
+          <a href="https://github.com/jashkenas/coffeescript/issues/1547">#1547</a>.
         </li>
         <li>
           The REPL now has a handy new multi-line mode for entering large
@@ -1439,7 +1549,7 @@ Expressions
           effectively creating a shallow copy of the list.
         </li>
         <li>
-          Additional tweaks and improvments to <tt>coffee --watch</tt> under
+          Additional tweaks and improvements to <tt>coffee --watch</tt> under
           Node's "new" file watching API. Watch will now beep by default
           if you introduce a syntax error into a watched script. We also now
           ignore hidden directories by default when watching recursively.
@@ -1448,10 +1558,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">
-        <a href="https://github.com/jashkenas/coffee-script/compare/1.1.3...1.2.0">1.2.0</a>
-        <span class="timestamp"> &ndash; <small>Dec. 18, 2011</small></span>
-      </b>
+      <%= releaseHeader('2011-12-18', '1.2.0', '1.1.3') %>
       <ul>
         <li>
           Multiple improvements to <tt>coffee --watch</tt> and <tt>--join</tt>.
@@ -1475,10 +1582,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">
-        <a href="https://github.com/jashkenas/coffee-script/compare/1.1.2...1.1.3">1.1.3</a>
-        <span class="timestamp"> &ndash; <small>Nov. 8, 2011</small></span>
-      </b>
+      <%= releaseHeader('2011-11-08', '1.1.3', '1.1.2') %>
       <ul>
         <li>
           Ahh, whitespace. CoffeeScript's compiled JS now tries to space things
@@ -1518,10 +1622,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">
-        <a href="https://github.com/jashkenas/coffee-script/compare/1.1.1...1.1.2">1.1.2</a>
-        <span class="timestamp"> &ndash; <small>August 4, 2011</small></span>
-      </b>
+      <%= releaseHeader('2011-08-04', '1.1.2', '1.1.1') %>
       Fixes for block comment formatting, <tt>?=</tt> compilation, implicit calls
       against control structures, implicit invocation of a try/catch block,
       variadic arguments leaking from local scope, line numbers in syntax errors
@@ -1532,17 +1633,13 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">1.1.1
-        <span class="timestamp"> &ndash; <small>May 10, 2011</small></span>
-      </b>
+      <%= releaseHeader('2011-05-10', '1.1.1', '1.1.0') %>
       Bugfix release for classes with external constructor functions, see
       issue #1182.
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">1.1.0
-        <span class="timestamp"> &ndash; <small>May 1, 2011</small></span>
-      </b>
+      <%= releaseHeader('2011-05-01', '1.1.0', '1.0.1') %>
       When running via the <tt>coffee</tt> executable, <tt>process.argv</tt> and
       friends now report <tt>coffee</tt> instead of <tt>node</tt>.
       Better compatibility with <b>Node.js 0.4.x</b> module lookup changes.
@@ -1558,9 +1655,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">1.0.1
-        <span class="timestamp"> &ndash; <small>Jan 31, 2011</small></span>
-      </b>
+      <%= releaseHeader('2011-01-31', '1.0.1', '1.0.0') %>
       Fixed a lexer bug with Unicode identifiers. Updated REPL for compatibility
       with Node.js 0.3.7. Fixed requiring relative paths in the REPL. Trailing
       <tt>return</tt> and <tt>return undefined</tt> are now optimized away.
@@ -1571,9 +1666,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">1.0.0
-        <span class="timestamp"> &ndash; <small>Dec 24, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-12-24', '1.0.0', '0.9.6') %>
       CoffeeScript loops no longer try to preserve block scope when functions
       are being generated within the loop body. Instead, you can use the
       <tt>do</tt> keyword to create a convenient closure wrapper.
@@ -1585,9 +1678,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.9.6
-        <span class="timestamp"> &ndash; <small>Dec 6, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-12-06', '0.9.6', '0.9.5') %>
       The REPL now properly formats stacktraces, and stays alive through
       asynchronous exceptions. Using <tt>--watch</tt> now prints timestamps as
       files are compiled. Fixed some accidentally-leaking variables within
@@ -1599,9 +1690,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.9.5
-        <span class="timestamp"> &ndash; <small>Nov 21, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-11-21', '0.9.5', '0.9.4') %>
       0.9.5 should be considered the first release candidate for CoffeeScript 1.0.
       There have been a large number of internal changes since the previous release,
       many contributed from <b>satyr</b>'s <a href="http://github.com/satyr/coco">Coco</a>
@@ -1615,9 +1704,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.9.4
-        <span class="timestamp"> &ndash; <small>Sep 21, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-09-21', '0.9.4', '0.9.3') %>
       CoffeeScript now uses appropriately-named temporary variables, and recycles
       their references after use. Added <tt>require.extensions</tt> support for
       <b>Node.js 0.3</b>. Loading CoffeeScript in the browser now adds just a
@@ -1626,9 +1713,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.9.3
-        <span class="timestamp"> &ndash; <small>Sep 16, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-09-16', '0.9.3', '0.9.2') %>
       CoffeeScript <tt>switch</tt> statements now compile into JS <tt>switch</tt>
       statements &mdash; they previously compiled into <tt>if/else</tt> chains
       for JavaScript 1.3 compatibility.
@@ -1637,9 +1722,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.9.2
-        <span class="timestamp"> &ndash; <small>Aug 23, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-08-23', '0.9.2', '0.9.1') %>
       Specifying the start and end of a range literal is now optional, eg. <tt>array[3..]</tt>.
       You can now say <tt>a not instanceof b</tt>.
       Fixed important bugs with nested significant and non-significant indentation (Issue #637).
@@ -1653,9 +1736,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.9.1
-        <span class="timestamp"> &ndash; <small>Aug 11, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-08-11', '0.9.1', '0.9.0') %>
       Bugfix release for <b>0.9.1</b>. Greatly improves the handling of mixed
       implicit objects, implicit function calls, and implicit indentation.
       String and regex interpolation is now strictly <tt>#{ ... }</tt> (Ruby style).
@@ -1664,9 +1745,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.9.0
-        <span class="timestamp"> &ndash; <small>Aug 4, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-08-04', '0.9.0', '0.7.2') %>
       The CoffeeScript <b>0.9</b> series is considered to be a release candidate
       for <b>1.0</b>; let's give her a shakedown cruise. <b>0.9.0</b> introduces a massive
       backwards-incompatible change: Assignment now uses <tt>=</tt>, and object
@@ -1690,17 +1769,13 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.7.2
-        <span class="timestamp"> &ndash; <small>Jul 12, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-07-12', '0.7.2', '0.7.1') %>
       Quick bugfix (right after 0.7.1) for a problem that prevented <tt>coffee</tt>
       command-line options from being parsed in some circumstances.
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.7.1
-        <span class="timestamp"> &ndash; <small>Jul 11, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-07-11', '0.7.1', '0.7.0') %>
       Block-style comments are now passed through and printed as JavaScript block
       comments -- making them useful for licenses and copyright headers. Better
       support for running coffee scripts standalone via hashbangs.
@@ -1708,9 +1783,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.7.0
-        <span class="timestamp"> &ndash; <small>Jun 28, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-06-28', '0.7.0', '0.6.2') %>
       Official CoffeeScript variable style is now camelCase, as in JavaScript.
       Reserved words are now allowed as object keys, and will be quoted for you.
       Range comprehensions now generate cleaner code, but you have to specify <tt>by -1</tt>
@@ -1727,9 +1800,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.6.2
-        <span class="timestamp"> &ndash; <small>May 15, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-05-15', '0.6.2', '0.6.1') %>
       The <tt>coffee</tt> command will now preserve directory structure when
       compiling a directory full of scripts. Fixed two omissions that were preventing
       the CoffeeScript compiler from running live within Internet Explorer.
@@ -1744,26 +1815,20 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.6.1
-        <span class="timestamp"> &ndash; <small>Apr 12, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-04-12', '0.6.1', '0.6.0') %>
       Upgraded CoffeeScript for compatibility with the new Node.js <b>v0.1.90</b>
       series.
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.6.0
-        <span class="timestamp"> &ndash; <small>Apr 3, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-04-03', '0.6.0', '0.5.6') %>
       Trailing commas are now allowed, a-la Python. Static
       properties may be assigned directly within class definitions,
       using <tt>@property</tt> notation.
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.5.6
-        <span class="timestamp"> &ndash; <small>Mar 23, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-03-23', '0.5.6', '0.5.5') %>
       Interpolation can now be used within regular expressions and heredocs, as well as
       strings. Added the <tt>&lt;-</tt> bind operator.
       Allowing assignment to half-expressions instead of special <tt>||=</tt>-style
@@ -1774,9 +1839,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.5.5
-        <span class="timestamp"> &ndash; <small>Mar 8, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-03-08', '0.5.5', '0.5.4') %>
       String interpolation, contributed by
       <a href="http://github.com/StanAngeloff">Stan Angeloff</a>.
       Since <tt>--run</tt> has been the default since <b>0.5.3</b>, updating
@@ -1785,18 +1848,14 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.5.4
-        <span class="timestamp"> &ndash; <small>Mar 3, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-03-03', '0.5.4', '0.5.3') %>
       Bugfix that corrects the Node.js global constants <tt>__filename</tt> and
       <tt>__dirname</tt>. Tweaks for more flexible parsing of nested function
       literals and improperly-indented comments. Updates for the latest Node.js API.
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.5.3
-        <span class="timestamp"> &ndash; <small>Feb 27, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-02-27', '0.5.3', '0.5.2') %>
       CoffeeScript now has a syntax for defining classes. Many of the core
       components (Nodes, Lexer, Rewriter, Scope, Optparse) are using them.
       Cakefiles can use <tt>optparse.coffee</tt> to define options for tasks.
@@ -1806,9 +1865,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.5.2
-        <span class="timestamp"> &ndash; <small>Feb 25, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-02-25', '0.5.2', '0.5.1') %>
       Added a compressed version of the compiler for inclusion in web pages as
       <br  /><tt>extras/coffee-script.js</tt>. It'll automatically run any script tags
       with type <tt>text/coffeescript</tt> for you. Added a <tt>--stdio</tt> option
@@ -1817,9 +1874,7 @@ Expressions
 
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.5.1
-        <span class="timestamp"> &ndash; <small>Feb 24, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-02-24', '0.5.1', '0.5.0') %>
       Improvements to null soaking with the existential operator, including
       soaks on indexed properties. Added conditions to <tt>while</tt> loops,
       so you can use them as filters with <tt>when</tt>, in the same manner as
@@ -1827,27 +1882,21 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.5.0
-        <span class="timestamp"> &ndash; <small>Feb 21, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-02-21', '0.5.0', '0.3.2') %>
       CoffeeScript 0.5.0 is a major release, While there are no language changes,
       the Ruby compiler has been removed in favor of a self-hosting
       compiler written in pure CoffeeScript.
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.3.2
-        <span class="timestamp"> &ndash; <small>Feb 8, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-02-08', '0.3.2', '0.3.0') %>
       <tt>@property</tt> is now a shorthand for <tt>this.property</tt>.<br />
       Switched the default JavaScript engine from Narwhal to Node.js. Pass
       the <tt>--narwhal</tt> flag if you'd like to continue using it.
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.3.0
-        <span class="timestamp"> &ndash; <small>Jan 26, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-01-26', '0.3.0', '0.2.6') %>
       CoffeeScript 0.3 includes major syntax changes:
       <br />
       The function symbol was changed to
@@ -1863,9 +1912,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.2.6
-        <span class="timestamp"> &ndash; <small>Jan 17, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-01-17', '0.2.6', '0.2.5') %>
       Added Python-style chained comparisons, the conditional existence
       operator <tt>?=</tt>, and some examples from <i>Beautiful Code</i>.
       Bugfixes relating to statement-to-expression conversion, arguments-to-array
@@ -1873,9 +1920,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.2.5
-        <span class="timestamp"> &ndash; <small>Jan 13, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-01-13', '0.2.5', '0.2.4') %>
       The conditions in switch statements can now take multiple values at once &mdash;
       If any of them are true, the case will run. Added the long arrow <tt>==></tt>,
       which defines and immediately binds a function to <tt>this</tt>. While loops can
@@ -1884,26 +1929,20 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.2.4
-        <span class="timestamp"> &ndash; <small>Jan 12, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-01-12', '0.2.4', '0.2.3') %>
       Added ECMAScript Harmony style destructuring assignment, for dealing with
       extracting values from nested arrays and objects. Added indentation-sensitive
       heredocs for nicely formatted strings or chunks of code.
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.2.3
-        <span class="timestamp"> &ndash; <small>Jan 11, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-01-11', '0.2.3', '0.2.2') %>
       Axed the unsatisfactory <tt>ino</tt> keyword, replacing it with <tt>of</tt> for
       object comprehensions. They now look like: <tt>for prop, value of object</tt>.
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.2.2
-        <span class="timestamp"> &ndash; <small>Jan 10, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-01-10', '0.2.2', '0.2.1') %>
       When performing a comprehension over an object, use <tt>ino</tt>, instead
       of <tt>in</tt>, which helps us generate smaller, more efficient code at
       compile time.
@@ -1924,16 +1963,12 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.2.1
-        <span class="timestamp"> &ndash; <small>Jan 5, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-01-05', '0.2.1', '0.2.0') %>
       Arguments objects are now converted into real arrays when referenced.
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.2.0
-        <span class="timestamp"> &ndash; <small>Jan 5, 2010</small></span>
-      </b>
+      <%= releaseHeader('2010-01-05', '0.2.0', '0.1.6') %>
       Major release. Significant whitespace. Better statement-to-expression
       conversion. Splats. Splice literals. Object comprehensions. Blocks.
       The existential operator. Many thanks to all the folks who posted issues,
@@ -1943,18 +1978,14 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.1.6
-        <span class="timestamp"> &ndash; <small>Dec 27, 2009</small></span>
-      </b>
+      <%= releaseHeader('2009-12-27', '0.1.6', '0.1.5') %>
       Bugfix for running <tt>coffee --interactive</tt> and <tt>--run</tt>
       from outside of the CoffeeScript directory. Bugfix for nested
       function/if-statements.
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.1.5
-        <span class="timestamp"> &ndash; <small>Dec 26, 2009</small></span>
-      </b>
+      <%= releaseHeader('2009-12-26', '0.1.5', '0.1.4') %>
       Array slice literals and array comprehensions can now both take Ruby-style
       ranges to specify the start and end. JavaScript variable declaration is
       now pushed up to the top of the scope, making all assignment statements into
@@ -1963,9 +1994,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.1.4
-        <span class="timestamp"> &ndash; <small>Dec 25, 2009</small></span>
-      </b>
+      <%= releaseHeader('2009-12-25', '0.1.4', '0.1.3') %>
       The official CoffeeScript extension is now <tt>.coffee</tt> instead of
       <tt>.cs</tt>, which properly belongs to
       <a href="http://en.wikipedia.org/wiki/C_Sharp_(programming_language)">C#</a>.
@@ -1977,9 +2006,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.1.3
-        <span class="timestamp"> &ndash; <small>Dec 25, 2009</small></span>
-      </b>
+      <%= releaseHeader('2009-12-25', '0.1.3', '0.1.2') %>
       The <tt>coffee</tt> command now includes <tt>--interactive</tt>,
       which launches an interactive CoffeeScript session, and <tt>--run</tt>,
       which directly compiles and executes a script. Both options depend on a
@@ -1993,9 +2020,7 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.1.2
-        <span class="timestamp"> &ndash; <small>Dec 24, 2009</small></span>
-      </b>
+      <%= releaseHeader('2009-12-24', '0.1.2', '0.1.1') %>
       Fixed a bug with calling <tt>super()</tt> through more than one level of
       inheritance, with the re-addition of the <tt>extends</tt> keyword.
       Added experimental <a href="http://narwhaljs.org/">Narwhal</a>
@@ -2007,16 +2032,12 @@ Expressions
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.1.1
-        <span class="timestamp"> &ndash; <small>Dec 24, 2009</small></span>
-      </b>
+      <%= releaseHeader('2009-12-24', '0.1.1', '0.1.0') %>
       Added <tt>instanceof</tt> and <tt>typeof</tt> as operators.
     </p>
 
     <p>
-      <b class="header" style="margin-top: 20px;">0.1.0
-        <span class="timestamp"> &ndash; <small>Dec 24, 2009</small></span>
-      </b>
+      <%= releaseHeader('2009-12-24', '0.1.0') %>
       Initial CoffeeScript release.
     </p>
 
@@ -2028,19 +2049,22 @@ Expressions
     # Set up the compilation function, to run when you stop typing.
     compileSource = ->
       source = $('#repl_source').val()
+      results = $('#repl_results')
       window.compiledJS = ''
       try
         window.compiledJS = CoffeeScript.compile source, bare: on
-        el = $('#repl_results')[0]
+        el = results[0]
         if el.innerText
           el.innerText = window.compiledJS
         else
-          $(el).text window.compiledJS
-        $('#error').hide()
+          results.text(window.compiledJS)
+        results.removeClass 'error'
+        $('.minibutton.run').removeClass 'error'
       catch {location, message}
         if location?
           message = "Error on line #{location.first_line + 1}: #{message}"
-        $('#error').text(message).show()
+        results.text(message).addClass 'error'
+        $('.minibutton.run').addClass 'error'
 
       # Update permalink
       $('#repl_permalink').attr 'href', "##{sourceFragment}#{encodeURIComponent source}"

documentation/js/aliases.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var volume, winner;
 
 if (ignition === true) {

documentation/js/array_comprehensions.js

@@ -1,23 +1,23 @@
-// Generated by CoffeeScript 1.7.0
-var courses, dish, food, foods, i, _i, _j, _k, _len, _len1, _len2, _ref;
+// Generated by CoffeeScript 1.9.2
+var courses, dish, food, foods, i, j, k, l, len, len1, len2, ref;
 
-_ref = ['toast', 'cheese', 'wine'];
-for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-  food = _ref[_i];
+ref = ['toast', 'cheese', 'wine'];
+for (j = 0, len = ref.length; j < len; j++) {
+  food = ref[j];
   eat(food);
 }
 
 courses = ['greens', 'caviar', 'truffles', 'roast', 'cake'];
 
-for (i = _j = 0, _len1 = courses.length; _j < _len1; i = ++_j) {
+for (i = k = 0, len1 = courses.length; k < len1; i = ++k) {
   dish = courses[i];
   menu(i + 1, dish);
 }
 
 foods = ['broccoli', 'spinach', 'chocolate'];
 
-for (_k = 0, _len2 = foods.length; _k < _len2; _k++) {
-  food = foods[_k];
+for (l = 0, len2 = foods.length; l < len2; l++) {
+  food = foods[l];
   if (food !== 'chocolate') {
     eat(food);
   }

documentation/js/block_comment.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 
 /*
 SkinnyMochaHalfCaffScript Compiler v1.0

documentation/js/cake_tasks.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var fs;
 
 fs = require('fs');
@@ -10,5 +10,5 @@ task('build:parser', 'rebuild the Jison parser', function(options) {
   require('jison');
   code = require('./lib/grammar').parser.generate();
   dir = options.output || 'lib';
-  return fs.writeFile("" + dir + "/parser.js", code);
+  return fs.writeFile(dir + "/parser.js", code);
 });

documentation/js/chaining.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 $('body').click(function(e) {
   return $('.box').fadeIn('fast').addClass('.active');
 }).css('background', 'white');

documentation/js/classes.js

@@ -1,7 +1,7 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var Animal, Horse, Snake, sam, tom,
-  __hasProp = {}.hasOwnProperty,
-  __extends = 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; };
+  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;
 
 Animal = (function() {
   function Animal(name) {
@@ -16,8 +16,8 @@ Animal = (function() {
 
 })();
 
-Snake = (function(_super) {
-  __extends(Snake, _super);
+Snake = (function(superClass) {
+  extend(Snake, superClass);
 
   function Snake() {
     return Snake.__super__.constructor.apply(this, arguments);
@@ -32,8 +32,8 @@ Snake = (function(_super) {
 
 })(Animal);
 
-Horse = (function(_super) {
-  __extends(Horse, _super);
+Horse = (function(superClass) {
+  extend(Horse, superClass);
 
   function Horse() {
     return Horse.__super__.constructor.apply(this, arguments);

documentation/js/comparisons.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var cholesterol, healthy;
 
 cholesterol = 127;

documentation/js/conditionals.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var date, mood;
 
 if (singing) {

documentation/js/constructor_destructuring.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var Person, tim;
 
 Person = (function() {

documentation/js/default_args.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var fill;
 
 fill = function(container, liquid) {

documentation/js/do.js

@@ -1,12 +1,12 @@
-// Generated by CoffeeScript 1.7.0
-var filename, _fn, _i, _len;
+// Generated by CoffeeScript 1.9.2
+var filename, fn, i, len;
 
-_fn = function(filename) {
+fn = function(filename) {
   return fs.readFile(filename, function(err, contents) {
     return compile(filename, contents.toString());
   });
 };
-for (_i = 0, _len = list.length; _i < _len; _i++) {
-  filename = list[_i];
-  _fn(filename);
+for (i = 0, len = list.length; i < len; i++) {
+  filename = list[i];
+  fn(filename);
 }

documentation/js/embedded.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var hi;
 
 hi = function() {

documentation/js/existence.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var footprints, solipsism, speed;
 
 if ((typeof mind !== "undefined" && mind !== null) && (typeof world === "undefined" || world === null)) {

documentation/js/expansion.js

@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 1.7.0
-var first, last, text, _ref;
+// Generated by CoffeeScript 1.9.2
+var first, last, ref, text;
 
 text = "Every literary critic believes he will outwit history and have the last word";
 
-_ref = text.split(" "), first = _ref[0], last = _ref[_ref.length - 1];
+ref = text.split(" "), first = ref[0], last = ref[ref.length - 1];

documentation/js/expressions.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var eldest, grade;
 
 grade = function(student) {

documentation/js/expressions_assignment.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var one, six, three, two;
 
 six = (one = 1) + (two = 2) + (three = 3);

documentation/js/expressions_comprehension.js

@@ -1,11 +1,11 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var globals, name;
 
 globals = ((function() {
-  var _results;
-  _results = [];
+  var results;
+  results = [];
   for (name in window) {
-    _results.push(name);
+    results.push(name);
   }
-  return _results;
+  return results;
 })()).slice(0, 10);

documentation/js/expressions_try.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var error;
 
 alert((function() {

documentation/js/fat_arrow.js

@@ -1,10 +1,10 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var Account;
 
 Account = function(customer, cart) {
   this.customer = customer;
   this.cart = cart;
-  return $('.shopping_cart').bind('click', (function(_this) {
+  return $('.shopping_cart').on('click', (function(_this) {
     return function(event) {
       return _this.customer.purchase(_this.cart);
     };

documentation/js/functions.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var cube, square;
 
 square = function(x) {

documentation/js/generators.js

@@ -0,0 +1,13 @@
+// Generated by CoffeeScript 1.9.2
+var perfectSquares;
+
+perfectSquares = function*() {
+  var num;
+  num = 0;
+  while (true) {
+    num += 1;
+    (yield num * num);
+  }
+};
+
+window.ps || (window.ps = perfectSquares());

documentation/js/heredocs.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var html;
 
 html = "<strong>\n  cup of coffeescript\n</strong>";

documentation/js/heregexes.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var OPERATOR;
 
 OPERATOR = /^(?:[-=]>|[-+*\/%<>&|^!?=]=|>>>=?|([-+:])\1|([&|<>])\2=?|\?\.|\.{2,3})/;

documentation/js/interpolation.js

@@ -1,8 +1,8 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var author, quote, sentence;
 
 author = "Wittgenstein";
 
 quote = "A picture is a fact. -- " + author;
 
-sentence = "" + (22 / 7) + " is a decent approximation of π";
+sentence = (22 / 7) + " is a decent approximation of π";

documentation/js/multiple_return_values.js

@@ -1,8 +1,8 @@
-// Generated by CoffeeScript 1.7.0
-var city, forecast, temp, weatherReport, _ref;
+// Generated by CoffeeScript 1.9.2
+var city, forecast, ref, temp, weatherReport;
 
 weatherReport = function(location) {
   return [location, 72, "Mostly Sunny"];
 };
 
-_ref = weatherReport("Berkeley, CA"), city = _ref[0], temp = _ref[1], forecast = _ref[2];
+ref = weatherReport("Berkeley, CA"), city = ref[0], temp = ref[1], forecast = ref[2];

documentation/js/object_comprehensions.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var age, ages, child, yearsOld;
 
 yearsOld = {
@@ -8,11 +8,11 @@ yearsOld = {
 };
 
 ages = (function() {
-  var _results;
-  _results = [];
+  var results;
+  results = [];
   for (child in yearsOld) {
     age = yearsOld[child];
-    _results.push("" + child + " is " + age);
+    results.push(child + " is " + age);
   }
-  return _results;
+  return results;
 })();

documentation/js/object_extraction.js

@@ -1,5 +1,5 @@
-// Generated by CoffeeScript 1.7.0
-var city, futurists, name, street, _ref, _ref1;
+// Generated by CoffeeScript 1.9.2
+var city, futurists, name, ref, ref1, street;
 
 futurists = {
   sculptor: "Umberto Boccioni",
@@ -10,4 +10,4 @@ futurists = {
   }
 };
 
-_ref = futurists.poet, name = _ref.name, (_ref1 = _ref.address, street = _ref1[0], city = _ref1[1]);
+ref = futurists.poet, name = ref.name, (ref1 = ref.address, street = ref1[0], city = ref1[1]);

documentation/js/objects_and_arrays.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var bitlist, kids, singers, song;
 
 song = ["do", "re", "mi", "fa", "so"];

documentation/js/objects_reserved.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 $('.account').attr({
   "class": 'active'
 });

documentation/js/overview.js

@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var cubes, list, math, num, number, opposite, race, square,
-  __slice = [].slice;
+  slice = [].slice;
 
 number = 42;
 
@@ -26,7 +26,7 @@ math = {
 
 race = function() {
   var runners, winner;
-  winner = arguments[0], runners = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+  winner = arguments[0], runners = 2 <= arguments.length ? slice.call(arguments, 1) : [];
   return print(winner, runners);
 };
 
@@ -35,11 +35,11 @@ if (typeof elvis !== "undefined" && elvis !== null) {
 }
 
 cubes = (function() {
-  var _i, _len, _results;
-  _results = [];
-  for (_i = 0, _len = list.length; _i < _len; _i++) {
-    num = list[_i];
-    _results.push(math.cube(num));
+  var i, len, results;
+  results = [];
+  for (i = 0, len = list.length; i < len; i++) {
+    num = list[i];
+    results.push(math.cube(num));
   }
-  return _results;
+  return results;
 })();

documentation/js/parallel_assignment.js

@@ -1,8 +1,8 @@
-// Generated by CoffeeScript 1.7.0
-var theBait, theSwitch, _ref;
+// Generated by CoffeeScript 1.9.2
+var ref, theBait, theSwitch;
 
 theBait = 1000;
 
 theSwitch = 0;
 
-_ref = [theSwitch, theBait], theBait = _ref[0], theSwitch = _ref[1];
+ref = [theSwitch, theBait], theBait = ref[0], theSwitch = ref[1];

documentation/js/patterns_and_splats.js

@@ -1,7 +1,7 @@
-// Generated by CoffeeScript 1.7.0
-var close, contents, open, tag, _i, _ref,
-  __slice = [].slice;
+// Generated by CoffeeScript 1.9.2
+var close, contents, i, open, ref, tag,
+  slice = [].slice;
 
 tag = "<impossible>";
 
-_ref = tag.split(""), open = _ref[0], contents = 3 <= _ref.length ? __slice.call(_ref, 1, _i = _ref.length - 1) : (_i = 1, []), close = _ref[_i++];
+ref = tag.split(""), open = ref[0], contents = 3 <= ref.length ? slice.call(ref, 1, i = ref.length - 1) : (i = 1, []), close = ref[i++];

documentation/js/prototypes.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 String.prototype.dasherize = function() {
   return this.replace(/_/g, "-");
 };

documentation/js/range_comprehensions.js

@@ -1,11 +1,11 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var countdown, num;
 
 countdown = (function() {
-  var _i, _results;
-  _results = [];
-  for (num = _i = 10; _i >= 1; num = --_i) {
-    _results.push(num);
+  var i, results;
+  results = [];
+  for (num = i = 10; i >= 1; num = --i) {
+    results.push(num);
   }
-  return _results;
+  return results;
 })();

documentation/js/scope.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var changeNumbers, inner, outer;
 
 outer = 1;

documentation/js/slices.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var copy, end, middle, numbers, start;
 
 numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9];

documentation/js/soaks.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
-var zip, _ref;
+// Generated by CoffeeScript 1.9.2
+var ref, zip;
 
-zip = typeof lottery.drawWinner === "function" ? (_ref = lottery.drawWinner().address) != null ? _ref.zipcode : void 0 : void 0;
+zip = typeof lottery.drawWinner === "function" ? (ref = lottery.drawWinner().address) != null ? ref.zipcode : void 0 : void 0;

documentation/js/splats.js

@@ -1,12 +1,12 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var awardMedals, contenders, gold, rest, silver,
-  __slice = [].slice;
+  slice = [].slice;
 
 gold = silver = rest = "unknown";
 
 awardMedals = function() {
   var first, others, second;
-  first = arguments[0], second = arguments[1], others = 3 <= arguments.length ? __slice.call(arguments, 2) : [];
+  first = arguments[0], second = arguments[1], others = 3 <= arguments.length ? slice.call(arguments, 2) : [];
   gold = first;
   silver = second;
   return rest = others;

documentation/js/splices.js

@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 1.7.0
-var numbers, _ref;
+// Generated by CoffeeScript 1.9.2
+var numbers, ref;
 
 numbers = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
 
-[].splice.apply(numbers, [3, 4].concat(_ref = [-3, -4, -5, -6])), _ref;
+[].splice.apply(numbers, [3, 4].concat(ref = [-3, -4, -5, -6])), ref;

documentation/js/strings.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var mobyDick;
 
 mobyDick = "Call me Ishmael. Some years ago -- never mind how long precisely -- having little or no money in my purse, and nothing particular to interest me on shore, I thought I would sail about a little and see the watery part of the world...";

documentation/js/switch.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 switch (day) {
   case "Mon":
     go(work);

documentation/js/switch_with_no_expression.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var grade, score;
 
 score = 76;

documentation/js/try.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var error;
 
 try {

documentation/js/while.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.2
 var lyrics, num;
 
 if (this.studyingEconomics) {
@@ -13,10 +13,10 @@ if (this.studyingEconomics) {
 num = 6;
 
 lyrics = (function() {
-  var _results;
-  _results = [];
+  var results;
+  results = [];
   while (num -= 1) {
-    _results.push("" + num + " little monkeys, jumping on the bed. One fell out and bumped his head.");
+    results.push(num + " little monkeys, jumping on the bed. One fell out and bumped his head.");
   }
-  return _results;
+  return results;
 })();

examples/custom_repl.coffee

@@ -0,0 +1,20 @@
+###
+Example of embedding the CoffeeScript REPL, strikingly similar to the Node REPL.
+###
+
+# Require 'coffee-script/repl' to import the repl module
+repl = require '../repl'
+
+console.log 'Custom REPL! Type `sayHi()` to see what it does!'
+
+# Start the REPL with your configuration
+r = repl.start
+  prompt: 'my-repl> '
+
+# Fields added to the context object are exposed as variables in the REPL
+r.context.sayHi = -> console.log 'Hello'
+
+# An exit event is emitted when the user exits the REPL
+r.on 'exit', ->
+  console.log 'Bye!'
+  process.exit()

lib/coffee-script/browser.js

@@ -1,7 +1,7 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.9.2
 (function() {
   var CoffeeScript, compile, runScripts,
-    __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; };
+    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; };
 
   CoffeeScript = require('./coffee-script');
 
@@ -34,14 +34,14 @@
 
   if ((typeof btoa !== "undefined" && btoa !== null) && (typeof JSON !== "undefined" && JSON !== null) && (typeof unescape !== "undefined" && unescape !== null) && (typeof encodeURIComponent !== "undefined" && encodeURIComponent !== null)) {
     compile = function(code, options) {
-      var js, v3SourceMap, _ref;
+      var js, ref, v3SourceMap;
       if (options == null) {
         options = {};
       }
       options.sourceMap = true;
       options.inline = true;
-      _ref = CoffeeScript.compile(code, options), js = _ref.js, v3SourceMap = _ref.v3SourceMap;
-      return "" + js + "\n//# sourceMappingURL=data:application/json;base64," + (btoa(unescape(encodeURIComponent(v3SourceMap)))) + "\n//# sourceURL=coffeescript";
+      ref = CoffeeScript.compile(code, options), js = ref.js, v3SourceMap = ref.v3SourceMap;
+      return js + "\n//# sourceMappingURL=data:application/json;base64," + (btoa(unescape(encodeURIComponent(v3SourceMap)))) + "\n//# sourceURL=coffeescript";
     };
   }
 
@@ -60,9 +60,9 @@
       xhr.overrideMimeType('text/plain');
     }
     xhr.onreadystatechange = function() {
-      var param, _ref;
+      var param, ref;
       if (xhr.readyState === 4) {
-        if ((_ref = xhr.status) === 0 || _ref === 200) {
+        if ((ref = xhr.status) === 0 || ref === 200) {
           param = [xhr.responseText, options];
           if (!hold) {
             CoffeeScript.run.apply(CoffeeScript, param);
@@ -79,19 +79,19 @@
   };
 
   runScripts = function() {
-    var coffees, coffeetypes, execute, i, index, s, script, scripts, _fn, _i, _len;
+    var coffees, coffeetypes, execute, fn, i, index, j, len, s, script, scripts;
     scripts = window.document.getElementsByTagName('script');
     coffeetypes = ['text/coffeescript', 'text/literate-coffeescript'];
     coffees = (function() {
-      var _i, _len, _ref, _results;
-      _results = [];
-      for (_i = 0, _len = scripts.length; _i < _len; _i++) {
-        s = scripts[_i];
-        if (_ref = s.type, __indexOf.call(coffeetypes, _ref) >= 0) {
-          _results.push(s);
+      var j, len, ref, results;
+      results = [];
+      for (j = 0, len = scripts.length; j < len; j++) {
+        s = scripts[j];
+        if (ref = s.type, indexOf.call(coffeetypes, ref) >= 0) {
+          results.push(s);
         }
       }
-      return _results;
+      return results;
     })();
     index = 0;
     execute = function() {
@@ -103,13 +103,14 @@
         return execute();
       }
     };
-    _fn = function(script, i) {
-      var options;
+    fn = function(script, i) {
+      var options, source;
       options = {
         literate: script.type === coffeetypes[1]
       };
-      if (script.src) {
-        return CoffeeScript.load(script.src, function(param) {
+      source = script.src || script.getAttribute('data-src');
+      if (source) {
+        return CoffeeScript.load(source, function(param) {
           coffees[i] = param;
           return execute();
         }, options, true);
@@ -118,9 +119,9 @@
         return coffees[i] = [script.innerHTML, options];
       }
     };
-    for (i = _i = 0, _len = coffees.length; _i < _len; i = ++_i) {
+    for (i = j = 0, len = coffees.length; j < len; i = ++j) {
       script = coffees[i];
-      _fn(script, i);
+      fn(script, i);
     }
     return execute();
   };

lib/coffee-script/cake.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.9.2
 (function() {
   var CoffeeScript, cakefileDirectory, fatalError, fs, helpers, missingTask, oparse, options, optparse, path, printTasks, switches, tasks;
 
@@ -12,6 +12,8 @@
 
   CoffeeScript = require('./coffee-script');
 
+  CoffeeScript.register();
+
   tasks = {};
 
   options = {};
@@ -22,9 +24,9 @@
 
   helpers.extend(global, {
     task: function(name, description, action) {
-      var _ref;
+      var ref;
       if (!action) {
-        _ref = [description, action], action = _ref[0], description = _ref[1];
+        ref = [description, action], action = ref[0], description = ref[1];
       }
       return tasks[name] = {
         name: name,
@@ -44,7 +46,7 @@
   });
 
   exports.run = function() {
-    var arg, args, e, _i, _len, _ref, _results;
+    var arg, args, e, i, len, ref, results;
     global.__originalDirname = fs.realpathSync('.');
     process.chdir(cakefileDirectory(__originalDirname));
     args = process.argv.slice(2);
@@ -61,20 +63,20 @@
       e = _error;
       return fatalError("" + e);
     }
-    _ref = options["arguments"];
-    _results = [];
-    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-      arg = _ref[_i];
-      _results.push(invoke(arg));
+    ref = options["arguments"];
+    results = [];
+    for (i = 0, len = ref.length; i < len; i++) {
+      arg = ref[i];
+      results.push(invoke(arg));
     }
-    return _results;
+    return results;
   };
 
   printTasks = function() {
     var cakefilePath, desc, name, relative, spaces, task;
     relative = path.relative || path.resolve;
     cakefilePath = path.join(relative(__originalDirname, process.cwd()), 'Cakefile');
-    console.log("" + cakefilePath + " defines the following tasks:\n");
+    console.log(cakefilePath + " defines the following tasks:\n");
     for (name in tasks) {
       task = tasks[name];
       spaces = 20 - name.length;

lib/coffee-script/coffee-script.js

@@ -1,8 +1,8 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.9.2
 (function() {
-  var Lexer, SourceMap, compile, formatSourcePosition, fs, getSourceMap, helpers, lexer, parser, path, sourceMaps, vm, withPrettyErrors,
-    __hasProp = {}.hasOwnProperty,
-    __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; };
+  var Lexer, SourceMap, base, compile, ext, formatSourcePosition, fs, getSourceMap, helpers, i, len, lexer, parser, path, ref, sourceMaps, vm, withPrettyErrors,
+    hasProp = {}.hasOwnProperty,
+    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');
 
@@ -18,7 +18,7 @@
 
   SourceMap = require('./sourcemap');
 
-  exports.VERSION = '1.7.1';
+  exports.VERSION = '1.9.2';
 
   exports.FILE_EXTENSIONS = ['.coffee', '.litcoffee', '.coffee.md'];
 
@@ -40,13 +40,25 @@
   };
 
   exports.compile = compile = withPrettyErrors(function(code, options) {
-    var answer, currentColumn, currentLine, extend, fragment, fragments, header, js, map, merge, newLines, _i, _len;
+    var answer, currentColumn, currentLine, extend, fragment, fragments, header, i, js, len, map, merge, newLines, token, tokens;
     merge = helpers.merge, extend = helpers.extend;
     options = extend({}, options);
     if (options.sourceMap) {
       map = new SourceMap;
     }
-    fragments = parser.parse(lexer.tokenize(code, options)).compileToFragments(options);
+    tokens = lexer.tokenize(code, options);
+    options.referencedVars = (function() {
+      var i, len, results;
+      results = [];
+      for (i = 0, len = tokens.length; i < len; i++) {
+        token = tokens[i];
+        if (token.variable) {
+          results.push(token[1]);
+        }
+      }
+      return results;
+    })();
+    fragments = parser.parse(tokens).compileToFragments(options);
     currentLine = 0;
     if (options.header) {
       currentLine += 1;
@@ -56,8 +68,8 @@
     }
     currentColumn = 0;
     js = "";
-    for (_i = 0, _len = fragments.length; _i < _len; _i++) {
-      fragment = fragments[_i];
+    for (i = 0, len = fragments.length; i < len; i++) {
+      fragment = fragments[i];
       if (options.sourceMap) {
         if (fragment.locationData) {
           map.add([fragment.locationData.first_line, fragment.locationData.first_column], [currentLine, currentColumn], {
@@ -103,7 +115,7 @@
   });
 
   exports.run = function(code, options) {
-    var answer, dir, mainModule, _ref;
+    var answer, dir, mainModule, ref;
     if (options == null) {
       options = {};
     }
@@ -114,30 +126,33 @@
     mainModule.paths = require('module')._nodeModulePaths(dir);
     if (!helpers.isCoffee(mainModule.filename) || require.extensions) {
       answer = compile(code, options);
-      code = (_ref = answer.js) != null ? _ref : answer;
+      code = (ref = answer.js) != null ? ref : answer;
     }
     return mainModule._compile(code, mainModule.filename);
   };
 
   exports["eval"] = function(code, options) {
-    var Module, Script, js, k, o, r, sandbox, v, _i, _len, _module, _ref, _ref1, _require;
+    var Module, _module, _require, createContext, i, isContext, js, k, len, o, r, ref, ref1, ref2, ref3, sandbox, v;
     if (options == null) {
       options = {};
     }
     if (!(code = code.trim())) {
       return;
     }
-    Script = vm.Script;
-    if (Script) {
+    createContext = (ref = vm.Script.createContext) != null ? ref : vm.createContext;
+    isContext = (ref1 = vm.isContext) != null ? ref1 : function(ctx) {
+      return options.sandbox instanceof createContext().constructor;
+    };
+    if (createContext) {
       if (options.sandbox != null) {
-        if (options.sandbox instanceof Script.createContext().constructor) {
+        if (isContext(options.sandbox)) {
           sandbox = options.sandbox;
         } else {
-          sandbox = Script.createContext();
-          _ref = options.sandbox;
-          for (k in _ref) {
-            if (!__hasProp.call(_ref, k)) continue;
-            v = _ref[k];
+          sandbox = createContext();
+          ref2 = options.sandbox;
+          for (k in ref2) {
+            if (!hasProp.call(ref2, k)) continue;
+            v = ref2[k];
             sandbox[k] = v;
           }
         }
@@ -154,9 +169,9 @@
           return Module._load(path, _module, true);
         };
         _module.filename = sandbox.__filename;
-        _ref1 = Object.getOwnPropertyNames(require);
-        for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-          r = _ref1[_i];
+        ref3 = Object.getOwnPropertyNames(require);
+        for (i = 0, len = ref3.length; i < len; i++) {
+          r = ref3[i];
           if (r !== 'paths') {
             _require[r] = require[r];
           }
@@ -169,7 +184,7 @@
     }
     o = {};
     for (k in options) {
-      if (!__hasProp.call(options, k)) continue;
+      if (!hasProp.call(options, k)) continue;
       v = options[k];
       o[k] = v;
     }
@@ -186,6 +201,18 @@
     return require('./register');
   };
 
+  if (require.extensions) {
+    ref = this.FILE_EXTENSIONS;
+    for (i = 0, len = ref.length; i < len; i++) {
+      ext = ref[i];
+      if ((base = require.extensions)[ext] == null) {
+        base[ext] = function() {
+          throw new Error("Use CoffeeScript.register() or require the coffee-script/register module to require " + ext + " files.");
+        };
+      }
+    }
+  }
+
   exports._compileFile = function(filename, sourceMap) {
     var answer, err, raw, stripped;
     if (sourceMap == null) {
@@ -211,10 +238,10 @@
   parser.lexer = {
     lex: function() {
       var tag, token;
-      token = this.tokens[this.pos++];
+      token = parser.tokens[this.pos++];
       if (token) {
         tag = token[0], this.yytext = token[1], this.yylloc = token[2];
-        this.errorToken = token.origin || token;
+        parser.errorToken = token.origin || token;
         this.yylineno = this.yylloc.first_line;
       } else {
         tag = '';
@@ -222,7 +249,7 @@
       return tag;
     },
     setInput: function(tokens) {
-      this.tokens = tokens;
+      parser.tokens = tokens;
       return this.pos = 0;
     },
     upcomingInput: function() {
@@ -232,12 +259,23 @@
 
   parser.yy = require('./nodes');
 
-  parser.yy.parseError = function(message, _arg) {
-    var errorLoc, errorTag, errorText, errorToken, token, tokens, _ref;
-    token = _arg.token;
-    _ref = parser.lexer, errorToken = _ref.errorToken, tokens = _ref.tokens;
+  parser.yy.parseError = function(message, arg) {
+    var errorLoc, errorTag, errorText, errorToken, token, tokens;
+    token = arg.token;
+    errorToken = parser.errorToken, tokens = parser.tokens;
     errorTag = errorToken[0], errorText = errorToken[1], errorLoc = errorToken[2];
-    errorText = errorToken === tokens[tokens.length - 1] ? 'end of input' : errorTag === 'INDENT' || errorTag === 'OUTDENT' ? 'indentation' : helpers.nameWhitespaceCharacter(errorText);
+    errorText = (function() {
+      switch (false) {
+        case errorToken !== tokens[tokens.length - 1]:
+          return 'end of input';
+        case errorTag !== 'INDENT' && errorTag !== 'OUTDENT':
+          return 'indentation';
+        case errorTag !== 'IDENTIFIER' && errorTag !== 'NUMBER' && errorTag !== 'STRING' && errorTag !== 'STRING_START' && errorTag !== 'REGEX' && errorTag !== 'REGEX_START':
+          return errorTag.replace(/_START$/, '').toLowerCase();
+        default:
+          return helpers.nameWhitespaceCharacter(errorText);
+      }
+    })();
     return helpers.throwSyntaxError("unexpected " + errorText, errorLoc);
   };
 
@@ -251,7 +289,7 @@
       if (frame.isEval()) {
         fileName = frame.getScriptNameOrSourceURL();
         if (!fileName) {
-          fileLocation = "" + (frame.getEvalOrigin()) + ", ";
+          fileLocation = (frame.getEvalOrigin()) + ", ";
         }
       } else {
         fileName = frame.getFileName();
@@ -260,7 +298,7 @@
       line = frame.getLineNumber();
       column = frame.getColumnNumber();
       source = getSourceMapping(fileName, line, column);
-      fileLocation = source ? "" + fileName + ":" + source[0] + ":" + source[1] : "" + fileName + ":" + line + ":" + column;
+      fileLocation = source ? fileName + ":" + source[0] + ":" + source[1] : fileName + ":" + line + ":" + column;
     }
     functionName = frame.getFunctionName();
     isConstructor = frame.isConstructor();
@@ -271,19 +309,19 @@
       if (functionName) {
         tp = as = '';
         if (typeName && functionName.indexOf(typeName)) {
-          tp = "" + typeName + ".";
+          tp = typeName + ".";
         }
         if (methodName && functionName.indexOf("." + methodName) !== functionName.length - methodName.length - 1) {
           as = " [as " + methodName + "]";
         }
         return "" + tp + functionName + as + " (" + fileLocation + ")";
       } else {
-        return "" + typeName + "." + (methodName || '<anonymous>') + " (" + fileLocation + ")";
+        return typeName + "." + (methodName || '<anonymous>') + " (" + fileLocation + ")";
       }
     } else if (isConstructor) {
       return "new " + (functionName || '<anonymous>') + " (" + fileLocation + ")";
     } else if (functionName) {
-      return "" + functionName + " (" + fileLocation + ")";
+      return functionName + " (" + fileLocation + ")";
     } else {
       return fileLocation;
     }
@@ -292,11 +330,11 @@
   sourceMaps = {};
 
   getSourceMap = function(filename) {
-    var answer, _ref;
+    var answer, ref1;
     if (sourceMaps[filename]) {
       return sourceMaps[filename];
     }
-    if (_ref = path != null ? path.extname(filename) : void 0, __indexOf.call(exports.FILE_EXTENSIONS, _ref) < 0) {
+    if (ref1 = path != null ? path.extname(filename) : void 0, indexOf.call(exports.FILE_EXTENSIONS, ref1) < 0) {
       return;
     }
     answer = exports._compileFile(filename, true);
@@ -304,7 +342,7 @@
   };
 
   Error.prepareStackTrace = function(err, stack) {
-    var frame, frames, getSourceMapping, _ref;
+    var frame, frames, getSourceMapping;
     getSourceMapping = function(filename, line, column) {
       var answer, sourceMap;
       sourceMap = getSourceMap(filename);
@@ -318,18 +356,18 @@
       }
     };
     frames = (function() {
-      var _i, _len, _results;
-      _results = [];
-      for (_i = 0, _len = stack.length; _i < _len; _i++) {
-        frame = stack[_i];
+      var j, len1, results;
+      results = [];
+      for (j = 0, len1 = stack.length; j < len1; j++) {
+        frame = stack[j];
         if (frame.getFunction() === exports.run) {
           break;
         }
-        _results.push("  at " + (formatSourcePosition(frame, getSourceMapping)));
+        results.push("  at " + (formatSourcePosition(frame, getSourceMapping)));
       }
-      return _results;
+      return results;
     })();
-    return "" + err.name + ": " + ((_ref = err.message) != null ? _ref : '') + "\n" + (frames.join('\n')) + "\n";
+    return (err.toString()) + "\n" + (frames.join('\n')) + "\n";
   };
 
 }).call(this);

lib/coffee-script/command.js

@@ -1,7 +1,7 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.9.2
 (function() {
-  var BANNER, CoffeeScript, EventEmitter, SWITCHES, compileJoin, compileOptions, compilePath, compileScript, compileStdio, exec, findDirectoryIndex, forkNode, fs, helpers, hidden, joinTimeout, mkdirp, notSources, optionParser, optparse, opts, outputPath, parseOptions, path, printLine, printTokens, printWarn, removeSource, removeSourceDir, silentUnlink, sourceCode, sources, spawn, timeLog, usage, useWinPathSep, version, wait, watch, watchDir, watchedDirs, 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; };
+  var BANNER, CoffeeScript, EventEmitter, SWITCHES, compileJoin, compileOptions, compilePath, compileScript, compileStdio, exec, findDirectoryIndex, forkNode, fs, helpers, hidden, joinTimeout, makePrelude, mkdirp, notSources, optionParser, optparse, opts, outputPath, parseOptions, path, printLine, printTokens, printWarn, ref, removeSource, removeSourceDir, silentUnlink, sourceCode, sources, spawn, timeLog, usage, useWinPathSep, version, wait, watch, watchDir, watchedDirs, writeJs,
+    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');
 
@@ -13,9 +13,7 @@
 
   CoffeeScript = require('./coffee-script');
 
-  mkdirp = require('mkdirp');
-
-  _ref = require('child_process'), spawn = _ref.spawn, exec = _ref.exec;
+  ref = require('child_process'), spawn = ref.spawn, exec = ref.exec;
 
   EventEmitter = require('events').EventEmitter;
 
@@ -37,7 +35,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'], ['-m', '--map', 'generate source map and save as .map files'], ['-n', '--nodes', 'print out the parse tree that the parser produces'], ['--nodejs [ARGS]', 'pass options directly to the "node" binary'], ['--no-header', 'suppress the "Generated by" header'], ['-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'], ['-l', '--literate', 'treat stdio as literate style coffee-script'], ['-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'], ['-m', '--map', 'generate source map and save as .js.map files'], ['-n', '--nodes', 'print out the parse tree that the parser produces'], ['--nodejs [ARGS]', 'pass options directly to the "node" binary'], ['--no-header', 'suppress the "Generated by" header'], ['-o', '--output [DIR]', 'set the output directory for compiled JavaScript'], ['-p', '--print', 'print out the compiled JavaScript'], ['-r', '--require [MODULE*]', 'require the given module before eval or REPL'], ['-s', '--stdio', 'listen for and compile scripts over stdio'], ['-l', '--literate', 'treat stdio as literate style coffee-script'], ['-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 = {};
 
@@ -52,11 +50,15 @@
   optionParser = null;
 
   exports.run = function() {
-    var literals, replCliOpts, source, _i, _len, _ref1, _results;
+    var i, len, literals, ref1, replCliOpts, results, source;
     parseOptions();
     replCliOpts = {
       useGlobal: true
     };
+    if (opts.require) {
+      opts.prelude = makePrelude(opts.require);
+    }
+    replCliOpts.prelude = opts.prelude;
     if (opts.nodejs) {
       return forkNode();
     }
@@ -86,20 +88,32 @@
     }
     if (opts.join) {
       opts.join = path.resolve(opts.join);
+      console.error('\nThe --join option is deprecated and will be removed in a future version.\n\nIf for some reason it\'s necessary to share local variables between files,\nreplace...\n\n    $ coffee --compile --join bundle.js -- a.coffee b.coffee c.coffee\n\nwith...\n\n    $ cat a.coffee b.coffee c.coffee | coffee --compile --stdio > bundle.js\n');
     }
-    _ref1 = opts["arguments"];
-    _results = [];
-    for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-      source = _ref1[_i];
+    ref1 = opts["arguments"];
+    results = [];
+    for (i = 0, len = ref1.length; i < len; i++) {
+      source = ref1[i];
       source = path.resolve(source);
-      _results.push(compilePath(source, true, source));
+      results.push(compilePath(source, true, source));
     }
-    return _results;
+    return results;
+  };
+
+  makePrelude = function(requires) {
+    return requires.map(function(module) {
+      var _, match, name;
+      if (match = module.match(/^(.*)=(.*)$/)) {
+        _ = match[0], name = match[1], module = match[2];
+      }
+      name || (name = helpers.baseFileName(module, true, useWinPathSep));
+      return name + " = require('" + module + "')";
+    }).join(';');
   };
 
   compilePath = function(source, topLevel, base) {
-    var code, err, file, files, stats, _i, _len, _results;
-    if (__indexOf.call(sources, source) >= 0 || watchedDirs[source] || !topLevel && (notSources[source] || hidden(source))) {
+    var code, err, file, files, i, len, results, stats;
+    if (indexOf.call(sources, source) >= 0 || watchedDirs[source] || !topLevel && (notSources[source] || hidden(source))) {
       return;
     }
     try {
@@ -134,12 +148,12 @@
           throw err;
         }
       }
-      _results = [];
-      for (_i = 0, _len = files.length; _i < _len; _i++) {
-        file = files[_i];
-        _results.push(compilePath(path.join(source, file), false, base));
+      results = [];
+      for (i = 0, len = files.length; i < len; i++) {
+        file = files[i];
+        results.push(compilePath(path.join(source, file), false, base));
       }
-      return _results;
+      return results;
     } else if (topLevel || helpers.isCoffee(source)) {
       sources.push(source);
       sourceCode.push(null);
@@ -164,10 +178,10 @@
   };
 
   findDirectoryIndex = function(source) {
-    var err, ext, index, _i, _len, _ref1;
-    _ref1 = CoffeeScript.FILE_EXTENSIONS;
-    for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-      ext = _ref1[_i];
+    var err, ext, i, index, len, ref1;
+    ref1 = CoffeeScript.FILE_EXTENSIONS;
+    for (i = 0, len = ref1.length; i < len; i++) {
+      ext = ref1[i];
       index = path.join(source, "index" + ext);
       try {
         if ((fs.statSync(index)).isFile()) {
@@ -204,6 +218,9 @@
         return printLine(CoffeeScript.nodes(t.input, t.options).toString().trim());
       } else if (o.run) {
         CoffeeScript.register();
+        if (opts.prelude) {
+          CoffeeScript["eval"](opts.prelude, t.options);
+        }
         return CoffeeScript.run(t.input, t.options);
       } else if (o.join && t.file !== o.join) {
         if (helpers.isLiterate(file)) {
@@ -280,7 +297,7 @@
       if (err.code !== 'ENOENT') {
         throw err;
       }
-      if (__indexOf.call(sources, source) < 0) {
+      if (indexOf.call(sources, source) < 0) {
         return;
       }
       try {
@@ -347,7 +364,7 @@
       }).on('change', function() {
         clearTimeout(readdirTimeout);
         return readdirTimeout = wait(25, function() {
-          var err, file, files, _i, _len, _results;
+          var err, file, files, i, len, results;
           try {
             files = fs.readdirSync(source);
           } catch (_error) {
@@ -357,12 +374,12 @@
             }
             return stopWatcher();
           }
-          _results = [];
-          for (_i = 0, _len = files.length; _i < _len; _i++) {
-            file = files[_i];
-            _results.push(compilePath(path.join(source, file), false, base));
+          results = [];
+          for (i = 0, len = files.length; i < len; i++) {
+            file = files[i];
+            results.push(compilePath(path.join(source, file), false, base));
           }
-          return _results;
+          return results;
         });
       });
     };
@@ -382,11 +399,11 @@
   };
 
   removeSourceDir = function(source, base) {
-    var file, sourcesChanged, _i, _len;
+    var file, i, len, sourcesChanged;
     delete watchedDirs[source];
     sourcesChanged = false;
-    for (_i = 0, _len = sources.length; _i < _len; _i++) {
-      file = sources[_i];
+    for (i = 0, len = sources.length; i < len; i++) {
+      file = sources[i];
       if (!(source === path.dirname(file))) {
         continue;
       }
@@ -405,18 +422,18 @@
     sourceCode.splice(index, 1);
     if (!opts.join) {
       silentUnlink(outputPath(source, base));
-      silentUnlink(outputPath(source, base, '.map'));
+      silentUnlink(outputPath(source, base, '.js.map'));
       return timeLog("removed " + source);
     }
   };
 
   silentUnlink = function(path) {
-    var err, _ref1;
+    var err, ref1;
     try {
       return fs.unlinkSync(path);
     } catch (_error) {
       err = _error;
-      if ((_ref1 = err.code) !== 'ENOENT' && _ref1 !== 'EPERM') {
+      if ((ref1 = err.code) !== 'ENOENT' && ref1 !== 'EPERM') {
         throw err;
       }
     }
@@ -439,12 +456,33 @@
     return path.join(dir, basename + extension);
   };
 
+  mkdirp = function(dir, fn) {
+    var mkdirs, mode;
+    mode = 0x1ff & ~process.umask();
+    return (mkdirs = function(p, fn) {
+      return fs.exists(p, function(exists) {
+        if (exists) {
+          return fn();
+        } else {
+          return mkdirs(path.dirname(p), function() {
+            return fs.mkdir(p, mode, function(err) {
+              if (err) {
+                return fn(err);
+              }
+              return fn();
+            });
+          });
+        }
+      });
+    })(dir, fn);
+  };
+
   writeJs = function(base, sourcePath, js, jsPath, generatedSourceMap) {
     var compile, jsDir, sourceMapPath;
     if (generatedSourceMap == null) {
       generatedSourceMap = null;
     }
-    sourceMapPath = outputPath(sourcePath, base, ".map");
+    sourceMapPath = outputPath(sourcePath, base, ".js.map");
     jsDir = path.dirname(jsPath);
     compile = function() {
       if (opts.compile) {
@@ -452,11 +490,12 @@
           js = ' ';
         }
         if (generatedSourceMap) {
-          js = "" + js + "\n//# sourceMappingURL=" + (helpers.baseFileName(sourceMapPath, false, useWinPathSep)) + "\n";
+          js = js + "\n//# sourceMappingURL=" + (helpers.baseFileName(sourceMapPath, false, useWinPathSep)) + "\n";
         }
         fs.writeFile(jsPath, js, function(err) {
           if (err) {
-            return printLine(err.message);
+            printLine(err.message);
+            return process.exit(1);
           } else if (opts.compile && opts.watch) {
             return timeLog("compiled " + sourcePath);
           }
@@ -465,7 +504,8 @@
       if (generatedSourceMap) {
         return fs.writeFile(sourceMapPath, generatedSourceMap, function(err) {
           if (err) {
-            return printLine("Could not write source map: " + err.message);
+            printLine("Could not write source map: " + err.message);
+            return process.exit(1);
           }
         });
       }
@@ -484,21 +524,21 @@
   };
 
   timeLog = function(message) {
-    return console.log("" + ((new Date).toLocaleTimeString()) + " - " + message);
+    return console.log(((new Date).toLocaleTimeString()) + " - " + message);
   };
 
   printTokens = function(tokens) {
     var strings, tag, token, value;
     strings = (function() {
-      var _i, _len, _results;
-      _results = [];
-      for (_i = 0, _len = tokens.length; _i < _len; _i++) {
-        token = tokens[_i];
+      var i, len, results;
+      results = [];
+      for (i = 0, len = tokens.length; i < len; i++) {
+        token = tokens[i];
         tag = token[0];
         value = token[1].toString().replace(/\n/, '\\n');
-        _results.push("[" + tag + " " + value + "]");
+        results.push("[" + tag + " " + value + "]");
       }
-      return _results;
+      return results;
     })();
     return printLine(strings.join(' '));
   };
@@ -551,7 +591,7 @@
     p = spawn(process.execPath, nodeArgs.concat(args), {
       cwd: process.cwd(),
       env: process.env,
-      customFds: [0, 1, 2]
+      stdio: [0, 1, 2]
     });
     return p.on('exit', function(code) {
       return process.exit(code);

lib/coffee-script/grammar.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.9.2
 (function() {
   var Parser, alt, alternatives, grammar, name, o, operators, token, tokens, unwrap;
 
@@ -63,16 +63,26 @@
     AlphaNumeric: [
       o('NUMBER', function() {
         return new Literal($1);
-      }), o('STRING', function() {
+      }), o('String')
+    ],
+    String: [
+      o('STRING', function() {
         return new Literal($1);
+      }), o('STRING_START Body STRING_END', function() {
+        return new Parens($2);
+      })
+    ],
+    Regex: [
+      o('REGEX', function() {
+        return new Literal($1);
+      }), o('REGEX_START Invocation REGEX_END', function() {
+        return $2;
       })
     ],
     Literal: [
       o('AlphaNumeric'), o('JS', function() {
         return new Literal($1);
-      }), o('REGEX', function() {
-        return new Literal($1);
-      }), o('DEBUGGER', function() {
+      }), o('Regex'), o('DEBUGGER', function() {
         return new Literal($1);
       }), o('UNDEFINED', function() {
         return new Undefined;
@@ -421,6 +431,11 @@
         return {
           source: LOC(2)(new Value($2))
         };
+      }), o('FOR Range BY Expression', function() {
+        return {
+          source: LOC(2)(new Value($2)),
+          step: $4
+        };
       }), o('ForStart ForSource', function() {
         $2.own = $1.own;
         $2.name = $1[0];
@@ -552,6 +567,12 @@
         return new Op('+', $2);
       }), {
         prec: 'UNARY_MATH'
+      }), o('YIELD Statement', function() {
+        return new Op($1, $2);
+      }), o('YIELD Expression', function() {
+        return new Op($1, $2);
+      }), o('YIELD FROM Expression', function() {
+        return new Op($1.concat($2), $3);
       }), o('-- SimpleAssignable', function() {
         return new Op('--', $2);
       }), o('++ SimpleAssignable', function() {
@@ -594,20 +615,20 @@
     ]
   };
 
-  operators = [['left', '.', '?.', '::', '?::'], ['left', 'CALL_START', 'CALL_END'], ['nonassoc', '++', '--'], ['left', '?'], ['right', 'UNARY'], ['right', '**'], ['right', 'UNARY_MATH'], ['left', 'MATH'], ['left', '+', '-'], ['left', 'SHIFT'], ['left', 'RELATION'], ['left', 'COMPARE'], ['left', 'LOGIC'], ['nonassoc', 'INDENT', 'OUTDENT'], ['right', '=', ':', 'COMPOUND_ASSIGN', 'RETURN', 'THROW', 'EXTENDS'], ['right', 'FORIN', 'FOROF', 'BY', 'WHEN'], ['right', 'IF', 'ELSE', 'FOR', 'WHILE', 'UNTIL', 'LOOP', 'SUPER', 'CLASS'], ['left', 'POST_IF']];
+  operators = [['left', '.', '?.', '::', '?::'], ['left', 'CALL_START', 'CALL_END'], ['nonassoc', '++', '--'], ['left', '?'], ['right', 'UNARY'], ['right', '**'], ['right', 'UNARY_MATH'], ['left', 'MATH'], ['left', '+', '-'], ['left', 'SHIFT'], ['left', 'RELATION'], ['left', 'COMPARE'], ['left', 'LOGIC'], ['nonassoc', 'INDENT', 'OUTDENT'], ['right', 'YIELD'], ['right', '=', ':', 'COMPOUND_ASSIGN', 'RETURN', 'THROW', 'EXTENDS'], ['right', 'FORIN', 'FOROF', 'BY', 'WHEN'], ['right', 'IF', 'ELSE', 'FOR', 'WHILE', 'UNTIL', 'LOOP', 'SUPER', 'CLASS'], ['left', 'POST_IF']];
 
   tokens = [];
 
   for (name in grammar) {
     alternatives = grammar[name];
     grammar[name] = (function() {
-      var _i, _j, _len, _len1, _ref, _results;
-      _results = [];
-      for (_i = 0, _len = alternatives.length; _i < _len; _i++) {
-        alt = alternatives[_i];
-        _ref = alt[0].split(' ');
-        for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {
-          token = _ref[_j];
+      var i, j, len, len1, ref, results;
+      results = [];
+      for (i = 0, len = alternatives.length; i < len; i++) {
+        alt = alternatives[i];
+        ref = alt[0].split(' ');
+        for (j = 0, len1 = ref.length; j < len1; j++) {
+          token = ref[j];
           if (!grammar[token]) {
             tokens.push(token);
           }
@@ -615,9 +636,9 @@
         if (name === 'Root') {
           alt[1] = "return " + alt[1];
         }
-        _results.push(alt);
+        results.push(alt);
       }
-      return _results;
+      return results;
     })();
   }
 

lib/coffee-script/helpers.js

@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.9.2
 (function() {
-  var buildLocationData, extend, flatten, last, repeat, syntaxErrorToString, _ref;
+  var buildLocationData, extend, flatten, ref, repeat, syntaxErrorToString;
 
   exports.starts = function(string, literal, start) {
     return literal === string.substr(start, literal.length);
@@ -26,15 +26,15 @@
   };
 
   exports.compact = function(array) {
-    var item, _i, _len, _results;
-    _results = [];
-    for (_i = 0, _len = array.length; _i < _len; _i++) {
-      item = array[_i];
+    var i, item, len1, results;
+    results = [];
+    for (i = 0, len1 = array.length; i < len1; i++) {
+      item = array[i];
       if (item) {
-        _results.push(item);
+        results.push(item);
       }
     }
-    return _results;
+    return results;
   };
 
   exports.count = function(string, substr) {
@@ -63,10 +63,10 @@
   };
 
   exports.flatten = flatten = function(array) {
-    var element, flattened, _i, _len;
+    var element, flattened, i, len1;
     flattened = [];
-    for (_i = 0, _len = array.length; _i < _len; _i++) {
-      element = array[_i];
+    for (i = 0, len1 = array.length; i < len1; i++) {
+      element = array[i];
       if (element instanceof Array) {
         flattened = flattened.concat(flatten(element));
       } else {
@@ -83,14 +83,10 @@
     return val;
   };
 
-  exports.last = last = function(array, back) {
-    return array[array.length - (back || 0) - 1];
-  };
-
-  exports.some = (_ref = Array.prototype.some) != null ? _ref : function(fn) {
-    var e, _i, _len;
-    for (_i = 0, _len = this.length; _i < _len; _i++) {
-      e = this[_i];
+  exports.some = (ref = Array.prototype.some) != null ? ref : function(fn) {
+    var e, i, len1;
+    for (i = 0, len1 = this.length; i < len1; i++) {
+      e = this[i];
       if (fn(e)) {
         return true;
       }
@@ -102,20 +98,20 @@
     var line, lines, maybe_code;
     maybe_code = true;
     lines = (function() {
-      var _i, _len, _ref1, _results;
-      _ref1 = code.split('\n');
-      _results = [];
-      for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-        line = _ref1[_i];
+      var i, len1, ref1, results;
+      ref1 = code.split('\n');
+      results = [];
+      for (i = 0, len1 = ref1.length; i < len1; i++) {
+        line = ref1[i];
         if (maybe_code && /^([ ]{4}|[ ]{0,3}\t)/.test(line)) {
-          _results.push(line);
+          results.push(line);
         } else if (maybe_code = /^\s*$/.test(line)) {
-          _results.push(line);
+          results.push(line);
         } else {
-          _results.push('# ' + line);
+          results.push('# ' + line);
         }
       }
-      return _results;
+      return results;
     })();
     return lines.join('\n');
   };
@@ -150,7 +146,7 @@
       locationData = obj;
     }
     if (locationData) {
-      return ("" + (locationData.first_line + 1) + ":" + (locationData.first_column + 1) + "-") + ("" + (locationData.last_line + 1) + ":" + (locationData.last_column + 1));
+      return ((locationData.first_line + 1) + ":" + (locationData.first_column + 1) + "-") + ((locationData.last_line + 1) + ":" + (locationData.last_column + 1));
     } else {
       return "No location data";
     }
@@ -205,11 +201,11 @@
   };
 
   syntaxErrorToString = function() {
-    var codeLine, colorize, colorsEnabled, end, filename, first_column, first_line, last_column, last_line, marker, start, _ref1, _ref2;
+    var codeLine, colorize, colorsEnabled, end, filename, first_column, first_line, last_column, last_line, marker, ref1, ref2, ref3, ref4, start;
     if (!(this.code && this.location)) {
       return Error.prototype.toString.call(this);
     }
-    _ref1 = this.location, first_line = _ref1.first_line, first_column = _ref1.first_column, last_line = _ref1.last_line, last_column = _ref1.last_column;
+    ref1 = this.location, first_line = ref1.first_line, first_column = ref1.first_column, last_line = ref1.last_line, last_column = ref1.last_column;
     if (last_line == null) {
       last_line = first_line;
     }
@@ -220,18 +216,18 @@
     codeLine = this.code.split('\n')[first_line];
     start = first_column;
     end = first_line === last_line ? last_column + 1 : codeLine.length;
-    marker = repeat(' ', start) + repeat('^', end - start);
+    marker = codeLine.slice(0, start).replace(/[^\s]/g, ' ') + repeat('^', end - start);
     if (typeof process !== "undefined" && process !== null) {
-      colorsEnabled = process.stdout.isTTY && !process.env.NODE_DISABLE_COLORS;
+      colorsEnabled = ((ref2 = process.stdout) != null ? ref2.isTTY : void 0) && !((ref3 = process.env) != null ? ref3.NODE_DISABLE_COLORS : void 0);
     }
-    if ((_ref2 = this.colorful) != null ? _ref2 : colorsEnabled) {
+    if ((ref4 = this.colorful) != null ? ref4 : colorsEnabled) {
       colorize = function(str) {
         return "\x1B[1;31m" + str + "\x1B[0m";
       };
       codeLine = codeLine.slice(0, start) + colorize(codeLine.slice(start, end)) + codeLine.slice(end);
       marker = colorize(marker);
     }
-    return "" + filename + ":" + (first_line + 1) + ":" + (first_column + 1) + ": error: " + this.message + "\n" + codeLine + "\n" + marker;
+    return filename + ":" + (first_line + 1) + ":" + (first_column + 1) + ": error: " + this.message + "\n" + codeLine + "\n" + marker;
   };
 
   exports.nameWhitespaceCharacter = function(string) {

lib/coffee-script/index.js

@@ -1,10 +1,10 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.9.2
 (function() {
-  var key, val, _ref;
+  var key, ref, val;
 
-  _ref = require('./coffee-script');
-  for (key in _ref) {
-    val = _ref[key];
+  ref = require('./coffee-script');
+  for (key in ref) {
+    val = ref[key];
     exports[key] = val;
   }
 

lib/coffee-script/optparse.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.9.2
 (function() {
   var LONG_FLAG, MULTI_FLAG, OPTIONAL, OptionParser, SHORT_FLAG, buildRule, buildRules, normalizeArguments, repeat;
 
@@ -11,14 +11,14 @@
     }
 
     OptionParser.prototype.parse = function(args) {
-      var arg, i, isOption, matchedRule, options, originalArgs, pos, rule, seenNonOptionArg, skippingArgument, value, _i, _j, _len, _len1, _ref;
+      var arg, i, isOption, j, k, len, len1, matchedRule, options, originalArgs, pos, ref, rule, seenNonOptionArg, skippingArgument, value;
       options = {
         "arguments": []
       };
       skippingArgument = false;
       originalArgs = args;
       args = normalizeArguments(args);
-      for (i = _i = 0, _len = args.length; _i < _len; i = ++_i) {
+      for (i = j = 0, len = args.length; j < len; i = ++j) {
         arg = args[i];
         if (skippingArgument) {
           skippingArgument = false;
@@ -33,9 +33,9 @@
         seenNonOptionArg = options["arguments"].length > 0;
         if (!seenNonOptionArg) {
           matchedRule = false;
-          _ref = this.rules;
-          for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {
-            rule = _ref[_j];
+          ref = this.rules;
+          for (k = 0, len1 = ref.length; k < len1; k++) {
+            rule = ref[k];
             if (rule.shortFlag === arg || rule.longFlag === arg) {
               value = true;
               if (rule.hasArgument) {
@@ -59,14 +59,14 @@
     };
 
     OptionParser.prototype.help = function() {
-      var letPart, lines, rule, spaces, _i, _len, _ref;
+      var j, len, letPart, lines, ref, rule, spaces;
       lines = [];
       if (this.banner) {
-        lines.unshift("" + this.banner + "\n");
+        lines.unshift(this.banner + "\n");
       }
-      _ref = this.rules;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        rule = _ref[_i];
+      ref = this.rules;
+      for (j = 0, len = ref.length; j < len; j++) {
+        rule = ref[j];
         spaces = 15 - rule.longFlag.length;
         spaces = spaces > 0 ? repeat(' ', spaces) : '';
         letPart = rule.shortFlag ? rule.shortFlag + ', ' : '    ';
@@ -88,16 +88,16 @@
   OPTIONAL = /\[(\w+(\*?))\]/;
 
   buildRules = function(rules) {
-    var tuple, _i, _len, _results;
-    _results = [];
-    for (_i = 0, _len = rules.length; _i < _len; _i++) {
-      tuple = rules[_i];
+    var j, len, results, tuple;
+    results = [];
+    for (j = 0, len = rules.length; j < len; j++) {
+      tuple = rules[j];
       if (tuple.length < 3) {
         tuple.unshift(null);
       }
-      _results.push(buildRule.apply(null, tuple));
+      results.push(buildRule.apply(null, tuple));
     }
-    return _results;
+    return results;
   };
 
   buildRule = function(shortFlag, longFlag, description, options) {
@@ -118,15 +118,15 @@
   };
 
   normalizeArguments = function(args) {
-    var arg, l, match, result, _i, _j, _len, _len1, _ref;
+    var arg, j, k, l, len, len1, match, ref, result;
     args = args.slice(0);
     result = [];
-    for (_i = 0, _len = args.length; _i < _len; _i++) {
-      arg = args[_i];
+    for (j = 0, len = args.length; j < len; j++) {
+      arg = args[j];
       if (match = arg.match(MULTI_FLAG)) {
-        _ref = match[1].split('');
-        for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {
-          l = _ref[_j];
+        ref = match[1].split('');
+        for (k = 0, len1 = ref.length; k < len1; k++) {
+          l = ref[k];
           result.push('-' + l);
         }
       } else {

lib/coffee-script/register.js

@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.9.2
 (function() {
-  var CoffeeScript, Module, binary, child_process, ext, findExtension, fork, helpers, loadFile, path, _i, _len, _ref;
+  var CoffeeScript, Module, binary, child_process, ext, findExtension, fork, helpers, i, len, loadFile, path, ref;
 
   CoffeeScript = require('./coffee-script');
 
@@ -17,9 +17,9 @@
   };
 
   if (require.extensions) {
-    _ref = CoffeeScript.FILE_EXTENSIONS;
-    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-      ext = _ref[_i];
+    ref = CoffeeScript.FILE_EXTENSIONS;
+    for (i = 0, len = ref.length; i < len; i++) {
+      ext = ref[i];
       require.extensions[ext] = loadFile;
     }
     Module = require('module');