CoffeeScript 1.8.0

Merge pull request #3611 from lydell/release-1.8.0
Release 1.8.0
2026-01-13 08:47:55 -05:00 · 2014-08-26 12:24:29 -04:00 · 2014-08-26 12:20:18 -04:00 · 2014-08-25 19:39:27 +02:00 · 2014-08-23 16:08:39 +02:00 · 2014-08-17 22:07:07 -07:00
100 changed files with 8254 additions and 7336 deletions
--- a/CONTRIBUTING.md
+++ b/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.
--- a/39
+++ b/39
@@ -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', ->
--- a/6
+++ b/6
@@ -38,13 +38,13 @@
  http://coffeescript.org/

  To suggest a feature, report a bug, or general discussion:
-  http://github.com/jashkenas/coffee-script/issues/
+  http://github.com/jashkenas/coffeescript/issues/

  If you'd like to chat, drop by #coffeescript on Freenode IRC,
  or on webchat.freenode.net.

  The source repository:
-  git://github.com/jashkenas/coffee-script.git
+  git://github.com/jashkenas/coffeescript.git

  Top 100 contributors are listed here:
-  http://github.com/jashkenas/coffee-script/contributors
+  http://github.com/jashkenas/coffeescript/contributors
--- a/README.md
+++ b/README.md
@@ -0,0 +1,60 @@
+            {
+         }   }   {
+        {   {  }  }
+         }   }{  {
+        {  }{  }  }                    _____       __  __
+       { }{ }{  { }                   / ____|     / _|/ _|
+     .- { { }  { }} -.               | |     ___ | |_| |_ ___  ___
+    (  { } { } { } }  )              | |    / _ \|  _|  _/ _ \/ _ \
+    |`-..________ ..-'|              | |___| (_) | | | ||  __/  __/
+    |                 |               \_____\___/|_| |_| \___|\___|
+    |                 ;--.
+    |                (__  \            _____           _       _
+    |                 | )  )          / ____|         (_)     | |
+    |                 |/  /          | (___   ___ _ __ _ _ __ | |_
+    |                 (  /            \___ \ / __| '__| | '_ \| __|
+    |                 |/              ____) | (__| |  | | |_) | |_
+    |                 |              |_____/ \___|_|  |_| .__/ \__|
+     `-.._________..-'                                  | |
+                                                        |_|
+
+CoffeeScript is a little language that compiles into JavaScript.
+
+## Installation
+
+If you have the node package manager, npm, installed:
+
+```shell
+npm install -g coffee-script
+```
+
+Leave off the `-g` if you don't wish to install globally. If you don't wish to use npm:
+
+```shell
+git clone https://github.com/jashkenas/coffeescript.git
+sudo coffeescript/bin/cake install
+```
+
+## Getting Started
+
+Execute a script:
+
+```shell
+coffee /path/to/script.coffee
+```
+
+Compile a script:
+
+```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
+
+Our lovely and talented contributors are listed here: http://github.com/jashkenas/coffeescript/contributors
--- a/documentation/css/docs.css
+++ b/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;
+  }
+
--- a/documentation/docs/browser.html
+++ b/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,38 @@ 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>]
+      <span class="hljs-keyword">if</span> script.src
+        CoffeeScript.load script.src,
+          <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 +283,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>
        
--- a/documentation/docs/cake.html
+++ b/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>
        
--- a/documentation/docs/coffee-script.html
+++ b/documentation/docs/coffee-script.html
--- a/documentation/docs/command.html
+++ b/documentation/docs/command.html
--- a/documentation/docs/docco.css
+++ b/documentation/docs/docco.css
@@ -78,7 +78,7 @@ h1 {

 hr {
  border: 0;
-  background: 1px solid #ddd;
+  background: 1px #ddd;
  height: 1px;
  margin: 20px 0;
 }
@@ -180,9 +180,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 +222,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 +322,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 +391,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;
 }
--- a/documentation/docs/grammar.html
+++ b/documentation/docs/grammar.html
--- a/documentation/docs/helpers.html
+++ b/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,11 @@ 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>Gets the last item of an array(-like) object.</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>.last = <span class="hljs-function"><span class="hljs-title">last</span> = <span class="hljs-params">(array, back)</span> -&gt;</span> array[array.length - (back <span class="hljs-keyword">or</span> <span class="hljs-number">0</span>) - <span class="hljs-number">1</span>]</pre></div></div>
            
        </li>
        
@@ -331,14 +326,13 @@ 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>Typical Array::some</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>.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>
        
@@ -351,21 +345,20 @@ looking for a particular method in an options hash.
              </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>
+can be compiled “normally”.</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
+            <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="keyword">else</span> <span class="keyword">if</span> maybe_code = <span class="regexp">/^\s*$/</span>.test 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="keyword">else</span>
-      <span class="string">'# '</span> + line
-  lines.join <span class="string">'\n'</span></pre></div></div>
+    <span class="hljs-keyword">else</span>
+      <span class="hljs-string">'# '</span> + line
+  lines.join <span class="hljs-string">'\n'</span></pre></div></div>
            
        </li>
        
@@ -377,19 +370,18 @@ can be compiled &quot;normally&quot;.
                <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>
+If <code>last</code> is not provided, this will simply return <code>first</code>.</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
+            <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="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>
+  <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>
        
@@ -401,18 +393,17 @@ If <code>last</code> is not provided, this will simply return <code>first</code>
                <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>
+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>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">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="keyword">return</span> obj</pre></div></div>
+    <span class="hljs-keyword">return</span> obj</pre></div></div>
            
        </li>
        
@@ -424,20 +415,19 @@ The object is returned either way.
                <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>
+<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">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
+            <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">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>
+  <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>
        
@@ -448,20 +438,19 @@ 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>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">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>
+            <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="number">1</span>]
-  <span class="keyword">return</span> file <span class="keyword">unless</span> stripExt
-  parts = file.split(<span class="string">'.'</span>)
+  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="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>
+  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>
        
@@ -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 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">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>
        
@@ -488,12 +476,11 @@ 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>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">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">isLiterate</span> = <span class="hljs-params">(file)</span> -&gt;</span> <span class="hljs-regexp">/\.(litcoffee|coffee\.md)$/</span>.test file</pre></div></div>
            
        </li>
        
@@ -504,18 +491,17 @@ 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>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">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
+            <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
-  <span class="keyword">throw</span> error</pre></div></div>
+  error.toString = syntaxErrorToString</pre></div></div>
            
        </li>
        
@@ -526,20 +512,15 @@ 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>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">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
+            <div class="content"><div class='highlight'><pre>  error.stack = error.toString()

-  {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>
+  <span class="hljs-keyword">throw</span> error</pre></div></div>
            
        </li>
        
@@ -550,24 +531,12 @@ 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>Update a compiler SyntaxError with source code information if it didn’t have
+it already.</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)
-
-  <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
-
-  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>
+            <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>
        
@@ -578,14 +547,77 @@ 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>Avoid screwing up the <code>stack</code> property of other errors (i.e. possible bugs).</p>

            </div>
            
-            <div class="content"><div class='highlight'><pre>
-  message</pre></div></div>
+            <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="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>
+
+  {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>
+        
+        
+        <li id="section-25">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-25">&#182;</a>
+              </div>
+              <p>Show only the first line on multi-line errors.</p>
+
+            </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-26">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-26">&#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>
        
--- a/documentation/docs/index.html
+++ b/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>
        
--- a/documentation/docs/lexer.html
+++ b/documentation/docs/lexer.html
--- a/documentation/docs/nodes.html
+++ b/documentation/docs/nodes.html
--- a/documentation/docs/optparse.html
+++ b/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>
            
--- a/documentation/docs/register.html
+++ b/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>
--- a/documentation/docs/repl.html
+++ b/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,8 +188,7 @@ 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>Generate the AST of the clean input.</p>

            </div>
            
@@ -200,27 +203,20 @@ 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>Add assignment to <code>_</code> variable to force the input to be an expression.</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>
+            <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 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>
+      js = ast.compile <span class="hljs-attribute">bare</span>: <span class="hljs-literal">yes</span>, <span class="hljs-attribute">locals</span>: Object.keys(context)
+      result = <span class="hljs-keyword">if</span> context <span class="hljs-keyword">is</span> <span class="hljs-built_in">global</span>
+        vm.runInThisContext js, filename
+      <span class="hljs-keyword">else</span>
+        vm.runInContext js, context, filename
+      cb <span class="hljs-literal">null</span>, result
+    <span class="hljs-keyword">catch</span> err</pre></div></div>
            
        </li>
        
@@ -231,21 +227,15 @@ 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>AST’s <code>compile</code> does not add source code information to syntax errors.</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>      updateSyntaxError err, input
+      cb err
+
+<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>
        
@@ -256,14 +246,17 @@ parens. Unwrap all that.
              <div class="pilwrap ">
                <a class="pilcrow" href="#section-8">&#182;</a>
              </div>
-              <p>Handle Ctrl-v
-</p>
+              <p>Node 0.11.12 changed API, prompt is now _prompt.</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>  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>
        
@@ -274,16 +267,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>Proxy node’s line listener</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>  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>
        
@@ -294,12 +292,13 @@ 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>Handle Ctrl-v</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>  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>
        
@@ -310,16 +309,15 @@ parens. Unwrap all that.
              <div class="pilwrap ">
                <a class="pilcrow" href="#section-11">&#182;</a>
              </div>
-              <p>eval, print, loop
-</p>
+              <p>allow arbitrarily switching between modes any time before multiple lines are entered</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>      <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>
        
@@ -330,19 +328,11 @@ parens. Unwrap all that.
              <div class="pilwrap ">
                <a class="pilcrow" href="#section-12">&#182;</a>
              </div>
-              <p>XXX: multiline hack
-</p>
+              <p>no-op unless the current line is empty</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>      <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>
        
@@ -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>eval, print, loop</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>      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>
        
@@ -371,13 +362,18 @@ 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>XXX: multiline hack</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>      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>
        
@@ -388,14 +384,13 @@ 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>Store and load command history from a file</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><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>
        
@@ -406,12 +401,12 @@ 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>Get file info and at most maxSize of command history</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>    stat = fs.statSync filename
+    size = Math.min maxSize, stat.size</pre></div></div>
            
        </li>
        
@@ -422,12 +417,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>Read last <code>size</code> bytes from the 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>    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>
        
@@ -438,19 +434,11 @@ 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>Set the history on the interpreter</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>    repl.rli.history = buffer.toString().split(<span class="hljs-string">'\n'</span>).reverse()</pre></div></div>
            
        </li>
        
@@ -461,15 +449,11 @@ 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>If the history file was truncated we should pop off a potential partial line</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>    repl.rli.history.pop() <span class="hljs-keyword">if</span> stat.size &gt; maxSize</pre></div></div>
            
        </li>
        
@@ -480,30 +464,104 @@ 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>Shift off the final blank newline</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.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-21">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-21">&#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-22">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-22">&#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-23">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-23">&#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>
+    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-24">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-24">&#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>
--- a/documentation/docs/rewriter.html
+++ b/documentation/docs/rewriter.html
--- a/documentation/docs/scope.html
+++ b/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,15 @@ 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>
+<p>Import the helpers we plan to use.</p>

            </div>
            
+            <div class="content"><div class='highlight'><pre>{extend, last} = <span class="hljs-built_in">require</span> <span class="hljs-string">'./helpers'</span>
+
+<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 +138,11 @@ 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>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>
-{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-property">@root</span>: <span class="hljs-literal">null</span></pre></div></div>
            
        </li>
        
@@ -146,13 +153,17 @@ 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>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>

            </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-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> -&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> = {}
+    Scope.root = <span class="hljs-keyword">this</span> <span class="hljs-keyword">unless</span> <span class="hljs-property">@parent</span></pre></div></div>
            
        </li>
        
@@ -163,19 +174,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 +194,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 +215,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 +234,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 +252,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 +269,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)</span> -&gt;</span>
+    <span class="hljs-keyword">if</span> name.length &gt; <span class="hljs-number">1</span>
+      <span class="hljs-string">'_'</span> + name + <span class="hljs-keyword">if</span> index &gt; <span class="hljs-number">1</span> <span class="hljs-keyword">then</span> index - <span class="hljs-number">1</span> <span class="hljs-keyword">else</span> <span class="hljs-string">''</span>
+    <span class="hljs-keyword">else</span>
+      <span class="hljs-string">'_'</span> + (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></pre></div></div>
            
        </li>
        
@@ -291,17 +288,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 +305,16 @@ 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, reserve=<span class="hljs-literal">true</span>)</span> -&gt;</span>
+    index = <span class="hljs-number">0</span>
+    index++ <span class="hljs-keyword">while</span> <span class="hljs-property">@check</span>((temp = <span class="hljs-property">@temporary</span> name, 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> reserve
+    temp</pre></div></div>
            
        </li>
        
@@ -331,18 +325,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 +343,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 +359,16 @@ 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>
+    realVars = []
+    tempVars = []
+    <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>
+      (<span class="hljs-keyword">if</span> v.name.charAt(<span class="hljs-number">0</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'_'</span> <span class="hljs-keyword">then</span> tempVars <span class="hljs-keyword">else</span> realVars).push v.name
+    realVars.sort().concat tempVars.sort()</pre></div></div>
            
        </li>
        
@@ -391,37 +379,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>
        
--- a/documentation/docs/sourcemap.html
+++ b/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>
        
--- a/documentation/docs/underscore.html
+++ b/documentation/docs/underscore.html
--- a/documentation/index.html.js
+++ b/documentation/index.html.js
@@ -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.8.0">1.8.0</a>
    </p>

-    <pre>
-sudo npm install -g coffee-script</pre>
+    <pre>npm install -g coffee-script</pre>

    <h2>
      <span id="overview" class="bookmark"></span>
@@ -145,27 +143,30 @@ 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:
+      (the Node Package Manager). You can then install CoffeeScript globally with npm:
    </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>

@@ -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.
@@ -1032,7 +1033,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>.
@@ -1082,7 +1083,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>
@@ -1125,7 +1126,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 +1139,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 +1147,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 +1166,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 +1193,54 @@ 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('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 +1264,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 +1278,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 +1304,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 +1330,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 +1356,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 +1381,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 +1399,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 +1425,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 +1434,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
@@ -1448,10 +1472,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 +1496,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 +1536,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 +1547,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 +1569,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 +1580,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 +1592,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 +1604,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 +1618,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 +1627,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 +1636,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 +1650,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 +1659,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 +1683,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 +1697,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 +1714,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 +1729,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 +1753,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 +1762,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 +1779,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 +1788,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 +1796,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 +1826,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 +1834,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 +1843,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 +1877,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 +1892,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 +1908,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 +1920,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 +1934,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 +1946,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 +1963,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}"
--- a/documentation/js/aliases.js
+++ b/documentation/js/aliases.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var volume, winner;

 if (ignition === true) {
--- a/documentation/js/array_comprehensions.js
+++ b/documentation/js/array_comprehensions.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var courses, dish, food, foods, i, _i, _j, _k, _len, _len1, _len2, _ref;

 _ref = ['toast', 'cheese', 'wine'];
--- a/documentation/js/block_comment.js
+++ b/documentation/js/block_comment.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0

 /*
 SkinnyMochaHalfCaffScript Compiler v1.0
--- a/documentation/js/cake_tasks.js
+++ b/documentation/js/cake_tasks.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var fs;

 fs = require('fs');
--- a/documentation/js/chaining.js
+++ b/documentation/js/chaining.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 $('body').click(function(e) {
  return $('.box').fadeIn('fast').addClass('.active');
 }).css('background', 'white');
--- a/documentation/js/classes.js
+++ b/documentation/js/classes.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 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; };
--- a/documentation/js/comparisons.js
+++ b/documentation/js/comparisons.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var cholesterol, healthy;

 cholesterol = 127;
--- a/documentation/js/conditionals.js
+++ b/documentation/js/conditionals.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var date, mood;

 if (singing) {
--- a/documentation/js/constructor_destructuring.js
+++ b/documentation/js/constructor_destructuring.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var Person, tim;

 Person = (function() {
--- a/documentation/js/default_args.js
+++ b/documentation/js/default_args.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var fill;

 fill = function(container, liquid) {
--- a/documentation/js/do.js
+++ b/documentation/js/do.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var filename, _fn, _i, _len;

 _fn = function(filename) {
--- a/documentation/js/embedded.js
+++ b/documentation/js/embedded.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var hi;

 hi = function() {
--- a/documentation/js/existence.js
+++ b/documentation/js/existence.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var footprints, solipsism, speed;

 if ((typeof mind !== "undefined" && mind !== null) && (typeof world === "undefined" || world === null)) {
--- a/documentation/js/expansion.js
+++ b/documentation/js/expansion.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var first, last, text, _ref;

 text = "Every literary critic believes he will outwit history and have the last word";
--- a/documentation/js/expressions.js
+++ b/documentation/js/expressions.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var eldest, grade;

 grade = function(student) {
--- a/documentation/js/expressions_assignment.js
+++ b/documentation/js/expressions_assignment.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var one, six, three, two;

 six = (one = 1) + (two = 2) + (three = 3);
--- a/documentation/js/expressions_comprehension.js
+++ b/documentation/js/expressions_comprehension.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var globals, name;

 globals = ((function() {
--- a/documentation/js/expressions_try.js
+++ b/documentation/js/expressions_try.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var error;

 alert((function() {
--- a/documentation/js/fat_arrow.js
+++ b/documentation/js/fat_arrow.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var Account;

 Account = function(customer, cart) {
--- a/documentation/js/functions.js
+++ b/documentation/js/functions.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var cube, square;

 square = function(x) {
--- a/documentation/js/heredocs.js
+++ b/documentation/js/heredocs.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var html;

 html = "<strong>\n  cup of coffeescript\n</strong>";
--- a/documentation/js/heregexes.js
+++ b/documentation/js/heregexes.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var OPERATOR;

 OPERATOR = /^(?:[-=]>|[-+*\/%<>&|^!?=]=|>>>=?|([-+:])\1|([&|<>])\2=?|\?\.|\.{2,3})/;
--- a/documentation/js/interpolation.js
+++ b/documentation/js/interpolation.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var author, quote, sentence;

 author = "Wittgenstein";
--- a/documentation/js/multiple_return_values.js
+++ b/documentation/js/multiple_return_values.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var city, forecast, temp, weatherReport, _ref;

 weatherReport = function(location) {
--- a/documentation/js/object_comprehensions.js
+++ b/documentation/js/object_comprehensions.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var age, ages, child, yearsOld;

 yearsOld = {
--- a/documentation/js/object_extraction.js
+++ b/documentation/js/object_extraction.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var city, futurists, name, street, _ref, _ref1;

 futurists = {
--- a/documentation/js/objects_and_arrays.js
+++ b/documentation/js/objects_and_arrays.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var bitlist, kids, singers, song;

 song = ["do", "re", "mi", "fa", "so"];
--- a/documentation/js/objects_reserved.js
+++ b/documentation/js/objects_reserved.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 $('.account').attr({
  "class": 'active'
 });
--- a/documentation/js/overview.js
+++ b/documentation/js/overview.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var cubes, list, math, num, number, opposite, race, square,
  __slice = [].slice;

--- a/documentation/js/parallel_assignment.js
+++ b/documentation/js/parallel_assignment.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var theBait, theSwitch, _ref;

 theBait = 1000;
--- a/documentation/js/patterns_and_splats.js
+++ b/documentation/js/patterns_and_splats.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var close, contents, open, tag, _i, _ref,
  __slice = [].slice;

--- a/documentation/js/prototypes.js
+++ b/documentation/js/prototypes.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 String.prototype.dasherize = function() {
  return this.replace(/_/g, "-");
 };
--- a/documentation/js/range_comprehensions.js
+++ b/documentation/js/range_comprehensions.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var countdown, num;

 countdown = (function() {
--- a/documentation/js/scope.js
+++ b/documentation/js/scope.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var changeNumbers, inner, outer;

 outer = 1;
--- a/documentation/js/slices.js
+++ b/documentation/js/slices.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var copy, end, middle, numbers, start;

 numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9];
--- a/documentation/js/soaks.js
+++ b/documentation/js/soaks.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var zip, _ref;

 zip = typeof lottery.drawWinner === "function" ? (_ref = lottery.drawWinner().address) != null ? _ref.zipcode : void 0 : void 0;
--- a/documentation/js/splats.js
+++ b/documentation/js/splats.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var awardMedals, contenders, gold, rest, silver,
  __slice = [].slice;

--- a/documentation/js/splices.js
+++ b/documentation/js/splices.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var numbers, _ref;

 numbers = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
--- a/documentation/js/strings.js
+++ b/documentation/js/strings.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 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...";
--- a/documentation/js/switch.js
+++ b/documentation/js/switch.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 switch (day) {
  case "Mon":
    go(work);
--- a/documentation/js/switch_with_no_expression.js
+++ b/documentation/js/switch_with_no_expression.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var grade, score;

 score = 76;
--- a/documentation/js/try.js
+++ b/documentation/js/try.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var error;

 try {
--- a/documentation/js/while.js
+++ b/documentation/js/while.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.8.0
 var lyrics, num;

 if (this.studyingEconomics) {
--- a/examples/custom_repl.coffee
+++ b/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()
--- a/extras/coffee-script.js
+++ b/extras/coffee-script.js
--- a/index.html
+++ b/index.html
@@ -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.8.0">1.8.0</a>
    </p>

-    <pre>
-sudo npm install -g coffee-script</pre>
+    <pre>npm install -g coffee-script</pre>

    <h2>
      <span id="overview" class="bookmark"></span>
@@ -261,27 +259,30 @@ cubes = (function() {
    <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:
+      (the Node Package Manager). You can then install CoffeeScript globally with npm:
    </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
@@ -467,7 +468,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>

@@ -1332,9 +1333,9 @@ alert((function() {
      <tr><td><tt>not</tt></td><td><tt>!</tt></td></tr>
      <tr><td><tt>and</tt></td><td><tt>&amp;&amp;</tt></td></tr>
      <tr><td><tt>or</tt></td><td><tt>||</tt></td></tr>
-      <tr><td><tt>true, yes, on</tt></td><td><tt>true</tt></td></tr>
-      <tr><td><tt>false, no, off</tt></td><td><tt>false</tt></td></tr>
-      <tr><td><tt>@, this</tt></td><td><tt>this</tt></td></tr>
+      <tr><td><tt>true</tt>, <tt>yes</tt>, <tt>on</tt></td><td><tt>true</tt></td></tr>
+      <tr><td><tt>false</tt>, <tt>no</tt>, <tt>off</tt></td><td><tt>false</tt></td></tr>
+      <tr><td><tt>@</tt>, <tt>this</tt></td><td><tt>this</tt></td></tr>
      <tr><td><tt>of</tt></td><td><tt>in</tt></td></tr>
      <tr><td><tt>in</tt></td><td><i><small>no JS equivalent</small></i></td></tr>
      <tr><td><tt>a ** b</tt></td><td><tt>Math.pow(a, b)</tt></td></tr>
@@ -1742,7 +1743,7 @@ futurists = {
 };

 _ref = futurists.poet, name = _ref.name, (_ref1 = _ref.address, street = _ref1[0], city = _ref1[1]);
-;alert("name + "-" + street");'>run: "name + "-" + street"</div><br class='clear' /></div>
+;alert(name + "-" + street);'>run: name + "-" + street</div><br class='clear' /></div>
    <p>
      Destructuring assignment can even be combined with splats.
    </p>
@@ -1788,7 +1789,7 @@ _ref = text.split(<span class="string">" "</span>), first = _ref[<span class="nu
 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];
-;alert("first + " " + last");'>run: "first + " " + last"</div><br class='clear' /></div>
+;alert(first + " " + last);'>run: first + " " + last</div><br class='clear' /></div>
    <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.
@@ -2289,7 +2290,7 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
        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>.
@@ -2339,7 +2340,7 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </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>
@@ -2382,7 +2383,7 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t

    <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 />
@@ -2395,7 +2396,7 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
        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>
@@ -2403,15 +2404,15 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
        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>
@@ -2422,7 +2423,7 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
        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>
@@ -2449,10 +2450,66 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </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>
+      <div class="anchor" id="1.8.0"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.7.1...1.8.0">1.8.0</a>
+  <span class="timestamp"> &mdash; <time datetime="2014-08-26">August 26, 2014</time></span>
+</b>
+      <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>
+      <div class="anchor" id="1.7.1"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.7.0...1.7.1">1.7.1</a>
+  <span class="timestamp"> &mdash; <time datetime="2014-01-29">January 29, 2014</time></span>
+</b>
+      <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>
+      <div class="anchor" id="1.7.0"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.6.3...1.7.0">1.7.0</a>
+  <span class="timestamp"> &mdash; <time datetime="2014-01-28">January 28, 2014</time></span>
+</b>
      <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>.
@@ -2487,7 +2544,7 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
          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.
@@ -2501,10 +2558,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
      </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>
+      <div class="anchor" id="1.6.3"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.6.2...1.6.3">1.6.3</a>
+  <span class="timestamp"> &mdash; <time datetime="2013-06-02">June 2, 2013</time></span>
+</b>
      <ul>
        <li>
          The CoffeeScript REPL now remembers your history between sessions.
@@ -2530,10 +2588,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </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>
+      <div class="anchor" id="1.6.2"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.6.1...1.6.2">1.6.2</a>
+  <span class="timestamp"> &mdash; <time datetime="2013-03-18">March 18, 2013</time></span>
+</b>
      <ul>
        <li>
          Source maps have been used to provide automatic line-mapping when
@@ -2559,10 +2618,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </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>
+      <div class="anchor" id="1.6.1"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.5.0...1.6.1">1.6.1</a>
+  <span class="timestamp"> &mdash; <time datetime="2013-03-05">March 5, 2013</time></span>
+</b>
      <ul>
        <li>
          First release of <a href="#source-maps">source maps</a>. Pass the
@@ -2588,10 +2648,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </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>
+      <div class="anchor" id="1.5.0"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.4.0...1.5.0">1.5.0</a>
+  <span class="timestamp"> &mdash; <time datetime="2013-02-25">February 25, 2013</time></span>
+</b>
      <ul>
        <li>
          First release of <a href="#literate">Literate CoffeeScript</a>.
@@ -2616,10 +2677,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </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>
+      <div class="anchor" id="1.4.0"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.3.3...1.4.0">1.4.0</a>
+  <span class="timestamp"> &mdash; <time datetime="2012-10-23">October 23, 2012</time></span>
+</b>
      <ul>
        <li>
          The CoffeeScript compiler now strips Microsoft's UTF-8 BOM if it
@@ -2637,15 +2699,16 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </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>
+      <div class="anchor" id="1.3.3"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.3.1...1.3.3">1.3.3</a>
+  <span class="timestamp"> &mdash; <time datetime="2012-05-15">May 15, 2012</time></span>
+</b>
      <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>
@@ -2666,10 +2729,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </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>
+      <div class="anchor" id="1.3.1"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.2.0...1.3.1">1.3.1</a>
+  <span class="timestamp"> &mdash; <time datetime="2012-04-10">April 10, 2012</time></span>
+</b>
      <ul>
        <li>
          CoffeeScript now enforces all of JavaScript's <b>Strict Mode</b> early syntax
@@ -2678,7 +2742,7 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
          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
@@ -2716,10 +2780,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </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>
+      <div class="anchor" id="1.2.0"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.1.3...1.2.0">1.2.0</a>
+  <span class="timestamp"> &mdash; <time datetime="2011-12-18">December 18, 2011</time></span>
+</b>
      <ul>
        <li>
          Multiple improvements to <tt>coffee --watch</tt> and <tt>--join</tt>.
@@ -2743,10 +2808,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </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>
+      <div class="anchor" id="1.1.3"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.1.2...1.1.3">1.1.3</a>
+  <span class="timestamp"> &mdash; <time datetime="2011-11-08">November 8, 2011</time></span>
+</b>
      <ul>
        <li>
          Ahh, whitespace. CoffeeScript's compiled JS now tries to space things
@@ -2786,10 +2852,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </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>
+      <div class="anchor" id="1.1.2"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.1.1...1.1.2">1.1.2</a>
+  <span class="timestamp"> &mdash; <time datetime="2011-08-04">August 4, 2011</time></span>
+</b>
      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
@@ -2800,17 +2867,21 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">1.1.1
-        <span class="timestamp"> &ndash; <small>May 10, 2011</small></span>
-      </b>
+      <div class="anchor" id="1.1.1"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.1.0...1.1.1">1.1.1</a>
+  <span class="timestamp"> &mdash; <time datetime="2011-05-10">May 10, 2011</time></span>
+</b>
      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>
+      <div class="anchor" id="1.1.0"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.0.1...1.1.0">1.1.0</a>
+  <span class="timestamp"> &mdash; <time datetime="2011-05-01">May 1, 2011</time></span>
+</b>
      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.
@@ -2826,9 +2897,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">1.0.1
-        <span class="timestamp"> &ndash; <small>Jan 31, 2011</small></span>
-      </b>
+      <div class="anchor" id="1.0.1"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/1.0.0...1.0.1">1.0.1</a>
+  <span class="timestamp"> &mdash; <time datetime="2011-01-31">January 31, 2011</time></span>
+</b>
      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.
@@ -2839,9 +2912,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">1.0.0
-        <span class="timestamp"> &ndash; <small>Dec 24, 2010</small></span>
-      </b>
+      <div class="anchor" id="1.0.0"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.9.6...1.0.0">1.0.0</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-12-24">December 24, 2010</time></span>
+</b>
      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.
@@ -2853,9 +2928,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.9.6
-        <span class="timestamp"> &ndash; <small>Dec 6, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.9.6"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.9.5...0.9.6">0.9.6</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-12-06">December 6, 2010</time></span>
+</b>
      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
@@ -2867,9 +2944,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.9.5
-        <span class="timestamp"> &ndash; <small>Nov 21, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.9.5"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.9.4...0.9.5">0.9.5</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-11-21">November 21, 2010</time></span>
+</b>
      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>
@@ -2883,9 +2962,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.9.4
-        <span class="timestamp"> &ndash; <small>Sep 21, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.9.4"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.9.3...0.9.4">0.9.4</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-09-21">September 21, 2010</time></span>
+</b>
      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
@@ -2894,9 +2975,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.9.3
-        <span class="timestamp"> &ndash; <small>Sep 16, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.9.3"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.9.2...0.9.3">0.9.3</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-09-16">September 16, 2010</time></span>
+</b>
      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.
@@ -2905,9 +2988,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.9.2
-        <span class="timestamp"> &ndash; <small>Aug 23, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.9.2"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.9.1...0.9.2">0.9.2</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-08-23">August 23, 2010</time></span>
+</b>
      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).
@@ -2921,9 +3006,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.9.1
-        <span class="timestamp"> &ndash; <small>Aug 11, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.9.1"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.9.0...0.9.1">0.9.1</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-08-11">August 11, 2010</time></span>
+</b>
      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).
@@ -2932,9 +3019,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.9.0
-        <span class="timestamp"> &ndash; <small>Aug 4, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.9.0"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.7.2...0.9.0">0.9.0</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-08-04">August 4, 2010</time></span>
+</b>
      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
@@ -2958,17 +3047,21 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.7.2
-        <span class="timestamp"> &ndash; <small>Jul 12, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.7.2"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.7.1...0.7.2">0.7.2</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-07-12">July 12, 2010</time></span>
+</b>
      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>
+      <div class="anchor" id="0.7.1"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.7.0...0.7.1">0.7.1</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-07-11">July 11, 2010</time></span>
+</b>
      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.
@@ -2976,9 +3069,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.7.0
-        <span class="timestamp"> &ndash; <small>Jun 28, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.7.0"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.6.2...0.7.0">0.7.0</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-06-28">June 28, 2010</time></span>
+</b>
      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>
@@ -2995,9 +3090,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.6.2
-        <span class="timestamp"> &ndash; <small>May 15, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.6.2"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.6.1...0.6.2">0.6.2</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-05-15">May 15, 2010</time></span>
+</b>
      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.
@@ -3012,26 +3109,32 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.6.1
-        <span class="timestamp"> &ndash; <small>Apr 12, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.6.1"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.6.0...0.6.1">0.6.1</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-04-12">April 12, 2010</time></span>
+</b>
      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>
+      <div class="anchor" id="0.6.0"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.5.6...0.6.0">0.6.0</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-04-03">April 3, 2010</time></span>
+</b>
      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>
+      <div class="anchor" id="0.5.6"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.5.5...0.5.6">0.5.6</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-03-23">March 23, 2010</time></span>
+</b>
      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
@@ -3042,9 +3145,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.5.5
-        <span class="timestamp"> &ndash; <small>Mar 8, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.5.5"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.5.4...0.5.5">0.5.5</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-03-08">March 8, 2010</time></span>
+</b>
      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
@@ -3053,18 +3158,22 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.5.4
-        <span class="timestamp"> &ndash; <small>Mar 3, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.5.4"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.5.3...0.5.4">0.5.4</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-03-03">March 3, 2010</time></span>
+</b>
      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>
+      <div class="anchor" id="0.5.3"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.5.2...0.5.3">0.5.3</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-02-27">February 27, 2010</time></span>
+</b>
      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.
@@ -3074,9 +3183,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.5.2
-        <span class="timestamp"> &ndash; <small>Feb 25, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.5.2"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.5.1...0.5.2">0.5.2</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-02-25">February 25, 2010</time></span>
+</b>
      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
@@ -3085,9 +3196,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t


    <p>
-      <b class="header" style="margin-top: 20px;">0.5.1
-        <span class="timestamp"> &ndash; <small>Feb 24, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.5.1"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.5.0...0.5.1">0.5.1</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-02-24">February 24, 2010</time></span>
+</b>
      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
@@ -3095,27 +3208,33 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.5.0
-        <span class="timestamp"> &ndash; <small>Feb 21, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.5.0"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.3.2...0.5.0">0.5.0</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-02-21">February 21, 2010</time></span>
+</b>
      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>
+      <div class="anchor" id="0.3.2"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.3.0...0.3.2">0.3.2</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-02-08">February 8, 2010</time></span>
+</b>
      <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>
+      <div class="anchor" id="0.3.0"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.2.6...0.3.0">0.3.0</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-01-26">January 26, 2010</time></span>
+</b>
      CoffeeScript 0.3 includes major syntax changes:
      <br />
      The function symbol was changed to
@@ -3131,9 +3250,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.2.6
-        <span class="timestamp"> &ndash; <small>Jan 17, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.2.6"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.2.5...0.2.6">0.2.6</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-01-17">January 17, 2010</time></span>
+</b>
      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
@@ -3141,9 +3262,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.2.5
-        <span class="timestamp"> &ndash; <small>Jan 13, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.2.5"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.2.4...0.2.5">0.2.5</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-01-13">January 13, 2010</time></span>
+</b>
      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
@@ -3152,26 +3275,32 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.2.4
-        <span class="timestamp"> &ndash; <small>Jan 12, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.2.4"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.2.3...0.2.4">0.2.4</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-01-12">January 12, 2010</time></span>
+</b>
      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>
+      <div class="anchor" id="0.2.3"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.2.2...0.2.3">0.2.3</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-01-11">January 11, 2010</time></span>
+</b>
      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>
+      <div class="anchor" id="0.2.2"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.2.1...0.2.2">0.2.2</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-01-10">January 10, 2010</time></span>
+</b>
      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.
@@ -3192,16 +3321,20 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.2.1
-        <span class="timestamp"> &ndash; <small>Jan 5, 2010</small></span>
-      </b>
+      <div class="anchor" id="0.2.1"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.2.0...0.2.1">0.2.1</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-01-05">January 5, 2010</time></span>
+</b>
      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>
+      <div class="anchor" id="0.2.0"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.1.6...0.2.0">0.2.0</a>
+  <span class="timestamp"> &mdash; <time datetime="2010-01-05">January 5, 2010</time></span>
+</b>
      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,
@@ -3211,18 +3344,22 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.1.6
-        <span class="timestamp"> &ndash; <small>Dec 27, 2009</small></span>
-      </b>
+      <div class="anchor" id="0.1.6"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.1.5...0.1.6">0.1.6</a>
+  <span class="timestamp"> &mdash; <time datetime="2009-12-27">December 27, 2009</time></span>
+</b>
      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>
+      <div class="anchor" id="0.1.5"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.1.4...0.1.5">0.1.5</a>
+  <span class="timestamp"> &mdash; <time datetime="2009-12-26">December 26, 2009</time></span>
+</b>
      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
@@ -3231,9 +3368,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.1.4
-        <span class="timestamp"> &ndash; <small>Dec 25, 2009</small></span>
-      </b>
+      <div class="anchor" id="0.1.4"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.1.3...0.1.4">0.1.4</a>
+  <span class="timestamp"> &mdash; <time datetime="2009-12-25">December 25, 2009</time></span>
+</b>
      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>.
@@ -3245,9 +3384,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.1.3
-        <span class="timestamp"> &ndash; <small>Dec 25, 2009</small></span>
-      </b>
+      <div class="anchor" id="0.1.3"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.1.2...0.1.3">0.1.3</a>
+  <span class="timestamp"> &mdash; <time datetime="2009-12-25">December 25, 2009</time></span>
+</b>
      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
@@ -3261,9 +3402,11 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.1.2
-        <span class="timestamp"> &ndash; <small>Dec 24, 2009</small></span>
-      </b>
+      <div class="anchor" id="0.1.2"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.1.1...0.1.2">0.1.2</a>
+  <span class="timestamp"> &mdash; <time datetime="2009-12-24">December 24, 2009</time></span>
+</b>
      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>
@@ -3275,16 +3418,20 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    </p>

    <p>
-      <b class="header" style="margin-top: 20px;">0.1.1
-        <span class="timestamp"> &ndash; <small>Dec 24, 2009</small></span>
-      </b>
+      <div class="anchor" id="0.1.1"></div>
+<b class="header">
+  <a href="https://github.com/jashkenas/coffeescript/compare/0.1.0...0.1.1">0.1.1</a>
+  <span class="timestamp"> &mdash; <time datetime="2009-12-24">December 24, 2009</time></span>
+</b>
      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>
+      <div class="anchor" id="0.1.0"></div>
+<b class="header">
+  0.1.0
+  <span class="timestamp"> &mdash; <time datetime="2009-12-24">December 24, 2009</time></span>
+</b>
      Initial CoffeeScript release.
    </p>

@@ -3296,19 +3443,22 @@ task(<span class="string">'build:parser'</span>, <span class="string">'rebuild t
    # 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}"
--- a/lib/coffee-script/browser.js
+++ b/lib/coffee-script/browser.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (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; };
--- a/lib/coffee-script/cake.js
+++ b/lib/coffee-script/cake.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (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 = {};
--- a/lib/coffee-script/coffee-script.js
+++ b/lib/coffee-script/coffee-script.js
@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (function() {
-  var Lexer, SourceMap, compile, formatSourcePosition, fs, getSourceMap, helpers, lexer, parser, path, sourceMaps, vm, withPrettyErrors,
+  var Lexer, SourceMap, compile, ext, formatSourcePosition, fs, getSourceMap, helpers, lexer, parser, path, sourceMaps, vm, withPrettyErrors, _base, _i, _len, _ref,
    __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; };

@@ -18,7 +18,7 @@

  SourceMap = require('./sourcemap');

-  exports.VERSION = '1.7.1';
+  exports.VERSION = '1.8.0';

  exports.FILE_EXTENSIONS = ['.coffee', '.litcoffee', '.coffee.md'];

@@ -186,6 +186,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) {
@@ -233,9 +245,9 @@
  parser.yy = require('./nodes');

  parser.yy.parseError = function(message, _arg) {
-    var errorLoc, errorTag, errorText, errorToken, token, tokens, _ref;
+    var errorLoc, errorTag, errorText, errorToken, token, tokens, _ref1;
    token = _arg.token;
-    _ref = parser.lexer, errorToken = _ref.errorToken, tokens = _ref.tokens;
+    _ref1 = parser.lexer, errorToken = _ref1.errorToken, tokens = _ref1.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);
    return helpers.throwSyntaxError("unexpected " + errorText, errorLoc);
@@ -292,11 +304,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 +316,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,10 +330,10 @@
      }
    };
    frames = (function() {
-      var _i, _len, _results;
+      var _j, _len1, _results;
      _results = [];
-      for (_i = 0, _len = stack.length; _i < _len; _i++) {
-        frame = stack[_i];
+      for (_j = 0, _len1 = stack.length; _j < _len1; _j++) {
+        frame = stack[_j];
        if (frame.getFunction() === exports.run) {
          break;
        }
@@ -329,7 +341,7 @@
      }
      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);
--- a/lib/coffee-script/command.js
+++ b/lib/coffee-script/command.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (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; };
@@ -37,7 +37,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'], ['-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 = {};

@@ -86,6 +86,7 @@
    }
    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 = [];
@@ -405,7 +406,7 @@
    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);
    }
  };
@@ -444,7 +445,7 @@
    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) {
@@ -456,7 +457,8 @@
        }
        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 +467,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);
          }
        });
      }
--- a/lib/coffee-script/grammar.js
+++ b/lib/coffee-script/grammar.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (function() {
  var Parser, alt, alternatives, grammar, name, o, operators, token, tokens, unwrap;

--- a/lib/coffee-script/helpers.js
+++ b/lib/coffee-script/helpers.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (function() {
  var buildLocationData, extend, flatten, last, repeat, syntaxErrorToString, _ref;

@@ -220,7 +220,7 @@
    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;
    }
--- a/lib/coffee-script/index.js
+++ b/lib/coffee-script/index.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (function() {
  var key, val, _ref;

--- a/lib/coffee-script/lexer.js
+++ b/lib/coffee-script/lexer.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (function() {
  var BOM, BOOL, CALLABLE, CODE, COFFEE_ALIASES, COFFEE_ALIAS_MAP, COFFEE_KEYWORDS, COMMENT, COMPARE, COMPOUND_ASSIGN, HEREDOC, HEREDOC_ILLEGAL, HEREDOC_INDENT, HEREGEX, HEREGEX_OMIT, IDENTIFIER, INDENTABLE_CLOSERS, INDEXABLE, INVERSES, JSTOKEN, JS_FORBIDDEN, JS_KEYWORDS, LINE_BREAK, LINE_CONTINUER, LOGIC, Lexer, MATH, MULTILINER, MULTI_DENT, NOT_REGEX, NOT_SPACED_REGEX, NUMBER, OPERATOR, REGEX, RELATION, RESERVED, Rewriter, SHIFT, SIMPLESTR, STRICT_PROSCRIBED, TRAILING_SPACES, UNARY, UNARY_MATH, WHITESPACE, compact, count, invertLiterate, key, last, locationDataToString, repeat, starts, throwSyntaxError, _ref, _ref1,
    __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; };
@@ -166,10 +166,10 @@
    };

    Lexer.prototype.stringToken = function() {
-      var octalEsc, quote, string, trimmed;
+      var inner, innerLen, numBreak, octalEsc, pos, quote, string, trimmed;
      switch (quote = this.chunk.charAt(0)) {
        case "'":
-          string = SIMPLESTR.exec(this.chunk)[0];
+          string = (SIMPLESTR.exec(this.chunk) || [])[0];
          break;
        case '"':
          string = this.balancedString(this.chunk, '"');
@@ -177,10 +177,16 @@
      if (!string) {
        return 0;
      }
-      trimmed = this.removeNewlines(string.slice(1, -1));
+      inner = string.slice(1, -1);
+      trimmed = this.removeNewlines(inner);
      if (quote === '"' && 0 < string.indexOf('#{', 1)) {
+        numBreak = pos = 0;
+        innerLen = inner.length;
+        while (inner.charAt(pos++) === '\n' && pos < innerLen) {
+          numBreak++;
+        }
        this.interpolateString(trimmed, {
-          strOffset: 1,
+          strOffset: 1 + numBreak,
          lexedLength: string.length
        });
      } else {
@@ -193,7 +199,7 @@
    };

    Lexer.prototype.heredocToken = function() {
-      var doc, heredoc, match, quote;
+      var doc, heredoc, match, quote, strOffset;
      if (!(match = HEREDOC.exec(this.chunk))) {
        return 0;
      }
@@ -204,9 +210,10 @@
        indent: null
      });
      if (quote === '"' && 0 <= doc.indexOf('#{')) {
+        strOffset = match[2].charAt(0) === '\n' ? 4 : 3;
        this.interpolateString(doc, {
          heredoc: true,
-          strOffset: 3,
+          strOffset: strOffset,
          lexedLength: heredoc.length
        });
      } else {
@@ -283,7 +290,8 @@
      this.token('CALL_START', '(', 0, 0);
      tokens = [];
      _ref2 = this.interpolateString(body, {
-        regex: true
+        regex: true,
+        strOffset: 3
      });
      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
        token = _ref2[_i];
@@ -625,7 +633,7 @@
        }
        inner = expr.slice(1, -1);
        if (inner.length) {
-          _ref2 = this.getLineAndColumnFromChunk(strOffset + i + 1), line = _ref2[0], column = _ref2[1];
+          _ref2 = this.getLineAndColumnFromChunk(strOffset + i + 2), line = _ref2[0], column = _ref2[1];
          nested = new Lexer().tokenize(inner, {
            line: line,
            column: column,
--- a/lib/coffee-script/nodes.js
+++ b/lib/coffee-script/nodes.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (function() {
  var Access, Arr, Assign, Base, Block, Call, Class, Code, CodeFragment, Comment, Existence, Expansion, Extends, For, HEXNUM, IDENTIFIER, IDENTIFIER_STR, IS_REGEX, IS_STRING, If, In, Index, LEVEL_ACCESS, LEVEL_COND, LEVEL_LIST, LEVEL_OP, LEVEL_PAREN, LEVEL_TOP, Literal, METHOD_DEF, NEGATE, NO, NUMBER, Obj, Op, Param, Parens, RESERVED, Range, Return, SIMPLENUM, STRICT_PROSCRIBED, Scope, Slice, Splat, Switch, TAB, THIS, Throw, Try, UTILITIES, Value, While, YES, addLocationDataFn, compact, del, ends, extend, flatten, fragmentsToText, isLiteralArguments, isLiteralThis, last, locationDataToString, merge, multident, parseNum, some, starts, throwSyntaxError, unfoldSoak, utility, _ref, _ref1,
    __hasProp = {}.hasOwnProperty,
@@ -623,10 +623,8 @@
  exports.Return = Return = (function(_super) {
    __extends(Return, _super);

-    function Return(expr) {
-      if (expr && !expr.unwrap().isUndefined) {
-        this.expression = expr;
-      }
+    function Return(expression) {
+      this.expression = expression;
    }

    Return.prototype.children = ['expression'];
@@ -3075,7 +3073,7 @@
      return "[].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }";
    },
    modulo: function() {
-      return "function(a, b) { return (a % b + +b) % b; }";
+      return "function(a, b) { return (+a % (b = +b) + b) % b; }";
    },
    hasProp: function() {
      return '{}.hasOwnProperty';
--- a/lib/coffee-script/optparse.js
+++ b/lib/coffee-script/optparse.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (function() {
  var LONG_FLAG, MULTI_FLAG, OPTIONAL, OptionParser, SHORT_FLAG, buildRule, buildRules, normalizeArguments, repeat;

--- a/lib/coffee-script/register.js
+++ b/lib/coffee-script/register.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (function() {
  var CoffeeScript, Module, binary, child_process, ext, findExtension, fork, helpers, loadFile, path, _i, _len, _ref;

--- a/lib/coffee-script/repl.js
+++ b/lib/coffee-script/repl.js
@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (function() {
-  var CoffeeScript, addHistory, addMultilineHandler, fs, merge, nodeREPL, path, replDefaults, updateSyntaxError, vm, _ref;
+  var CoffeeScript, addHistory, addMultilineHandler, fs, getCommandId, merge, nodeREPL, path, replDefaults, updateSyntaxError, vm, _ref;

  fs = require('fs');

@@ -41,14 +41,15 @@
  };

  addMultilineHandler = function(repl) {
-    var inputStream, multiline, nodeLineListener, outputStream, rli;
+    var inputStream, multiline, nodeLineListener, origPrompt, outputStream, rli, _ref1;
    rli = repl.rli, inputStream = repl.inputStream, outputStream = repl.outputStream;
+    origPrompt = (_ref1 = repl._prompt) != null ? _ref1 : repl.prompt;
    multiline = {
      enabled: false,
-      initialPrompt: repl.prompt.replace(/^[^> ]*/, function(x) {
+      initialPrompt: origPrompt.replace(/^[^> ]*/, function(x) {
        return x.replace(/./g, '-');
      }),
-      prompt: repl.prompt.replace(/^[^> ]*>?/, function(x) {
+      prompt: origPrompt.replace(/^[^> ]*>?/, function(x) {
        return x.replace(/./g, '.');
      }),
      buffer: ''
@@ -61,6 +62,7 @@
        rli.setPrompt(multiline.prompt);
        rli.prompt(true);
      } else {
+        rli.setPrompt(origPrompt);
        nodeLineListener(cmd);
      }
    });
@@ -71,7 +73,7 @@
      if (multiline.enabled) {
        if (!multiline.buffer.match(/\n/)) {
          multiline.enabled = !multiline.enabled;
-          rli.setPrompt(repl.prompt);
+          rli.setPrompt(origPrompt);
          rli.prompt(true);
          return;
        }
@@ -123,7 +125,7 @@
    repl.rli.on('exit', function() {
      return fs.close(fd);
    });
-    return repl.commands['.history'] = {
+    return repl.commands[getCommandId(repl, 'history')] = {
      help: 'Show command history',
      action: function() {
        repl.outputStream.write("" + (repl.rli.history.slice(0).reverse().join('\n')) + "\n");
@@ -132,6 +134,16 @@
    };
  };

+  getCommandId = function(repl, commandName) {
+    var commandsHaveLeadingDot;
+    commandsHaveLeadingDot = repl.commands['.help'] != null;
+    if (commandsHaveLeadingDot) {
+      return "." + commandName;
+    } else {
+      return commandName;
+    }
+  };
+
  module.exports = {
    start: function(opts) {
      var build, major, minor, repl, _ref1;
@@ -156,6 +168,7 @@
      if (opts.historyFile) {
        addHistory(repl, opts.historyFile, opts.historyMaxInputSize);
      }
+      repl.commands[getCommandId(repl, 'load')].help = 'Load code from a file into this REPL session';
      return repl;
    }
  };
--- a/lib/coffee-script/rewriter.js
+++ b/lib/coffee-script/rewriter.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (function() {
  var BALANCED_PAIRS, CALL_CLOSERS, EXPRESSION_CLOSE, EXPRESSION_END, EXPRESSION_START, IMPLICIT_CALL, IMPLICIT_END, IMPLICIT_FUNC, IMPLICIT_UNSPACED_CALL, INVERSES, LINEBREAKS, SINGLE_CLOSERS, SINGLE_LINERS, generate, left, rite, _i, _len, _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; },
--- a/lib/coffee-script/scope.js
+++ b/lib/coffee-script/scope.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (function() {
  var Scope, extend, last, _ref;

--- a/lib/coffee-script/sourcemap.js
+++ b/lib/coffee-script/sourcemap.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.1
+// Generated by CoffeeScript 1.8.0
 (function() {
  var LineMap, SourceMap;

--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
    "compiler"
  ],
  "author": "Jeremy Ashkenas",
-  "version": "1.7.1",
+  "version": "1.8.0",
  "license": "MIT",
  "engines": {
    "node": ">=0.8.0"
@@ -21,20 +21,22 @@
    "coffee": "./bin/coffee",
    "cake": "./bin/cake"
  },
+  "preferGlobal": true,
  "scripts": {
    "test": "node ./bin/cake test"
  },
  "homepage": "http://coffeescript.org",
-  "bugs": "https://github.com/jashkenas/coffee-script/issues",
+  "bugs": "https://github.com/jashkenas/coffeescript/issues",
  "repository": {
    "type": "git",
-    "url": "git://github.com/jashkenas/coffee-script.git"
+    "url": "git://github.com/jashkenas/coffeescript.git"
  },
  "devDependencies": {
    "uglify-js": "~2.2",
    "jison": ">=0.2.0",
    "highlight.js": "~8.0.0",
-    "underscore": "~1.5.2"
+    "underscore": "~1.5.2",
+    "docco": "~0.6.2"
  },
  "dependencies": {
    "mkdirp": "~0.3.5"
--- a/repl.js
+++ b/repl.js
@@ -0,0 +1 @@
+module.exports = require('./lib/coffee-script/repl');
--- a/src/cake.coffee
+++ b/src/cake.coffee
@@ -13,6 +13,9 @@ helpers      = require './helpers'
 optparse     = require './optparse'
 CoffeeScript = require './coffee-script'

+# Register .coffee extension
+CoffeeScript.register()
+
 # Keep track of the list of defined tasks, the accepted options, and so on.
 tasks     = {}
 options   = {}
--- a/src/coffee-script.coffee
+++ b/src/coffee-script.coffee
@@ -12,7 +12,7 @@ helpers       = require './helpers'
 SourceMap     = require './sourcemap'

 # The current CoffeeScript version number.
-exports.VERSION = '1.7.1'
+exports.VERSION = '1.8.0'

 exports.FILE_EXTENSIONS = ['.coffee', '.litcoffee', '.coffee.md']

@@ -158,6 +158,14 @@ exports.eval = (code, options = {}) ->

 exports.register = -> require './register'

+# Throw error with deprecation warning when depending upon implicit `require.extensions` registration
+if require.extensions
+  for ext in @FILE_EXTENSIONS
+    require.extensions[ext] ?= ->
+      throw new Error """
+      Use CoffeeScript.register() or require the coffee-script/register module to require #{ext} files.
+      """
+
 exports._compileFile = (filename, sourceMap = no) ->
  raw = fs.readFileSync filename, 'utf8'
  stripped = if raw.charCodeAt(0) is 0xFEFF then raw.substring 1 else raw
@@ -294,5 +302,5 @@ Error.prepareStackTrace = (err, stack) ->
    break if frame.getFunction() is exports.run
    "  at #{formatSourcePosition frame, getSourceMapping}"

-  "#{err.name}: #{err.message ? ''}\n#{frames.join '\n'}\n"
+  "#{err.toString()}\n#{frames.join '\n'}\n"

--- a/src/command.coffee
+++ b/src/command.coffee
@@ -39,7 +39,7 @@ SWITCHES = [
  ['-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']
+  ['-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']
@@ -65,7 +65,7 @@ optionParser = null
 # `--` will be passed verbatim to your script as arguments in `process.argv`
 exports.run = ->
  parseOptions()
-  # Make the REPL *CLI* use the global context so as to (a) be consistent with the 
+  # Make the REPL *CLI* use the global context so as to (a) be consistent with the
  # `node` REPL CLI and, therefore, (b) make packages that modify native prototypes
  # (such as 'colors' and 'sugar') work as expected.
  replCliOpts = useGlobal: yes
@@ -81,7 +81,22 @@ exports.run = ->
  process.argv[0] = 'coffee'

  opts.output = path.resolve opts.output  if opts.output
-  opts.join   = path.resolve opts.join    if opts.join
+  if opts.join
+    opts.join = path.resolve opts.join
+    console.error '''
+
+    The --join option is deprecated and will be removed in a future version.
+
+    If for some reason it's necessary to share local variables between files,
+    replace...
+
+        $ coffee --compile --join bundle.js -- a.coffee b.coffee c.coffee
+
+    with...
+
+        $ cat a.coffee b.coffee c.coffee | coffee --compile --stdio > bundle.js
+
+    '''
  for source in opts.arguments
    source = path.resolve source
    compilePath source, yes, source
@@ -294,7 +309,7 @@ removeSource = (source, base) ->
  sourceCode.splice index, 1
  unless opts.join
    silentUnlink outputPath source, base
-    silentUnlink outputPath source, base, '.map'
+    silentUnlink outputPath source, base, '.js.map'
    timeLog "removed #{source}"

 silentUnlink = (path) ->
@@ -319,10 +334,10 @@ outputPath = (source, base, extension=".js") ->
 # are written out in `cwd` as `.js` files with the same name, but the output
 # directory can be customized with `--output`.
 #
-# If `generatedSourceMap` is provided, this will write a `.map` file into the
+# If `generatedSourceMap` is provided, this will write a `.js.map` file into the
 # same directory as the `.js` file.
 writeJs = (base, sourcePath, js, jsPath, generatedSourceMap = null) ->
-  sourceMapPath = outputPath sourcePath, base, ".map"
+  sourceMapPath = outputPath sourcePath, base, ".js.map"
  jsDir  = path.dirname jsPath
  compile = ->
    if opts.compile
@@ -331,12 +346,14 @@ writeJs = (base, sourcePath, js, jsPath, generatedSourceMap = null) ->
      fs.writeFile jsPath, js, (err) ->
        if err
          printLine err.message
+          process.exit 1
        else if opts.compile and opts.watch
          timeLog "compiled #{sourcePath}"
    if generatedSourceMap
      fs.writeFile sourceMapPath, generatedSourceMap, (err) ->
        if err
          printLine "Could not write source map: #{err.message}"
+          process.exit 1
  fs.exists jsDir, (itExists) ->
    if itExists then compile() else mkdirp jsDir, compile

--- a/src/helpers.coffee
+++ b/src/helpers.coffee
@@ -172,7 +172,7 @@ syntaxErrorToString = ->
  start    = first_column
  # Show only the first line on multi-line errors.
  end      = if first_line is last_line then last_column + 1 else codeLine.length
-  marker   = repeat(' ', start) + repeat('^', end - start)
+  marker   = codeLine[...start].replace(/[^\s]/g, ' ') + repeat('^', end - start)

  # Check to see if we're running on a color-enabled TTY.
  if process?
--- a/src/index.coffee
+++ b/src/index.coffee
@@ -1,2 +1,2 @@
 # Loader for CoffeeScript as a Node.js library.
-exports[key] = val for key, val of require './coffee-script'
+exports[key] = val for key, val of require './coffee-script'
--- a/src/lexer.coffee
+++ b/src/lexer.coffee
@@ -187,12 +187,16 @@ exports.Lexer = class Lexer
  # are balanced within the string's contents, and within nested interpolations.
  stringToken: ->
    switch quote = @chunk.charAt 0
-      when "'" then [string] = SIMPLESTR.exec @chunk
+      when "'" then [string] = SIMPLESTR.exec(@chunk) || []
      when '"' then string = @balancedString @chunk, '"'
    return 0 unless string
-    trimmed = @removeNewlines string[1...-1]
+    inner = string[1...-1]
+    trimmed = @removeNewlines inner
    if quote is '"' and 0 < string.indexOf '#{', 1
-      @interpolateString trimmed, strOffset: 1, lexedLength: string.length
+      numBreak = pos = 0
+      innerLen = inner.length
+      numBreak++ while inner.charAt(pos++) is '\n' and pos < innerLen
+      @interpolateString trimmed, strOffset: 1 + numBreak, lexedLength: string.length
    else
      @token 'STRING', quote + @escapeLines(trimmed) + quote, 0, string.length
    if octalEsc = /^(?:\\.|[^\\])*\\(?:0[0-7]|[1-7])/.test string
@@ -207,7 +211,8 @@ exports.Lexer = class Lexer
    quote = heredoc.charAt 0
    doc = @sanitizeHeredoc match[2], quote: quote, indent: null
    if quote is '"' and 0 <= doc.indexOf '#{'
-      @interpolateString doc, heredoc: yes, strOffset: 3, lexedLength: heredoc.length
+      strOffset = if match[2].charAt(0) is '\n' then 4 else 3
+      @interpolateString doc, heredoc: yes, strOffset: strOffset, lexedLength: heredoc.length
    else
      @token 'STRING', @makeString(doc, quote, yes), 0, heredoc.length
    heredoc.length
@@ -258,7 +263,7 @@ exports.Lexer = class Lexer
    @token 'IDENTIFIER', 'RegExp', 0, 0
    @token 'CALL_START', '(', 0, 0
    tokens = []
-    for token in @interpolateString(body, regex: yes)
+    for token in @interpolateString(body, regex: yes, strOffset: 3)
      [tag, value] = token
      if tag is 'TOKENS'
        tokens.push value...
@@ -548,7 +553,7 @@ exports.Lexer = class Lexer
        errorToken = @makeToken '', 'string interpolation', offsetInChunk + i + 1, 2
      inner = expr[1...-1]
      if inner.length
-        [line, column] = @getLineAndColumnFromChunk(strOffset + i + 1)
+        [line, column] = @getLineAndColumnFromChunk(strOffset + i + 2)
        nested = new Lexer().tokenize inner, line: line, column: column, rewrite: off
        popped = nested.pop()
        popped = nested.shift() if nested[0]?[0] is 'TERMINATOR'
--- a/src/nodes.coffee
+++ b/src/nodes.coffee
@@ -434,8 +434,7 @@ class exports.Bool extends Base
 # A `return` is a *pureStatement* -- wrapping it in a closure wouldn't
 # make sense.
 exports.Return = class Return extends Base
-  constructor: (expr) ->
-    @expression = expr if expr and not expr.unwrap().isUndefined
+  constructor: (@expression) ->

  children: ['expression']

@@ -2194,7 +2193,7 @@ UTILITIES =
  "

  modulo: -> """
-    function(a, b) { return (a % b + +b) % b; }
+    function(a, b) { return (+a % (b = +b) + b) % b; }
  """

  # Shortcuts to speed up the lookup time for native functions.
--- a/src/register.coffee
+++ b/src/register.coffee
@@ -14,10 +14,8 @@ if require.extensions
  for ext in CoffeeScript.FILE_EXTENSIONS
    require.extensions[ext] = loadFile

-  # Patch Node's module loader to be able to handle mult-dot extensions.
-  # This is a horrible thing that should not be required. Perhaps, one day,
-  # when a truly benevolent dictator comes to rule over the Republik of Node,
-  # it won't be.
+  # Patch Node's module loader to be able to handle multi-dot extensions.
+  # This is a horrible thing that should not be required.
  Module = require 'module'

  findExtension = (filename) ->
@@ -49,4 +47,4 @@ if child_process
        args = []
      args = [path].concat args
      path = binary
-    fork path, args, options
+    fork path, args, options
--- a/src/repl.coffee
+++ b/src/repl.coffee
@@ -28,7 +28,7 @@ replDefaults =
      ]
      js = ast.compile bare: yes, locals: Object.keys(context)
      result = if context is global
-        vm.runInThisContext js, filename 
+        vm.runInThisContext js, filename
      else
        vm.runInContext js, context, filename
      cb null, result
@@ -39,11 +39,13 @@ replDefaults =

 addMultilineHandler = (repl) ->
  {rli, inputStream, outputStream} = repl
+  # Node 0.11.12 changed API, prompt is now _prompt.
+  origPrompt = repl._prompt ? repl.prompt

  multiline =
    enabled: off
-    initialPrompt: repl.prompt.replace /^[^> ]*/, (x) -> x.replace /./g, '-'
-    prompt: repl.prompt.replace /^[^> ]*>?/, (x) -> x.replace /./g, '.'
+    initialPrompt: origPrompt.replace /^[^> ]*/, (x) -> x.replace /./g, '-'
+    prompt: origPrompt.replace /^[^> ]*>?/, (x) -> x.replace /./g, '.'
    buffer: ''

  # Proxy node's line listener
@@ -55,6 +57,7 @@ addMultilineHandler = (repl) ->
      rli.setPrompt multiline.prompt
      rli.prompt true
    else
+      rli.setPrompt origPrompt
      nodeLineListener cmd
    return

@@ -65,7 +68,7 @@ addMultilineHandler = (repl) ->
      # allow arbitrarily switching between modes any time before multiple lines are entered
      unless multiline.buffer.match /\n/
        multiline.enabled = not multiline.enabled
-        rli.setPrompt repl.prompt
+        rli.setPrompt origPrompt
        rli.prompt true
        return
      # no-op unless the current line is empty
@@ -117,12 +120,17 @@ addHistory = (repl, filename, maxSize) ->
  repl.rli.on 'exit', -> fs.close fd

  # Add a command to show the history stack
-  repl.commands['.history'] =
+  repl.commands[getCommandId(repl, 'history')] =
    help: 'Show command history'
    action: ->
      repl.outputStream.write "#{repl.rli.history[..].reverse().join '\n'}\n"
      repl.displayPrompt()

+getCommandId = (repl, commandName) ->
+  # Node 0.11 changed API, a command such as '.help' is now stored as 'help'
+  commandsHaveLeadingDot = repl.commands['.help']?
+  if commandsHaveLeadingDot then ".#{commandName}" else commandName
+
 module.exports =
  start: (opts = {}) ->
    [major, minor, build] = process.versions.node.split('.').map (n) -> parseInt(n)
@@ -138,4 +146,6 @@ module.exports =
    repl.on 'exit', -> repl.outputStream.write '\n'
    addMultilineHandler repl
    addHistory repl, opts.historyFile, opts.historyMaxInputSize if opts.historyFile
+    # Adapt help inherited from the node REPL
+    repl.commands[getCommandId(repl, 'load')].help = 'Load code from a file into this REPL session'
    repl
--- a/test/error_messages.coffee
+++ b/test/error_messages.coffee
@@ -41,6 +41,17 @@ test "compiler error formatting", ->
                 ^^^^
  '''

+test "compiler error formatting with mixed tab and space", ->
+  assertErrorFormat """
+    \t  if a
+    \t  test
+  """,
+  '''
+    [stdin]:1:4: error: unexpected if
+    \t  if a
+    \t  ^^
+  '''
+

 if require?
  fs   = require 'fs'
@@ -50,11 +61,18 @@ if require?
    err = new Error 'error'
    ok err.stack.match /test[\/\\]error_messages\.coffee:\d+:\d+\b/

+  test "patchStackTrace stack prelude consistent with V8", ->
+    err = new Error
+    ok err.stack.match /^Error\n/ # Notice no colon when no message.
+
+    err = new Error 'error'
+    ok err.stack.match /^Error: error\n/
+
  test "#2849: compilation error in a require()d file", ->
    # Create a temporary file to require().
    ok not fs.existsSync 'test/syntax-error.coffee'
    fs.writeFileSync 'test/syntax-error.coffee', 'foo in bar or in baz'
-  
+
    try
      assertErrorFormat '''
        require './test/syntax-error'
@@ -67,7 +85,7 @@ if require?
    finally
      fs.unlink 'test/syntax-error.coffee'

-  
+
 test "#1096: unexpected generated tokens", ->
  # Unexpected interpolation
  assertErrorFormat '{"#{key}": val}', '''
--- a/test/functions.coffee
+++ b/test/functions.coffee
@@ -240,3 +240,16 @@ test "#1435 Indented property access", ->
            rec.rec()
          .rec()
    1
+
+test "#1038 Optimize trailing return statements", ->
+  compile = (code) -> CoffeeScript.compile(code, bare: yes).trim().replace(/\s+/g, " ")
+
+  eq "(function() {});",                 compile("->")
+  eq "(function() {});",                 compile("-> return")
+  eq "(function() { return void 0; });", compile("-> undefined")
+  eq "(function() { return void 0; });", compile("-> return undefined")
+  eq "(function() { foo(); });",         compile("""
+                                                 ->
+                                                   foo()
+                                                   return
+                                                 """)
--- a/test/location.coffee
+++ b/test/location.coffee
@@ -59,6 +59,426 @@ test "Verify location of generated tokens (with indented first line)", ->
  eq numberToken[2].last_line, 0
  eq numberToken[2].last_column, 7

+test 'Verify locations in string interpolation (in "string")', ->
+  tokens = CoffeeScript.tokens '"a#{b}c"'
+
+  eq tokens.length, 8
+  [openParen, a, firstPlus, b, secondPlus, c, closeParen] = tokens
+
+  eq a[2].first_line, 0
+  eq a[2].first_column, 1
+  eq a[2].last_line, 0
+  eq a[2].last_column, 1
+
+  eq b[2].first_line, 0
+  eq b[2].first_column, 4
+  eq b[2].last_line, 0
+  eq b[2].last_column, 4
+
+  eq c[2].first_line, 0
+  eq c[2].first_column, 6
+  eq c[2].last_line, 0
+  eq c[2].last_column, 6
+
+test 'Verify locations in string interpolation (in "string", multiple interpolation)', ->
+  tokens = CoffeeScript.tokens '"#{a}b#{c}"'
+
+  eq tokens.length, 10
+  [{}, {}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 0
+  eq a[2].first_column, 3
+  eq a[2].last_line, 0
+  eq a[2].last_column, 3
+
+  eq b[2].first_line, 0
+  eq b[2].first_column, 5
+  eq b[2].last_line, 0
+  eq b[2].last_column, 5
+
+  eq c[2].first_line, 0
+  eq c[2].first_column, 8
+  eq c[2].last_line, 0
+  eq c[2].last_column, 8
+
+test 'Verify locations in string interpolation (in "string", multiple interpolation and line breaks)', ->
+  tokens = CoffeeScript.tokens '"#{a}\nb\n#{c}"'
+
+  eq tokens.length, 10
+  [{}, {}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 0
+  eq a[2].first_column, 3
+  eq a[2].last_line, 0
+  eq a[2].last_column, 3
+
+  eq b[2].first_line, 0
+  eq b[2].first_column, 5
+  eq b[2].last_line, 1
+  eq b[2].last_column, 1
+
+  eq c[2].first_line, 2
+  eq c[2].first_column, 2
+  eq c[2].last_line, 2
+  eq c[2].last_column, 2
+
+test 'Verify locations in string interpolation (in "string", multiple interpolation and starting with line breaks)', ->
+  tokens = CoffeeScript.tokens '"\n#{a}\nb\n#{c}"'
+
+  eq tokens.length, 10
+  [{}, {}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 1
+  eq a[2].first_column, 2
+  eq a[2].last_line, 1
+  eq a[2].last_column, 2
+
+  eq b[2].first_line, 1
+  eq b[2].first_column, 4
+  eq b[2].last_line, 2
+  eq b[2].last_column, 1
+
+  eq c[2].first_line, 3
+  eq c[2].first_column, 2
+  eq c[2].last_line, 3
+  eq c[2].last_column, 2
+
+test 'Verify locations in string interpolation (in "string", multiple interpolation and starting with line breaks)', ->
+  tokens = CoffeeScript.tokens '"\n\n#{a}\n\nb\n\n#{c}"'
+
+  eq tokens.length, 10
+  [{}, {}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 2
+  eq a[2].first_column, 2
+  eq a[2].last_line, 2
+  eq a[2].last_column, 2
+
+  eq b[2].first_line, 2
+  eq b[2].first_column, 4
+  eq b[2].last_line, 5
+  eq b[2].last_column, 0
+
+  eq c[2].first_line, 6
+  eq c[2].first_column, 2
+  eq c[2].last_line, 6
+  eq c[2].last_column, 2
+
+test 'Verify locations in string interpolation (in "string", multiple interpolation and starting with line breaks)', ->
+  tokens = CoffeeScript.tokens '"\n\n\n#{a}\n\n\nb\n\n\n#{c}"'
+
+  eq tokens.length, 10
+  [{}, {}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 3
+  eq a[2].first_column, 2
+  eq a[2].last_line, 3
+  eq a[2].last_column, 2
+
+  eq b[2].first_line, 3
+  eq b[2].first_column, 4
+  eq b[2].last_line, 8
+  eq b[2].last_column, 0
+
+  eq c[2].first_line, 9
+  eq c[2].first_column, 2
+  eq c[2].last_line, 9
+  eq c[2].last_column, 2
+
+test 'Verify locations in string interpolation (in """string""", line breaks)', ->
+  tokens = CoffeeScript.tokens '"""a\n#{b}\nc"""'
+
+  eq tokens.length, 8
+  [{}, a, {}, b, {}, c, {}, {}] = tokens
+
+  eq a[2].first_line, 0
+  eq a[2].first_column, 3
+  eq a[2].last_line, 0
+  eq a[2].last_column, 4
+
+  eq b[2].first_line, 1
+  eq b[2].first_column, 2
+  eq b[2].last_line, 1
+  eq b[2].last_column, 2
+
+  eq c[2].first_line, 1
+  eq c[2].first_column, 4
+  eq c[2].last_line, 2
+  eq c[2].last_column, 0
+
+test 'Verify locations in string interpolation (in """string""", starting with a line break)', ->
+  tokens = CoffeeScript.tokens '"""\n#{b}\nc"""'
+
+  eq tokens.length, 8
+  [{}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 0
+  eq a[2].first_column, 0
+  eq a[2].last_line, 0
+  eq a[2].last_column, 0
+
+  eq b[2].first_line, 1
+  eq b[2].first_column, 2
+  eq b[2].last_line, 1
+  eq b[2].last_column, 2
+
+  eq c[2].first_line, 1
+  eq c[2].first_column, 4
+  eq c[2].last_line, 2
+  eq c[2].last_column, 0
+
+test 'Verify locations in string interpolation (in """string""", starting with line breaks)', ->
+  tokens = CoffeeScript.tokens '"""\n\n#{b}\nc"""'
+
+  eq tokens.length, 8
+  [{}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 1
+  eq a[2].first_column, 0
+  eq a[2].last_line, 1
+  eq a[2].last_column, 0
+
+  eq b[2].first_line, 2
+  eq b[2].first_column, 2
+  eq b[2].last_line, 2
+  eq b[2].last_column, 2
+
+  eq c[2].first_line, 2
+  eq c[2].first_column, 4
+  eq c[2].last_line, 3
+  eq c[2].last_column, 0
+
+test 'Verify locations in string interpolation (in """string""", multiple interpolation)', ->
+  tokens = CoffeeScript.tokens '"""#{a}\nb\n#{c}"""'
+
+  eq tokens.length, 10
+  [{}, {}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 0
+  eq a[2].first_column, 5
+  eq a[2].last_line, 0
+  eq a[2].last_column, 5
+
+  eq b[2].first_line, 0
+  eq b[2].first_column, 7
+  eq b[2].last_line, 1
+  eq b[2].last_column, 1
+
+  eq c[2].first_line, 2
+  eq c[2].first_column, 2
+  eq c[2].last_line, 2
+  eq c[2].last_column, 2
+
+test 'Verify locations in string interpolation (in """string""", multiple interpolation, and starting with line breaks)', ->
+  tokens = CoffeeScript.tokens '"""\n\n#{a}\n\nb\n\n#{c}"""'
+
+  eq tokens.length, 10
+  [{}, {}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 2
+  eq a[2].first_column, 2
+  eq a[2].last_line, 2
+  eq a[2].last_column, 2
+
+  eq b[2].first_line, 2
+  eq b[2].first_column, 4
+  eq b[2].last_line, 5
+  eq b[2].last_column, 0
+
+  eq c[2].first_line, 6
+  eq c[2].first_column, 2
+  eq c[2].last_line, 6
+  eq c[2].last_column, 2
+
+test 'Verify locations in string interpolation (in """string""", multiple interpolation, and starting with line breaks)', ->
+  tokens = CoffeeScript.tokens '"""\n\n\n#{a}\n\n\nb\n\n\n#{c}"""'
+
+  eq tokens.length, 10
+  [{}, {}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 3
+  eq a[2].first_column, 2
+  eq a[2].last_line, 3
+  eq a[2].last_column, 2
+
+  eq b[2].first_line, 3
+  eq b[2].first_column, 4
+  eq b[2].last_line, 8
+  eq b[2].last_column, 0
+
+  eq c[2].first_line, 9
+  eq c[2].first_column, 2
+  eq c[2].last_line, 9
+  eq c[2].last_column, 2
+
+test 'Verify locations in heregex interpolation (in ///regex///, multiple interpolation)', ->
+  tokens = CoffeeScript.tokens '///#{a}b#{c}///'
+
+  eq tokens.length, 11
+  [{}, {}, {}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 0
+  eq a[2].first_column, 5
+  eq a[2].last_line, 0
+  eq a[2].last_column, 5
+
+  eq b[2].first_line, 0
+  eq b[2].first_column, 7
+  eq b[2].last_line, 0
+  eq b[2].last_column, 7
+
+  eq c[2].first_line, 0
+  eq c[2].first_column, 10
+  eq c[2].last_line, 0
+  eq c[2].last_column, 10
+
+test 'Verify locations in heregex interpolation (in ///regex///, multiple interpolation)', ->
+  tokens = CoffeeScript.tokens '///a#{b}c///'
+
+  eq tokens.length, 9
+  [{}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 0
+  eq a[2].first_column, 3
+  eq a[2].last_line, 0
+  eq a[2].last_column, 3
+
+  eq b[2].first_line, 0
+  eq b[2].first_column, 6
+  eq b[2].last_line, 0
+  eq b[2].last_column, 6
+
+  eq c[2].first_line, 0
+  eq c[2].first_column, 8
+  eq c[2].last_line, 0
+  eq c[2].last_column, 8
+
+test 'Verify locations in heregex interpolation (in ///regex///, multiple interpolation and line breaks)', ->
+  tokens = CoffeeScript.tokens '///#{a}\nb\n#{c}///'
+
+  eq tokens.length, 11
+  [{}, {}, {}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 0
+  eq a[2].first_column, 5
+  eq a[2].last_line, 0
+  eq a[2].last_column, 5
+
+  eq b[2].first_line, 0
+  eq b[2].first_column, 7
+  eq b[2].last_line, 1
+  eq b[2].last_column, 1
+
+  eq c[2].first_line, 2
+  eq c[2].first_column, 2
+  eq c[2].last_line, 2
+  eq c[2].last_column, 2
+
+test 'Verify locations in heregex interpolation (in ///regex///, multiple interpolation and line breaks)', ->
+  tokens = CoffeeScript.tokens '///#{a}\n\n\nb\n\n\n#{c}///'
+
+  eq tokens.length, 11
+  [{}, {}, {}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 0
+  eq a[2].first_column, 5
+  eq a[2].last_line, 0
+  eq a[2].last_column, 5
+
+  eq b[2].first_line, 0
+  eq b[2].first_column, 7
+  eq b[2].last_line, 5
+  eq b[2].last_column, 0
+
+  eq c[2].first_line, 6
+  eq c[2].first_column, 2
+  eq c[2].last_line, 6
+  eq c[2].last_column, 2
+
+test 'Verify locations in heregex interpolation (in ///regex///, multiple interpolation and line breaks)', ->
+  tokens = CoffeeScript.tokens '///a\n\n\n#{b}\n\n\nc///'
+
+  eq tokens.length, 9
+  [{}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 0
+  eq a[2].first_column, 3
+  eq a[2].last_line, 2
+  eq a[2].last_column, 0
+
+  eq b[2].first_line, 3
+  eq b[2].first_column, 2
+  eq b[2].last_line, 3
+  eq b[2].last_column, 2
+
+  eq c[2].first_line, 3
+  eq c[2].first_column, 4
+  eq c[2].last_line, 6
+  eq c[2].last_column, 0
+
+test 'Verify locations in heregex interpolation (in ///regex///, multiple interpolation and line breaks and stating with linebreak)', ->
+  tokens = CoffeeScript.tokens '///\n#{a}\nb\n#{c}///'
+
+  eq tokens.length, 11
+  [{}, {}, {}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 1
+  eq a[2].first_column, 2
+  eq a[2].last_line, 1
+  eq a[2].last_column, 2
+
+  eq b[2].first_line, 1
+  eq b[2].first_column, 4
+  eq b[2].last_line, 2
+  eq b[2].last_column, 1
+
+  eq c[2].first_line, 3
+  eq c[2].first_column, 2
+  eq c[2].last_line, 3
+  eq c[2].last_column, 2
+
+test 'Verify locations in heregex interpolation (in ///regex///, multiple interpolation and line breaks and stating with linebreak)', ->
+  tokens = CoffeeScript.tokens '///\n\n\n#{a}\n\n\nb\n\n\n#{c}///'
+
+  eq tokens.length, 11
+  [{}, {}, {}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 3
+  eq a[2].first_column, 2
+  eq a[2].last_line, 3
+  eq a[2].last_column, 2
+
+  eq b[2].first_line, 3
+  eq b[2].first_column, 4
+  eq b[2].last_line, 8
+  eq b[2].last_column, 0
+
+  eq c[2].first_line, 9
+  eq c[2].first_column, 2
+  eq c[2].last_line, 9
+  eq c[2].last_column, 2
+
+test 'Verify locations in heregex interpolation (in ///regex///, multiple interpolation and line breaks and stating with linebreak)', ->
+  tokens = CoffeeScript.tokens '///\n\n\na\n\n\n#{b}\n\n\nc///'
+
+  eq tokens.length, 9
+  [{}, {}, a, {}, b, {}, c] = tokens
+
+  eq a[2].first_line, 0
+  eq a[2].first_column, 3
+  eq a[2].last_line, 5
+  eq a[2].last_column, 0
+
+  eq b[2].first_line, 6
+  eq b[2].first_column, 2
+  eq b[2].last_line, 6
+  eq b[2].last_column, 2
+
+  eq c[2].first_line, 6
+  eq c[2].first_column, 4
+  eq c[2].last_line, 9
+  eq c[2].last_column, 0
+
 test "Verify all tokens get a location", ->
  doesNotThrow ->
    tokens = CoffeeScript.tokens testScript
--- a/test/operators.coffee
+++ b/test/operators.coffee
@@ -357,3 +357,16 @@ test "modulo operator converts arguments to numbers", ->
  eq 1, 1 %% '42'
  eq 1, '1' %% 42
  eq 1, '1' %% '42'
+
+test "#3361: Modulo operator coerces right operand once", ->
+  count = 0
+  res = 42 %% valueOf: -> count += 1
+  eq 1, count
+  eq 0, res
+
+test "#3363: Modulo operator coercing order", ->
+  count = 2
+  a = valueOf: -> count *= 2
+  b = valueOf: -> count += 1
+  eq 4, a %% b
+  eq 5, count
--- a/test/scope.coffee
+++ b/test/scope.coffee
@@ -33,6 +33,14 @@ test "catch statements should introduce their argument to scope", ->
    do -> e = 5
    eq 5, e

+test "loop variable should be accessible after for-of loop", ->
+  d = (x for x of {1:'a',2:'b'})
+  ok x in ['1','2']
+
+test "loop variable should be accessible after for-in loop", ->
+  d = (x for x in [1,2])
+  eq x, 2
+
 class Array then slice: fail # needs to be global
 class Object then hasOwnProperty: fail
 test "#1973: redefining Array/Object constructors shouldn't confuse __X helpers", ->
@@ -113,4 +121,4 @@ test "#3259: leak with @-params within destructured parameters", ->

  eq 'undefined', typeof foo
  eq 'undefined', typeof bar
-  eq 'undefined', typeof baz
+  eq 'undefined', typeof baz
Author	SHA1	Message	Date
Jeremy Ashkenas	81047d45ee	CoffeeScript 1.8.0	2014-08-26 12:24:29 -04:00
Jeremy Ashkenas	9177676979	Merge pull request #3611 from lydell/release-1.8.0 Release 1.8.0	2014-08-26 12:20:18 -04:00
Simon Lydell	7cfba37f7c	Update changelog for 1.8.0	2014-08-25 19:39:27 +02:00
Simon Lydell	ee8d105194	Rebuild docs	2014-08-23 16:08:39 +02:00
Michael Ficarra	6929441cb7	Merge pull request #3592 from mmotorny/master Exit with an error code 1 if could not write a compiled JavaScript file ...	2014-08-17 22:07:07 -07:00
Maksym Motornyy	b5734028d9	Exit with an error code 1 if could not write a compiled JavaScript file or a source map Currently CoffeeScript reports a success even if it failed to write a compiled file to disk. This behavior confuses automated tools such as test runners which may return false positives if a test failed to compile because of a file lock.	2014-08-17 20:42:30 -07:00
Michael Ficarra	ab6f69c741	Merge pull request #3561 from yjo/js-map-file-ext Use '.js.map' as file extension for created map files	2014-07-29 10:52:59 -07:00
Joe Lee-Moyet	2ec6e7e944	Use '.js.map' as file extension for created map files Addresses jashkenas/coffeescript#3297	2014-07-29 17:28:08 +01:00
Nami-Doc	fbbda3f85f	Fix the "Examples" link on coffeescript.org It now points to the "Trending repositories" of the month.	2014-07-23 22:17:00 +02:00
Michael Ficarra	f96ab11feb	Merge pull request #3545 from jordanbtucker/patch-1 `bin/cake` will be in `coffeescript`	2014-07-17 16:23:47 -07:00
jordanbtucker	5c1daf966a	`bin/cake` will be in `coffeescript` Since the name change, `bin/cake` will be in `coffeescript`, not `coffee-script`.	2014-07-17 15:04:40 -07:00
Michael Ficarra	df8529fbfb	Merge pull request #3543 from ysmood/err_info_issue Fixed an error formatting issue	2014-07-16 07:36:48 -07:00
Yad Smood	3465e7554d	Fixed an error formatting issue `f7b36054fc` When using tab for code indent, the error marker will be wrongly positioned.	2014-07-16 17:56:07 +08:00
Yad Smood	f7b36054fc	Add a test case for compiler error formatting. Error formatting with mixed tab and space.	2014-07-16 17:50:15 +08:00
Michael Ficarra	3ec10df4a1	Merge pull request #3539 from minodisk/fix-heregex-interpolation Fix wrong location issue in heregex interpolation	2014-07-13 21:10:03 -07:00
minodisk	deead4bfad	Fix wrong location issue in heregex interpolation	2014-07-13 16:39:41 +09:00
Michael Ficarra	302aa6a457	Merge pull request #3533 from minodisk/fix-string-interpolation Fix wrong location issue in "string" interpolation	2014-07-02 21:49:24 -07:00
minodisk	5920939e23	Fix wrong location issue in "string" interpolation	2014-07-03 13:11:20 +09:00
Michael Ficarra	2bab1b6aa1	Merge pull request #3524 from minodisk/master Fix location data bug for string interpolations	2014-07-01 07:35:57 -07:00
minodisk	2b539ebea8	Fix wrong location issue in string interpolation starting with line break	2014-07-01 11:28:21 +09:00
dabbler0	159d562230	Fix off-by-one issue with string interpolation in lexer	2014-07-01 10:55:17 +09:00
Nami-Doc	eb030a2c73	Update link to "CoffeeScript Ristretto", fixes #3489	2014-06-26 17:10:11 +02:00
Michael Ficarra	5a54d8ba6d	Merge pull request #3509 from aviflax/patch-1 Remove sudo from install command in introduction	2014-06-09 08:21:27 -07:00
Avi Flax	f619416492	Remove typo No idea how that got in there.	2014-06-06 13:46:41 -04:00
Avi Flax	2dd1ec3314	Remove sudo from install command in introduction 1. It just seems like a bad practice to encourage people to run npm with `sudo` 2. The doc wasn’t consistent with itself — down below in the full “Installation” section the same command did not include `sudo`	2014-06-06 09:26:18 -04:00
Michael Ficarra	4ad625a265	Merge pull request #3508 from bwin/patch-1 remove docco as dependency (still a devDependency)	2014-06-05 21:51:26 -07:00
Benjamin Winkler	df2b79fa56	remove docco as dependency (still a devDependency) also changed version requirement notation for from `n.n.x` to `~n.n.n` like the others	2014-06-06 04:33:19 +02:00
Michael Ficarra	c4f9c3abf5	Merge pull request #3503 from datenreisender/handle-dotless-commands Handle dotless commands in the REPL.	2014-06-03 23:22:15 -07:00
Marko Schulz	9410216b02	Make getCommandId() more readable.	2014-06-03 22:50:25 +02:00
Marko Schulz	233055a7ab	Implement changes recommended in the pull request.	2014-06-03 11:29:03 +02:00
Marko Schulz	edf3c12fcc	Handle dotless commands in the REPL. Node 0.11 switched to storing the REPL commands dotless internally. This fixes the problem brought up in #3450.	2014-06-02 13:24:57 +02:00
Michael Ficarra	1bb3c843e1	Merge pull request #3450 from ehuss/node11repl Fix repl for Node 0.11.12.	2014-05-28 07:56:15 -07:00
Nami-Doc	48f2c2d0d2	Merge pull request #3494 from ELLIOTTCABLE/patch-1 Fix “list of open-source CoffeeScript on GitHub”	2014-05-24 10:57:17 +02:00
ELLIOTTCABLE	7e01672479	Fix “list of open-source CoffeeScript on GitHub” Link's been broken with the recent GitHub re-arrangement. This is the closest thing I could find to what that link used to lead to.	2014-05-24 01:22:27 -05:00
Michael Ficarra	ddc023b28b	Merge pull request #3492 from forty/master Do not rely on properties order in scope tests	2014-05-21 07:49:39 -07:00
Quentin Barbe	c65f584112	Do not rely on properties order in scope tests	2014-05-21 16:40:44 +02:00
Jeremy Ashkenas	70a9a341ac	Merge pull request #3491 from forty/master Add tests to check that the FOR variable is defined after the loop	2014-05-20 17:48:26 -04:00
forty	c608901d5a	Add tests to check that the FOR variable is defined after the loop	2014-05-20 23:37:33 +02:00
Jeremy Ashkenas	a5a1ea9157	Merge pull request #3477 from davidchambers/deprecate-join command: deprecate --join	2014-05-12 10:59:17 -04:00
David Chambers	1cd48a9f5d	command: deprecate --join	2014-05-11 22:41:39 -07:00
Jeremy Ashkenas	d8b7a55eb9	Merge pull request #3448 from leedm777/export-repl Export the CoffeeScript REPL.	2014-05-08 16:08:45 -04:00
Jeremy Ashkenas	f0764096e9	now that github supports renames, coffeescript, not coffee-script	2014-05-08 15:07:42 -04:00
Michael Ficarra	ade9620351	Merge pull request #3460 from datenreisender/correct-repl-help Fix help for .load	2014-05-01 07:48:58 -07:00
Marko Schulz	3fdc3a4758	Fix help for .load	2014-05-01 14:54:43 +02:00
Eric Huss	03705c674f	Fix repl for Node 0.11.12. Node changed their repl so that it inherits from readline.Interface. This means that `prompt` is now the rli function and not the original prompt string. This may be a little hacky, but I figure it would give someone a start if they want to do a better fix. The commit that changed this in Node is joyent/node@3ae0b17c76 This bug was mentioned in Issue #3395.	2014-04-19 01:18:21 -07:00
David M. Lee	576fe44ef8	Export the CoffeeScript REPL. This is done by adding a root level wrapper script for lib/coffee-script/repl, similar to how the register script is wrapped. This allows user programs to embed a CoffeeScript REPL without digging into CoffeeScript's internals.	2014-04-18 08:26:51 -05:00
Michael Ficarra	e02c8abb1a	Merge pull request #3425 from charlierudolph/compile_errors Display compile errors - rebase from @jeremybanks	2014-03-18 08:11:29 -05:00
Michael Ficarra	2723f1afe9	Merge pull request #3424 from charlierudolph/fix_index Fix errors on index	2014-03-17 21:57:38 -05:00
Jeremy Banks	6114751d21	Display compile errors - rebase from @jeremybanks	2014-03-17 17:09:05 -07:00
charlierudolph	15b64addbf	Fix errors on index Extra quotations resulted in subtracting two strings and then a javascript syntax error	2014-03-17 16:15:31 -07:00
Nami-Doc	4547612e50	Merge pull request #3418 from fcolas6013/patch-2 fix spell mistake on index.html.js	2014-03-15 22:24:54 +01:00
Fabrice Colas	9c15b13a96	fix spell mistake on index.html.js	2014-03-15 14:23:46 -07:00
Jeremy Ashkenas	63acf6a5ff	Merge pull request #3355 from aroben/kill-isUndefined Remove reference to never-defined .isUndefined property	2014-03-15 16:37:59 -04:00
Jeremy Ashkenas	3339c2f228	Merge pull request #3415 from matt-hickford/patch-1 Package with preferGlobal as appropriate for command-line application	2014-03-14 23:36:28 -04:00
Matt Hickford	c2db81d892	Package with preferGlobal as appropriate for command-line application Per https://www.npmjs.org/doc/json.html#preferGlobal > If your package is primarily a command-line application that should be installed globally, then set this value to true to provide a warning if it is installed locally. > > It doesn't actually prevent users from installing it locally, but it does help prevent some confusion if it doesn't work as expected.	2014-03-15 00:44:38 +00:00
Nami-Doc	8b15d8218d	Merge pull request #3401 from sailxjx/master fix a spell mistake in cakefile	2014-03-11 09:09:00 +01:00
sailxjx	bfc9d4d594	fix a spell mistake in cakefile	2014-03-11 15:11:02 +08:00
Michael Ficarra	ab5728c030	fix cake install; related: #3395 , #3393	2014-03-03 13:24:20 -06:00
Michael Ficarra	dcf1556ffc	Update README.md	2014-02-28 13:18:54 -06:00
Jeremy Ashkenas	53c53bd3e6	Update README.md	2014-02-28 07:59:24 -05:00
Jeremy Ashkenas	c2e1ab589c	Delete README	2014-02-28 07:58:14 -05:00
Jeremy Ashkenas	75207a08ad	Merge pull request #3393 from christianbundy/markdown-readme Convert README to Markdown	2014-02-28 07:57:41 -05:00
Christian Bundy	a2dbfdc2f4	Convert README to Markdown	2014-02-27 22:19:04 -08:00
Michael Ficarra	0a82ac7d69	remove editorialisation	2014-02-22 23:20:06 -06:00
Michael Ficarra	a489006afb	typo: mult-dot => multi-dot	2014-02-22 23:20:06 -06:00
Michael Ficarra	af08cfd37f	add newlines to end of files	2014-02-22 23:20:06 -06:00
Michael Ficarra	9dc3a3df13	Merge pull request #3386 from blmarket/deprecate_warning Fixes issue #3349, prints deprecation warning	2014-02-22 22:33:25 -06:00
Jeong, Heon	a82aecc008	Improved coding convention and messages.	2014-02-23 13:03:42 +09:00
Jeong, Heon	36a3e03048	Fixes issue #3349 , prints deprecation warning This patch fixes issue #3349, by prints deprecation warning for users who depends on old(<1.7.0) implicit module registration.	2014-02-23 11:48:16 +09:00
Jeremy Ashkenas	fc8e9fd92a	Merge pull request #3382 from davidchambers/time-elements changelog: use time elements for release dates	2014-02-18 12:18:45 -05:00
David Chambers	c9e87f3044	changelog: use time elements for release dates	2014-02-18 08:49:46 -08:00
Michael Ficarra	bb319e2add	Merge pull request #3381 from davidchambers/inline-css changelog: replace inline CSS	2014-02-18 08:08:03 -06:00
David Chambers	81e2253a55	changelog: replace inline CSS	2014-02-17 21:45:49 -08:00
Michael Ficarra	c41a14f447	Merge pull request #3380 from madprgmr/master Rudimentary fix for jashkenas/coffee-script#3379.	2014-02-17 17:56:36 -06:00
Sean Hussey	a323160d14	Rudimentary fix for jashkenas/coffee-script#3379 .	2014-02-17 18:37:10 -05:00
Jeremy Ashkenas	a216f93b54	Merge pull request #3376 from davidchambers/anchors change log improvements	2014-02-17 14:14:13 -05:00
David Chambers	551cf56ceb	changelog: add missing compare view URLs	2014-02-16 18:09:17 -08:00
David Chambers	09446ad515	changelog: add anchor to each section Add releaseHeader helper to avoid repetition.	2014-02-16 18:08:35 -08:00
Michael Ficarra	b31951980e	Merge pull request #3368 from ricardobeat/cake-register-by-default Cakefile: register .coffee extension by default	2014-02-09 22:19:41 -06:00
Ricardo Tomasi	e7ba29514d	Register .coffee extension by default on Cakefile	2014-02-10 01:16:14 -02:00
Michael Ficarra	a2c0106b3f	fixes #3363 : modulo operator evaluation order	2014-02-08 20:56:34 -06:00
Michael Ficarra	4dfc75dede	Merge pull request #3362 from epidemian/fix-modulo-coercion Fix #3361, make %% coerce right operand only once	2014-02-08 10:38:58 -06:00
Demian Ferreiro	0ad30e9b3f	Fix #3361 , make %% coerce right operand only once Force coercion of right operand once before doing arithmetic with it in the `__modulo` utility function.	2014-02-08 13:24:39 -03:00
Jeremy Ashkenas	46f55d1bb4	Merge pull request #3360 from lydell/install-docs Improve installation documentation	2014-02-07 10:53:51 -05:00
Simon Lydell	27f1976159	Improve installation documentation - Simplify the command to install latest master. - Promote using `--save` when installing locally, since it automatically locks the minor version, protecting users from accidentally installing breaking updates.	2014-02-07 16:30:52 +01:00
Michael Ficarra	816241d9a1	Merge pull request #3359 from lydell/v8-consistent-stacktraces Make patched stack traces’ prelude consistent with V8	2014-02-07 09:00:45 -06:00
Simon Lydell	4bbd63c883	Make patched stack traces’ prelude consistent with V8 In V8, the `stack` property of errors contains a prelude and then the stack trace. The contents of the prelude depends on whether the error has a message or not. If the error has _not_ got a message, the prelude contains the name of the error and a newline. If the error _has_ got a message, the prelude contains the name of the error, a colon, a space, the message and a newline. In other words, the prelude consists of `error.toString() + "\n"` Before, coffee-script’s patched stack traces worked exactly like that, except that it _always_ added a colon and a space after the name of the error. This fix is important because it allows for easy and consistent consumption of the stack trace only: `stack = error.stack[error.toString().length..]`	2014-02-07 13:01:01 +01:00
Adam Roben	e9a0512663	Remove reference to never-defined .isUndefined property This was added in `f4a7cca075` to fix #1038 for CoffeeScript 1.0.1. `.isUndefined` was removed in `caf3da2f66` but this code was never updated. That actually caused the behavior of this code to change (trailing `undefined` and `return undefined` statements no longer got optimized away) when CoffeeScript 1.3.2 was released, but the new behavior was deemed correct in https://github.com/jashkenas/coffee-script/issues/1038#issuecomment-14427560.	2014-02-06 09:23:16 -05:00
Adam Roben	8980647f32	Add tests for the optimization of trailing return statements This documents current behavior. When #1038 was fixed, we also optimized away trailing "undefined" and "return undefined", but that is no longer the case.	2014-02-06 09:21:35 -05:00
Michael Ficarra	eda4f0c55b	Merge remote-tracking branch 'origin/gh-pages'	2014-02-01 21:07:10 -06:00
Michael Ficarra	ed928928f6	use npm-installed docco rather than relying on globally installed docco	2014-02-01 21:06:21 -06:00
Michael Ficarra	5f28319cb1	update "latest version" documentation link to 1.7.1	2014-01-29 23:24:06 -06:00
Michael Ficarra	6b0ee127da	recompile documentation with 1.7.1	2014-01-29 23:21:44 -06:00
Michael Ficarra	5e31672793	Merge branch 'master' into gh-pages	2014-01-29 23:21:00 -06:00
Michael Ficarra	cc4cc8e652	update changelog for 1.7.1	2014-01-29 23:07:27 -06:00
Michael Ficarra	52b89d5b03	rebuild annotated source documentation	2014-01-29 22:54:00 -06:00
Michael Ficarra	094a0cbe95	add docco as npm dependency so it doesn't have to be installed globally	2014-01-29 22:52:49 -06:00
Michael Ficarra	f8eca2e822	Merge branch 'master' into gh-pages	2014-01-29 22:51:23 -06:00
Jeremy Ashkenas	3357b6cf2c	index.html	2014-01-28 20:49:26 -05:00
Rory O’Kane	6df8d92499	Fix markup in math operator documentation In the documentation, surround the new operators with `<tt>` tags instead of Markdown-style backticks, since this is HTML.	2014-01-28 20:49:20 -05:00
dannguyen	ef7b3a75e0	Just a small typo in 1.7.0 changelog	2014-01-28 16:47:42 -05:00
				`@@ -0,0 +1 @@`
				`module.exports = require('./lib/coffee-script/repl');`