more text tweaks

Decouple "mkdirp".

CONTRIBUTING.md

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

Cakefile

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

README

@@ -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

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

bower.json

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

documentation/coffee/generators.coffee

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

documentation/css/docs.css

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

documentation/docs/browser.html

@@ -16,78 +16,85 @@
           <a class="large" href="javascript:void(0);">Jump To &hellip;</a>
           <a class="small" href="javascript:void(0);">+</a>
           <div id="jump_wrapper">
-          <div id="jump_page">
-            
+          <div id="jump_page_wrapper">
+            <div id="jump_page">
               
-              <a class="source" href="browser.html">
-                browser.coffee
-              </a>
-            
+                
+                <a class="source" href="browser.html">
+                  browser.coffee
+                </a>
               
-              <a class="source" href="cake.html">
-                cake.coffee
-              </a>
-            
+                
+                <a class="source" href="cake.html">
+                  cake.coffee
+                </a>
               
-              <a class="source" href="coffee-script.html">
-                coffee-script.coffee
-              </a>
-            
+                
+                <a class="source" href="coffee-script.html">
+                  coffee-script.coffee
+                </a>
               
-              <a class="source" href="command.html">
-                command.coffee
-              </a>
-            
+                
+                <a class="source" href="command.html">
+                  command.coffee
+                </a>
               
-              <a class="source" href="grammar.html">
-                grammar.coffee
-              </a>
-            
+                
+                <a class="source" href="grammar.html">
+                  grammar.coffee
+                </a>
               
-              <a class="source" href="helpers.html">
-                helpers.coffee
-              </a>
-            
+                
+                <a class="source" href="helpers.html">
+                  helpers.coffee
+                </a>
               
-              <a class="source" href="index.html">
-                index.coffee
-              </a>
-            
+                
+                <a class="source" href="index.html">
+                  index.coffee
+                </a>
               
-              <a class="source" href="lexer.html">
-                lexer.coffee
-              </a>
-            
+                
+                <a class="source" href="lexer.html">
+                  lexer.coffee
+                </a>
               
-              <a class="source" href="nodes.html">
-                nodes.coffee
-              </a>
-            
+                
+                <a class="source" href="nodes.html">
+                  nodes.coffee
+                </a>
               
-              <a class="source" href="optparse.html">
-                optparse.coffee
-              </a>
-            
+                
+                <a class="source" href="optparse.html">
+                  optparse.coffee
+                </a>
               
-              <a class="source" href="repl.html">
-                repl.coffee
-              </a>
-            
+                
+                <a class="source" href="register.html">
+                  register.coffee
+                </a>
               
-              <a class="source" href="rewriter.html">
-                rewriter.coffee
-              </a>
-            
+                
+                <a class="source" href="repl.html">
+                  repl.coffee
+                </a>
               
-              <a class="source" href="scope.html">
-                scope.litcoffee
-              </a>
-            
+                
+                <a class="source" href="rewriter.html">
+                  rewriter.coffee
+                </a>
               
-              <a class="source" href="sourcemap.html">
-                sourcemap.litcoffee
-              </a>
-            
+                
+                <a class="source" href="scope.html">
+                  scope.litcoffee
+                </a>
+              
+                
+                <a class="source" href="sourcemap.html">
+                  sourcemap.litcoffee
+                </a>
+              
+            </div>
           </div>
         </li>
       </ul>
@@ -111,14 +118,13 @@
               <p>This <strong>Browser</strong> compatibility layer extends core CoffeeScript functions
 to make things work smoothly when compiling code directly in the browser.
 We add support for loading remote Coffee scripts via <strong>XHR</strong>, and
-<code>text/coffeescript</code> script tags, source maps via data-URLs, and so on.
-</p>
+<code>text/coffeescript</code> script tags, source maps via data-URLs, and so on.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>
-CoffeeScript = require <span class="string">'./coffee-script'</span>
-CoffeeScript.require = require
+CoffeeScript = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffee-script'</span>
+CoffeeScript.<span class="hljs-built_in">require</span> = <span class="hljs-built_in">require</span>
 compile = CoffeeScript.compile</pre></div></div>
             
         </li>
@@ -130,13 +136,12 @@ compile = CoffeeScript.compile</pre></div></div>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-2">&#182;</a>
               </div>
-              <p>Use standard JavaScript <code>eval</code> to eval code.
-</p>
+              <p>Use standard JavaScript <code>eval</code> to eval code.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>CoffeeScript.<span class="function"><span class="title">eval</span></span> = (code, options = {}) -&gt;
-  options.bare ?= <span class="literal">on</span>
+            <div class="content"><div class='highlight'><pre>CoffeeScript.e<span class="hljs-function"><span class="hljs-title">val</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.r<span class="hljs-function"><span class="hljs-title">un</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.l<span class="hljs-function"><span class="hljs-title">oad</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.o<span class="hljs-function"><span class="hljs-title">nreadystatechange</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>
         

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>exports.r<span class="hljs-function"><span class="hljs-title">un</span> = -&gt;</span>
+  <span class="hljs-built_in">global</span>.__originalDirname = fs.realpathSync <span class="hljs-string">'.'</span>
+  process.chdir cakefileDirectory __originalDirname
+  args = process.argv[<span class="hljs-number">2.</span>.]
+  CoffeeScript.run fs.readFileSync(<span class="hljs-string">'Cakefile'</span>).toString(), <span class="hljs-attribute">filename</span>: <span class="hljs-string">'Cakefile'</span>
+  oparse = <span class="hljs-keyword">new</span> optparse.OptionParser switches
+  <span class="hljs-keyword">return</span> printTasks() <span class="hljs-keyword">unless</span> args.length
+  <span class="hljs-keyword">try</span>
+    options = oparse.parse(args)
+  <span class="hljs-keyword">catch</span> e
+    <span class="hljs-keyword">return</span> fatalError <span class="hljs-string">"<span class="hljs-subst">#{e}</span>"</span>
+  invoke arg <span class="hljs-keyword">for</span> arg <span class="hljs-keyword">in</span> options.arguments</pre></div></div>
             
         </li>
         
@@ -297,17 +282,20 @@ original directory name, when running Cake tasks from subdirectories.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-10">&#182;</a>
               </div>
-              <p>Print an error and exit when attempting to use an invalid task/option.
-</p>
+              <p>Display the list of Cake tasks in a format similar to <code>rake -T</code></p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="function"><span class="title">fatalError</span></span> = (message) -&gt;
-  console.error message + <span class="string">'\n'</span>
-  console.log <span class="string">'To see a list of all tasks/options, run "cake"'</span>
-  process.exit <span class="number">1</span>
-
-<span class="function"><span class="title">missingTask</span></span> = (task) -&gt; fatalError <span class="string">"No such task: <span class="subst">#{task}</span>"</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">printTasks</span> = -&gt;</span>
+  relative = path.relative <span class="hljs-keyword">or</span> path.resolve
+  cakefilePath = path.join relative(__originalDirname, process.cwd()), <span class="hljs-string">'Cakefile'</span>
+  <span class="hljs-built_in">console</span>.log <span class="hljs-string">"<span class="hljs-subst">#{cakefilePath}</span> defines the following tasks:\n"</span>
+  <span class="hljs-keyword">for</span> name, task <span class="hljs-keyword">of</span> tasks
+    spaces = <span class="hljs-number">20</span> - name.length
+    spaces = <span class="hljs-keyword">if</span> spaces &gt; <span class="hljs-number">0</span> <span class="hljs-keyword">then</span> Array(spaces + <span class="hljs-number">1</span>).join(<span class="hljs-string">' '</span>) <span class="hljs-keyword">else</span> <span class="hljs-string">''</span>
+    desc   = <span class="hljs-keyword">if</span> task.description <span class="hljs-keyword">then</span> <span class="hljs-string">"# <span class="hljs-subst">#{task.description}</span>"</span> <span class="hljs-keyword">else</span> <span class="hljs-string">''</span>
+    <span class="hljs-built_in">console</span>.log <span class="hljs-string">"cake <span class="hljs-subst">#{name}</span><span class="hljs-subst">#{spaces}</span> <span class="hljs-subst">#{desc}</span>"</span>
+  <span class="hljs-built_in">console</span>.log oparse.help() <span class="hljs-keyword">if</span> switches.length</pre></div></div>
             
         </li>
         
@@ -318,17 +306,36 @@ original directory name, when running Cake tasks from subdirectories.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-11">&#182;</a>
               </div>
-              <p>When <code>cake</code> is invoked, search in the current and all parent directories
-to find the relevant Cakefile.
-</p>
+              <p>Print an error and exit when attempting to use an invalid task/option.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="function"><span class="title">cakefileDirectory</span></span> = (dir) -&gt;
-  <span class="keyword">return</span> dir <span class="keyword">if</span> existsSync path.join dir, <span class="string">'Cakefile'</span>
-  parent = path.normalize path.join dir, <span class="string">'..'</span>
-  <span class="keyword">return</span> cakefileDirectory parent <span class="keyword">unless</span> parent <span class="keyword">is</span> dir
-  <span class="keyword">throw</span> <span class="keyword">new</span> Error <span class="string">"Cakefile not found in <span class="subst">#{process.cwd()}</span>"</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">fatalError</span> = <span class="hljs-params">(message)</span> -&gt;</span>
+  <span class="hljs-built_in">console</span>.error message + <span class="hljs-string">'\n'</span>
+  <span class="hljs-built_in">console</span>.log <span class="hljs-string">'To see a list of all tasks/options, run "cake"'</span>
+  process.exit <span class="hljs-number">1</span>
+<span class="hljs-function">
+<span class="hljs-title">missingTask</span> = <span class="hljs-params">(task)</span> -&gt;</span> fatalError <span class="hljs-string">"No such task: <span class="hljs-subst">#{task}</span>"</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-12">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-12">&#182;</a>
+              </div>
+              <p>When <code>cake</code> is invoked, search in the current and all parent directories
+to find the relevant Cakefile.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">cakefileDirectory</span> = <span class="hljs-params">(dir)</span> -&gt;</span>
+  <span class="hljs-keyword">return</span> dir <span class="hljs-keyword">if</span> fs.existsSync path.join dir, <span class="hljs-string">'Cakefile'</span>
+  parent = path.normalize path.join dir, <span class="hljs-string">'..'</span>
+  <span class="hljs-keyword">return</span> cakefileDirectory parent <span class="hljs-keyword">unless</span> parent <span class="hljs-keyword">is</span> dir
+  <span class="hljs-keyword">throw</span> <span class="hljs-keyword">new</span> Error <span class="hljs-string">"Cakefile not found in <span class="hljs-subst">#{process.cwd()}</span>"</span></pre></div></div>
             
         </li>
         

documentation/docs/docco.css

@@ -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;
 }

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>exports.s<span class="hljs-function"><span class="hljs-title">tarts</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>exports.e<span class="hljs-function"><span class="hljs-title">nds</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>exports.repeat = r<span class="hljs-function"><span class="hljs-title">epeat</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>exports.c<span class="hljs-function"><span class="hljs-title">ompact</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>exports.c<span class="hljs-function"><span class="hljs-title">ount</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>exports.m<span class="hljs-function"><span class="hljs-title">erge</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 = exports.e<span class="hljs-function"><span class="hljs-title">xtend</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>exports.flatten = f<span class="hljs-function"><span class="hljs-title">latten</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>exports.d<span class="hljs-function"><span class="hljs-title">el</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>exports.last = l<span class="hljs-function"><span class="hljs-title">ast</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>exports.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>exports.i<span class="hljs-function"><span class="hljs-title">nvertLiterate</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>exports.a<span class="hljs-function"><span class="hljs-title">ddLocationDataFn</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>exports.l<span class="hljs-function"><span class="hljs-title">ocationDataToString</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>exports.b<span class="hljs-function"><span class="hljs-title">aseFileName</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>exports.i<span class="hljs-function"><span class="hljs-title">sCoffee</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>exports.i<span class="hljs-function"><span class="hljs-title">sLiterate</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>exports.t<span class="hljs-function"><span class="hljs-title">hrowSyntaxError</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>exports.u<span class="hljs-function"><span class="hljs-title">pdateSyntaxError</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>
+
+exports.n<span class="hljs-function"><span class="hljs-title">ameWhitespaceCharacter</span> = <span class="hljs-params">(string)</span> -&gt;</span>
+  <span class="hljs-keyword">switch</span> string
+    <span class="hljs-keyword">when</span> <span class="hljs-string">' '</span> <span class="hljs-keyword">then</span> <span class="hljs-string">'space'</span>
+    <span class="hljs-keyword">when</span> <span class="hljs-string">'\n'</span> <span class="hljs-keyword">then</span> <span class="hljs-string">'newline'</span>
+    <span class="hljs-keyword">when</span> <span class="hljs-string">'\r'</span> <span class="hljs-keyword">then</span> <span class="hljs-string">'carriage return'</span>
+    <span class="hljs-keyword">when</span> <span class="hljs-string">'\t'</span> <span class="hljs-keyword">then</span> <span class="hljs-string">'tab'</span>
+    <span class="hljs-keyword">else</span> string</pre></div></div>
             
         </li>
         

documentation/docs/index.html

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

documentation/docs/optparse.html

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

documentation/docs/register.html

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

documentation/docs/repl.html

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

documentation/docs/scope.html

@@ -16,78 +16,85 @@
           <a class="large" href="javascript:void(0);">Jump To &hellip;</a>
           <a class="small" href="javascript:void(0);">+</a>
           <div id="jump_wrapper">
-          <div id="jump_page">
-            
+          <div id="jump_page_wrapper">
+            <div id="jump_page">
               
-              <a class="source" href="browser.html">
-                browser.coffee
-              </a>
-            
+                
+                <a class="source" href="browser.html">
+                  browser.coffee
+                </a>
               
-              <a class="source" href="cake.html">
-                cake.coffee
-              </a>
-            
+                
+                <a class="source" href="cake.html">
+                  cake.coffee
+                </a>
               
-              <a class="source" href="coffee-script.html">
-                coffee-script.coffee
-              </a>
-            
+                
+                <a class="source" href="coffee-script.html">
+                  coffee-script.coffee
+                </a>
               
-              <a class="source" href="command.html">
-                command.coffee
-              </a>
-            
+                
+                <a class="source" href="command.html">
+                  command.coffee
+                </a>
               
-              <a class="source" href="grammar.html">
-                grammar.coffee
-              </a>
-            
+                
+                <a class="source" href="grammar.html">
+                  grammar.coffee
+                </a>
               
-              <a class="source" href="helpers.html">
-                helpers.coffee
-              </a>
-            
+                
+                <a class="source" href="helpers.html">
+                  helpers.coffee
+                </a>
               
-              <a class="source" href="index.html">
-                index.coffee
-              </a>
-            
+                
+                <a class="source" href="index.html">
+                  index.coffee
+                </a>
               
-              <a class="source" href="lexer.html">
-                lexer.coffee
-              </a>
-            
+                
+                <a class="source" href="lexer.html">
+                  lexer.coffee
+                </a>
               
-              <a class="source" href="nodes.html">
-                nodes.coffee
-              </a>
-            
+                
+                <a class="source" href="nodes.html">
+                  nodes.coffee
+                </a>
               
-              <a class="source" href="optparse.html">
-                optparse.coffee
-              </a>
-            
+                
+                <a class="source" href="optparse.html">
+                  optparse.coffee
+                </a>
               
-              <a class="source" href="repl.html">
-                repl.coffee
-              </a>
-            
+                
+                <a class="source" href="register.html">
+                  register.coffee
+                </a>
               
-              <a class="source" href="rewriter.html">
-                rewriter.coffee
-              </a>
-            
+                
+                <a class="source" href="repl.html">
+                  repl.coffee
+                </a>
               
-              <a class="source" href="scope.html">
-                scope.litcoffee
-              </a>
-            
+                
+                <a class="source" href="rewriter.html">
+                  rewriter.coffee
+                </a>
               
-              <a class="source" href="sourcemap.html">
-                sourcemap.litcoffee
-              </a>
-            
+                
+                <a class="source" href="scope.html">
+                  scope.litcoffee
+                </a>
+              
+                
+                <a class="source" href="sourcemap.html">
+                  sourcemap.litcoffee
+                </a>
+              
+            </div>
           </div>
         </li>
       </ul>
@@ -113,11 +120,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>
+
+exports.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,18 @@ with external scopes.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-2">&#182;</a>
               </div>
-              <p>Import the helpers we plan to use.
-</p>
+              <p>Initialize a scope with its parent, for lookups up the chain,
+as well as a reference to the <strong>Block</strong> node it belongs to, which is
+where it should declare its variables, a reference to the function that
+it belongs to, and a list of variables referenced in the source code
+and therefore should be avoided when generating variables.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-{extend, last} = require <span class="string">'./helpers'</span>
-
-exports.Scope = <span class="class"><span class="keyword">class</span> <span class="title">Scope</span></span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">constructor</span>: <span class="hljs-function"><span class="hljs-params">(<span class="hljs-property">@parent</span>, <span class="hljs-property">@expressions</span>, <span class="hljs-property">@method</span>, <span class="hljs-property">@referencedVars</span>)</span> -&gt;</span>
+    <span class="hljs-property">@variables</span> = [{<span class="hljs-attribute">name</span>: <span class="hljs-string">'arguments'</span>, <span class="hljs-attribute">type</span>: <span class="hljs-string">'arguments'</span>}]
+    <span class="hljs-property">@positions</span> = {}
+    <span class="hljs-property">@utilities</span> = {} <span class="hljs-keyword">unless</span> <span class="hljs-property">@parent</span></pre></div></div>
             
         </li>
         
@@ -146,13 +160,11 @@ exports.Scope = <span class="class"><span class="keyword">class</span> <span cla
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-3">&#182;</a>
               </div>
-              <p>The <code>root</code> is the top-level <strong>Scope</strong> object for a given file.
-</p>
+              <p>The <code>@root</code> is the top-level <strong>Scope</strong> object for a given file.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  <span class="property">@root</span>: <span class="literal">null</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>    <span class="hljs-property">@root</span> = <span class="hljs-property">@parent</span>?.root ? <span class="hljs-keyword">this</span></pre></div></div>
             
         </li>
         
@@ -163,19 +175,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 +195,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 +216,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 +235,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 +253,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 +270,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 +289,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 +306,19 @@ walks up to the root scope.
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-11">&#182;</a>
               </div>
-              <p>Gets the type of a variable.
-</p>
+              <p>If we need to store an intermediate result, find an available name for a
+compiler-generated variable. <code>_var</code>, <code>_var2</code>, and so on…</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  type: (name) -&gt;
-    <span class="keyword">return</span> v.type <span class="keyword">for</span> v <span class="keyword">in</span> <span class="property">@variables</span> <span class="keyword">when</span> v.name <span class="keyword">is</span> name
-    <span class="literal">null</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">freeVariable</span>: <span class="hljs-function"><span class="hljs-params">(name, reserve=<span class="hljs-literal">true</span>)</span> -&gt;</span>
+    index = <span class="hljs-number">0</span>
+    <span class="hljs-keyword">loop</span>
+      temp = <span class="hljs-property">@temporary</span> name, index
+      <span class="hljs-keyword">break</span> <span class="hljs-keyword">unless</span> <span class="hljs-property">@check</span>(temp) <span class="hljs-keyword">or</span> temp <span class="hljs-keyword">in</span> <span class="hljs-property">@root</span>.referencedVars
+      index++
+    <span class="hljs-property">@add</span> temp, <span class="hljs-string">'var'</span>, <span class="hljs-literal">yes</span> <span class="hljs-keyword">if</span> reserve
+    temp</pre></div></div>
             
         </li>
         
@@ -331,18 +329,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 +347,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 +363,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 +383,13 @@ compiler-generated variable. <code>_var</code>, <code>_var2</code>, and so on...
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-15">&#182;</a>
               </div>
-              <p>Return the list of variables first declared in this scope.
-</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>
-  declaredVariables: -&gt;
-    realVars = []
-    tempVars = []
-    <span class="keyword">for</span> v <span class="keyword">in</span> <span class="property">@variables</span> <span class="keyword">when</span> v.type <span class="keyword">is</span> <span class="string">'var'</span>
-      (<span class="keyword">if</span> v.name.charAt(<span class="number">0</span>) <span class="keyword">is</span> <span class="string">'_'</span> <span class="keyword">then</span> tempVars <span class="keyword">else</span> realVars).push v.name
-    realVars.sort().concat tempVars.sort()</pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-16">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-16">&#182;</a>
-              </div>
               <p>Return the list of assignments that are supposed to be made at the top
-of this scope.
-</p>
+of this scope.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>
-  assignedVariables: -&gt;
-    <span class="string">"<span class="subst">#{v.name}</span> = <span class="subst">#{v.type.value}</span>"</span> <span class="keyword">for</span> v <span class="keyword">in</span> <span class="property">@variables</span> <span class="keyword">when</span> v.type.assigned</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">assignedVariables</span>:<span class="hljs-function"> -&gt;</span>
+    <span class="hljs-string">"<span class="hljs-subst">#{v.name}</span> = <span class="hljs-subst">#{v.type.value}</span>"</span> <span class="hljs-keyword">for</span> v <span class="hljs-keyword">in</span> <span class="hljs-property">@variables</span> <span class="hljs-keyword">when</span> v.type.assigned</pre></div></div>
             
         </li>
         

documentation/docs/sourcemap.html

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

documentation/images/just_logo.svg

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

documentation/images/logo.svg

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

documentation/index.html.js

@@ -34,7 +34,7 @@
         <a href="#operators">Operators and Aliases</a>
         <a href="#classes">Classes, Inheritance, and Super</a>
         <a href="#destructuring">Destructuring Assignment</a>
-        <a href="#fat-arrow">Function Binding</a>
+        <a href="#fat-arrow">Bound and Generator Functions</a>
         <a href="#embedded">Embedded JavaScript</a>
         <a href="#switch">Switch and Try/Catch</a>
         <a href="#comparisons">Chained Comparisons</a>
@@ -87,7 +87,6 @@
         <a href="documentation/docs/sourcemap.html">Source Maps &mdash; src/sourcemap</a>
       </div>
     </div>
-    <div id="error" style="display:none;"></div>
   </div>
 
   <div class="container">
@@ -111,11 +110,10 @@
 
     <p>
       <b>Latest Version:</b>
-      <a href="http://github.com/jashkenas/coffee-script/tarball/1.7.0">1.7.0</a>
+      <a href="http://github.com/jashkenas/coffeescript/tarball/1.9.0">1.9.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>
@@ -144,28 +142,31 @@ sudo npm install -g coffee-script</pre>
 
     <p>
       To install, first make sure you have a working copy of the latest stable version of
-      <a href="http://nodejs.org/">Node.js</a>, and <a href="http://npmjs.org">npm</a>
-      (the Node Package Manager). You can then install CoffeeScript with npm:
+      <a href="http://nodejs.org/">Node.js</a>. You can then install CoffeeScript globally
+      with <a href="http://npmjs.org">npm</a>:
     </p>
 
     <pre>
 npm install -g coffee-script</pre>
 
     <p>
-      (Leave off the <tt>-g</tt> if you don't wish to install globally.)
+      When you need CoffeeScript as a dependency, install it locally:
     </p>
 
+    <pre>
+npm install --save coffee-script</pre>
+
     <p>
       If you'd prefer to install the latest <b>master</b> version of CoffeeScript, you
       can clone the CoffeeScript
-      <a href="http://github.com/jashkenas/coffee-script">source repository</a>
+      <a href="http://github.com/jashkenas/coffeescript">source repository</a>
       from GitHub, or download
-      <a href="http://github.com/jashkenas/coffee-script/tarball/master">the source</a> directly.
-      To install the lastest master CoffeeScript compiler with npm:
+      <a href="http://github.com/jashkenas/coffeescript/tarball/master">the source</a> directly.
+      To install the latest master CoffeeScript compiler with npm:
     </p>
 
 <pre>
-npm install -g http://github.com/jashkenas/coffee-script/tarball/master</pre>
+npm install -g jashkenas/coffeescript</pre>
 
     <p>
       Or, if you want to install to <tt>/usr/local</tt>, and don't want to use
@@ -351,7 +352,7 @@ Expressions
       Just for kicks, a little bit of the compiler is currently implemented in this fashion:
       See it
       <a href="https://gist.github.com/jashkenas/3fc3c1a8b1009c00d9df">as a document</a>,
-      <a href="https://raw.github.com/jashkenas/coffee-script/master/src/scope.litcoffee">raw</a>,
+      <a href="https://raw.github.com/jashkenas/coffeescript/master/src/scope.litcoffee">raw</a>,
       and <a href="http://cl.ly/LxEu">properly highlighted in a text editor</a>.
     </p>
 
@@ -657,7 +658,7 @@ Expressions
       test for JavaScript object-key presence.
     </p>
     <p>
-      To simplify math expressions, `**` can be used for exponentiation, `//` performs integer division and `%%` provides true mathematical modulo.
+      To simplify math expressions, <tt>**</tt> can be used for exponentiation, <tt>//</tt> performs integer division and <tt>%%</tt> provides true mathematical modulo.
     </p>
     <p>
       All together now:
@@ -670,9 +671,9 @@ Expressions
       <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>
@@ -706,7 +707,7 @@ Expressions
     <%= codeFor('soaks') %>
     <p>
       Soaking up nulls is similar to Ruby's
-      <a href="http://andand.rubyforge.org/">andand gem</a>, and to the
+      <a href="https://rubygems.org/gems/andand">andand gem</a>, and to the
       <a href="http://groovy.codehaus.org/Operators#Operators-SafeNavigationOperator%28%3F.%29">safe navigation operator</a>
       in Groovy.
     </p>
@@ -775,7 +776,7 @@ Expressions
       Destructuring assignment can be used with any depth of array and object nesting,
       to help pull out deeply nested properties.
     </p>
-    <%= codeFor('object_extraction', '"name + "-" + street"') %>
+    <%= codeFor('object_extraction', 'name + "-" + street') %>
     <p>
       Destructuring assignment can even be combined with splats.
     </p>
@@ -783,7 +784,7 @@ Expressions
     <p>
       Expansion can be used to retrieve elements from the end of an array without having to assign the rest of its values. It works in function parameter lists as well.
     </p>
-    <%= codeFor('expansion', '"first + " " + last"') %>
+    <%= codeFor('expansion', 'first + " " + last') %>
     <p>
       Destructuring assignment is also useful when combined with class constructors
       to assign properties to your instance from an options object passed to the constructor.
@@ -792,7 +793,7 @@ Expressions
 
     <p>
       <span id="fat-arrow" class="bookmark"></span>
-      <b class="header">Function binding</b>
+      <b class="header">Bound Functions, Generator Functions</b>
       In JavaScript, the <tt>this</tt> keyword is dynamically scoped to mean the
       object that the current function is attached to. If you pass a function as
       a callback or attach it to a different object, the original value of <tt>this</tt>
@@ -819,6 +820,13 @@ Expressions
       be automatically bound to each instance of the class when the instance is
       constructed.
     </p>
+    <p>
+      CoffeeScript functions also support 
+      <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function*">ES6 generator functions</a>
+      through the <tt>yield</tt> keyword. There's no <tt>function*(){}</tt> 
+      nonsense &mdash; a generator in CoffeeScript is simply a function that yields.
+    </p>
+    <%= codeFor('generators', 'ps.next().value') %>
 
     <p>
       <span id="embedded" class="bookmark"></span>
@@ -1032,7 +1040,7 @@ Expressions
         size (Rails, Node).
       </li>
       <li>
-        <a href="http://ristrettolo.gy">CoffeeScript Ristretto</a>
+        <a href="https://leanpub.com/coffeescript-ristretto/read">CoffeeScript Ristretto</a>
         is a deep dive into CoffeeScript's semantics from simple functions up through
         closures, higher-order functions, objects, classes, combinators, and decorators.
         By <a href="http://braythwayt.com/">Reg Braithwaite</a>.
@@ -1044,14 +1052,18 @@ Expressions
       </li>
       <li>
         <a href="http://www.packtpub.com/coffeescript-application-development/book">CoffeeScript Application Development</a>
-        is a new book from Packt Publishing that introduces CoffeeScript while
+        from Packt, introduces CoffeeScript while
         walking through the process of building a demonstration web application.
       </li>
       <li>
         <a href="http://www.manning.com/lee/">CoffeeScript in Action</a>
-        is a new book from Manning Publications that covers CoffeeScript syntax, composition techniques
+        from Manning Publications, covers CoffeeScript syntax, composition techniques
         and application development.
       </li>
+      <li>
+        <a href="http://www.dpunkt.de/buecher/4021/coffeescript.html">CoffeeScript: Die Alternative zu JavaScript</a>
+        from dpunkt.verlag, is the first CoffeeScript book in Deutsch.
+      </li>
     </ul>
 
     <h2>
@@ -1082,7 +1094,7 @@ Expressions
     </h2>
 
     <p>
-      The <a href="https://github.com/languages/coffeescript">best list of
+      The <a href="https://github.com/trending?l=coffeescript&amp;since=monthly">best list of
       open-source CoffeeScript examples</a> can be found on GitHub. But just
       to throw out few more:
     </p>
@@ -1114,8 +1126,8 @@ Expressions
         the Bolo tank game for modern browsers.
       </li>
       <li>
-        <b>josh</b>'s <a href="http://josh.github.com/nack/">nack</a>, a Node.js-powered
-        <a href="http://rack.rubyforge.org/">Rack</a> server.
+        <b>github</b>'s <a href="https://atom.io/">Atom</a>,
+        a hackable text editor built on web technologies.
       </li>
     </ul>
 
@@ -1125,7 +1137,7 @@ Expressions
 
     <ul>
       <li>
-        <a href="http://github.com/jashkenas/coffee-script/">Source Code</a><br />
+        <a href="http://github.com/jashkenas/coffeescript/">Source Code</a><br />
         Use <tt>bin/coffee</tt> to test your changes,<br />
         <tt>bin/cake test</tt> to run the test suite,<br />
         <tt>bin/cake build</tt> to rebuild the CoffeeScript compiler, and <br />
@@ -1138,7 +1150,7 @@ Expressions
         they pass, there's a good chance you've made a successful change.
       </li>
       <li>
-        <a href="http://github.com/jashkenas/coffee-script/issues">CoffeeScript Issues</a><br />
+        <a href="http://github.com/jashkenas/coffeescript/issues">CoffeeScript Issues</a><br />
         Bug reports, feature proposals, and ideas for changes to the language belong here.
       </li>
       <li>
@@ -1146,15 +1158,15 @@ Expressions
         If you'd like to ask a question, the mailing list is a good place to get help.
       </li>
       <li>
-        <a href="http://github.com/jashkenas/coffee-script/wiki">The CoffeeScript Wiki</a><br />
+        <a href="http://github.com/jashkenas/coffeescript/wiki">The CoffeeScript Wiki</a><br />
         If you've ever learned a neat CoffeeScript tip or trick, or ran into a gotcha &mdash; share it on the wiki.
         The wiki also serves as a directory of handy
-        <a href="http://github.com/jashkenas/coffee-script/wiki/Text-editor-plugins">text editor extensions</a>,
-        <a href="http://github.com/jashkenas/coffee-script/wiki/Web-framework-plugins">web framework plugins</a>,
-        and general <a href="http://github.com/jashkenas/coffee-script/wiki/Build-tools">CoffeeScript build tools</a>.
+        <a href="http://github.com/jashkenas/coffeescript/wiki/Text-editor-plugins">text editor extensions</a>,
+        <a href="http://github.com/jashkenas/coffeescript/wiki/Web-framework-plugins">web framework plugins</a>,
+        and general <a href="http://github.com/jashkenas/coffeescript/wiki/Build-tools">CoffeeScript build tools</a>.
       </li>
       <li>
-        <a href="http://github.com/jashkenas/coffee-script/wiki/FAQ">The FAQ</a><br />
+        <a href="http://github.com/jashkenas/coffeescript/wiki/FAQ">The FAQ</a><br />
         Perhaps your CoffeeScript-related question has been asked before. Check the FAQ first.
       </li>
       <li>
@@ -1165,7 +1177,7 @@ Expressions
         point for converting simple scripts.
       </li>
       <li>
-        <a href="https://github.com/jashkenas/coffee-script/downloads">High-Rez Logo</a><br />
+        <a href="https://github.com/jashkenas/coffeescript/downloads">High-Rez Logo</a><br />
         The CoffeeScript logo is available in Illustrator, EPS and PSD formats, for use
         in presentations.
       </li>
@@ -1192,10 +1204,73 @@ Expressions
     </h2>
 
     <p>
-      <b class="header" style="margin-top: 20px;">
-        <a href="https://github.com/jashkenas/coffee-script/compare/1.6.3...1.7.0">1.7.0</a>
-        <span class="timestamp"> &ndash; <small>January 28, 2014</small></span>
-      </b>
+      <%= releaseHeader('2015-01-29', '1.9.0', '1.8.0') %>
+      <ul>
+        <li>
+          CoffeeScript now supports ES6 generators. A generator is simply a function
+          that <tt>yield</tt>s. 
+        </li>
+        <li>
+          Improved error reporting for string interpolation.
+        </li>
+        <li>
+          Changed strategy for the generation of internal compiler variable names.
+        </li>
+        <li>
+          Fixed REPL compatibility with latest versions of Node and IO.js.
+        </li>
+      </ul>
+    </p>
+
+    <p>
+      <%= releaseHeader('2014-08-26', '1.8.0', '1.7.1') %>
+      <ul>
+        <li>
+          The <tt>--join</tt> option of the CLI is now deprecated.
+        </li>
+        <li>
+          Source maps now use <tt>.js.map</tt> as file extension, instead of just <tt>.map</tt>.
+        </li>
+        <li>
+          The CLI now exits with the exit code 1 when it fails to write a file to disk.
+        </li>
+        <li>
+          The compiler no longer crashes on unterminated, single-quoted strings.
+        </li>
+        <li>
+          Fixed location data for string interpolations, which made source maps out of sync.
+        </li>
+        <li>
+          The error marker in error messages is now correctly positioned if the code is indented with tabs.
+        </li>
+        <li>
+          Fixed a slight formatting error in CoffeeScript’s source map-patched stack traces.
+        </li>
+        <li>
+          The <tt>%%</tt> operator now coerces its right operand only once.
+        </li>
+        <li>
+          It is now possible to require CoffeeScript files from Cakefiles without having to register the compiler first.
+        </li>
+        <li>
+          The CoffeeScript REPL is now exported and can be required using <tt>require 'coffee-script/repl'</tt>.
+        </li>
+        <li>
+          Fixes for the REPL in Node 0.11.
+        </li>
+      </ul>
+    </p>
+
+    <p>
+      <%= releaseHeader('2014-01-29', '1.7.1', '1.7.0') %>
+      <ul>
+        <li>
+          Fixed a typo that broke node module lookup when running a script directly with the <tt>coffee</tt> binary.
+        </li>
+      </ul>
+    </p>
+    <p>
+      <%= releaseHeader('2014-01-28', '1.7.0', '1.6.3') %>
       <ul>
         <li>
           When requiring CoffeeScript files in Node you must now explicitly register the compiler. This can be done with <tt>require 'coffee-script/register'</tt> or <tt>CoffeeScript.register()</tt>. Also for configuration such as Mocha's, use <b>coffee-script/register</b>.
@@ -1210,7 +1285,7 @@ Expressions
       <%= codeFor('chaining') %>
       <ul>
         <li>
-          Added <tt>**</tt>, <tt>//</tt> and <tt>%%</tt> operators and <tt>...</tt> expansion in paramater lists and destructuring expressions.
+          Added <tt>**</tt>, <tt>//</tt> and <tt>%%</tt> operators and <tt>...</tt> expansion in parameter lists and destructuring expressions.
         </li>
         <li>
           Multiline strings are now joined by a single space and ignore all indentation. A backslash at the end of a line can denote the amount of whitespace between lines, in both strings and heredocs. Backslashes correctly escape whitespace in block regexes.
@@ -1219,7 +1294,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 +1308,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 +1334,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 +1360,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 +1386,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 +1411,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 +1429,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 +1455,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 +1464,7 @@ Expressions
           a function definition, deleting naked variables, setting the value of
           <tt>eval</tt> or <tt>arguments</tt>, and more.
           See a full discussion at
-          <a href="https://github.com/jashkenas/coffee-script/issues/1547">#1547</a>.
+          <a href="https://github.com/jashkenas/coffeescript/issues/1547">#1547</a>.
         </li>
         <li>
           The REPL now has a handy new multi-line mode for entering large
@@ -1439,7 +1493,7 @@ Expressions
           effectively creating a shallow copy of the list.
         </li>
         <li>
-          Additional tweaks and improvments to <tt>coffee --watch</tt> under
+          Additional tweaks and improvements to <tt>coffee --watch</tt> under
           Node's "new" file watching API. Watch will now beep by default
           if you introduce a syntax error into a watched script. We also now
           ignore hidden directories by default when watching recursively.
@@ -1448,10 +1502,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 +1526,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 +1566,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 +1577,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 +1599,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 +1610,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 +1622,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 +1634,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 +1648,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 +1657,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 +1666,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 +1680,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 +1689,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 +1713,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 +1727,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 +1744,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 +1759,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 +1783,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 +1792,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 +1809,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 +1818,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 +1826,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 +1856,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 +1864,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 +1873,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 +1907,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 +1922,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 +1938,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 +1950,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 +1964,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 +1976,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 +1993,22 @@ Expressions
     # Set up the compilation function, to run when you stop typing.
     compileSource = ->
       source = $('#repl_source').val()
+      results = $('#repl_results')
       window.compiledJS = ''
       try
         window.compiledJS = CoffeeScript.compile source, bare: on
-        el = $('#repl_results')[0]
+        el = results[0]
         if el.innerText
           el.innerText = window.compiledJS
         else
-          $(el).text window.compiledJS
-        $('#error').hide()
+          results.text(window.compiledJS)
+        results.removeClass 'error'
+        $('.minibutton.run').removeClass 'error'
       catch {location, message}
         if location?
           message = "Error on line #{location.first_line + 1}: #{message}"
-        $('#error').text(message).show()
+        results.text(message).addClass 'error'
+        $('.minibutton.run').addClass 'error'
 
       # Update permalink
       $('#repl_permalink').attr 'href', "##{sourceFragment}#{encodeURIComponent source}"

documentation/js/aliases.js

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

documentation/js/array_comprehensions.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 var courses, dish, food, foods, i, _i, _j, _k, _len, _len1, _len2, _ref;
 
 _ref = ['toast', 'cheese', 'wine'];

documentation/js/block_comment.js

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

documentation/js/cake_tasks.js

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

documentation/js/chaining.js

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

documentation/js/classes.js

@@ -1,11 +1,11 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.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; };
+  __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; },
+  __hasProp = {}.hasOwnProperty;
 
 Animal = (function() {
-  function Animal(name) {
-    this.name = name;
+  function Animal(_at_name) {
+    this.name = _at_name;
   }
 
   Animal.prototype.move = function(meters) {

documentation/js/comparisons.js

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

documentation/js/conditionals.js

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

documentation/js/constructor_destructuring.js

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

documentation/js/default_args.js

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

documentation/js/do.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 var filename, _fn, _i, _len;
 
 _fn = function(filename) {

documentation/js/embedded.js

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

documentation/js/existence.js

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

documentation/js/expansion.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 var first, last, text, _ref;
 
 text = "Every literary critic believes he will outwit history and have the last word";

documentation/js/expressions.js

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

documentation/js/expressions_assignment.js

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

documentation/js/expressions_comprehension.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 var globals, name;
 
 globals = ((function() {

documentation/js/expressions_try.js

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

documentation/js/fat_arrow.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 var Account;
 
 Account = function(customer, cart) {

documentation/js/functions.js

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

documentation/js/generators.js

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

documentation/js/heredocs.js

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

documentation/js/heregexes.js

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

documentation/js/interpolation.js

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

documentation/js/multiple_return_values.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 var city, forecast, temp, weatherReport, _ref;
 
 weatherReport = function(location) {

documentation/js/object_comprehensions.js

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

documentation/js/object_extraction.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 var city, futurists, name, street, _ref, _ref1;
 
 futurists = {

documentation/js/objects_and_arrays.js

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

documentation/js/objects_reserved.js

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

documentation/js/overview.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 var cubes, list, math, num, number, opposite, race, square,
   __slice = [].slice;
 

documentation/js/parallel_assignment.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 var theBait, theSwitch, _ref;
 
 theBait = 1000;

documentation/js/patterns_and_splats.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 var close, contents, open, tag, _i, _ref,
   __slice = [].slice;
 

documentation/js/prototypes.js

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

documentation/js/range_comprehensions.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 var countdown, num;
 
 countdown = (function() {

documentation/js/scope.js

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

documentation/js/slices.js

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

documentation/js/soaks.js

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

documentation/js/splats.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 var awardMedals, contenders, gold, rest, silver,
   __slice = [].slice;
 

documentation/js/splices.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 var numbers, _ref;
 
 numbers = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];

documentation/js/strings.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.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...";

documentation/js/switch.js

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

documentation/js/switch_with_no_expression.js

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

documentation/js/try.js

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

documentation/js/while.js

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

examples/custom_repl.coffee

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

lib/coffee-script/browser.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.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; };
@@ -41,7 +41,7 @@
       options.sourceMap = true;
       options.inline = true;
       _ref = CoffeeScript.compile(code, options), js = _ref.js, v3SourceMap = _ref.v3SourceMap;
-      return "" + js + "\n//# sourceMappingURL=data:application/json;base64," + (btoa(unescape(encodeURIComponent(v3SourceMap)))) + "\n//# sourceURL=coffeescript";
+      return js + "\n//# sourceMappingURL=data:application/json;base64," + (btoa(unescape(encodeURIComponent(v3SourceMap)))) + "\n//# sourceURL=coffeescript";
     };
   }
 

lib/coffee-script/cake.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.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 = {};
@@ -74,7 +76,7 @@
     var cakefilePath, desc, name, relative, spaces, task;
     relative = path.relative || path.resolve;
     cakefilePath = path.join(relative(__originalDirname, process.cwd()), 'Cakefile');
-    console.log("" + cakefilePath + " defines the following tasks:\n");
+    console.log(cakefilePath + " defines the following tasks:\n");
     for (name in tasks) {
       task = tasks[name];
       spaces = 20 - name.length;

lib/coffee-script/coffee-script.js

@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.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.0';
+  exports.VERSION = '1.9.0';
 
   exports.FILE_EXTENSIONS = ['.coffee', '.litcoffee', '.coffee.md'];
 
@@ -40,13 +40,25 @@
   };
 
   exports.compile = compile = withPrettyErrors(function(code, options) {
-    var answer, currentColumn, currentLine, extend, fragment, fragments, header, js, map, merge, newLines, _i, _len;
+    var answer, currentColumn, currentLine, extend, fragment, fragments, header, js, map, merge, newLines, token, tokens, _i, _len;
     merge = helpers.merge, extend = helpers.extend;
     options = extend({}, options);
     if (options.sourceMap) {
       map = new SourceMap;
     }
-    fragments = parser.parse(lexer.tokenize(code, options)).compileToFragments(options);
+    tokens = lexer.tokenize(code, options);
+    options.referencedVars = (function() {
+      var _i, _len, _results;
+      _results = [];
+      for (_i = 0, _len = tokens.length; _i < _len; _i++) {
+        token = tokens[_i];
+        if (token.variable && token[1].charAt(0) === '_') {
+          _results.push(token[1]);
+        }
+      }
+      return _results;
+    })();
+    fragments = parser.parse(tokens).compileToFragments(options);
     currentLine = 0;
     if (options.header) {
       currentLine += 1;
@@ -110,7 +122,7 @@
     mainModule = require.main;
     mainModule.filename = process.argv[1] = options.filename ? fs.realpathSync(options.filename) : '.';
     mainModule.moduleCache && (mainModule.moduleCache = {});
-    dir = options.fileName ? path.dirname(fs.realpathSync(options.filename)) : fs.realpathSync('.');
+    dir = options.filename ? path.dirname(fs.realpathSync(options.filename)) : fs.realpathSync('.');
     mainModule.paths = require('module')._nodeModulePaths(dir);
     if (!helpers.isCoffee(mainModule.filename) || require.extensions) {
       answer = compile(code, options);
@@ -120,24 +132,27 @@
   };
 
   exports["eval"] = function(code, options) {
-    var Module, Script, js, k, o, r, sandbox, v, _i, _len, _module, _ref, _ref1, _require;
+    var Module, createContext, isContext, js, k, o, r, sandbox, v, _i, _len, _module, _ref, _ref1, _ref2, _ref3, _require;
     if (options == null) {
       options = {};
     }
     if (!(code = code.trim())) {
       return;
     }
-    Script = vm.Script;
-    if (Script) {
+    createContext = (_ref = vm.Script.createContext) != null ? _ref : vm.createContext;
+    isContext = (_ref1 = vm.isContext) != null ? _ref1 : function(ctx) {
+      return options.sandbox instanceof createContext().constructor;
+    };
+    if (createContext) {
       if (options.sandbox != null) {
-        if (options.sandbox instanceof Script.createContext().constructor) {
+        if (isContext(options.sandbox)) {
           sandbox = options.sandbox;
         } else {
-          sandbox = Script.createContext();
-          _ref = options.sandbox;
-          for (k in _ref) {
-            if (!__hasProp.call(_ref, k)) continue;
-            v = _ref[k];
+          sandbox = createContext();
+          _ref2 = options.sandbox;
+          for (k in _ref2) {
+            if (!__hasProp.call(_ref2, k)) continue;
+            v = _ref2[k];
             sandbox[k] = v;
           }
         }
@@ -154,9 +169,9 @@
           return Module._load(path, _module, true);
         };
         _module.filename = sandbox.__filename;
-        _ref1 = Object.getOwnPropertyNames(require);
-        for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-          r = _ref1[_i];
+        _ref3 = Object.getOwnPropertyNames(require);
+        for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
+          r = _ref3[_i];
           if (r !== 'paths') {
             _require[r] = require[r];
           }
@@ -186,6 +201,18 @@
     return require('./register');
   };
 
+  if (require.extensions) {
+    _ref = this.FILE_EXTENSIONS;
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      ext = _ref[_i];
+      if ((_base = require.extensions)[ext] == null) {
+        _base[ext] = function() {
+          throw new Error("Use CoffeeScript.register() or require the coffee-script/register module to require " + ext + " files.");
+        };
+      }
+    }
+  }
+
   exports._compileFile = function(filename, sourceMap) {
     var answer, err, raw, stripped;
     if (sourceMap == null) {
@@ -211,10 +238,10 @@
   parser.lexer = {
     lex: function() {
       var tag, token;
-      token = this.tokens[this.pos++];
+      token = parser.tokens[this.pos++];
       if (token) {
         tag = token[0], this.yytext = token[1], this.yylloc = token[2];
-        this.errorToken = token.origin || token;
+        parser.errorToken = token.origin || token;
         this.yylineno = this.yylloc.first_line;
       } else {
         tag = '';
@@ -222,7 +249,7 @@
       return tag;
     },
     setInput: function(tokens) {
-      this.tokens = tokens;
+      parser.tokens = tokens;
       return this.pos = 0;
     },
     upcomingInput: function() {
@@ -233,9 +260,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;
     token = _arg.token;
-    _ref = parser.lexer, errorToken = _ref.errorToken, tokens = _ref.tokens;
+    errorToken = parser.errorToken, tokens = parser.tokens;
     errorTag = errorToken[0], errorText = errorToken[1], errorLoc = errorToken[2];
     errorText = errorToken === tokens[tokens.length - 1] ? 'end of input' : errorTag === 'INDENT' || errorTag === 'OUTDENT' ? 'indentation' : helpers.nameWhitespaceCharacter(errorText);
     return helpers.throwSyntaxError("unexpected " + errorText, errorLoc);
@@ -251,7 +278,7 @@
       if (frame.isEval()) {
         fileName = frame.getScriptNameOrSourceURL();
         if (!fileName) {
-          fileLocation = "" + (frame.getEvalOrigin()) + ", ";
+          fileLocation = (frame.getEvalOrigin()) + ", ";
         }
       } else {
         fileName = frame.getFileName();
@@ -260,7 +287,7 @@
       line = frame.getLineNumber();
       column = frame.getColumnNumber();
       source = getSourceMapping(fileName, line, column);
-      fileLocation = source ? "" + fileName + ":" + source[0] + ":" + source[1] : "" + fileName + ":" + line + ":" + column;
+      fileLocation = source ? fileName + ":" + source[0] + ":" + source[1] : fileName + ":" + line + ":" + column;
     }
     functionName = frame.getFunctionName();
     isConstructor = frame.isConstructor();
@@ -271,19 +298,19 @@
       if (functionName) {
         tp = as = '';
         if (typeName && functionName.indexOf(typeName)) {
-          tp = "" + typeName + ".";
+          tp = typeName + ".";
         }
         if (methodName && functionName.indexOf("." + methodName) !== functionName.length - methodName.length - 1) {
           as = " [as " + methodName + "]";
         }
         return "" + tp + functionName + as + " (" + fileLocation + ")";
       } else {
-        return "" + typeName + "." + (methodName || '<anonymous>') + " (" + fileLocation + ")";
+        return typeName + "." + (methodName || '<anonymous>') + " (" + fileLocation + ")";
       }
     } else if (isConstructor) {
       return "new " + (functionName || '<anonymous>') + " (" + fileLocation + ")";
     } else if (functionName) {
-      return "" + functionName + " (" + fileLocation + ")";
+      return functionName + " (" + fileLocation + ")";
     } else {
       return fileLocation;
     }
@@ -292,11 +319,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 +331,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 +345,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 +356,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);

lib/coffee-script/command.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.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; };
@@ -13,8 +13,6 @@
 
   CoffeeScript = require('./coffee-script');
 
-  mkdirp = require('mkdirp');
-
   _ref = require('child_process'), spawn = _ref.spawn, exec = _ref.exec;
 
   EventEmitter = require('events').EventEmitter;
@@ -37,7 +35,7 @@
 
   BANNER = 'Usage: coffee [options] path/to/script.coffee -- [args]\n\nIf called without options, `coffee` will run your script.';
 
-  SWITCHES = [['-b', '--bare', 'compile without a top-level function wrapper'], ['-c', '--compile', 'compile to JavaScript and save as .js files'], ['-e', '--eval', 'pass a string from the command line as input'], ['-h', '--help', 'display this help message'], ['-i', '--interactive', 'run an interactive CoffeeScript REPL'], ['-j', '--join [FILE]', 'concatenate the source CoffeeScript before compiling'], ['-m', '--map', 'generate source map and save as .map files'], ['-n', '--nodes', 'print out the parse tree that the parser produces'], ['--nodejs [ARGS]', 'pass options directly to the "node" binary'], ['--no-header', 'suppress the "Generated by" header'], ['-o', '--output [DIR]', 'set the output directory for compiled JavaScript'], ['-p', '--print', 'print out the compiled JavaScript'], ['-s', '--stdio', 'listen for and compile scripts over stdio'], ['-l', '--literate', 'treat stdio as literate style coffee-script'], ['-t', '--tokens', 'print out the tokens that the lexer/rewriter produce'], ['-v', '--version', 'display the version number'], ['-w', '--watch', 'watch scripts for changes and rerun commands']];
+  SWITCHES = [['-b', '--bare', 'compile without a top-level function wrapper'], ['-c', '--compile', 'compile to JavaScript and save as .js files'], ['-e', '--eval', 'pass a string from the command line as input'], ['-h', '--help', 'display this help message'], ['-i', '--interactive', 'run an interactive CoffeeScript REPL'], ['-j', '--join [FILE]', 'concatenate the source CoffeeScript before compiling'], ['-m', '--map', 'generate source map and save as .js.map files'], ['-n', '--nodes', 'print out the parse tree that the parser produces'], ['--nodejs [ARGS]', 'pass options directly to the "node" binary'], ['--no-header', 'suppress the "Generated by" header'], ['-o', '--output [DIR]', 'set the output directory for compiled JavaScript'], ['-p', '--print', 'print out the compiled JavaScript'], ['-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 +84,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 +404,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);
     }
   };
@@ -439,12 +438,33 @@
     return path.join(dir, basename + extension);
   };
 
+  mkdirp = function(dir, fn) {
+    var mkdirs, mode;
+    mode = 0x1ff & ~process.umask();
+    return (mkdirs = function(p, fn) {
+      return fs.exists(p, function(exists) {
+        if (exists) {
+          return fn();
+        } else {
+          return mkdirs(path.dirname(p), function() {
+            return fs.mkdir(p, mode, function(err) {
+              if (err) {
+                return fn(err);
+              }
+              return fn();
+            });
+          });
+        }
+      });
+    })(dir, fn);
+  };
+
   writeJs = function(base, sourcePath, js, jsPath, generatedSourceMap) {
     var compile, jsDir, sourceMapPath;
     if (generatedSourceMap == null) {
       generatedSourceMap = null;
     }
-    sourceMapPath = outputPath(sourcePath, base, ".map");
+    sourceMapPath = outputPath(sourcePath, base, ".js.map");
     jsDir = path.dirname(jsPath);
     compile = function() {
       if (opts.compile) {
@@ -452,11 +472,12 @@
           js = ' ';
         }
         if (generatedSourceMap) {
-          js = "" + js + "\n//# sourceMappingURL=" + (helpers.baseFileName(sourceMapPath, false, useWinPathSep)) + "\n";
+          js = js + "\n//# sourceMappingURL=" + (helpers.baseFileName(sourceMapPath, false, useWinPathSep)) + "\n";
         }
         fs.writeFile(jsPath, js, function(err) {
           if (err) {
-            return printLine(err.message);
+            printLine(err.message);
+            return process.exit(1);
           } else if (opts.compile && opts.watch) {
             return timeLog("compiled " + sourcePath);
           }
@@ -465,7 +486,8 @@
       if (generatedSourceMap) {
         return fs.writeFile(sourceMapPath, generatedSourceMap, function(err) {
           if (err) {
-            return printLine("Could not write source map: " + err.message);
+            printLine("Could not write source map: " + err.message);
+            return process.exit(1);
           }
         });
       }
@@ -484,7 +506,7 @@
   };
 
   timeLog = function(message) {
-    return console.log("" + ((new Date).toLocaleTimeString()) + " - " + message);
+    return console.log(((new Date).toLocaleTimeString()) + " - " + message);
   };
 
   printTokens = function(tokens) {

lib/coffee-script/grammar.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 (function() {
   var Parser, alt, alternatives, grammar, name, o, operators, token, tokens, unwrap;
 
@@ -421,6 +421,11 @@
         return {
           source: LOC(2)(new Value($2))
         };
+      }), o('FOR Range BY Expression', function() {
+        return {
+          source: LOC(2)(new Value($2)),
+          step: $4
+        };
       }), o('ForStart ForSource', function() {
         $2.own = $1.own;
         $2.name = $1[0];
@@ -552,6 +557,12 @@
         return new Op('+', $2);
       }), {
         prec: 'UNARY_MATH'
+      }), o('YIELD Statement', function() {
+        return new Op($1, $2);
+      }), o('YIELD Expression', function() {
+        return new Op($1, $2);
+      }), o('YIELD FROM Expression', function() {
+        return new Op($1.concat($2), $3);
       }), o('-- SimpleAssignable', function() {
         return new Op('--', $2);
       }), o('++ SimpleAssignable', function() {
@@ -594,7 +605,7 @@
     ]
   };
 
-  operators = [['left', '.', '?.', '::', '?::'], ['left', 'CALL_START', 'CALL_END'], ['nonassoc', '++', '--'], ['left', '?'], ['right', 'UNARY'], ['right', '**'], ['right', 'UNARY_MATH'], ['left', 'MATH'], ['left', '+', '-'], ['left', 'SHIFT'], ['left', 'RELATION'], ['left', 'COMPARE'], ['left', 'LOGIC'], ['nonassoc', 'INDENT', 'OUTDENT'], ['right', '=', ':', 'COMPOUND_ASSIGN', 'RETURN', 'THROW', 'EXTENDS'], ['right', 'FORIN', 'FOROF', 'BY', 'WHEN'], ['right', 'IF', 'ELSE', 'FOR', 'WHILE', 'UNTIL', 'LOOP', 'SUPER', 'CLASS'], ['left', 'POST_IF']];
+  operators = [['left', '.', '?.', '::', '?::'], ['left', 'CALL_START', 'CALL_END'], ['nonassoc', '++', '--'], ['left', '?'], ['right', 'UNARY'], ['right', '**'], ['right', 'UNARY_MATH'], ['left', 'MATH'], ['left', '+', '-'], ['left', 'SHIFT'], ['left', 'RELATION'], ['left', 'COMPARE'], ['left', 'LOGIC'], ['nonassoc', 'INDENT', 'OUTDENT'], ['right', 'YIELD'], ['right', '=', ':', 'COMPOUND_ASSIGN', 'RETURN', 'THROW', 'EXTENDS'], ['right', 'FORIN', 'FOROF', 'BY', 'WHEN'], ['right', 'IF', 'ELSE', 'FOR', 'WHILE', 'UNTIL', 'LOOP', 'SUPER', 'CLASS'], ['left', 'POST_IF']];
 
   tokens = [];
 

lib/coffee-script/helpers.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 (function() {
   var buildLocationData, extend, flatten, last, repeat, syntaxErrorToString, _ref;
 
@@ -150,7 +150,7 @@
       locationData = obj;
     }
     if (locationData) {
-      return ("" + (locationData.first_line + 1) + ":" + (locationData.first_column + 1) + "-") + ("" + (locationData.last_line + 1) + ":" + (locationData.last_column + 1));
+      return ((locationData.first_line + 1) + ":" + (locationData.first_column + 1) + "-") + ((locationData.last_line + 1) + ":" + (locationData.last_column + 1));
     } else {
       return "No location data";
     }
@@ -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;
     }
@@ -231,7 +231,7 @@
       codeLine = codeLine.slice(0, start) + colorize(codeLine.slice(start, end)) + codeLine.slice(end);
       marker = colorize(marker);
     }
-    return "" + filename + ":" + (first_line + 1) + ":" + (first_column + 1) + ": error: " + this.message + "\n" + codeLine + "\n" + marker;
+    return filename + ":" + (first_line + 1) + ":" + (first_column + 1) + ": error: " + this.message + "\n" + codeLine + "\n" + marker;
   };
 
   exports.nameWhitespaceCharacter = function(string) {

lib/coffee-script/index.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 (function() {
   var key, val, _ref;
 

lib/coffee-script/lexer.js

@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.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,
+  var BOM, BOOL, CALLABLE, CODE, COFFEE_ALIASES, COFFEE_ALIAS_MAP, COFFEE_KEYWORDS, COMMENT, COMPARE, COMPOUND_ASSIGN, HERECOMMENT_ILLEGAL, HEREDOC_DOUBLE, HEREDOC_INDENT, HEREDOC_SINGLE, HEREGEX, HEREGEX_OMIT, IDENTIFIER, INDENTABLE_CLOSERS, INDEXABLE, INVERSES, JSTOKEN, JS_FORBIDDEN, JS_KEYWORDS, LEADING_BLANK_LINE, LINE_BREAK, LINE_CONTINUER, LOGIC, Lexer, MATH, MULTILINER, MULTI_DENT, NOT_REGEX, NUMBER, OCTAL_ESCAPE, OPERATOR, POSSIBLY_DIVISION, REGEX, REGEX_FLAGS, REGEX_ILLEGAL, RELATION, RESERVED, Rewriter, SHIFT, STRICT_PROSCRIBED, STRING_DOUBLE, STRING_OMIT, STRING_SINGLE, STRING_START, TRAILING_BLANK_LINE, TRAILING_SPACES, UNARY, UNARY_MATH, VALID_FLAGS, 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; };
 
   _ref = require('./rewriter'), Rewriter = _ref.Rewriter, INVERSES = _ref.INVERSES;
@@ -11,7 +11,7 @@
     function Lexer() {}
 
     Lexer.prototype.tokenize = function(code, opts) {
-      var consumed, i, tag, _ref2;
+      var consumed, end, i, _ref2;
       if (opts == null) {
         opts = {};
       }
@@ -28,13 +28,19 @@
       code = this.clean(code);
       i = 0;
       while (this.chunk = code.slice(i)) {
-        consumed = this.identifierToken() || this.commentToken() || this.whitespaceToken() || this.lineToken() || this.heredocToken() || this.stringToken() || this.numberToken() || this.regexToken() || this.jsToken() || this.literalToken();
+        consumed = this.identifierToken() || this.commentToken() || this.whitespaceToken() || this.lineToken() || this.stringToken() || this.numberToken() || this.regexToken() || this.jsToken() || this.literalToken();
         _ref2 = this.getLineAndColumnFromChunk(consumed), this.chunkLine = _ref2[0], this.chunkColumn = _ref2[1];
         i += consumed;
+        if (opts.untilBalanced && this.ends.length === 0) {
+          return {
+            tokens: this.tokens,
+            index: i
+          };
+        }
       }
       this.closeIndentation();
-      if (tag = this.ends.pop()) {
-        this.error("missing " + tag);
+      if (end = this.ends.pop()) {
+        throwSyntaxError("missing " + end.tag, end.origin[2]);
       }
       if (opts.rewrite === false) {
         return this.tokens;
@@ -69,6 +75,10 @@
         this.token('OWN', id);
         return id.length;
       }
+      if (id === 'from' && this.tag() === 'YIELD') {
+        this.token('FROM', id);
+        return id.length;
+      }
       forcedIdentifier = colon || (prev = last(this.tokens)) && (((_ref2 = prev[0]) === '.' || _ref2 === '?.' || _ref2 === '::' || _ref2 === '?::') || !prev.spaced && prev[0] === '@');
       tag = 'IDENTIFIER';
       if (!forcedIdentifier && (__indexOf.call(JS_KEYWORDS, id) >= 0 || __indexOf.call(COFFEE_KEYWORDS, id) >= 0)) {
@@ -129,6 +139,7 @@
         })();
       }
       tagToken = this.token(tag, id, 0, idLength);
+      tagToken.variable = !forcedIdentifier;
       if (poppedToken) {
         _ref4 = [poppedToken[2].first_line, poppedToken[2].first_column], tagToken[2].first_line = _ref4[0], tagToken[2].first_column = _ref4[1];
       }
@@ -166,53 +177,87 @@
     };
 
     Lexer.prototype.stringToken = function() {
-      var octalEsc, quote, string, trimmed;
-      switch (quote = this.chunk.charAt(0)) {
-        case "'":
-          string = SIMPLESTR.exec(this.chunk)[0];
-          break;
-        case '"':
-          string = this.balancedString(this.chunk, '"');
-      }
-      if (!string) {
+      var $, attempt, doc, end, heredoc, i, indent, indentRegex, match, quote, regex, start, token, tokens, _ref2, _ref3;
+      quote = (STRING_START.exec(this.chunk) || [])[0];
+      if (!quote) {
         return 0;
       }
-      trimmed = this.removeNewlines(string.slice(1, -1));
-      if (quote === '"' && 0 < string.indexOf('#{', 1)) {
-        this.interpolateString(trimmed, {
-          strOffset: 1,
-          lexedLength: string.length
-        });
+      regex = (function() {
+        switch (quote) {
+          case "'":
+            return STRING_SINGLE;
+          case '"':
+            return STRING_DOUBLE;
+          case "'''":
+            return HEREDOC_SINGLE;
+          case '"""':
+            return HEREDOC_DOUBLE;
+        }
+      })();
+      heredoc = quote.length === 3;
+      start = quote.length;
+      _ref2 = this.matchWithInterpolations(this.chunk.slice(start), regex, quote, start), tokens = _ref2.tokens, end = _ref2.index;
+      $ = tokens.length - 1;
+      if (heredoc) {
+        indent = null;
+        doc = ((function() {
+          var _i, _len, _results;
+          _results = [];
+          for (i = _i = 0, _len = tokens.length; _i < _len; i = ++_i) {
+            token = tokens[i];
+            if (token[0] === 'NEOSTRING') {
+              _results.push(token[1]);
+            }
+          }
+          return _results;
+        })()).join('#{}');
+        while (match = HEREDOC_INDENT.exec(doc)) {
+          attempt = match[1];
+          if (indent === null || (0 < (_ref3 = attempt.length) && _ref3 < indent.length)) {
+            indent = attempt;
+          }
+        }
+        if (indent) {
+          indentRegex = RegExp("^" + indent, "gm");
+        }
+        this.mergeInterpolationTokens(tokens, {
+          quote: quote[0],
+          start: start,
+          end: end
+        }, (function(_this) {
+          return function(value, i) {
+            value = _this.formatString(value);
+            if (i === 0) {
+              value = value.replace(LEADING_BLANK_LINE, '');
+            }
+            if (i === $) {
+              value = value.replace(TRAILING_BLANK_LINE, '');
+            }
+            value = value.replace(indentRegex, '');
+            value = value.replace(MULTILINER, '\\n');
+            return value;
+          };
+        })(this));
       } else {
-        this.token('STRING', quote + this.escapeLines(trimmed) + quote, 0, string.length);
+        this.mergeInterpolationTokens(tokens, {
+          quote: quote,
+          start: start,
+          end: end
+        }, (function(_this) {
+          return function(value, i) {
+            value = _this.formatString(value);
+            value = value.replace(STRING_OMIT, function(match, offset) {
+              if ((i === 0 && offset === 0) || (i === $ && offset + match.length === value.length)) {
+                return '';
+              } else {
+                return ' ';
+              }
+            });
+            return value;
+          };
+        })(this));
       }
-      if (octalEsc = /^(?:\\.|[^\\])*\\(?:0[0-7]|[1-7])/.test(string)) {
-        this.error("octal escape sequences " + string + " are not allowed");
-      }
-      return string.length;
-    };
-
-    Lexer.prototype.heredocToken = function() {
-      var doc, heredoc, match, quote;
-      if (!(match = HEREDOC.exec(this.chunk))) {
-        return 0;
-      }
-      heredoc = match[0];
-      quote = heredoc.charAt(0);
-      doc = this.sanitizeHeredoc(match[2], {
-        quote: quote,
-        indent: null
-      });
-      if (quote === '"' && 0 <= doc.indexOf('#{')) {
-        this.interpolateString(doc, {
-          heredoc: true,
-          strOffset: 3,
-          lexedLength: heredoc.length
-        });
-      } else {
-        this.token('STRING', this.makeString(doc, quote, true), 0, heredoc.length);
-      }
-      return heredoc.length;
+      return end;
     };
 
     Lexer.prototype.commentToken = function() {
@@ -222,10 +267,13 @@
       }
       comment = match[0], here = match[1];
       if (here) {
-        this.token('HERECOMMENT', this.sanitizeHeredoc(here, {
-          herecomment: true,
-          indent: repeat(' ', this.indent)
-        }), 0, comment.length);
+        if (match = HERECOMMENT_ILLEGAL.exec(comment)) {
+          this.error("block comments cannot contain " + match[0], match.index);
+        }
+        if (here.indexOf('\n') >= 0) {
+          here = here.replace(RegExp("\\n" + (repeat(' ', this.indent)), "g"), '\n');
+        }
+        this.token('HERECOMMENT', here, 0, comment.length);
       }
       return comment.length;
     };
@@ -240,85 +288,67 @@
     };
 
     Lexer.prototype.regexToken = function() {
-      var flags, length, match, prev, regex, _ref2, _ref3;
-      if (this.chunk.charAt(0) !== '/') {
-        return 0;
-      }
-      if (length = this.heregexToken()) {
-        return length;
-      }
-      prev = last(this.tokens);
-      if (prev && (_ref2 = prev[0], __indexOf.call((prev.spaced ? NOT_REGEX : NOT_SPACED_REGEX), _ref2) >= 0)) {
-        return 0;
-      }
-      if (!(match = REGEX.exec(this.chunk))) {
-        return 0;
-      }
-      _ref3 = match, match = _ref3[0], regex = _ref3[1], flags = _ref3[2];
-      if (regex === '//') {
-        return 0;
-      }
-      if (regex.slice(0, 2) === '/*') {
-        this.error('regular expressions cannot begin with `*`');
-      }
-      this.token('REGEX', "" + regex + flags, 0, match.length);
-      return match.length;
-    };
-
-    Lexer.prototype.heregexToken = function() {
-      var body, flags, flagsOffset, heregex, match, plusToken, prev, re, tag, token, tokens, value, _i, _len, _ref2, _ref3, _ref4;
-      if (!(match = HEREGEX.exec(this.chunk))) {
-        return 0;
-      }
-      heregex = match[0], body = match[1], flags = match[2];
-      if (0 > body.indexOf('#{')) {
-        re = this.escapeLines(body.replace(HEREGEX_OMIT, '$1$2').replace(/\//g, '\\/'), true);
-        if (re.match(/^\*/)) {
-          this.error('regular expressions cannot begin with `*`');
-        }
-        this.token('REGEX', "/" + (re || '(?:)') + "/" + flags, 0, heregex.length);
-        return heregex.length;
-      }
-      this.token('IDENTIFIER', 'RegExp', 0, 0);
-      this.token('CALL_START', '(', 0, 0);
-      tokens = [];
-      _ref2 = this.interpolateString(body, {
-        regex: true
-      });
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        token = _ref2[_i];
-        tag = token[0], value = token[1];
-        if (tag === 'TOKENS') {
-          tokens.push.apply(tokens, value);
-        } else if (tag === 'NEOSTRING') {
-          if (!(value = value.replace(HEREGEX_OMIT, '$1$2'))) {
-            continue;
+      var closed, end, flags, index, match, prev, re, regex, rparen, tokens, _ref2, _ref3, _ref4;
+      switch (false) {
+        case !(match = REGEX_ILLEGAL.exec(this.chunk)):
+          this.error("regular expressions cannot begin with " + match[2], match.index + match[1].length);
+          break;
+        case this.chunk.slice(0, 3) !== '///':
+          _ref2 = this.matchWithInterpolations(this.chunk.slice(3), HEREGEX, '///', 3), tokens = _ref2.tokens, index = _ref2.index;
+          break;
+        case !(match = REGEX.exec(this.chunk)):
+          regex = match[0], closed = match[1];
+          index = regex.length;
+          prev = last(this.tokens);
+          if (prev) {
+            if (prev.spaced && (_ref3 = prev[0], __indexOf.call(CALLABLE, _ref3) >= 0) && !prev.stringEnd && !prev.regexEnd) {
+              if (!closed || POSSIBLY_DIVISION.test(regex)) {
+                return 0;
+              }
+            } else if (_ref4 = prev[0], __indexOf.call(NOT_REGEX, _ref4) >= 0) {
+              return 0;
+            }
           }
-          value = value.replace(/\\/g, '\\\\');
-          token[0] = 'STRING';
-          token[1] = this.makeString(value, '"', true);
-          tokens.push(token);
-        } else {
-          this.error("Unexpected " + tag);
-        }
-        prev = last(this.tokens);
-        plusToken = ['+', '+'];
-        plusToken[2] = prev[2];
-        tokens.push(plusToken);
+          if (!closed) {
+            this.error('missing / (unclosed regex)');
+          }
+          break;
+        default:
+          return 0;
       }
-      tokens.pop();
-      if (((_ref3 = tokens[0]) != null ? _ref3[0] : void 0) !== 'STRING') {
-        this.token('STRING', '""', 0, 0);
-        this.token('+', '+', 0, 0);
+      flags = REGEX_FLAGS.exec(this.chunk.slice(index))[0];
+      end = index + flags.length;
+      switch (false) {
+        case !!VALID_FLAGS.test(flags):
+          this.error("invalid regular expression flags " + flags, index);
+          break;
+        case !regex:
+          this.token('REGEX', "" + regex + flags);
+          break;
+        case tokens.length !== 1:
+          re = this.formatHeregex(tokens[0][1]).replace(/\//g, '\\/');
+          this.token('REGEX', "/" + (re || '(?:)') + "/" + flags);
+          break;
+        default:
+          this.token('IDENTIFIER', 'RegExp', 0, 0);
+          this.token('CALL_START', '(', 0, 0);
+          this.mergeInterpolationTokens(tokens, {
+            quote: '"',
+            start: 3,
+            end: end
+          }, (function(_this) {
+            return function(value) {
+              return _this.formatHeregex(value).replace(/\\/g, '\\\\');
+            };
+          })(this));
+          if (flags) {
+            this.token(',', ',', index, 0);
+            this.token('STRING', '"' + flags + '"', index, flags.length);
+          }
+          rparen = this.token(')', ')', end, 0);
+          rparen.regexEnd = true;
       }
-      (_ref4 = this.tokens).push.apply(_ref4, tokens);
-      if (flags) {
-        flagsOffset = heregex.lastIndexOf(flags);
-        this.token(',', ',', flagsOffset, 0);
-        this.token('STRING', '"' + flags + '"', flagsOffset, flags.length);
-      }
-      this.token(')', ')', heregex.length - 1, 0);
-      return heregex.length;
+      return end;
     };
 
     Lexer.prototype.lineToken = function() {
@@ -351,7 +381,9 @@
         diff = size - this.indent + this.outdebt;
         this.token('INDENT', diff, indent.length - size, size);
         this.indents.push(diff);
-        this.ends.push('OUTDENT');
+        this.ends.push({
+          tag: 'OUTDENT'
+        });
         this.outdebt = this.indebt = 0;
         this.indent = size;
       } else if (size < this.baseIndent) {
@@ -435,7 +467,7 @@
     };
 
     Lexer.prototype.literalToken = function() {
-      var match, prev, tag, value, _ref2, _ref3, _ref4, _ref5;
+      var match, prev, tag, token, value, _ref2, _ref3, _ref4, _ref5;
       if (match = OPERATOR.exec(this.chunk)) {
         value = match[0];
         if (CODE.test(value)) {
@@ -474,7 +506,7 @@
       } else if (__indexOf.call(LOGIC, value) >= 0 || value === '?' && (prev != null ? prev.spaced : void 0)) {
         tag = 'LOGIC';
       } else if (prev && !prev.spaced) {
-        if (value === '(' && (_ref4 = prev[0], __indexOf.call(CALLABLE, _ref4) >= 0)) {
+        if (value === '(' && (_ref4 = prev[0], __indexOf.call(CALLABLE, _ref4) >= 0) && !prev.stringEnd && !prev.regexEnd) {
           if (prev[0] === '?') {
             prev[0] = 'FUNC_EXIST';
           }
@@ -487,48 +519,25 @@
           }
         }
       }
+      token = this.makeToken(tag, value);
       switch (value) {
         case '(':
         case '{':
         case '[':
-          this.ends.push(INVERSES[value]);
+          this.ends.push({
+            tag: INVERSES[value],
+            origin: token
+          });
           break;
         case ')':
         case '}':
         case ']':
           this.pair(value);
       }
-      this.token(tag, value);
+      this.tokens.push(token);
       return value.length;
     };
 
-    Lexer.prototype.sanitizeHeredoc = function(doc, options) {
-      var attempt, herecomment, indent, match, _ref2;
-      indent = options.indent, herecomment = options.herecomment;
-      if (herecomment) {
-        if (HEREDOC_ILLEGAL.test(doc)) {
-          this.error("block comment cannot contain \"*/\", starting");
-        }
-        if (doc.indexOf('\n') < 0) {
-          return doc;
-        }
-      } else {
-        while (match = HEREDOC_INDENT.exec(doc)) {
-          attempt = match[1];
-          if (indent === null || (0 < (_ref2 = attempt.length) && _ref2 < indent.length)) {
-            indent = attempt;
-          }
-        }
-      }
-      if (indent) {
-        doc = doc.replace(RegExp("\\n" + indent, "g"), '\n');
-      }
-      if (!herecomment) {
-        doc = doc.replace(/^\n/, '');
-      }
-      return doc;
-    };
-
     Lexer.prototype.tagParameters = function() {
       var i, stack, tok, tokens;
       if (this.tag() !== ')') {
@@ -562,113 +571,82 @@
       return this.outdentToken(this.indent);
     };
 
-    Lexer.prototype.balancedString = function(str, end) {
-      var continueCount, i, letter, match, prev, stack, _i, _ref2;
-      continueCount = 0;
-      stack = [end];
-      for (i = _i = 1, _ref2 = str.length; 1 <= _ref2 ? _i < _ref2 : _i > _ref2; i = 1 <= _ref2 ? ++_i : --_i) {
-        if (continueCount) {
-          --continueCount;
-          continue;
+    Lexer.prototype.matchWithInterpolations = function(str, regex, end, offsetInChunk) {
+      var close, column, index, line, nested, open, strPart, tokens, _ref2, _ref3, _ref4;
+      tokens = [];
+      while (true) {
+        strPart = regex.exec(str)[0];
+        tokens.push(this.makeToken('NEOSTRING', strPart, offsetInChunk));
+        str = str.slice(strPart.length);
+        offsetInChunk += strPart.length;
+        if (str.slice(0, 2) !== '#{') {
+          break;
         }
-        switch (letter = str.charAt(i)) {
-          case '\\':
-            ++continueCount;
-            continue;
-          case end:
-            stack.pop();
-            if (!stack.length) {
-              return str.slice(0, +i + 1 || 9e9);
-            }
-            end = stack[stack.length - 1];
-            continue;
+        _ref2 = this.getLineAndColumnFromChunk(offsetInChunk + 1), line = _ref2[0], column = _ref2[1];
+        _ref3 = new Lexer().tokenize(str.slice(1), {
+          line: line,
+          column: column,
+          untilBalanced: true
+        }), nested = _ref3.tokens, index = _ref3.index;
+        index += 1;
+        open = nested[0], close = nested[nested.length - 1];
+        open[0] = open[1] = '(';
+        close[0] = close[1] = ')';
+        close.origin = ['', 'end of interpolation', close[2]];
+        if (((_ref4 = nested[1]) != null ? _ref4[0] : void 0) === 'TERMINATOR') {
+          nested.splice(1, 1);
         }
-        if (end === '}' && (letter === '"' || letter === "'")) {
-          stack.push(end = letter);
-        } else if (end === '}' && letter === '/' && (match = HEREGEX.exec(str.slice(i)) || REGEX.exec(str.slice(i)))) {
-          continueCount += match[0].length - 1;
-        } else if (end === '}' && letter === '{') {
-          stack.push(end = '}');
-        } else if (end === '"' && prev === '#' && letter === '{') {
-          stack.push(end = '}');
-        }
-        prev = letter;
+        tokens.push(['TOKENS', nested]);
+        str = str.slice(index);
+        offsetInChunk += index;
       }
-      return this.error("missing " + (stack.pop()) + ", starting");
+      if (str.slice(0, end.length) !== end) {
+        this.error("missing " + end);
+      }
+      return {
+        tokens: tokens,
+        index: offsetInChunk + end.length
+      };
     };
 
-    Lexer.prototype.interpolateString = function(str, options) {
-      var column, errorToken, expr, heredoc, i, inner, interpolated, len, letter, lexedLength, line, locationToken, nested, offsetInChunk, pi, plusToken, popped, regex, rparen, strOffset, tag, token, tokens, value, _i, _len, _ref2, _ref3, _ref4;
-      if (options == null) {
-        options = {};
-      }
-      heredoc = options.heredoc, regex = options.regex, offsetInChunk = options.offsetInChunk, strOffset = options.strOffset, lexedLength = options.lexedLength;
-      offsetInChunk || (offsetInChunk = 0);
-      strOffset || (strOffset = 0);
-      lexedLength || (lexedLength = str.length);
-      tokens = [];
-      pi = 0;
-      i = -1;
-      while (letter = str.charAt(i += 1)) {
-        if (letter === '\\') {
-          i += 1;
-          continue;
-        }
-        if (!(letter === '#' && str.charAt(i + 1) === '{' && (expr = this.balancedString(str.slice(i + 1), '}')))) {
-          continue;
-        }
-        if (pi < i) {
-          tokens.push(this.makeToken('NEOSTRING', str.slice(pi, i), strOffset + pi));
-        }
-        if (!errorToken) {
-          errorToken = this.makeToken('', 'string interpolation', offsetInChunk + i + 1, 2);
-        }
-        inner = expr.slice(1, -1);
-        if (inner.length) {
-          _ref2 = this.getLineAndColumnFromChunk(strOffset + i + 1), line = _ref2[0], column = _ref2[1];
-          nested = new Lexer().tokenize(inner, {
-            line: line,
-            column: column,
-            rewrite: false
-          });
-          popped = nested.pop();
-          if (((_ref3 = nested[0]) != null ? _ref3[0] : void 0) === 'TERMINATOR') {
-            popped = nested.shift();
-          }
-          if (len = nested.length) {
-            if (len > 1) {
-              nested.unshift(this.makeToken('(', '(', strOffset + i + 1, 0));
-              nested.push(this.makeToken(')', ')', strOffset + i + 1 + inner.length, 0));
-            }
-            tokens.push(['TOKENS', nested]);
-          }
-        }
-        i += expr.length;
-        pi = i + 1;
-      }
-      if ((i > pi && pi < str.length)) {
-        tokens.push(this.makeToken('NEOSTRING', str.slice(pi), strOffset + pi));
-      }
-      if (regex) {
-        return tokens;
-      }
-      if (!tokens.length) {
-        return this.token('STRING', '""', offsetInChunk, lexedLength);
-      }
-      if (tokens[0][0] !== 'NEOSTRING') {
-        tokens.unshift(this.makeToken('NEOSTRING', '', offsetInChunk));
-      }
+    Lexer.prototype.mergeInterpolationTokens = function(tokens, _arg, fn) {
+      var converted, end, errorToken, firstEmptyStringIndex, firstIndex, i, interpolated, locationToken, plusToken, quote, rparen, start, tag, token, tokensToPush, value, _i, _len, _ref2;
+      quote = _arg.quote, start = _arg.start, end = _arg.end;
       if (interpolated = tokens.length > 1) {
-        this.token('(', '(', offsetInChunk, 0, errorToken);
+        errorToken = this.makeToken('', 'interpolation', start + tokens[0][1].length, 2);
+        this.token('(', '(', 0, 0, errorToken);
       }
+      firstIndex = this.tokens.length;
       for (i = _i = 0, _len = tokens.length; _i < _len; i = ++_i) {
         token = tokens[i];
         tag = token[0], value = token[1];
-        if (i) {
-          if (i) {
-            plusToken = this.token('+', '+');
-          }
-          locationToken = tag === 'TOKENS' ? value[0] : token;
+        switch (tag) {
+          case 'TOKENS':
+            if (value.length === 2) {
+              continue;
+            }
+            locationToken = value[0];
+            tokensToPush = value;
+            break;
+          case 'NEOSTRING':
+            converted = fn(token[1], i);
+            if (converted.length === 0) {
+              if (i === 0) {
+                firstEmptyStringIndex = this.tokens.length;
+              } else {
+                continue;
+              }
+            }
+            if (i === 2 && (firstEmptyStringIndex != null)) {
+              this.tokens.splice(firstEmptyStringIndex, 2);
+            }
+            token[0] = 'STRING';
+            token[1] = this.makeString(converted, quote);
+            locationToken = token;
+            tokensToPush = [token];
+        }
+        if (this.tokens.length > firstIndex) {
+          plusToken = this.token('+', '+');
           plusToken[2] = {
             first_line: locationToken[2].first_line,
             first_column: locationToken[2].first_column,
@@ -676,27 +654,17 @@
             last_column: locationToken[2].first_column
           };
         }
-        if (tag === 'TOKENS') {
-          (_ref4 = this.tokens).push.apply(_ref4, value);
-        } else if (tag === 'NEOSTRING') {
-          token[0] = 'STRING';
-          token[1] = this.makeString(value, '"', heredoc);
-          this.tokens.push(token);
-        } else {
-          this.error("Unexpected " + tag);
-        }
+        (_ref2 = this.tokens).push.apply(_ref2, tokensToPush);
       }
       if (interpolated) {
-        rparen = this.makeToken(')', ')', offsetInChunk + lexedLength, 0);
-        rparen.stringEnd = true;
-        this.tokens.push(rparen);
+        rparen = this.token(')', ')', end, 0);
+        return rparen.stringEnd = true;
       }
-      return tokens;
     };
 
     Lexer.prototype.pair = function(tag) {
-      var wanted;
-      if (tag !== (wanted = last(this.ends))) {
+      var wanted, _ref2;
+      if (tag !== (wanted = (_ref2 = last(this.ends)) != null ? _ref2.tag : void 0)) {
         if ('OUTDENT' !== wanted) {
           this.error("unmatched " + tag);
         }
@@ -765,29 +733,25 @@
 
     Lexer.prototype.unfinished = function() {
       var _ref2;
-      return LINE_CONTINUER.test(this.chunk) || ((_ref2 = this.tag()) === '\\' || _ref2 === '.' || _ref2 === '?.' || _ref2 === '?::' || _ref2 === 'UNARY' || _ref2 === 'MATH' || _ref2 === 'UNARY_MATH' || _ref2 === '+' || _ref2 === '-' || _ref2 === '**' || _ref2 === 'SHIFT' || _ref2 === 'RELATION' || _ref2 === 'COMPARE' || _ref2 === 'LOGIC' || _ref2 === 'THROW' || _ref2 === 'EXTENDS');
+      return LINE_CONTINUER.test(this.chunk) || ((_ref2 = this.tag()) === '\\' || _ref2 === '.' || _ref2 === '?.' || _ref2 === '?::' || _ref2 === 'UNARY' || _ref2 === 'MATH' || _ref2 === 'UNARY_MATH' || _ref2 === '+' || _ref2 === '-' || _ref2 === 'YIELD' || _ref2 === '**' || _ref2 === 'SHIFT' || _ref2 === 'RELATION' || _ref2 === 'COMPARE' || _ref2 === 'LOGIC' || _ref2 === 'THROW' || _ref2 === 'EXTENDS');
     };
 
-    Lexer.prototype.removeNewlines = function(str) {
-      return str.replace(/^\s*\n\s*/, '').replace(/([^\\]|\\\\)\s*\n\s*$/, '$1');
-    };
-
-    Lexer.prototype.escapeLines = function(str, heredoc) {
-      str = str.replace(/\\[^\S\n]*(\n|\\)\s*/g, function(escaped, character) {
+    Lexer.prototype.formatString = function(str) {
+      return str.replace(/\\[^\S\n]*(\n|\\)\s*/g, function(escaped, character) {
         if (character === '\n') {
           return '';
         } else {
           return escaped;
         }
       });
-      if (heredoc) {
-        return str.replace(MULTILINER, '\\n');
-      } else {
-        return str.replace(/\s*\n\s*/g, ' ');
-      }
     };
 
-    Lexer.prototype.makeString = function(body, quote, heredoc) {
+    Lexer.prototype.formatHeregex = function(str) {
+      return str.replace(HEREGEX_OMIT, '$1$2').replace(MULTILINER, '\\n');
+    };
+
+    Lexer.prototype.makeString = function(body, quote) {
+      var match;
       if (!body) {
         return quote + quote;
       }
@@ -799,7 +763,10 @@
         }
       });
       body = body.replace(RegExp("" + quote, "g"), '\\$&');
-      return quote + this.escapeLines(body, heredoc) + quote;
+      if (match = OCTAL_ESCAPE.exec(body)) {
+        this.error("octal escape sequences are not allowed " + match[2], match.index + match[1].length + 1);
+      }
+      return quote + body + quote;
     };
 
     Lexer.prototype.error = function(message, offset) {
@@ -818,7 +785,7 @@
 
   })();
 
-  JS_KEYWORDS = ['true', 'false', 'null', 'this', 'new', 'delete', 'typeof', 'in', 'instanceof', 'return', 'throw', 'break', 'continue', 'debugger', 'if', 'else', 'switch', 'for', 'while', 'do', 'try', 'catch', 'finally', 'class', 'extends', 'super'];
+  JS_KEYWORDS = ['true', 'false', 'null', 'this', 'new', 'delete', 'typeof', 'in', 'instanceof', 'return', 'throw', 'break', 'continue', 'debugger', 'yield', 'if', 'else', 'switch', 'for', 'while', 'do', 'try', 'catch', 'finally', 'class', 'extends', 'super'];
 
   COFFEE_KEYWORDS = ['undefined', 'then', 'unless', 'until', 'loop', 'of', 'by', 'when'];
 
@@ -845,9 +812,9 @@
 
   COFFEE_KEYWORDS = COFFEE_KEYWORDS.concat(COFFEE_ALIASES);
 
-  RESERVED = ['case', 'default', 'function', 'var', 'void', 'with', 'const', 'let', 'enum', 'export', 'import', 'native', '__hasProp', '__extends', '__slice', '__bind', '__indexOf', 'implements', 'interface', 'package', 'private', 'protected', 'public', 'static', 'yield'];
+  RESERVED = ['case', 'default', 'function', 'var', 'void', 'with', 'const', 'let', 'enum', 'export', 'import', 'native', 'implements', 'interface', 'package', 'private', 'protected', 'public', 'static'];
 
-  STRICT_PROSCRIBED = ['arguments', 'eval'];
+  STRICT_PROSCRIBED = ['arguments', 'eval', 'yield*'];
 
   JS_FORBIDDEN = JS_KEYWORDS.concat(RESERVED).concat(STRICT_PROSCRIBED);
 
@@ -857,12 +824,10 @@
 
   BOM = 65279;
 
-  IDENTIFIER = /^([$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)([^\n\S]*:(?!:))?/;
+  IDENTIFIER = /^(?!\d)((?:(?!\s)[$\w\x7f-\uffff])+)([^\n\S]*:(?!:))?/;
 
   NUMBER = /^0b[01]+|^0o[0-7]+|^0x[\da-f]+|^\d*\.?\d+(?:e[+-]?\d+)?/i;
 
-  HEREDOC = /^("""|''')((?:\\[\s\S]|[^\\])*?)(?:\n[^\n\S]*)?\1/;
-
   OPERATOR = /^(?:[-=]>|[-+*\/%<>&|^!?=]=|>>>=?|([-+:])\1|([&|<>*\/%])\2=?|\?(\.|::)|\.{2,3})/;
 
   WHITESPACE = /^[^\n\S]+/;
@@ -873,24 +838,48 @@
 
   MULTI_DENT = /^(?:\n[^\n\S]*)+/;
 
-  SIMPLESTR = /^'[^\\']*(?:\\[\s\S][^\\']*)*'/;
-
   JSTOKEN = /^`[^\\`]*(?:\\.[^\\`]*)*`/;
 
-  REGEX = /^(\/(?![\s=])[^[\/\n\\]*(?:(?:\\[\s\S]|\[[^\]\n\\]*(?:\\[\s\S][^\]\n\\]*)*])[^[\/\n\\]*)*\/)([imgy]{0,4})(?!\w)/;
+  STRING_START = /^(?:'''|"""|'|")/;
 
-  HEREGEX = /^\/{3}((?:\\?[\s\S])+?)\/{3}([imgy]{0,4})(?!\w)/;
+  STRING_SINGLE = /^(?:[^\\']|\\[\s\S])*/;
+
+  STRING_DOUBLE = /^(?:[^\\"#]|\\[\s\S]|\#(?!\{))*/;
+
+  HEREDOC_SINGLE = /^(?:[^\\']|\\[\s\S]|'(?!''))*/;
+
+  HEREDOC_DOUBLE = /^(?:[^\\"#]|\\[\s\S]|"(?!"")|\#(?!\{))*/;
+
+  STRING_OMIT = /\s*\n\s*/g;
+
+  HEREDOC_INDENT = /\n+([^\n\S]*)(?=\S)/g;
+
+  REGEX = /^\/(?!\/)(?:[^[\/\n\\]|\\.|\[(?:\\.|[^\]\n\\])*])*(\/)?/;
+
+  REGEX_FLAGS = /^\w*/;
+
+  VALID_FLAGS = /^(?!.*(.).*\1)[imgy]*$/;
+
+  HEREGEX = /^(?:[^\\\/#]|\\[\s\S]|\/(?!\/\/)|\#(?!\{))*/;
 
   HEREGEX_OMIT = /((?:\\\\)+)|\\(\s|\/)|\s+(?:#.*)?/g;
 
+  REGEX_ILLEGAL = /^(\/|\/{3}\s*)(\*)/;
+
+  POSSIBLY_DIVISION = /^\/=?\s/;
+
   MULTILINER = /\n/g;
 
-  HEREDOC_INDENT = /\n+([^\n\S]*)/g;
-
-  HEREDOC_ILLEGAL = /\*\//;
+  HERECOMMENT_ILLEGAL = /\*\//;
 
   LINE_CONTINUER = /^\s*(?:,|\??\.(?![.\d])|::)/;
 
+  OCTAL_ESCAPE = /^((?:\\.|[^\\])*)(\\(?:0[0-7]|[1-7]))/;
+
+  LEADING_BLANK_LINE = /^[^\n\S]*\n/;
+
+  TRAILING_BLANK_LINE = /\n[^\n\S]*$/;
+
   TRAILING_SPACES = /\s+$/;
 
   COMPOUND_ASSIGN = ['-=', '+=', '/=', '*=', '%=', '||=', '&&=', '?=', '<<=', '>>=', '>>>=', '&=', '^=', '|=', '**=', '//=', '%%='];
@@ -911,13 +900,11 @@
 
   BOOL = ['TRUE', 'FALSE'];
 
-  NOT_REGEX = ['NUMBER', 'REGEX', 'BOOL', 'NULL', 'UNDEFINED', '++', '--'];
+  CALLABLE = ['IDENTIFIER', ')', ']', '?', '@', 'THIS', 'SUPER'];
 
-  NOT_SPACED_REGEX = NOT_REGEX.concat(')', '}', 'THIS', 'IDENTIFIER', 'STRING', ']');
+  INDEXABLE = CALLABLE.concat(['NUMBER', 'STRING', 'REGEX', 'BOOL', 'NULL', 'UNDEFINED', '}', '::']);
 
-  CALLABLE = ['IDENTIFIER', 'STRING', 'REGEX', ')', ']', '}', '?', '::', '@', 'THIS', 'SUPER'];
-
-  INDEXABLE = CALLABLE.concat('NUMBER', 'BOOL', 'NULL', 'UNDEFINED');
+  NOT_REGEX = INDEXABLE.concat(['++', '--']);
 
   LINE_BREAK = ['INDENT', 'OUTDENT', 'TERMINATOR'];
 

lib/coffee-script/nodes.js

@@ -1,8 +1,8 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.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,
     __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; },
+    __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; },
     __slice = [].slice;
 
@@ -87,7 +87,7 @@
     };
 
     Base.prototype.compileClosure = function(o) {
-      var args, argumentsNode, func, jumpNode, meth;
+      var args, argumentsNode, func, jumpNode, meth, parts;
       if (jumpNode = this.jumps()) {
         jumpNode.error('cannot use a pure statement in an expression');
       }
@@ -104,7 +104,12 @@
         }
         func = new Value(func, [new Access(new Literal(meth))]);
       }
-      return (new Call(func, args)).compileNode(o);
+      parts = (new Call(func, args)).compileNode(o);
+      if (func.isGenerator) {
+        parts.unshift(this.makeCode("(yield* "));
+        parts.push(this.makeCode(")"));
+      }
+      return parts;
     };
 
     Base.prototype.cache = function(o, level, reused) {
@@ -131,7 +136,7 @@
       var me;
       me = this.unwrapAll();
       if (res) {
-        return new Call(new Literal("" + res + ".push"), [me]);
+        return new Call(new Literal(res + ".push"), [me]);
       } else {
         return new Return(me);
       }
@@ -408,24 +413,24 @@
     };
 
     Block.prototype.compileRoot = function(o) {
-      var exp, fragments, i, name, prelude, preludeExps, rest, _i, _len, _ref2;
+      var exp, fragments, i, name, prelude, preludeExps, rest, _i, _len, _ref2, _ref3;
       o.indent = o.bare ? '' : TAB;
       o.level = LEVEL_TOP;
       this.spaced = true;
-      o.scope = new Scope(null, this, null);
-      _ref2 = o.locals || [];
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        name = _ref2[_i];
+      o.scope = new Scope(null, this, null, (_ref2 = o.referencedVars) != null ? _ref2 : []);
+      _ref3 = o.locals || [];
+      for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
+        name = _ref3[_i];
         o.scope.parameter(name);
       }
       prelude = [];
       if (!o.bare) {
         preludeExps = (function() {
-          var _j, _len1, _ref3, _results;
-          _ref3 = this.expressions;
+          var _j, _len1, _ref4, _results;
+          _ref4 = this.expressions;
           _results = [];
-          for (i = _j = 0, _len1 = _ref3.length; _j < _len1; i = ++_j) {
-            exp = _ref3[i];
+          for (i = _j = 0, _len1 = _ref4.length; _j < _len1; i = ++_j) {
+            exp = _ref4[i];
             if (!(exp.unwrap() instanceof Comment)) {
               break;
             }
@@ -480,7 +485,7 @@
           if (i) {
             fragments.push(this.makeCode('\n'));
           }
-          fragments.push(this.makeCode("" + this.tab + "var "));
+          fragments.push(this.makeCode(this.tab + "var "));
           if (declars) {
             fragments.push(this.makeCode(scope.declaredVariables().join(', ')));
           }
@@ -512,8 +517,8 @@
   exports.Literal = Literal = (function(_super) {
     __extends(Literal, _super);
 
-    function Literal(value) {
-      this.value = value;
+    function Literal(_at_value) {
+      this.value = _at_value;
     }
 
     Literal.prototype.makeReturn = function() {
@@ -612,8 +617,8 @@
       return [this.makeCode(this.val)];
     };
 
-    function Bool(val) {
-      this.val = val;
+    function Bool(_at_val) {
+      this.val = _at_val;
     }
 
     return Bool;
@@ -623,10 +628,8 @@
   exports.Return = Return = (function(_super) {
     __extends(Return, _super);
 
-    function Return(expr) {
-      if (expr && !expr.unwrap().isUndefined) {
-        this.expression = expr;
-      }
+    function Return(_at_expression) {
+      this.expression = _at_expression;
     }
 
     Return.prototype.children = ['expression'];
@@ -847,8 +850,8 @@
   exports.Comment = Comment = (function(_super) {
     __extends(Comment, _super);
 
-    function Comment(comment) {
-      this.comment = comment;
+    function Comment(_at_comment) {
+      this.comment = _at_comment;
     }
 
     Comment.prototype.isStatement = YES;
@@ -857,7 +860,7 @@
 
     Comment.prototype.compileNode = function(o, level) {
       var code, comment;
-      comment = this.comment.replace(/^(\s*)#/gm, "$1 *");
+      comment = this.comment.replace(/^(\s*)# /gm, "$1 * ");
       code = "/*" + (multident(comment, this.tab)) + (__indexOf.call(comment, '\n') >= 0 ? "\n" + this.tab : '') + " */";
       if ((level || o.level) === LEVEL_TOP) {
         code = o.indent + code;
@@ -872,9 +875,9 @@
   exports.Call = Call = (function(_super) {
     __extends(Call, _super);
 
-    function Call(variable, args, soak) {
-      this.args = args != null ? args : [];
-      this.soak = soak;
+    function Call(variable, _at_args, _at_soak) {
+      this.args = _at_args != null ? _at_args : [];
+      this.soak = _at_soak;
       this.isNew = false;
       this.isSuper = variable === 'super';
       this.variable = this.isSuper ? null : variable;
@@ -907,7 +910,7 @@
         accesses.push(new Access(new Literal(method.name)));
         return (new Value(new Literal(method.klass), accesses)).compile(o);
       } else if (method != null ? method.ctor : void 0) {
-        return "" + method.name + ".__super__.constructor";
+        return method.name + ".__super__.constructor";
       } else {
         return this.error('cannot call super outside of an instance method.');
       }
@@ -1009,7 +1012,7 @@
     Call.prototype.compileSplat = function(o, splatArgs) {
       var answer, base, fun, idt, name, ref;
       if (this.isSuper) {
-        return [].concat(this.makeCode("" + (this.superReference(o)) + ".apply(" + (this.superThis(o)) + ", "), splatArgs, this.makeCode(")"));
+        return [].concat(this.makeCode((this.superReference(o)) + ".apply(" + (this.superThis(o)) + ", "), splatArgs, this.makeCode(")"));
       }
       if (this.isNew) {
         idt = this.tab + TAB;
@@ -1043,15 +1046,15 @@
   exports.Extends = Extends = (function(_super) {
     __extends(Extends, _super);
 
-    function Extends(child, parent) {
-      this.child = child;
-      this.parent = parent;
+    function Extends(_at_child, _at_parent) {
+      this.child = _at_child;
+      this.parent = _at_parent;
     }
 
     Extends.prototype.children = ['child', 'parent'];
 
     Extends.prototype.compileToFragments = function(o) {
-      return new Call(new Value(new Literal(utility('extends'))), [this.child, this.parent]).compileToFragments(o);
+      return new Call(new Value(new Literal(utility('extends', o))), [this.child, this.parent]).compileToFragments(o);
     };
 
     return Extends;
@@ -1061,8 +1064,8 @@
   exports.Access = Access = (function(_super) {
     __extends(Access, _super);
 
-    function Access(name, tag) {
-      this.name = name;
+    function Access(_at_name, tag) {
+      this.name = _at_name;
       this.name.asKey = true;
       this.soak = tag === 'soak';
     }
@@ -1090,8 +1093,8 @@
   exports.Index = Index = (function(_super) {
     __extends(Index, _super);
 
-    function Index(index) {
-      this.index = index;
+    function Index(_at_index) {
+      this.index = _at_index;
     }
 
     Index.prototype.children = ['index'];
@@ -1113,9 +1116,9 @@
 
     Range.prototype.children = ['from', 'to'];
 
-    function Range(from, to, tag) {
-      this.from = from;
-      this.to = to;
+    function Range(_at_from, _at_to, tag) {
+      this.from = _at_from;
+      this.to = _at_to;
       this.exclusive = tag === 'exclusive';
       this.equals = this.exclusive ? '' : '=';
     }
@@ -1148,23 +1151,23 @@
       idx = del(o, 'index');
       idxName = del(o, 'name');
       namedIndex = idxName && idxName !== idx;
-      varPart = "" + idx + " = " + this.fromC;
+      varPart = idx + " = " + this.fromC;
       if (this.toC !== this.toVar) {
         varPart += ", " + this.toC;
       }
       if (this.step !== this.stepVar) {
         varPart += ", " + this.step;
       }
-      _ref2 = ["" + idx + " <" + this.equals, "" + idx + " >" + this.equals], lt = _ref2[0], gt = _ref2[1];
-      condPart = this.stepNum ? parseNum(this.stepNum[0]) > 0 ? "" + lt + " " + this.toVar : "" + gt + " " + this.toVar : known ? ((_ref3 = [parseNum(this.fromNum[0]), parseNum(this.toNum[0])], from = _ref3[0], to = _ref3[1], _ref3), from <= to ? "" + lt + " " + to : "" + gt + " " + to) : (cond = this.stepVar ? "" + this.stepVar + " > 0" : "" + this.fromVar + " <= " + this.toVar, "" + cond + " ? " + lt + " " + this.toVar + " : " + gt + " " + this.toVar);
-      stepPart = this.stepVar ? "" + idx + " += " + this.stepVar : known ? namedIndex ? from <= to ? "++" + idx : "--" + idx : from <= to ? "" + idx + "++" : "" + idx + "--" : namedIndex ? "" + cond + " ? ++" + idx + " : --" + idx : "" + cond + " ? " + idx + "++ : " + idx + "--";
+      _ref2 = [idx + " <" + this.equals, idx + " >" + this.equals], lt = _ref2[0], gt = _ref2[1];
+      condPart = this.stepNum ? parseNum(this.stepNum[0]) > 0 ? lt + " " + this.toVar : gt + " " + this.toVar : known ? ((_ref3 = [parseNum(this.fromNum[0]), parseNum(this.toNum[0])], from = _ref3[0], to = _ref3[1], _ref3), from <= to ? lt + " " + to : gt + " " + to) : (cond = this.stepVar ? this.stepVar + " > 0" : this.fromVar + " <= " + this.toVar, cond + " ? " + lt + " " + this.toVar + " : " + gt + " " + this.toVar);
+      stepPart = this.stepVar ? idx + " += " + this.stepVar : known ? namedIndex ? from <= to ? "++" + idx : "--" + idx : from <= to ? idx + "++" : idx + "--" : namedIndex ? cond + " ? ++" + idx + " : --" + idx : cond + " ? " + idx + "++ : " + idx + "--";
       if (namedIndex) {
-        varPart = "" + idxName + " = " + varPart;
+        varPart = idxName + " = " + varPart;
       }
       if (namedIndex) {
-        stepPart = "" + idxName + " = " + stepPart;
+        stepPart = idxName + " = " + stepPart;
       }
-      return [this.makeCode("" + varPart + "; " + condPart + "; " + stepPart)];
+      return [this.makeCode(varPart + "; " + condPart + "; " + stepPart)];
     };
 
     Range.prototype.compileArray = function(o) {
@@ -1188,8 +1191,8 @@
         o.index = i;
         body = fragmentsToText(this.compileNode(o));
       } else {
-        vars = ("" + i + " = " + this.fromC) + (this.toC !== this.toVar ? ", " + this.toC : '');
-        cond = "" + this.fromVar + " <= " + this.toVar;
+        vars = (i + " = " + this.fromC) + (this.toC !== this.toVar ? ", " + this.toC : '');
+        cond = this.fromVar + " <= " + this.toVar;
         body = "var " + vars + "; " + cond + " ? " + i + " <" + this.equals + " " + this.toVar + " : " + i + " >" + this.equals + " " + this.toVar + "; " + cond + " ? " + i + "++ : " + i + "--";
       }
       post = "{ " + result + ".push(" + i + "); }\n" + idt + "return " + result + ";\n" + o.indent;
@@ -1211,8 +1214,8 @@
 
     Slice.prototype.children = ['range'];
 
-    function Slice(range) {
-      this.range = range;
+    function Slice(_at_range) {
+      this.range = _at_range;
       Slice.__super__.constructor.call(this);
     }
 
@@ -1237,8 +1240,8 @@
   exports.Obj = Obj = (function(_super) {
     __extends(Obj, _super);
 
-    function Obj(props, generated) {
-      this.generated = generated != null ? generated : false;
+    function Obj(props, _at_generated) {
+      this.generated = _at_generated != null ? _at_generated : false;
       this.objects = this.properties = props || [];
     }
 
@@ -1286,7 +1289,7 @@
         }
       }
       answer.unshift(this.makeCode("{" + (props.length && '\n')));
-      answer.push(this.makeCode("" + (props.length && '\n' + this.tab) + "}"));
+      answer.push(this.makeCode((props.length && '\n' + this.tab) + "}"));
       if (this.front) {
         return this.wrapInBraces(answer);
       } else {
@@ -1376,10 +1379,10 @@
   exports.Class = Class = (function(_super) {
     __extends(Class, _super);
 
-    function Class(variable, parent, body) {
-      this.variable = variable;
-      this.parent = parent;
-      this.body = body != null ? body : new Block;
+    function Class(_at_variable, _at_parent, _at_body) {
+      this.variable = _at_variable;
+      this.parent = _at_parent;
+      this.body = _at_body != null ? _at_body : new Block;
       this.boundFuncs = [];
       this.body.classBody = true;
     }
@@ -1420,7 +1423,7 @@
       for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
         bvar = _ref2[_i];
         lhs = (new Value(new Literal("this"), [new Access(bvar)])).compile(o);
-        this.ctor.body.unshift(new Literal("" + lhs + " = " + (utility('bind')) + "(" + lhs + ", this)"));
+        this.ctor.body.unshift(new Literal(lhs + " = " + (utility('bind', o)) + "(" + lhs + ", this)"));
       }
     };
 
@@ -1507,9 +1510,9 @@
       if (!this.ctor) {
         this.ctor = new Code;
         if (this.externalCtor) {
-          this.ctor.body.push(new Literal("" + this.externalCtor + ".apply(this, arguments)"));
+          this.ctor.body.push(new Literal(this.externalCtor + ".apply(this, arguments)"));
         } else if (this.parent) {
-          this.ctor.body.push(new Literal("" + name + ".__super__.constructor.apply(this, arguments)"));
+          this.ctor.body.push(new Literal(name + ".__super__.constructor.apply(this, arguments)"));
         }
         this.ctor.body.makeReturn();
         this.body.expressions.unshift(this.ctor);
@@ -1563,11 +1566,11 @@
   exports.Assign = Assign = (function(_super) {
     __extends(Assign, _super);
 
-    function Assign(variable, value, context, options) {
+    function Assign(_at_variable, _at_value, _at_context, options) {
       var forbidden, name, _ref2;
-      this.variable = variable;
-      this.value = value;
-      this.context = context;
+      this.variable = _at_variable;
+      this.value = _at_value;
+      this.context = _at_context;
       this.param = options && options.param;
       this.subpattern = options && options.subpattern;
       forbidden = (_ref2 = (name = this.variable.unwrapAll().value), __indexOf.call(STRICT_PROSCRIBED, _ref2) >= 0);
@@ -1674,7 +1677,7 @@
       assigns = [];
       expandedIdx = false;
       if (!IDENTIFIER.test(vvarText) || this.variable.assigns(vvarText)) {
-        assigns.push([this.makeCode("" + (ref = o.scope.freeVariable('ref')) + " = ")].concat(__slice.call(vvar)));
+        assigns.push([this.makeCode((ref = o.scope.freeVariable('ref')) + " = ")].concat(__slice.call(vvar)));
         vvar = [this.makeCode(ref)];
         vvarText = ref;
       }
@@ -1695,7 +1698,7 @@
         if (!expandedIdx && obj instanceof Splat) {
           name = obj.name.unwrap().value;
           obj = obj.unwrap();
-          val = "" + olen + " <= " + vvarText + ".length ? " + (utility('slice')) + ".call(" + vvarText + ", " + i;
+          val = olen + " <= " + vvarText + ".length ? " + (utility('slice', o)) + ".call(" + vvarText + ", " + i;
           if (rest = olen - i - 1) {
             ivar = o.scope.freeVariable('i');
             val += ", " + ivar + " = " + vvarText + ".length - " + rest + ") : (" + ivar + " = " + i + ", [])";
@@ -1703,15 +1706,15 @@
             val += ") : []";
           }
           val = new Literal(val);
-          expandedIdx = "" + ivar + "++";
+          expandedIdx = ivar + "++";
         } else if (!expandedIdx && obj instanceof Expansion) {
           if (rest = olen - i - 1) {
             if (rest === 1) {
-              expandedIdx = "" + vvarText + ".length - 1";
+              expandedIdx = vvarText + ".length - 1";
             } else {
               ivar = o.scope.freeVariable('i');
-              val = new Literal("" + ivar + " = " + vvarText + ".length - " + rest);
-              expandedIdx = "" + ivar + "++";
+              val = new Literal(ivar + " = " + vvarText + ".length - " + rest);
+              expandedIdx = ivar + "++";
               assigns.push(val.compileToFragments(o, LEVEL_LIST));
             }
           }
@@ -1819,6 +1822,10 @@
       this.params = params || [];
       this.body = body || new Block;
       this.bound = tag === 'boundfunc';
+      this.isGenerator = !!this.body.contains(function(node) {
+        var _ref2;
+        return node instanceof Op && ((_ref2 = node.operator) === 'yield' || _ref2 === 'yield*');
+      });
     }
 
     Code.prototype.children = ['params', 'body'];
@@ -1867,15 +1874,9 @@
         }
         _ref5 = this.params;
         for (_k = 0, _len2 = _ref5.length; _k < _len2; _k++) {
-          p = _ref5[_k].name;
-          if (!(!(param instanceof Expansion))) {
-            continue;
-          }
-          if (p["this"]) {
-            p = p.properties[0].name;
-          }
-          if (p.value) {
-            o.scope.add(p.value, 'var', true);
+          p = _ref5[_k];
+          if (!(p instanceof Expansion) && p.name.value) {
+            o.scope.add(p.name.value, 'var', true);
           }
         }
         splats = new Assign(new Value(new Arr((function() {
@@ -1928,7 +1929,7 @@
       uniqs = [];
       this.eachParamName(function(name, node) {
         if (__indexOf.call(uniqs, name) >= 0) {
-          node.error("multiple parameters named '" + name + "'");
+          node.error("multiple parameters named " + name);
         }
         return uniqs.push(name);
       });
@@ -1936,6 +1937,9 @@
         this.body.makeReturn();
       }
       code = 'function';
+      if (this.isGenerator) {
+        code += '*';
+      }
       if (this.ctor) {
         code += ' ' + this.name;
       }
@@ -1987,11 +1991,11 @@
   exports.Param = Param = (function(_super) {
     __extends(Param, _super);
 
-    function Param(name, value, splat) {
-      var _ref2;
-      this.name = name;
-      this.value = value;
-      this.splat = splat;
+    function Param(_at_name, _at_value, _at_splat) {
+      var name, _ref2;
+      this.name = _at_name;
+      this.value = _at_value;
+      this.splat = _at_splat;
       if (_ref2 = (name = this.name.unwrapAll().value), __indexOf.call(STRICT_PROSCRIBED, _ref2) >= 0) {
         this.name.error("parameter name \"" + name + "\" is not allowed");
       }
@@ -2004,16 +2008,14 @@
     };
 
     Param.prototype.asReference = function(o) {
-      var node;
+      var name, node;
       if (this.reference) {
         return this.reference;
       }
       node = this.name;
       if (node["this"]) {
-        node = node.properties[0].name;
-        if (node.value.reserved) {
-          node = new Literal(o.scope.freeVariable(node.value));
-        }
+        name = "at_" + node.properties[0].name.value;
+        node = new Literal(o.scope.freeVariable(name));
       } else if (node.isComplex()) {
         node = new Literal(o.scope.freeVariable('arg'));
       }
@@ -2035,11 +2037,7 @@
         name = this.name;
       }
       atParam = function(obj) {
-        var node;
-        node = obj.properties[0].name;
-        if (!node.value.reserved) {
-          return iterator(node.value, node);
-        }
+        return iterator("@" + obj.properties[0].name.value, obj);
       };
       if (name instanceof Literal) {
         return iterator(name.value, name);
@@ -2111,13 +2109,13 @@
         if (apply) {
           return fragments;
         }
-        return [].concat(node.makeCode("" + (utility('slice')) + ".call("), fragments, node.makeCode(")"));
+        return [].concat(node.makeCode((utility('slice', o)) + ".call("), fragments, node.makeCode(")"));
       }
       args = list.slice(index);
       for (i = _i = 0, _len = args.length; _i < _len; i = ++_i) {
         node = args[i];
         compiledNode = node.compileToFragments(o, LEVEL_LIST);
-        args[i] = node instanceof Splat ? [].concat(node.makeCode("" + (utility('slice')) + ".call("), compiledNode, node.makeCode(")")) : [].concat(node.makeCode("["), compiledNode, node.makeCode("]"));
+        args[i] = node instanceof Splat ? [].concat(node.makeCode((utility('slice', o)) + ".call("), compiledNode, node.makeCode(")")) : [].concat(node.makeCode("["), compiledNode, node.makeCode("]"));
       }
       if (index === 0) {
         node = list[0];
@@ -2189,8 +2187,8 @@
       }
     };
 
-    While.prototype.addBody = function(body) {
-      this.body = body;
+    While.prototype.addBody = function(_at_body) {
+      this.body = _at_body;
       return this;
     };
 
@@ -2275,7 +2273,8 @@
     CONVERSIONS = {
       '==': '===',
       '!=': '!==',
-      'of': 'in'
+      'of': 'in',
+      'yieldfrom': 'yield*'
     };
 
     INVERSIONS = {
@@ -2287,13 +2286,18 @@
 
     Op.prototype.isSimpleNumber = NO;
 
+    Op.prototype.isYield = function() {
+      var _ref2;
+      return (_ref2 = this.operator) === 'yield' || _ref2 === 'yield*';
+    };
+
     Op.prototype.isUnary = function() {
       return !this.second;
     };
 
     Op.prototype.isComplex = function() {
       var _ref2;
-      return !(this.isUnary() && ((_ref2 = this.operator) === '+' || _ref2 === '-')) || this.first.isComplex();
+      return !(this.isUnary() && ((_ref2 = this.operator) === '+' || _ref2 === '-') && this.first instanceof Value && this.first.isSimpleNumber());
     };
 
     Op.prototype.isChainable = function() {
@@ -2371,6 +2375,9 @@
       if (((_ref2 = this.operator) === '--' || _ref2 === '++') && (_ref3 = this.first.unwrapAll().value, __indexOf.call(STRICT_PROSCRIBED, _ref3) >= 0)) {
         this.error("cannot increment/decrement \"" + (this.first.unwrapAll().value) + "\"");
       }
+      if (this.isYield()) {
+        return this.compileYield(o);
+      }
       if (this.isUnary()) {
         return this.compileUnary(o);
       }
@@ -2446,6 +2453,25 @@
       return this.joinFragmentArrays(parts, '');
     };
 
+    Op.prototype.compileYield = function(o) {
+      var op, parts;
+      parts = [];
+      op = this.operator;
+      if (o.scope.parent == null) {
+        this.error('yield statements must occur within a function generator.');
+      }
+      if (__indexOf.call(Object.keys(this.first), 'expression') >= 0) {
+        if (this.first.expression != null) {
+          parts.push(this.first.expression.compileToFragments(o, LEVEL_OP));
+        }
+      } else {
+        parts.push([this.makeCode("(" + op + " ")]);
+        parts.push(this.first.compileToFragments(o, LEVEL_OP));
+        parts.push([this.makeCode(")")]);
+      }
+      return this.joinFragmentArrays(parts, '');
+    };
+
     Op.prototype.compilePower = function(o) {
       var pow;
       pow = new Value(new Literal('Math'), [new Access(new Literal('pow'))]);
@@ -2461,7 +2487,7 @@
 
     Op.prototype.compileModulo = function(o) {
       var mod;
-      mod = new Value(new Literal(utility('modulo')));
+      mod = new Value(new Literal(utility('modulo', o)));
       return new Call(mod, [this.first, this.second]).compileToFragments(o);
     };
 
@@ -2476,9 +2502,9 @@
   exports.In = In = (function(_super) {
     __extends(In, _super);
 
-    function In(object, array) {
-      this.object = object;
-      this.array = array;
+    function In(_at_object, _at_array) {
+      this.object = _at_object;
+      this.array = _at_array;
     }
 
     In.prototype.children = ['object', 'array'];
@@ -2527,7 +2553,7 @@
     In.prototype.compileLoopTest = function(o) {
       var fragments, ref, sub, _ref2;
       _ref2 = this.object.cache(o, LEVEL_LIST), sub = _ref2[0], ref = _ref2[1];
-      fragments = [].concat(this.makeCode(utility('indexOf') + ".call("), this.array.compileToFragments(o, LEVEL_LIST), this.makeCode(", "), ref, this.makeCode(") " + (this.negated ? '< 0' : '>= 0')));
+      fragments = [].concat(this.makeCode(utility('indexOf', o) + ".call("), this.array.compileToFragments(o, LEVEL_LIST), this.makeCode(", "), ref, this.makeCode(") " + (this.negated ? '< 0' : '>= 0')));
       if (fragmentsToText(sub) === fragmentsToText(ref)) {
         return fragments;
       }
@@ -2550,11 +2576,11 @@
   exports.Try = Try = (function(_super) {
     __extends(Try, _super);
 
-    function Try(attempt, errorVariable, recovery, ensure) {
-      this.attempt = attempt;
-      this.errorVariable = errorVariable;
-      this.recovery = recovery;
-      this.ensure = ensure;
+    function Try(_at_attempt, _at_errorVariable, _at_recovery, _at_ensure) {
+      this.attempt = _at_attempt;
+      this.errorVariable = _at_errorVariable;
+      this.recovery = _at_recovery;
+      this.ensure = _at_ensure;
     }
 
     Try.prototype.children = ['attempt', 'recovery', 'ensure'];
@@ -2582,7 +2608,7 @@
       tryPart = this.attempt.compileToFragments(o, LEVEL_TOP);
       catchPart = this.recovery ? (placeholder = new Literal('_error'), this.errorVariable ? this.recovery.unshift(new Assign(this.errorVariable, placeholder)) : void 0, [].concat(this.makeCode(" catch ("), placeholder.compileToFragments(o), this.makeCode(") {\n"), this.recovery.compileToFragments(o, LEVEL_TOP), this.makeCode("\n" + this.tab + "}"))) : !(this.ensure || this.recovery) ? [this.makeCode(' catch (_error) {}')] : [];
       ensurePart = this.ensure ? [].concat(this.makeCode(" finally {\n"), this.ensure.compileToFragments(o, LEVEL_TOP), this.makeCode("\n" + this.tab + "}")) : [];
-      return [].concat(this.makeCode("" + this.tab + "try {\n"), tryPart, this.makeCode("\n" + this.tab + "}"), catchPart, ensurePart);
+      return [].concat(this.makeCode(this.tab + "try {\n"), tryPart, this.makeCode("\n" + this.tab + "}"), catchPart, ensurePart);
     };
 
     return Try;
@@ -2592,8 +2618,8 @@
   exports.Throw = Throw = (function(_super) {
     __extends(Throw, _super);
 
-    function Throw(expression) {
-      this.expression = expression;
+    function Throw(_at_expression) {
+      this.expression = _at_expression;
     }
 
     Throw.prototype.children = ['expression'];
@@ -2615,8 +2641,8 @@
   exports.Existence = Existence = (function(_super) {
     __extends(Existence, _super);
 
-    function Existence(expression) {
-      this.expression = expression;
+    function Existence(_at_expression) {
+      this.expression = _at_expression;
     }
 
     Existence.prototype.children = ['expression'];
@@ -2631,7 +2657,7 @@
         _ref2 = this.negated ? ['===', '||'] : ['!==', '&&'], cmp = _ref2[0], cnj = _ref2[1];
         code = "typeof " + code + " " + cmp + " \"undefined\" " + cnj + " " + code + " " + cmp + " null";
       } else {
-        code = "" + code + " " + (this.negated ? '==' : '!=') + " null";
+        code = code + " " + (this.negated ? '==' : '!=') + " null";
       }
       return [this.makeCode(o.level <= LEVEL_COND ? code : "(" + code + ")")];
     };
@@ -2643,8 +2669,8 @@
   exports.Parens = Parens = (function(_super) {
     __extends(Parens, _super);
 
-    function Parens(body) {
-      this.body = body;
+    function Parens(_at_body) {
+      this.body = _at_body;
     }
 
     Parens.prototype.children = ['body'];
@@ -2732,7 +2758,7 @@
       }
       ivar = (this.object && index) || scope.freeVariable('i');
       kvar = (this.range && name) || index || ivar;
-      kvarAssign = kvar !== ivar ? "" + kvar + " = " : "";
+      kvarAssign = kvar !== ivar ? kvar + " = " : "";
       if (this.step && !this.range) {
         _ref3 = this.cacheToCodeFragments(this.step.cache(o, LEVEL_LIST)), step = _ref3[0], stepVar = _ref3[1];
         stepNum = stepVar.match(NUMBER);
@@ -2757,7 +2783,7 @@
           svar = ref;
         }
         if (name && !this.pattern) {
-          namePart = "" + name + " = " + svar + "[" + kvar + "]";
+          namePart = name + " = " + svar + "[" + kvar + "]";
         }
         if (!this.object) {
           if (step !== stepVar) {
@@ -2768,8 +2794,8 @@
           }
           declare = "" + kvarAssign + ivar + " = 0, " + lvar + " = " + svar + ".length";
           declareDown = "" + kvarAssign + ivar + " = " + svar + ".length - 1";
-          compare = "" + ivar + " < " + lvar;
-          compareDown = "" + ivar + " >= 0";
+          compare = ivar + " < " + lvar;
+          compareDown = ivar + " >= 0";
           if (this.step) {
             if (stepNum) {
               if (down) {
@@ -2777,14 +2803,14 @@
                 declare = declareDown;
               }
             } else {
-              compare = "" + stepVar + " > 0 ? " + compare + " : " + compareDown;
+              compare = stepVar + " > 0 ? " + compare + " : " + compareDown;
               declare = "(" + stepVar + " > 0 ? (" + declare + ") : " + declareDown + ")";
             }
-            increment = "" + ivar + " += " + stepVar;
+            increment = ivar + " += " + stepVar;
           } else {
-            increment = "" + (kvar !== ivar ? "++" + ivar : "" + ivar + "++");
+            increment = "" + (kvar !== ivar ? "++" + ivar : ivar + "++");
           }
-          forPartFragments = [this.makeCode("" + declare + "; " + compare + "; " + kvarAssign + increment)];
+          forPartFragments = [this.makeCode(declare + "; " + compare + "; " + kvarAssign + increment)];
         }
       }
       if (this.returns) {
@@ -2802,16 +2828,16 @@
         }
       }
       if (this.pattern) {
-        body.expressions.unshift(new Assign(this.name, new Literal("" + svar + "[" + kvar + "]")));
+        body.expressions.unshift(new Assign(this.name, new Literal(svar + "[" + kvar + "]")));
       }
       defPartFragments = [].concat(this.makeCode(defPart), this.pluckDirectCall(o, body));
       if (namePart) {
         varPart = "\n" + idt1 + namePart + ";";
       }
       if (this.object) {
-        forPartFragments = [this.makeCode("" + kvar + " in " + svar)];
+        forPartFragments = [this.makeCode(kvar + " in " + svar)];
         if (this.own) {
-          guardPart = "\n" + idt1 + "if (!" + (utility('hasProp')) + ".call(" + svar + ", " + kvar + ")) continue;";
+          guardPart = "\n" + idt1 + "if (!" + (utility('hasProp', o)) + ".call(" + svar + ", " + kvar + ")) continue;";
         }
       }
       bodyFragments = body.compileToFragments(merge(o, {
@@ -2820,7 +2846,7 @@
       if (bodyFragments && (bodyFragments.length > 0)) {
         bodyFragments = [].concat(this.makeCode("\n"), bodyFragments, this.makeCode("\n"));
       }
-      return [].concat(defPartFragments, this.makeCode("" + (resultPart || '') + this.tab + "for ("), forPartFragments, this.makeCode(") {" + guardPart + varPart), bodyFragments, this.makeCode("" + this.tab + "}" + (returnResult || '')));
+      return [].concat(defPartFragments, this.makeCode("" + (resultPart || '') + this.tab + "for ("), forPartFragments, this.makeCode(") {" + guardPart + varPart), bodyFragments, this.makeCode(this.tab + "}" + (returnResult || '')));
     };
 
     For.prototype.pluckDirectCall = function(o, body) {
@@ -2856,10 +2882,10 @@
   exports.Switch = Switch = (function(_super) {
     __extends(Switch, _super);
 
-    function Switch(subject, cases, otherwise) {
-      this.subject = subject;
-      this.cases = cases;
-      this.otherwise = otherwise;
+    function Switch(_at_subject, _at_cases, _at_otherwise) {
+      this.subject = _at_subject;
+      this.cases = _at_cases;
+      this.otherwise = _at_otherwise;
     }
 
     Switch.prototype.children = ['subject', 'cases', 'otherwise'];
@@ -2941,8 +2967,8 @@
   exports.If = If = (function(_super) {
     __extends(If, _super);
 
-    function If(condition, body, options) {
-      this.body = body;
+    function If(condition, _at_body, options) {
+      this.body = _at_body;
       if (options == null) {
         options = {};
       }
@@ -3065,8 +3091,8 @@
   })(Base);
 
   UTILITIES = {
-    "extends": function() {
-      return "function(child, parent) { for (var key in parent) { if (" + (utility('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; }";
+    "extends": function(o) {
+      return "function(child, parent) { for (var key in parent) { if (" + (utility('hasProp', o)) + ".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; }";
     },
     bind: function() {
       return 'function(fn, me){ return function(){ return fn.apply(me, arguments); }; }';
@@ -3075,7 +3101,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';
@@ -3115,11 +3141,16 @@
 
   IS_REGEX = /^\//;
 
-  utility = function(name) {
-    var ref;
-    ref = "__" + name;
-    Scope.root.assign(ref, UTILITIES[name]());
-    return ref;
+  utility = function(name, o) {
+    var ref, root;
+    root = o.scope.root;
+    if (name in root.utilities) {
+      return root.utilities[name];
+    } else {
+      ref = root.freeVariable("_" + name);
+      root.assign(ref, UTILITIES[name](o));
+      return root.utilities[name] = ref;
+    }
   };
 
   multident = function(code, tab) {

lib/coffee-script/optparse.js

@@ -1,12 +1,12 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 (function() {
   var LONG_FLAG, MULTI_FLAG, OPTIONAL, OptionParser, SHORT_FLAG, buildRule, buildRules, normalizeArguments, repeat;
 
   repeat = require('./helpers').repeat;
 
   exports.OptionParser = OptionParser = (function() {
-    function OptionParser(rules, banner) {
-      this.banner = banner;
+    function OptionParser(rules, _at_banner) {
+      this.banner = _at_banner;
       this.rules = buildRules(rules);
     }
 
@@ -62,7 +62,7 @@
       var letPart, lines, rule, spaces, _i, _len, _ref;
       lines = [];
       if (this.banner) {
-        lines.unshift("" + this.banner + "\n");
+        lines.unshift(this.banner + "\n");
       }
       _ref = this.rules;
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {

lib/coffee-script/register.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 (function() {
   var CoffeeScript, Module, binary, child_process, ext, findExtension, fork, helpers, loadFile, path, _i, _len, _ref;
 

lib/coffee-script/repl.js

@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.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');
 
@@ -19,16 +19,29 @@
     historyFile: process.env.HOME ? path.join(process.env.HOME, '.coffee_history') : void 0,
     historyMaxInputSize: 10240,
     "eval": function(input, context, filename, cb) {
-      var Assign, Block, Literal, Value, ast, err, js, result, _ref1;
+      var Assign, Block, Literal, Value, ast, err, js, referencedVars, result, token, tokens, _ref1;
       input = input.replace(/\uFF00/g, '\n');
       input = input.replace(/^\(([\s\S]*)\n\)$/m, '$1');
       _ref1 = require('./nodes'), Block = _ref1.Block, Assign = _ref1.Assign, Value = _ref1.Value, Literal = _ref1.Literal;
       try {
-        ast = CoffeeScript.nodes(input);
+        tokens = CoffeeScript.tokens(input);
+        referencedVars = (function() {
+          var _i, _len, _results;
+          _results = [];
+          for (_i = 0, _len = tokens.length; _i < _len; _i++) {
+            token = tokens[_i];
+            if (token.variable && token[1].charAt(0) === '_') {
+              _results.push(token[1]);
+            }
+          }
+          return _results;
+        })();
+        ast = CoffeeScript.nodes(tokens);
         ast = new Block([new Assign(new Value(new Literal('_')), ast, '=')]);
         js = ast.compile({
           bare: true,
-          locals: Object.keys(context)
+          locals: Object.keys(context),
+          referencedVars: referencedVars
         });
         result = context === global ? vm.runInThisContext(js, filename) : vm.runInContext(js, context, filename);
         return cb(null, result);
@@ -41,14 +54,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: ''
@@ -57,10 +71,11 @@
     rli.removeListener('line', nodeLineListener);
     rli.on('line', function(cmd) {
       if (multiline.enabled) {
-        multiline.buffer += "" + cmd + "\n";
+        multiline.buffer += cmd + "\n";
         rli.setPrompt(multiline.prompt);
         rli.prompt(true);
       } else {
+        rli.setPrompt(origPrompt);
         nodeLineListener(cmd);
       }
     });
@@ -71,7 +86,7 @@
       if (multiline.enabled) {
         if (!multiline.buffer.match(/\n/)) {
           multiline.enabled = !multiline.enabled;
-          rli.setPrompt(repl.prompt);
+          rli.setPrompt(origPrompt);
           rli.prompt(true);
           return;
         }
@@ -116,22 +131,32 @@
     fd = fs.openSync(filename, 'a');
     repl.rli.addListener('line', function(code) {
       if (code && code.length && code !== '.history' && lastLine !== code) {
-        fs.write(fd, "" + code + "\n");
+        fs.write(fd, code + "\n");
         return lastLine = code;
       }
     });
     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");
+        repl.outputStream.write((repl.rli.history.slice(0).reverse().join('\n')) + "\n");
         return repl.displayPrompt();
       }
     };
   };
 
+  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 +181,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;
     }
   };

lib/coffee-script/rewriter.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.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; },
@@ -17,8 +17,8 @@
   exports.Rewriter = (function() {
     function Rewriter() {}
 
-    Rewriter.prototype.rewrite = function(tokens) {
-      this.tokens = tokens;
+    Rewriter.prototype.rewrite = function(_at_tokens) {
+      this.tokens = _at_tokens;
       this.removeLeadingNewlines();
       this.closeOpenCalls();
       this.closeOpenIndexes();
@@ -194,7 +194,7 @@
         };
         endImplicitCall = function() {
           stack.pop();
-          tokens.splice(i, 0, generate('CALL_END', ')'));
+          tokens.splice(i, 0, generate('CALL_END', ')', ['', 'end of input', token[2]]));
           return i += 1;
         };
         startImplicitObject = function(j, startsLine) {
@@ -257,14 +257,14 @@
           }
           stack.pop();
         }
-        if ((__indexOf.call(IMPLICIT_FUNC, tag) >= 0 && token.spaced && !token.stringEnd || tag === '?' && i > 0 && !tokens[i - 1].spaced) && (__indexOf.call(IMPLICIT_CALL, nextTag) >= 0 || __indexOf.call(IMPLICIT_UNSPACED_CALL, nextTag) >= 0 && !((_ref = tokens[i + 1]) != null ? _ref.spaced : void 0) && !((_ref1 = tokens[i + 1]) != null ? _ref1.newLine : void 0))) {
+        if ((__indexOf.call(IMPLICIT_FUNC, tag) >= 0 && token.spaced && !token.stringEnd && !token.regexEnd || tag === '?' && i > 0 && !tokens[i - 1].spaced) && (__indexOf.call(IMPLICIT_CALL, nextTag) >= 0 || __indexOf.call(IMPLICIT_UNSPACED_CALL, nextTag) >= 0 && !((_ref = tokens[i + 1]) != null ? _ref.spaced : void 0) && !((_ref1 = tokens[i + 1]) != null ? _ref1.newLine : void 0))) {
           if (tag === '?') {
             tag = token[0] = 'FUNC_EXIST';
           }
           startImplicitCall(i + 1);
           return forward(2);
         }
-        if (__indexOf.call(IMPLICIT_FUNC, tag) >= 0 && this.matchTags(i + 1, 'INDENT', null, ':') && !this.findTagsBackwards(i, ['CLASS', 'EXTENDS', 'IF', 'CATCH', 'SWITCH', 'LEADING_WHEN', 'FOR', 'WHILE', 'UNTIL'])) {
+        if (__indexOf.call(IMPLICIT_FUNC, tag) >= 0 && !token.stringEnd && !token.regexEnd && this.matchTags(i + 1, 'INDENT', null, ':') && !this.findTagsBackwards(i, ['CLASS', 'EXTENDS', 'IF', 'CATCH', 'SWITCH', 'LEADING_WHEN', 'FOR', 'WHILE', 'UNTIL'])) {
           startImplicitCall(i + 1);
           stack.push(['INDENT', i + 2]);
           return forward(3);
@@ -458,7 +458,7 @@
 
   IMPLICIT_FUNC = ['IDENTIFIER', 'SUPER', ')', 'CALL_END', ']', 'INDEX_END', '@', 'THIS'];
 
-  IMPLICIT_CALL = ['IDENTIFIER', 'NUMBER', 'STRING', 'JS', 'REGEX', 'NEW', 'PARAM_START', 'CLASS', 'IF', 'TRY', 'SWITCH', 'THIS', 'BOOL', 'NULL', 'UNDEFINED', 'UNARY', 'UNARY_MATH', 'SUPER', 'THROW', '@', '->', '=>', '[', '(', '{', '--', '++'];
+  IMPLICIT_CALL = ['IDENTIFIER', 'NUMBER', 'STRING', 'JS', 'REGEX', 'NEW', 'PARAM_START', 'CLASS', 'IF', 'TRY', 'SWITCH', 'THIS', 'BOOL', 'NULL', 'UNDEFINED', 'UNARY', 'YIELD', 'UNARY_MATH', 'SUPER', 'THROW', '@', '->', '=>', '[', '(', '{', '--', '++'];
 
   IMPLICIT_UNSPACED_CALL = ['+', '-'];
 

lib/coffee-script/scope.js

@@ -1,16 +1,17 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 (function() {
-  var Scope, extend, last, _ref;
+  var Scope, extend, last, _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; };
 
   _ref = require('./helpers'), extend = _ref.extend, last = _ref.last;
 
   exports.Scope = Scope = (function() {
-    Scope.root = null;
-
-    function Scope(parent, expressions, method) {
-      this.parent = parent;
-      this.expressions = expressions;
-      this.method = method;
+    function Scope(_at_parent, _at_expressions, _at_method, _at_referencedVars) {
+      var _ref1, _ref2;
+      this.parent = _at_parent;
+      this.expressions = _at_expressions;
+      this.method = _at_method;
+      this.referencedVars = _at_referencedVars;
       this.variables = [
         {
           name: 'arguments',
@@ -19,8 +20,9 @@
       ];
       this.positions = {};
       if (!this.parent) {
-        Scope.root = this;
+        this.utilities = {};
       }
+      this.root = (_ref1 = (_ref2 = this.parent) != null ? _ref2.root : void 0) != null ? _ref1 : this;
     }
 
     Scope.prototype.add = function(name, type, immediate) {
@@ -91,7 +93,11 @@
         reserve = true;
       }
       index = 0;
-      while (this.check((temp = this.temporary(name, index)))) {
+      while (true) {
+        temp = this.temporary(name, index);
+        if (!(this.check(temp) || __indexOf.call(this.root.referencedVars, temp) >= 0)) {
+          break;
+        }
         index++;
       }
       if (reserve) {
@@ -133,7 +139,7 @@
       for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
         v = _ref1[_i];
         if (v.type.assigned) {
-          _results.push("" + v.name + " = " + v.type.value);
+          _results.push(v.name + " = " + v.type.value);
         }
       }
       return _results;

lib/coffee-script/sourcemap.js

@@ -1,10 +1,10 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.9.0
 (function() {
   var LineMap, SourceMap;
 
   LineMap = (function() {
-    function LineMap(line) {
-      this.line = line;
+    function LineMap(_at_line) {
+      this.line = _at_line;
       this.columns = [];
     }
 

package.json

@@ -8,7 +8,7 @@
     "compiler"
   ],
   "author": "Jeremy Ashkenas",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "license": "MIT",
   "engines": {
     "node": ">=0.8.0"
@@ -21,22 +21,22 @@
     "coffee": "./bin/coffee",
     "cake": "./bin/cake"
   },
+  "preferGlobal": true,
   "scripts": {
-    "test": "node ./bin/cake test"
+    "test":         "node ./bin/cake test",
+    "test-harmony": "node --harmony ./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"
-  },
-  "dependencies": {
-    "mkdirp": "~0.3.5"
+    "underscore": "~1.5.2",
+    "docco": "~0.6.2"
   }
 }

repl.js

@@ -0,0 +1 @@
+module.exports = require('./lib/coffee-script/repl');

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   = {}

src/coffee-script.coffee

@@ -12,7 +12,7 @@ helpers       = require './helpers'
 SourceMap     = require './sourcemap'
 
 # The current CoffeeScript version number.
-exports.VERSION = '1.7.0'
+exports.VERSION = '1.9.0'
 
 exports.FILE_EXTENSIONS = ['.coffee', '.litcoffee', '.coffee.md']
 
@@ -44,7 +44,17 @@ exports.compile = compile = withPrettyErrors (code, options) ->
   if options.sourceMap
     map = new SourceMap
 
-  fragments = parser.parse(lexer.tokenize code, options).compileToFragments options
+  tokens = lexer.tokenize code, options
+
+  # Pass a list of referenced variables, so that generated variables won't get
+  # the same name. Since all generated variables start with an underscore only
+  # referenced variables also starting with an underscore are passed, as an
+  # optimization.
+  options.referencedVars = (
+    token[1] for token in tokens when token.variable and token[1].charAt(0) is '_'
+  )
+
+  fragments = parser.parse(tokens).compileToFragments options
 
   currentLine = 0
   currentLine += 1 if options.header
@@ -107,7 +117,7 @@ exports.run = (code, options = {}) ->
   mainModule.moduleCache and= {}
 
   # Assign paths for node_modules loading
-  dir = if options.fileName
+  dir = if options.filename
     path.dirname fs.realpathSync options.filename
   else
     fs.realpathSync '.'
@@ -124,13 +134,17 @@ exports.run = (code, options = {}) ->
 # The CoffeeScript REPL uses this to run the input.
 exports.eval = (code, options = {}) ->
   return unless code = code.trim()
-  Script = vm.Script
-  if Script
+  createContext = vm.Script.createContext ? vm.createContext
+
+  isContext = vm.isContext ? (ctx) ->
+    options.sandbox instanceof createContext().constructor
+
+  if createContext
     if options.sandbox?
-      if options.sandbox instanceof Script.createContext().constructor
+      if isContext options.sandbox
         sandbox = options.sandbox
       else
-        sandbox = Script.createContext()
+        sandbox = createContext()
         sandbox[k] = v for own k, v of options.sandbox
       sandbox.global = sandbox.root = sandbox.GLOBAL = sandbox
     else
@@ -158,6 +172,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
@@ -180,16 +202,17 @@ lexer = new Lexer
 # directly as a "Jison lexer".
 parser.lexer =
   lex: ->
-    token = @tokens[@pos++]
+    token = parser.tokens[@pos++]
     if token
       [tag, @yytext, @yylloc] = token
-      @errorToken = token.origin or token
+      parser.errorToken = token.origin or token
       @yylineno = @yylloc.first_line
     else
       tag = ''
 
     tag
-  setInput: (@tokens) ->
+  setInput: (tokens) ->
+    parser.tokens = tokens
     @pos = 0
   upcomingInput: ->
     ""
@@ -201,7 +224,7 @@ parser.yy.parseError = (message, {token}) ->
   # Disregard Jison's message, it contains redundant line numer information.
   # Disregard the token, we take its value directly from the lexer in case
   # the error is caused by a generated token which might refer to its origin.
-  {errorToken, tokens} = parser.lexer
+  {errorToken, tokens} = parser
   [errorTag, errorText, errorLoc] = errorToken
 
   errorText = if errorToken is tokens[tokens.length - 1]
@@ -294,5 +317,4 @@ 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"

src/command.coffee

@@ -10,7 +10,6 @@ path           = require 'path'
 helpers        = require './helpers'
 optparse       = require './optparse'
 CoffeeScript   = require './coffee-script'
-mkdirp         = require 'mkdirp'
 {spawn, exec}  = require 'child_process'
 {EventEmitter} = require 'events'
 
@@ -39,7 +38,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 +64,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 +80,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 +308,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) ->
@@ -315,14 +329,28 @@ outputPath = (source, base, extension=".js") ->
     dir = path.join opts.output, path.relative base, srcDir
   path.join dir, basename + extension
 
+# Recursively mkdir, like `mkdir -p`.
+mkdirp = (dir, fn) ->
+  mode = 0o777 & ~process.umask()
+
+  do mkdirs = (p = dir, fn) ->
+    fs.exists p, (exists) ->
+      if exists
+        fn()
+      else
+        mkdirs path.dirname(p), ->
+          fs.mkdir p, mode, (err) ->
+            return fn err if err
+            fn()
+
 # Write out a JavaScript source file with the compiled code. By default, files
 # 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 +359,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
 

src/grammar.coffee

@@ -451,7 +451,8 @@ grammar =
   ]
 
   ForBody: [
-    o 'FOR Range',                              -> source: LOC(2) new Value($2)
+    o 'FOR Range',                              -> source: (LOC(2) new Value($2))
+    o 'FOR Range BY Expression',                -> source: (LOC(2) new Value($2)), step: $4
     o 'ForStart ForSource',                     -> $2.own = $1.own; $2.name = $1[0]; $2.index = $1[1]; $2
   ]
 
@@ -536,6 +537,9 @@ grammar =
     o 'UNARY_MATH Expression',                  -> new Op $1 , $2
     o '-     Expression',                      (-> new Op '-', $2), prec: 'UNARY_MATH'
     o '+     Expression',                      (-> new Op '+', $2), prec: 'UNARY_MATH'
+    o 'YIELD Statement',                        -> new Op $1 , $2
+    o 'YIELD Expression',                       -> new Op $1 , $2
+    o 'YIELD FROM Expression',                  -> new Op $1.concat($2) , $3
 
     o '-- SimpleAssignable',                    -> new Op '--', $2
     o '++ SimpleAssignable',                    -> new Op '++', $2
@@ -595,6 +599,7 @@ operators = [
   ['left',      'COMPARE']
   ['left',      'LOGIC']
   ['nonassoc',  'INDENT', 'OUTDENT']
+  ['right',     'YIELD']
   ['right',     '=', ':', 'COMPOUND_ASSIGN', 'RETURN', 'THROW', 'EXTENDS']
   ['right',     'FORIN', 'FOROF', 'BY', 'WHEN']
   ['right',     'IF', 'ELSE', 'FOR', 'WHILE', 'UNTIL', 'LOOP', 'SUPER', 'CLASS']

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?

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'

src/lexer.coffee

@@ -32,8 +32,7 @@ exports.Lexer = class Lexer
   # Each tokenizing method is responsible for returning the number of characters
   # it has consumed.
   #
-  # Before returning the token stream, run it through the [Rewriter](rewriter.html)
-  # unless explicitly asked not to.
+  # Before returning the token stream, run it through the [Rewriter](rewriter.html).
   tokenize: (code, opts = {}) ->
     @literate   = opts.literate  # Are we lexing literate CoffeeScript?
     @indent     = 0              # The current indentation level.
@@ -60,7 +59,6 @@ exports.Lexer = class Lexer
            @commentToken()    or
            @whitespaceToken() or
            @lineToken()       or
-           @heredocToken()    or
            @stringToken()     or
            @numberToken()     or
            @regexToken()      or
@@ -72,8 +70,10 @@ exports.Lexer = class Lexer
 
       i += consumed
 
+      return {@tokens, index: i} if opts.untilBalanced and @ends.length is 0
+
     @closeIndentation()
-    @error "missing #{tag}" if tag = @ends.pop()
+    throwSyntaxError "missing #{end.tag}", end.origin[2] if end = @ends.pop()
     return @tokens if opts.rewrite is off
     (new Rewriter).rewrite @tokens
 
@@ -109,6 +109,9 @@ exports.Lexer = class Lexer
     if id is 'own' and @tag() is 'FOR'
       @token 'OWN', id
       return id.length
+    if id is 'from' and @tag() is 'YIELD'
+      @token 'FROM', id
+      return id.length
     forcedIdentifier = colon or
       (prev = last @tokens) and (prev[0] in ['.', '?.', '::', '?::'] or
       not prev.spaced and prev[0] is '@')
@@ -153,6 +156,7 @@ exports.Lexer = class Lexer
         else  tag
 
     tagToken = @token tag, id, 0, idLength
+    tagToken.variable = not forcedIdentifier
     if poppedToken
       [tagToken[2].first_line, tagToken[2].first_column] =
         [poppedToken[2].first_line, poppedToken[2].first_column]
@@ -183,44 +187,60 @@ exports.Lexer = class Lexer
     @token 'NUMBER', number, 0, lexedLength
     lexedLength
 
-  # Matches strings, including multi-line strings. Ensures that quotation marks
-  # are balanced within the string's contents, and within nested interpolations.
+  # Matches strings, including multi-line strings, as well as heredocs, with or without
+  # interpolation.
   stringToken: ->
-    switch quote = @chunk.charAt 0
-      when "'" then [string] = SIMPLESTR.exec @chunk
-      when '"' then string = @balancedString @chunk, '"'
-    return 0 unless string
-    trimmed = @removeNewlines string[1...-1]
-    if quote is '"' and 0 < string.indexOf '#{', 1
-      @interpolateString trimmed, strOffset: 1, lexedLength: string.length
-    else
-      @token 'STRING', quote + @escapeLines(trimmed) + quote, 0, string.length
-    if octalEsc = /^(?:\\.|[^\\])*\\(?:0[0-7]|[1-7])/.test string
-      @error "octal escape sequences #{string} are not allowed"
-    string.length
+    [quote] = STRING_START.exec(@chunk) || []
+    return 0 unless quote
+    regex = switch quote
+      when "'"   then STRING_SINGLE
+      when '"'   then STRING_DOUBLE
+      when "'''" then HEREDOC_SINGLE
+      when '"""' then HEREDOC_DOUBLE
+    heredoc = quote.length is 3
 
-  # Matches heredocs, adjusting indentation to the correct level, as heredocs
-  # preserve whitespace, but ignore indentation to the left.
-  heredocToken: ->
-    return 0 unless match = HEREDOC.exec @chunk
-    heredoc = match[0]
-    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
+    start = quote.length
+    {tokens, index: end} = @matchWithInterpolations @chunk[start..], regex, quote, start
+    $ = tokens.length - 1
+
+    if heredoc
+      # Find the smallest indentation. It will be removed from all lines later.
+      indent = null
+      doc = (token[1] for token, i in tokens when token[0] is 'NEOSTRING').join '#{}'
+      while match = HEREDOC_INDENT.exec doc
+        attempt = match[1]
+        indent = attempt if indent is null or 0 < attempt.length < indent.length
+      indentRegex = /// ^#{indent} ///gm if indent
+      @mergeInterpolationTokens tokens, {quote: quote[0], start, end}, (value, i) =>
+        value = @formatString value
+        value = value.replace LEADING_BLANK_LINE,  '' if i is 0
+        value = value.replace TRAILING_BLANK_LINE, '' if i is $
+        value = value.replace indentRegex, ''
+        value = value.replace MULTILINER, '\\n'
+        value
     else
-      @token 'STRING', @makeString(doc, quote, yes), 0, heredoc.length
-    heredoc.length
+      @mergeInterpolationTokens tokens, {quote, start, end}, (value, i) =>
+        value = @formatString value
+        value = value.replace STRING_OMIT, (match, offset) ->
+          if (i is 0 and offset is 0) or
+             (i is $ and offset + match.length is value.length)
+            ''
+          else
+            ' '
+        value
+
+    end
 
   # Matches and consumes comments.
   commentToken: ->
     return 0 unless match = @chunk.match COMMENT
     [comment, here] = match
     if here
-      @token 'HERECOMMENT',
-        (@sanitizeHeredoc here,
-          herecomment: true, indent: repeat ' ', @indent),
-        0, comment.length
+      if match = HERECOMMENT_ILLEGAL.exec comment
+        @error "block comments cannot contain #{match[0]}", match.index
+      if here.indexOf('\n') >= 0
+        here = here.replace /// \n #{repeat ' ', @indent} ///g, '\n'
+      @token 'HERECOMMENT', here, 0, comment.length
     comment.length
 
   # Matches JavaScript interpolated directly into the source via backticks.
@@ -229,70 +249,50 @@ exports.Lexer = class Lexer
     @token 'JS', (script = match[0])[1...-1], 0, script.length
     script.length
 
-  # Matches regular expression literals. Lexing regular expressions is difficult
-  # to distinguish from division, so we borrow some basic heuristics from
-  # JavaScript and Ruby.
+  # Matches regular expression literals, as well as multiline extended ones.
+  # Lexing regular expressions is difficult to distinguish from division, so we
+  # borrow some basic heuristics from JavaScript and Ruby.
   regexToken: ->
-    return 0 if @chunk.charAt(0) isnt '/'
-    return length if length = @heregexToken()
-
-    prev = last @tokens
-    return 0 if prev and (prev[0] in (if prev.spaced then NOT_REGEX else NOT_SPACED_REGEX))
-    return 0 unless match = REGEX.exec @chunk
-    [match, regex, flags] = match
-    # Avoid conflicts with floor division operator.
-    return 0 if regex is '//'
-    if regex[..1] is '/*' then @error 'regular expressions cannot begin with `*`'
-    @token 'REGEX', "#{regex}#{flags}", 0, match.length
-    match.length
-
-  # Matches multiline extended regular expressions.
-  heregexToken: ->
-    return 0 unless match = HEREGEX.exec @chunk
-    [heregex, body, flags] = match
-    if 0 > body.indexOf '#{'
-      re = @escapeLines body.replace(HEREGEX_OMIT, '$1$2').replace(/\//g, '\\/'), yes
-      if re.match /^\*/ then @error 'regular expressions cannot begin with `*`'
-      @token 'REGEX', "/#{ re or '(?:)' }/#{flags}", 0, heregex.length
-      return heregex.length
-    @token 'IDENTIFIER', 'RegExp', 0, 0
-    @token 'CALL_START', '(', 0, 0
-    tokens = []
-    for token in @interpolateString(body, regex: yes)
-      [tag, value] = token
-      if tag is 'TOKENS'
-        tokens.push value...
-      else if tag is 'NEOSTRING'
-        continue unless value = value.replace HEREGEX_OMIT, '$1$2'
-        # Convert NEOSTRING into STRING
-        value = value.replace /\\/g, '\\\\'
-        token[0] = 'STRING'
-        token[1] = @makeString(value, '"', yes)
-        tokens.push token
+    switch
+      when match = REGEX_ILLEGAL.exec @chunk
+        @error "regular expressions cannot begin with #{match[2]}", match.index + match[1].length
+      when @chunk[...3] is '///'
+        {tokens, index} = @matchWithInterpolations @chunk[3..], HEREGEX, '///', 3
+      when match = REGEX.exec @chunk
+        [regex, closed] = match
+        index = regex.length
+        prev = last @tokens
+        if prev
+          if prev.spaced and prev[0] in CALLABLE and not prev.stringEnd and not prev.regexEnd
+            return 0 if not closed or POSSIBLY_DIVISION.test regex
+          else if prev[0] in NOT_REGEX
+            return 0
+        @error 'missing / (unclosed regex)' unless closed
       else
-        @error "Unexpected #{tag}"
+        return 0
 
-      prev = last @tokens
-      plusToken = ['+', '+']
-      plusToken[2] = prev[2] # Copy location data
-      tokens.push plusToken
+    [flags] = REGEX_FLAGS.exec @chunk[index..]
+    end = index + flags.length
+    switch
+      when not VALID_FLAGS.test flags
+        @error "invalid regular expression flags #{flags}", index
+      when regex
+        @token 'REGEX', "#{regex}#{flags}"
+      when tokens.length is 1
+        re = @formatHeregex(tokens[0][1]).replace(/\//g, '\\/')
+        @token 'REGEX', "/#{ re or '(?:)' }/#{flags}"
+      else
+        @token 'IDENTIFIER', 'RegExp', 0, 0
+        @token 'CALL_START', '(', 0, 0
+        @mergeInterpolationTokens tokens, {quote: '"', start: 3, end}, (value) =>
+          @formatHeregex(value).replace(/\\/g, '\\\\')
+        if flags
+          @token ',', ',', index, 0
+          @token 'STRING', '"' + flags + '"', index, flags.length
+        rparen = @token ')', ')', end, 0
+        rparen.regexEnd = true
 
-    # Remove the extra "+"
-    tokens.pop()
-
-    unless tokens[0]?[0] is 'STRING'
-      @token 'STRING', '""', 0, 0
-      @token '+', '+', 0, 0
-    @tokens.push tokens...
-
-    if flags
-      # Find the flags in the heregex
-      flagsOffset = heregex.lastIndexOf flags
-      @token ',', ',', flagsOffset, 0
-      @token 'STRING', '"' + flags + '"', flagsOffset, flags.length
-
-    @token ')', ')', heregex.length-1, 0
-    heregex.length
+    end
 
   # Matches newlines, indents, and outdents, and determines which is which.
   # If we can detect that the current line is continued onto the the next line,
@@ -325,7 +325,7 @@ exports.Lexer = class Lexer
       diff = size - @indent + @outdebt
       @token 'INDENT', diff, indent.length - size, size
       @indents.push diff
-      @ends.push 'OUTDENT'
+      @ends.push {tag: 'OUTDENT'}
       @outdebt = @indebt = 0
       @indent = size
     else if size < @baseIndent
@@ -418,38 +418,23 @@ exports.Lexer = class Lexer
     else if value in SHIFT           then tag = 'SHIFT'
     else if value in LOGIC or value is '?' and prev?.spaced then tag = 'LOGIC'
     else if prev and not prev.spaced
-      if value is '(' and prev[0] in CALLABLE
+      if value is '(' and prev[0] in CALLABLE and not prev.stringEnd and not prev.regexEnd
         prev[0] = 'FUNC_EXIST' if prev[0] is '?'
         tag = 'CALL_START'
       else if value is '[' and prev[0] in INDEXABLE
         tag = 'INDEX_START'
         switch prev[0]
           when '?'  then prev[0] = 'INDEX_SOAK'
+    token = @makeToken tag, value
     switch value
-      when '(', '{', '[' then @ends.push INVERSES[value]
+      when '(', '{', '[' then @ends.push {tag: INVERSES[value], origin: token}
       when ')', '}', ']' then @pair value
-    @token tag, value
+    @tokens.push token
     value.length
 
   # Token Manipulators
   # ------------------
 
-  # Sanitize a heredoc or herecomment by
-  # erasing all external indentation on the left-hand side.
-  sanitizeHeredoc: (doc, options) ->
-    {indent, herecomment} = options
-    if herecomment
-      if HEREDOC_ILLEGAL.test doc
-        @error "block comment cannot contain \"*/\", starting"
-      return doc if doc.indexOf('\n') < 0
-    else
-      while match = HEREDOC_INDENT.exec doc
-        attempt = match[1]
-        indent = attempt if indent is null or 0 < attempt.length < indent.length
-    doc = doc.replace /// \n #{indent} ///g, '\n' if indent
-    doc = doc.replace /^\n/, '' unless herecomment
-    doc
-
   # A source of ambiguity in our grammar used to be parameter lists in function
   # definitions versus argument lists in function calls. Walk backwards, tagging
   # parameters specially in order to make things easier for the parser.
@@ -475,138 +460,126 @@ exports.Lexer = class Lexer
   closeIndentation: ->
     @outdentToken @indent
 
-  # Matches a balanced group such as a single or double-quoted string. Pass in
-  # a series of delimiters, all of which must be nested correctly within the
-  # contents of the string. This method allows us to have strings within
-  # interpolations within strings, ad infinitum.
-  balancedString: (str, end) ->
-    continueCount = 0
-    stack = [end]
-    for i in [1...str.length]
-      if continueCount
-        --continueCount
-        continue
-      switch letter = str.charAt i
-        when '\\'
-          ++continueCount
-          continue
-        when end
-          stack.pop()
-          unless stack.length
-            return str[0..i]
-          end = stack[stack.length - 1]
-          continue
-      if end is '}' and letter in ['"', "'"]
-        stack.push end = letter
-      else if end is '}' and letter is '/' and match = (HEREGEX.exec(str[i..]) or REGEX.exec(str[i..]))
-        continueCount += match[0].length - 1
-      else if end is '}' and letter is '{'
-        stack.push end = '}'
-      else if end is '"' and prev is '#' and letter is '{'
-        stack.push end = '}'
-      prev = letter
-    @error "missing #{ stack.pop() }, starting"
-
-  # Expand variables and expressions inside double-quoted strings using
-  # Ruby-like notation for substitution of arbitrary expressions.
+  # Match the contents of a delimited token and expand variables and expressions
+  # inside it using Ruby-like notation for substitution of arbitrary
+  # expressions.
   #
   #     "Hello #{name.capitalize()}."
   #
-  # If it encounters an interpolation, this method will recursively create a
-  # new Lexer, tokenize the interpolated contents, and merge them into the
-  # token stream.
+  # If it encounters an interpolation, this method will recursively create a new
+  # Lexer and tokenize until the `{` of `#{` is balanced with a `}`.
   #
-  #  - `str` is the start of the string contents (IE with the " or """ stripped
-  #    off.)
-  #  - `options.offsetInChunk` is the start of the interpolated string in the
-  #    current chunk, including the " or """, etc...  If not provided, this is
-  #    assumed to be 0.  `options.lexedLength` is the length of the
-  #    interpolated string, including both the start and end quotes.  Both of these
-  #    values are ignored if `options.regex` is true.
-  #  - `options.strOffset` is the offset of str, relative to the start of the
-  #    current chunk.
-  interpolateString: (str, options = {}) ->
-    {heredoc, regex, offsetInChunk, strOffset, lexedLength} = options
-    offsetInChunk ||= 0
-    strOffset ||= 0
-    lexedLength ||= str.length
-
-    # Parse the string.
+  #  - `str` is the start of the token contents (with the starting delimiter
+  #    stripped off.)
+  #  - `regex` matches the contents of a token (but not `end`, and not `#{` if
+  #    interpolations are desired).
+  #  - `end` is the terminator of the token.
+  #  - `offsetInChunk` is the start of the interpolated string in the current
+  #    chunk, including the starting delimiter.
+  #
+  # Examples of delimiters are `'`, `"`, `'''`, `"""` and `///`.
+  #
+  # This method allows us to have strings within interpolations within strings,
+  # ad infinitum.
+  matchWithInterpolations: (str, regex, end, offsetInChunk) ->
     tokens = []
-    pi = 0
-    i  = -1
-    while letter = str.charAt i += 1
-      if letter is '\\'
-        i += 1
-        continue
-      unless letter is '#' and str.charAt(i+1) is '{' and
-             (expr = @balancedString str[i + 1..], '}')
-        continue
-      # NEOSTRING is a fake token.  This will be converted to a string below.
-      tokens.push @makeToken('NEOSTRING', str[pi...i], strOffset + pi) if pi < i
-      unless errorToken
-        errorToken = @makeToken '', 'string interpolation', offsetInChunk + i + 1, 2
-      inner = expr[1...-1]
-      if inner.length
-        [line, column] = @getLineAndColumnFromChunk(strOffset + i + 1)
-        nested = new Lexer().tokenize inner, line: line, column: column, rewrite: off
-        popped = nested.pop()
-        popped = nested.shift() if nested[0]?[0] is 'TERMINATOR'
-        if len = nested.length
-          if len > 1
-            nested.unshift @makeToken '(', '(', strOffset + i + 1, 0
-            nested.push    @makeToken ')', ')', strOffset + i + 1 + inner.length, 0
-          # Push a fake 'TOKENS' token, which will get turned into real tokens below.
-          tokens.push ['TOKENS', nested]
-      i += expr.length
-      pi = i + 1
-    tokens.push @makeToken('NEOSTRING', str[pi..], strOffset + pi) if i > pi < str.length
+    loop
+      [strPart] = regex.exec str
 
-    # If regex, then return now and let the regex code deal with all these fake tokens
-    return tokens if regex
+      # Push a fake 'NEOSTRING' token, which will get turned into a real string later.
+      tokens.push @makeToken 'NEOSTRING', strPart, offsetInChunk
 
-    # If we didn't find any tokens, then just return an empty string.
-    return @token 'STRING', '""', offsetInChunk, lexedLength unless tokens.length
+      str = str[strPart.length..]
+      offsetInChunk += strPart.length
 
-    # If the first token is not a string, add a fake empty string to the beginning.
-    tokens.unshift @makeToken('NEOSTRING', '', offsetInChunk) unless tokens[0][0] is 'NEOSTRING'
+      break unless str[...2] is '#{'
 
+      # The `1`s are to remove the `#` in `#{`.
+      [line, column] = @getLineAndColumnFromChunk offsetInChunk + 1
+      {tokens: nested, index} =
+        new Lexer().tokenize str[1..], line: line, column: column, untilBalanced: on
+      # Skip the trailing `}`.
+      index += 1
+
+      # Turn the leading and trailing `{` and `}` into parentheses. Unnecessary
+      # parentheses will be removed later.
+      [open, ..., close] = nested
+      open[0]  = open[1]  = '('
+      close[0] = close[1] = ')'
+      close.origin = ['', 'end of interpolation', close[2]]
+
+      # Remove leading 'TERMINATOR' (if any).
+      nested.splice 1, 1 if nested[1]?[0] is 'TERMINATOR'
+
+      # Push a fake 'TOKENS' token, which will get turned into real tokens later.
+      tokens.push ['TOKENS', nested]
+
+      str = str[index..]
+      offsetInChunk += index
+
+    unless str[...end.length] is end
+      @error "missing #{end}"
+
+    {tokens, index: offsetInChunk + end.length}
+
+  # Merge the array `tokens` of the fake token types 'TOKENS' and 'NEOSTRING'
+  # (as returned by `matchWithInterpolations`) into the token stream. The value
+  # of 'NEOSTRING's are converted using `fn` and turned into strings using
+  # `quote` first.  The tokens are wrapped in parentheses if needed, using
+  # `start` and `end` for their location data.
+  mergeInterpolationTokens: (tokens, {quote, start, end}, fn) ->
     if interpolated = tokens.length > 1
-      @token '(', '(', offsetInChunk, 0, errorToken
+      errorToken = @makeToken '', 'interpolation', start + tokens[0][1].length, 2
+      @token '(', '(', 0, 0, errorToken
 
-    # Push all the tokens
+    firstIndex = @tokens.length
     for token, i in tokens
       [tag, value] = token
-      if i
+      switch tag
+        when 'TOKENS'
+          # Optimize out empty interpolations (an empty pair of parentheses).
+          continue if value.length is 2
+          # Push all the tokens in the fake 'TOKENS' token. These already have
+          # sane location data.
+          locationToken = value[0]
+          tokensToPush = value
+        when 'NEOSTRING'
+          # Convert 'NEOSTRING' into 'STRING'.
+          converted = fn token[1], i
+          # Optimize out empty strings. We ensure that the tokens stream always
+          # starts with a string token, though, to make sure that the result
+          # really is a string.
+          if converted.length is 0
+            if i is 0
+              firstEmptyStringIndex = @tokens.length
+            else
+              continue
+          # However, there is one case where we can optimize away a starting
+          # empty string.
+          if i is 2 and firstEmptyStringIndex?
+            @tokens.splice firstEmptyStringIndex, 2 # Remove empty string and the plus.
+          token[0] = 'STRING'
+          token[1] = @makeString converted, quote
+          locationToken = token
+          tokensToPush = [token]
+      if @tokens.length > firstIndex
         # Create a 0-length "+" token.
-        plusToken = @token '+', '+' if i
-        locationToken = if tag == 'TOKENS' then value[0] else token
+        plusToken = @token '+', '+'
         plusToken[2] =
-          first_line: locationToken[2].first_line
+          first_line:   locationToken[2].first_line
           first_column: locationToken[2].first_column
-          last_line: locationToken[2].first_line
-          last_column: locationToken[2].first_column
-      if tag is 'TOKENS'
-        # Push all the tokens in the fake 'TOKENS' token.  These already have
-        # sane location data.
-        @tokens.push value...
-      else if tag is 'NEOSTRING'
-        # Convert NEOSTRING into STRING
-        token[0] = 'STRING'
-        token[1] = @makeString value, '"', heredoc
-        @tokens.push token
-      else
-        @error "Unexpected #{tag}"
+          last_line:    locationToken[2].first_line
+          last_column:  locationToken[2].first_column
+      @tokens.push tokensToPush...
+
     if interpolated
-      rparen = @makeToken ')', ')', offsetInChunk + lexedLength, 0
+      rparen = @token ')', ')', end, 0
       rparen.stringEnd = true
-      @tokens.push rparen
-    tokens
 
   # Pairs up a closing token, ensuring that all listed pairs of tokens are
   # correctly balanced throughout the course of the token stream.
   pair: (tag) ->
-    unless tag is wanted = last @ends
+    unless tag is wanted = last(@ends)?.tag
       @error "unmatched #{tag}" unless 'OUTDENT' is wanted
       # Auto-close INDENT to support syntax like this:
       #
@@ -683,32 +656,27 @@ exports.Lexer = class Lexer
   # Are we in the midst of an unfinished expression?
   unfinished: ->
     LINE_CONTINUER.test(@chunk) or
-    @tag() in ['\\', '.', '?.', '?::', 'UNARY', 'MATH', 'UNARY_MATH', '+', '-',
+    @tag() in ['\\', '.', '?.', '?::', 'UNARY', 'MATH', 'UNARY_MATH', '+', '-', 'YIELD',
                '**', 'SHIFT', 'RELATION', 'COMPARE', 'LOGIC', 'THROW', 'EXTENDS']
 
-  # Remove newlines from beginning and (non escaped) from end of string literals.
-  removeNewlines: (str) ->
-    str.replace(/^\s*\n\s*/, '')
-       .replace(/([^\\]|\\\\)\s*\n\s*$/, '$1')
-
-  # Converts newlines for string literals.
-  escapeLines: (str, heredoc) ->
-    # Ignore escaped backslashes and remove escaped newlines
-    str = str.replace /\\[^\S\n]*(\n|\\)\s*/g, (escaped, character) ->
+  formatString: (str) ->
+    # Ignore escaped backslashes and remove escaped newlines.
+    str.replace /\\[^\S\n]*(\n|\\)\s*/g, (escaped, character) ->
       if character is '\n' then '' else escaped
-    if heredoc
-      str.replace MULTILINER, '\\n'
-    else
-      str.replace /\s*\n\s*/g, ' '
 
-  # Constructs a string token by escaping quotes and newlines.
-  makeString: (body, quote, heredoc) ->
+  formatHeregex: (str) ->
+    str.replace(HEREGEX_OMIT, '$1$2').replace(MULTILINER, '\\n')
+
+  # Constructs a string token by escaping quotes.
+  makeString: (body, quote) ->
     return quote + quote unless body
-    # Ignore escaped backslashes and unescape quotes
+    # Ignore escaped backslashes and unescape quotes.
     body = body.replace /// \\( #{quote} | \\ ) ///g, (match, contents) ->
       if contents is quote then contents else match
     body = body.replace /// #{quote} ///g, '\\$&'
-    quote + @escapeLines(body, heredoc) + quote
+    if match = OCTAL_ESCAPE.exec body
+      @error "octal escape sequences are not allowed #{match[2]}", match.index + match[1].length + 1
+    quote + body + quote
 
   # Throws a compiler error on the current position.
   error: (message, offset = 0) ->
@@ -724,7 +692,7 @@ exports.Lexer = class Lexer
 JS_KEYWORDS = [
   'true', 'false', 'null', 'this'
   'new', 'delete', 'typeof', 'in', 'instanceof'
-  'return', 'throw', 'break', 'continue', 'debugger'
+  'return', 'throw', 'break', 'continue', 'debugger', 'yield'
   'if', 'else', 'switch', 'for', 'while', 'do', 'try', 'catch', 'finally'
   'class', 'extends', 'super'
 ]
@@ -751,12 +719,11 @@ COFFEE_KEYWORDS = COFFEE_KEYWORDS.concat COFFEE_ALIASES
 # to avoid having a JavaScript error at runtime.
 RESERVED = [
   'case', 'default', 'function', 'var', 'void', 'with', 'const', 'let', 'enum'
-  'export', 'import', 'native', '__hasProp', '__extends', '__slice', '__bind'
-  '__indexOf', 'implements', 'interface', 'package', 'private', 'protected'
-  'public', 'static', 'yield'
+  'export', 'import', 'native', 'implements', 'interface', 'package', 'private'
+  'protected', 'public', 'static'
 ]
 
-STRICT_PROSCRIBED = ['arguments', 'eval']
+STRICT_PROSCRIBED = ['arguments', 'eval', 'yield*']
 
 # The superset of both JavaScript keywords and reserved words, none of which may
 # be used as identifiers or properties.
@@ -770,7 +737,8 @@ BOM = 65279
 
 # Token matching regexes.
 IDENTIFIER = /// ^
-  ( [$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]* )
+  (?!\d)
+  ( (?: (?!\s)[$\w\x7f-\uffff] )+ )
   ( [^\n\S]* : (?!:) )?  # Is this a property name?
 ///
 
@@ -781,8 +749,6 @@ NUMBER     = ///
   ^ \d*\.?\d+ (?:e[+-]?\d+)?  # decimal
 ///i
 
-HEREDOC    = /// ^ ("""|''') ((?: \\[\s\S] | [^\\] )*?) (?:\n[^\n\S]*)? \1 ///
-
 OPERATOR   = /// ^ (
   ?: [-=]>             # function
    | [-+*/%<>&|^!?=]=  # compound assign / compare
@@ -801,26 +767,34 @@ CODE       = /^[-=]>/
 
 MULTI_DENT = /^(?:\n[^\n\S]*)+/
 
-SIMPLESTR  = /^'[^\\']*(?:\\[\s\S][^\\']*)*'/
-
 JSTOKEN    = /^`[^\\`]*(?:\\.[^\\`]*)*`/
 
+# String-matching-regexes.
+STRING_START   = /^(?:'''|"""|'|")/
+
+STRING_SINGLE  = /// ^(?: [^\\']  | \\[\s\S]                      )* ///
+STRING_DOUBLE  = /// ^(?: [^\\"#] | \\[\s\S] |           \#(?!\{) )* ///
+HEREDOC_SINGLE = /// ^(?: [^\\']  | \\[\s\S] | '(?!'')            )* ///
+HEREDOC_DOUBLE = /// ^(?: [^\\"#] | \\[\s\S] | "(?!"") | \#(?!\{) )* ///
+
+STRING_OMIT    = /\s*\n\s*/g
+HEREDOC_INDENT = /\n+([^\n\S]*)(?=\S)/g
+
 # Regex-matching-regexes.
 REGEX = /// ^
-  (/ (?! [\s=] )   # disallow leading whitespace or equals signs
-  [^ [ / \n \\ ]*  # every other thing
-  (?:
-    (?: \\[\s\S]   # anything escaped
-      | \[         # character class
-           [^ \] \n \\ ]*
-           (?: \\[\s\S] [^ \] \n \\ ]* )*
-         ]
-    ) [^ [ / \n \\ ]*
-  )*
-  /) ([imgy]{0,4}) (?!\w)
+  / (?!/) (
+  ?: [^ [ / \n \\ ]  # every other thing
+   | \\.             # anything (but newlines) escaped
+   | \[              # character class
+       (?: \\. | [^ \] \n \\ ] )*
+     ]
+  )* (/)?
 ///
 
-HEREGEX      = /// ^ /{3} ((?:\\?[\s\S])+?) /{3} ([imgy]{0,4}) (?!\w) ///
+REGEX_FLAGS  = /^\w*/
+VALID_FLAGS  = /^(?!.*(.).*\1)[imgy]*$/
+
+HEREGEX      = /// ^(?: [^\\/#] | \\[\s\S] | /(?!//) | \#(?!\{) )* ///
 
 HEREGEX_OMIT = ///
     ((?:\\\\)+)     # consume (and preserve) an even number of backslashes
@@ -828,16 +802,23 @@ HEREGEX_OMIT = ///
   | \s+(?:#.*)?     # remove whitespace and comments
 ///g
 
-# Token cleaning regexes.
-MULTILINER      = /\n/g
+REGEX_ILLEGAL = /// ^ ( / | /{3}\s*) (\*) ///
 
-HEREDOC_INDENT  = /\n+([^\n\S]*)/g
+POSSIBLY_DIVISION   = /// ^ /=?\s ///
 
-HEREDOC_ILLEGAL = /\*\//
+# Other regexes.
+MULTILINER          = /\n/g
 
-LINE_CONTINUER  = /// ^ \s* (?: , | \??\.(?![.\d]) | :: ) ///
+HERECOMMENT_ILLEGAL = /\*\//
 
-TRAILING_SPACES = /\s+$/
+LINE_CONTINUER      = /// ^ \s* (?: , | \??\.(?![.\d]) | :: ) ///
+
+OCTAL_ESCAPE        = /// ^ ((?: \\. | [^\\] )*) (\\ (?: 0[0-7] | [1-7] )) ///
+
+LEADING_BLANK_LINE  = /^[^\n\S]*\n/
+TRAILING_BLANK_LINE = /\n[^\n\S]*$/
+
+TRAILING_SPACES     = /\s+$/
 
 # Compound assignment tokens.
 COMPOUND_ASSIGN = [
@@ -868,23 +849,17 @@ RELATION = ['IN', 'OF', 'INSTANCEOF']
 # Boolean tokens.
 BOOL = ['TRUE', 'FALSE']
 
-# Tokens which a regular expression will never immediately follow, but which
-# a division operator might.
-#
-# See: http://www.mozilla.org/js/language/js20-2002-04/rationale/syntax.html#regular-expressions
-#
-# Our list is shorter, due to sans-parentheses method calls.
-NOT_REGEX = ['NUMBER', 'REGEX', 'BOOL', 'NULL', 'UNDEFINED', '++', '--']
-
-# If the previous token is not spaced, there are more preceding tokens that
-# force a division parse:
-NOT_SPACED_REGEX = NOT_REGEX.concat ')', '}', 'THIS', 'IDENTIFIER', 'STRING', ']'
-
 # Tokens which could legitimately be invoked or indexed. An opening
 # parentheses or bracket following these tokens will be recorded as the start
 # of a function invocation or indexing operation.
-CALLABLE  = ['IDENTIFIER', 'STRING', 'REGEX', ')', ']', '}', '?', '::', '@', 'THIS', 'SUPER']
-INDEXABLE = CALLABLE.concat 'NUMBER', 'BOOL', 'NULL', 'UNDEFINED'
+CALLABLE  = ['IDENTIFIER', ')', ']', '?', '@', 'THIS', 'SUPER']
+INDEXABLE = CALLABLE.concat ['NUMBER', 'STRING', 'REGEX', 'BOOL', 'NULL', 'UNDEFINED', '}', '::']
+
+# Tokens which a regular expression will never immediately follow (except spaced
+# CALLABLEs in some cases), but which a division operator can.
+#
+# See: http://www-archive.mozilla.org/js/language/js20-2002-04/rationale/syntax.html#regular-expressions
+NOT_REGEX = INDEXABLE.concat ['++', '--']
 
 # Tokens that, when immediately preceding a `WHEN`, indicate that the `WHEN`
 # occurs at the start of a line. We disambiguate these from trailing whens to