CoffeeScript 1.8.0

Release 1.8.0

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

@@ -1,5 +1,6 @@
 fs            = require 'fs'
 path          = require 'path'
+_             = require 'underscore'
 CoffeeScript  = require './lib/coffee-script'
 {spawn, exec} = require 'child_process'
 helpers       = require './lib/coffee-script/helpers'
@@ -41,6 +42,56 @@ run = (args, cb) ->
 log = (message, color, explanation) ->
   console.log color + message + reset + ' ' + (explanation or '')
 
+codeFor = ->
+  counter = 0
+  hljs = require 'highlight.js'
+  hljs.configure classPrefix: ''
+  (file, executable = false, showLoad = true) ->
+    counter++
+    return unless fs.existsSync "documentation/js/#{file}.js"
+    cs = fs.readFileSync "documentation/coffee/#{file}.coffee", 'utf-8'
+    js = fs.readFileSync "documentation/js/#{file}.js", 'utf-8'
+    js = js.replace /^\/\/ generated.*?\n/i, ''
+
+    cshtml = "<pre><code>#{hljs.highlight('coffeescript', cs).value}</code></pre>"
+    jshtml = "<pre><code>#{hljs.highlight('javascript', js).value}</code></pre>"
+    append = if executable is yes then '' else "alert(#{executable});"
+    if executable and executable != yes
+      cs.replace /(\S)\s*\Z/m, "$1\n\nalert #{executable}"
+    run    = if executable is true then 'run' else "run: #{executable}"
+    name   = "example#{counter}"
+    script = "<script>window.#{name} = #{JSON.stringify cs}</script>"
+    load   = if showLoad then "<div class='minibutton load' onclick='javascript: loadConsole(#{name});'>load</div>" else ''
+    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) ->
@@ -53,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"
@@ -84,7 +135,6 @@ task 'build:parser', 'rebuild the Jison parser (run build first)', ->
   parser = require('./lib/coffee-script/grammar').parser
   fs.writeFile 'lib/coffee-script/parser.js', parser.generate()
 
-
 task 'build:browser', 'rebuild the merged script for inclusion in the browser', ->
   code = ''
   for name in ['helpers', 'rewriter', 'lexer', 'parser', 'scope', 'nodes', 'sourcemap', 'coffee-script', 'browser']
@@ -118,17 +168,28 @@ task 'build:browser', 'rebuild the merged script for inclusion in the browser',
 
 
 task 'doc:site', 'watch and continually rebuild the documentation for the website', ->
-  exec 'rake doc', (err) ->
-    throw err if err
+  source = 'documentation/index.html.js'
+  exec 'bin/coffee -bc -o documentation/js documentation/coffee/*.coffee'
+
+  do renderIndex = ->
+    codeSnippetCounter = 0
+    rendered = _.template fs.readFileSync(source, 'utf-8'),
+      codeFor: codeFor()
+      releaseHeader: releaseHeader
+    fs.writeFileSync 'index.html', rendered
+    log "compiled", green, "#{source}"
+
+  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', ->
@@ -155,6 +216,7 @@ task 'bench', 'quick benchmark of compilation time', ->
 
 # Run the CoffeeScript test suite.
 runTests = (CoffeeScript) ->
+  CoffeeScript.register()
   startTime   = Date.now()
   currentFile = null
   passedTests = 0

LICENSE

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

README

@@ -1,12 +1,11 @@
-
             {
          }   }   {
         {   {  }  }
          }   }{  {
         {  }{  }  }                    _____       __  __
-       ( }{ }{  { )                   / ____|     / _|/ _|
+       { }{ }{  { }                   / ____|     / _|/ _|
      .- { { }  { }} -.               | |     ___ | |_| |_ ___  ___
-    (  ( } { } { } }  )              | |    / _ \|  _|  _/ _ \/ _ \
+    (  { } { } { } }  )              | |    / _ \|  _|  _/ _ \/ _ \
     |`-..________ ..-'|              | |___| (_) | | | ||  __/  __/
     |                 |               \_____\___/|_| |_| \___|\___|
     |                 ;--.
@@ -22,13 +21,13 @@
 
   CoffeeScript is a little language that compiles into JavaScript.
 
-  Install Node.js, and then the CoffeeScript compiler:
-  sudo bin/cake install
-
-  Or, if you have the Node Package Manager installed:
+  If you have the Node Package Manager installed:
   npm install -g coffee-script
   (Leave off the -g if you don't wish to install globally.)
 
+  Or, if you don't wish to use npm:
+  sudo bin/cake install
+
   Execute a script:
   coffee /path/to/script.coffee
 
@@ -39,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
 
-  All contributors are listed here:
-  http://github.com/jashkenas/coffee-script/contributors
+  Top 100 contributors are listed here:
+  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

Rakefile

@@ -1,79 +0,0 @@
-require 'rubygems'
-require 'erb'
-require 'fileutils'
-require 'rake/testtask'
-require 'json'
-
-desc "Build the documentation page"
-task :doc do
-  source = 'documentation/index.html.erb'
-  child = fork { exec "bin/coffee -bcw -o documentation/js documentation/coffee/*.coffee" }
-  at_exit { Process.kill("INT", child) }
-  Signal.trap("INT") { exit }
-  loop do
-    mtime = File.stat(source).mtime
-    if !@mtime || mtime > @mtime
-      rendered = ERB.new(File.read(source)).result(binding)
-      File.open('index.html', 'w+') {|f| f.write(rendered) }
-    end
-    @mtime = mtime
-    sleep 1
-  end
-end
-
-desc "Build coffee-script-source gem"
-task :gem do
-  require 'rubygems'
-  require 'rubygems/package'
-
-  gemspec = Gem::Specification.new do |s|
-    s.name      = 'coffee-script-source'
-    s.version   = JSON.parse(File.read('package.json'))["version"]
-    s.date      = Time.now.strftime("%Y-%m-%d")
-
-    s.homepage    = "http://jashkenas.github.com/coffee-script/"
-    s.summary     = "The CoffeeScript Compiler"
-    s.description = <<-EOS
-      CoffeeScript is a little language that compiles into JavaScript.
-      Underneath all of those embarrassing braces and semicolons,
-      JavaScript has always had a gorgeous object model at its heart.
-      CoffeeScript is an attempt to expose the good parts of JavaScript
-      in a simple way.
-    EOS
-
-    s.files = [
-      'lib/coffee_script/coffee-script.js',
-      'lib/coffee_script/source.rb'
-    ]
-
-    s.authors           = ['Jeremy Ashkenas']
-    s.email             = 'jashkenas@gmail.com'
-    s.rubyforge_project = 'coffee-script-source'
-    s.license           = "MIT"
-  end
-
-  file = File.open("coffee-script-source.gem", "w")
-  Gem::Package.open(file, 'w') do |pkg|
-    pkg.metadata = gemspec.to_yaml
-
-    path = "lib/coffee_script/source.rb"
-    contents = <<-ERUBY
-module CoffeeScript
-  module Source
-    def self.bundled_path
-      File.expand_path("../coffee-script.js", __FILE__)
-    end
-  end
-end
-    ERUBY
-    pkg.add_file_simple(path, 0644, contents.size) do |tar_io|
-      tar_io.write(contents)
-    end
-
-    contents = File.read("extras/coffee-script.js")
-    path = "lib/coffee_script/coffee-script.js"
-    pkg.add_file_simple(path, 0644, contents.size) do |tar_io|
-      tar_io.write(contents)
-    end
-  end
-end

documentation/coffee/chaining.coffee

@@ -0,0 +1,8 @@
+$ 'body'
+.click (e) ->
+  $ '.box'
+  .fadeIn 'fast'
+  .addClass '.active'
+.css 'background', 'white'
+
+

documentation/coffee/constructor_destructuring.coffee

@@ -2,3 +2,5 @@ class Person
   constructor: (options) -> 
     {@name, @age, @height} = options
 
+tim = new Person age: 4
+

documentation/coffee/expansion.coffee

@@ -0,0 +1,7 @@
+text = "Every literary critic believes he will
+        outwit history and have the last word"
+
+[first, ..., last] = text.split " "
+
+
+

documentation/coffee/slices.coffee

@@ -2,8 +2,8 @@ numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9]
 
 start   = numbers[0..2]
 
-middle  = numbers[3...6]
+middle  = numbers[3...-2]
 
-end     = numbers[6..]
+end     = numbers[-2..]
 
 copy    = numbers[..]

documentation/coffee/strings.coffee

@@ -1,8 +1,6 @@
 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..."
-
-
+  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/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/css/idle.css

@@ -1,64 +0,0 @@
-pre.idle .InheritedClass {
-}
-pre.idle .TypeName {
-   color: #21439C;
-}
-pre.idle .Number {
-}
-pre.idle .LibraryVariable {
-   color: #A535AE;
-}
-pre.idle .Storage {
-   color: #FF5600;
-}
-pre.idle .line-numbers {
-   background-color: #BAD6FD;
-   color: #000000;
-}
-pre.idle {
-   background-color: #FFFFFF;
-   color: #000000;
-}
-pre.idle .StringInterpolation {
-   color: #990000;
-}
-pre.idle .TagName {
-}
-pre.idle .LibraryConstant {
-   color: #A535AE;
-}
-pre.idle .FunctionArgument {
-   color: #0076ad;
-}
-pre.idle .BuiltInConstant {
-   color: #A535AE;
-}
-pre.idle .Invalid {
-   background-color: #990000;
-   color: #FFFFFF;
-}
-pre.idle .LibraryClassType {
-   color: #A535AE;
-}
-pre.idle .LibraryFunction {
-   color: #A535AE;
-}
-pre.idle .TagAttribute {
-}
-pre.idle .Keyword {
-   color: #FF5600;
-}
-pre.idle .UserDefinedConstant {
-}
-pre.idle .String {
-   color: #00A33F;
-}
-pre.idle .FunctionName {
-   color: #21439C;
-}
-pre.idle .Variable {
-  color: #A535AE;
-}
-pre.idle .Comment {
-   color: #919191;
-}

documentation/css/tomorrow.css

@@ -0,0 +1,66 @@
+/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */
+/* Original code:; http://softwaremaniacs.org/media/soft/highlight/styles/tomorrow.css */
+/* But forked for CoffeeScript */
+.tomorrow-comment, pre .comment, pre .title {
+  color: #8e908c;
+}
+
+.tomorrow-red, pre .variable, pre .tag, pre .regexp, pre .ruby .constant, pre .xml .tag .title, pre .xml .pi, pre .xml .doctype, pre .html .doctype, pre .css .id, pre .css .class, pre .css .pseudo {
+  color: #c82829;
+}
+
+.tomorrow-orange, pre .number, pre .preprocessor, pre .built_in, pre .params, pre .constant {
+  color: #000000;
+}
+
+.tomorrow-yellow, pre .class, pre .ruby .class .title, pre .css .rules .attribute {
+  color: #eab700;
+}
+
+.tomorrow-green, pre .string, pre .value, pre .inheritance, pre .header, pre .ruby .symbol, pre .xml .cdata {
+  color: #718c00;
+}
+
+.tomorrow-aqua, pre .css .hexcolor {
+  color: #3e999f;
+}
+
+.tomorrow-blue, pre .function, pre .function .title, pre .python .decorator, pre .python .title, pre .ruby .function .title, pre .ruby .title .keyword, pre .perl .sub, pre .javascript .title, pre .coffeescript .title {
+  color: #21439C;
+}
+
+.tomorrow-purple, pre .keyword, pre .reserved, pre .javascript .function {
+  color: #FF5600;
+}
+
+pre .subst {
+  color: #A535AE;
+}
+
+pre .literal {
+  color: #A535AE;
+}
+
+pre .property {
+  color: #A535AE;
+}
+
+pre .class .title {
+  color: #21439C;
+}
+
+pre code {
+  display: block;
+  background: white;
+  color: #000000;
+}
+
+pre .coffeescript .javascript,
+pre .javascript .xml,
+pre .tex .formula,
+pre .xml .javascript,
+pre .xml .vbscript,
+pre .xml .css,
+pre .xml .cdata {
+  opacity: 0.5;
+}

documentation/docs/browser.html

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

documentation/docs/cake.html

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

documentation/docs/docco.css

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

documentation/docs/index.html

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

documentation/docs/optparse.html

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

documentation/docs/register.html

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

documentation/docs/repl.html

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

documentation/docs/scope.html

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

documentation/docs/sourcemap.html

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

documentation/js/aliases.js

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

documentation/js/array_comprehensions.js

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

documentation/js/block_comment.js

@@ -1,7 +1,7 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
+
 /*
 SkinnyMochaHalfCaffScript Compiler v1.0
 Released under the MIT License
-*/
-
+ */
 

documentation/js/cake_tasks.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 var fs;
 
 fs = require('fs');

documentation/js/chaining.js

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

documentation/js/classes.js

@@ -1,5 +1,5 @@
-// Generated by CoffeeScript 1.6.3
-var Animal, Horse, Snake, sam, tom, _ref, _ref1,
+// Generated by CoffeeScript 1.8.0
+var Animal, Horse, Snake, sam, tom,
   __hasProp = {}.hasOwnProperty,
   __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
@@ -20,8 +20,7 @@ Snake = (function(_super) {
   __extends(Snake, _super);
 
   function Snake() {
-    _ref = Snake.__super__.constructor.apply(this, arguments);
-    return _ref;
+    return Snake.__super__.constructor.apply(this, arguments);
   }
 
   Snake.prototype.move = function() {
@@ -37,8 +36,7 @@ Horse = (function(_super) {
   __extends(Horse, _super);
 
   function Horse() {
-    _ref1 = Horse.__super__.constructor.apply(this, arguments);
-    return _ref1;
+    return Horse.__super__.constructor.apply(this, arguments);
   }
 
   Horse.prototype.move = function() {

documentation/js/comparisons.js

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

documentation/js/conditionals.js

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

documentation/js/constructor_destructuring.js

@@ -1,5 +1,5 @@
-// Generated by CoffeeScript 1.6.3
-var Person;
+// Generated by CoffeeScript 1.8.0
+var Person, tim;
 
 Person = (function() {
   function Person(options) {
@@ -9,3 +9,7 @@ Person = (function() {
   return Person;
 
 })();
+
+tim = new Person({
+  age: 4
+});

documentation/js/default_args.js

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

documentation/js/do.js

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

documentation/js/embedded.js

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

documentation/js/existence.js

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

documentation/js/expansion.js

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

documentation/js/expressions.js

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

documentation/js/expressions_assignment.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.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.6.3
+// Generated by CoffeeScript 1.8.0
 var globals, name;
 
 globals = ((function() {

documentation/js/expressions_try.js

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

documentation/js/fat_arrow.js

@@ -1,11 +1,12 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 var Account;
 
 Account = function(customer, cart) {
-  var _this = this;
   this.customer = customer;
   this.cart = cart;
-  return $('.shopping_cart').bind('click', function(event) {
-    return _this.customer.purchase(_this.cart);
-  });
+  return $('.shopping_cart').bind('click', (function(_this) {
+    return function(event) {
+      return _this.customer.purchase(_this.cart);
+    };
+  })(this));
 };

documentation/js/functions.js

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

documentation/js/heredocs.js

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

documentation/js/heregexes.js

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

documentation/js/interpolation.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 var author, quote, sentence;
 
 author = "Wittgenstein";

documentation/js/multiple_return_values.js

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

documentation/js/object_comprehensions.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 var age, ages, child, yearsOld;
 
 yearsOld = {

documentation/js/object_extraction.js

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

documentation/js/objects_and_arrays.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.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.6.3
+// Generated by CoffeeScript 1.8.0
 $('.account').attr({
   "class": 'active'
 });

documentation/js/overview.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.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.6.3
+// Generated by CoffeeScript 1.8.0
 var theBait, theSwitch, _ref;
 
 theBait = 1000;

documentation/js/patterns_and_splats.js

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

documentation/js/prototypes.js

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

documentation/js/range_comprehensions.js

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

documentation/js/scope.js

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

documentation/js/slices.js

@@ -1,12 +1,12 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 var copy, end, middle, numbers, start;
 
 numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9];
 
 start = numbers.slice(0, 3);
 
-middle = numbers.slice(3, 6);
+middle = numbers.slice(3, -2);
 
-end = numbers.slice(6);
+end = numbers.slice(-2);
 
 copy = numbers.slice(0);

documentation/js/soaks.js

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

documentation/js/splats.js

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

documentation/js/splices.js

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

documentation/js/switch.js

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

documentation/js/switch_with_no_expression.js

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

documentation/js/try.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 var error;
 
 try {

documentation/js/while.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.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/blocks.coffee

@@ -31,7 +31,7 @@ File.open = (path, mode, block) ->
 # Write.
 write = (location, data) ->
   path = new Pathname location
-  throw new Error "Location does not exist" unless fs.existsSync(location)
+  throw new Error "Location does not exist" unless fs.existsSync location
 
   File.open path, 'w', (file) ->
     return false if Digest.MD5.hexdigest(file.read()) is data.hash()

examples/code.coffee

@@ -13,7 +13,7 @@ run_loop = ->
   wait()
 
 # Objects:
-dense_object_literal = {one: 1, two: 2, three: 3}
+dense_object_literal = one: 1, two: 2, three: 3
 
 spaced_out_multiline_object =
   pi: 3.14159
@@ -56,7 +56,7 @@ race = ->
   run()
   walk()
   crawl()
-  if tired then return sleep()
+  return sleep() if tired
   race()
 
 # Conditional assignment:
@@ -64,7 +64,7 @@ good or= evil
 wine and= cheese
 
 # Nested property access and calls.
-((moon.turn(360))).shapes[3].move({x: 45, y: 30}).position['top'].offset('x')
+(moon.turn 360).shapes[3].move(x: 45, y: 30).position['top'].offset('x')
 
 a = b = c = 5
 
@@ -79,7 +79,7 @@ try
   dogs_and_cats_living_together()
   throw "up"
 catch error
-  print(error)
+  print error
 finally
   clean_up()
 
@@ -130,8 +130,8 @@ wednesday = -> eat_breakfast(); go_to_work(); eat_dinner()
 
 # Multiline strings with inner quotes.
 story = "Lorem ipsum dolor \"sit\" amet, consectetuer adipiscing elit,
-sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna
-aliquam erat volutpat. Ut wisi enim ad."
+         sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna
+         aliquam erat volutpat. Ut wisi enim ad."
 
 # Inheritance and calling super.
 class Animal

examples/computer_science/binary_search.coffee

@@ -19,7 +19,7 @@ binary_search = (items, value) ->
 
 
 # Test the function.
-console.log 2 is binary_search [10, 20, 30, 40, 50], 30
-console.log 4 is binary_search [-97, 35, 67, 88, 1200], 1200
-console.log 0 is binary_search [0, 45, 70], 0
-console.log(-1 is binary_search [0, 45, 70], 10)
+console.log  2 is binary_search [10, 20, 30, 40, 50], 30
+console.log  4 is binary_search [-97, 35, 67, 88, 1200], 1200
+console.log  0 is binary_search [0, 45, 70], 0
+console.log -1 is binary_search [0, 45, 70], 10

examples/computer_science/bubble_sort.coffee

@@ -1,8 +1,8 @@
 # A bubble sort implementation, sorting the given array in-place.
 bubble_sort = (list) ->
   for i in [0...list.length]
-    for j in [0...list.length - i]
-      [list[j], list[j+1]] = [list[j+1], list[j]] if list[j] > list[j+1]
+    for j in [0...list.length - i] when list[j] > list[j + 1]
+      [list[j], list[j+1]] = [list[j + 1], list[j]]
   list
 
 

examples/computer_science/linked_list.coffee

@@ -1,8 +1,8 @@
 # "Classic" linked list implementation that doesn't keep track of its size.
 class LinkedList
 
-  ->
-    this._head = null # Pointer to the first item in the list.
+  constructor: ->
+    @_head = null # Pointer to the first item in the list.
 
 
   # Appends some data to the end of the list. This method traverses the existing
@@ -12,10 +12,10 @@ class LinkedList
     # Create a new node object to wrap the data.
     node = data: data, next: null
 
-    current = this._head or= node
+    current = @_head or= node
 
-    if this._head isnt node
-      (current = current.next) while current.next
+    if @_head isnt node
+      current = current.next while current.next
       current.next = node
 
     this
@@ -27,11 +27,11 @@ class LinkedList
     # Check for out-of-bounds values.
     return null if index < 0
 
-    current = this._head or null
+    current = @_head or null
     i = -1
 
     # Advance through the list.
-    (current = current.next) while current and index > (i += 1)
+    current = current.next while current and index > ++i
 
     # Return null if we've reached the end.
     current and current.data
@@ -43,16 +43,16 @@ class LinkedList
     # Check for out-of-bounds values.
     return null if index < 0
 
-    current = this._head or null
+    current = @_head or null
     i = -1
 
     # Special case: removing the first item.
     if index is 0
-      this._head = current.next
+      @_head = current.next
     else
 
       # Find the right location.
-      ([previous, current] = [current, current.next]) while index > (i += 1)
+      [previous, current] = [current, current.next] while index > ++i
 
       # Skip over the item to remove.
       previous.next = current.next
@@ -63,7 +63,7 @@ class LinkedList
 
   # Calculate the number of items in the list.
   size: ->
-    current = this._head
+    current = @_head
     count = 0
 
     while current
@@ -76,7 +76,7 @@ class LinkedList
   # Convert the list into an array.
   toArray: ->
     result  = []
-    current = this._head
+    current = @_head
 
     while current
       result.push current.data
@@ -86,7 +86,7 @@ class LinkedList
 
 
   # The string representation of the linked list.
-  toString: -> this.toArray().toString()
+  toString: -> @toArray().toString()
 
 
 # Tests.

examples/computer_science/luhn_algorithm.coffee

@@ -7,13 +7,13 @@ is_valid_identifier = (identifier) ->
   sum = 0
   alt = false
 
-  for i in [identifier.length - 1..0] by -1
+  for c in identifier by -1
 
     # Get the next digit.
-    num = parseInt identifier.charAt(i), 10
+    num = parseInt c, 10
 
     # If it's not a valid number, abort.
-    return false if isNaN(num)
+    return false if isNaN num
 
     # If it's an alternate number...
     if alt

examples/computer_science/merge_sort.coffee

@@ -3,13 +3,12 @@ merge_sort = (list) ->
 
   return list if list.length is 1
 
-  result  = []
   pivot   = Math.floor list.length / 2
   left    = merge_sort list.slice 0, pivot
   right   = merge_sort list.slice pivot
 
-  while left.length and right.length
-    result.push(if left[0] < right[0] then left.shift() else right.shift())
+  result = while left.length and right.length
+    if left[0] < right[0] then left.shift() else right.shift()
 
   result.concat(left).concat(right)
 

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()

examples/poignant.coffee

@@ -1,8 +1,11 @@
 # Examples from the Poignant Guide.
+# These are examples of syntax differences between CoffeeScript and Ruby,
+# they won't run.
 
 # ['toast', 'cheese', 'wine'].each { |food| print food.capitalize }
 
-['toast', 'wine', 'cheese'].each (food) -> print food.capitalize()
+print food.capitalize() for food in ['toast', 'wine', 'cheese']
+
 
 
 
@@ -14,10 +17,10 @@
 # end
 
 LotteryTicket =
-  get_picks:      -> @picks
-  set_picks:      (@picks) ->
-  get_purchased:  -> @purchase
-  set_purchased:  (@purchased) ->
+  get_picks:     -> @picks
+  set_picks:     (@picks) ->
+  get_purchased: -> @purchase
+  set_purchased: (@purchased) ->
 
 
 
@@ -42,13 +45,10 @@ LotteryDraw =
   play: ->
     result  = LotteryTicket.new_random()
     winners = {}
-    this.tickets.each (buyer, ticket_list) ->
-      ticket_list.each (ticket) ->
-        score = ticket.score result
-        return if score is 0
-        winners[buyer] or= []
-        winners[buyer].push [ticket, score]
-    this.tickets = {}
+    for buyer, ticketList of @tickets
+      for ticket in ticketList when (score = ticket.score result) isnt 0
+        (winners[buyer] or= []).push [ticket, score]
+    @tickets = {}
     winners
 
 
@@ -64,7 +64,7 @@ LotteryDraw =
 
 WishScanner =
   scan_for_a_wish: ->
-    wish = this.read().detect (thought) -> thought.index('wish: ') is 0
+    wish = @read().detect (thought) -> thought.indexOf('wish: ') is 0
     wish.replace 'wish: ', ''
 
 
@@ -109,28 +109,28 @@ Creature =
 
   # This method applies a hit taken during a fight.
   hit: (damage) ->
-    p_up = Math.rand this.charisma
+    p_up = Math.rand @charisma
     if p_up % 9 is 7
-      this.life += p_up / 4
-      console.log "[" + this.name + " magick powers up " + p_up + "!]"
-    this.life -= damage
-    if this.life <= 0 then console.log "[" + this.name + " has died.]"
+      @life += p_up / 4
+      console.log "[#{@name} magick powers up #{p_up}!]"
+    @life -= damage
+    if @life <= 0 then console.log "[#{@name} has died.]"
 
   # This method takes one turn in a fight.
   fight: (enemy, weapon) ->
-    if this.life <= 0 then return console.log "[" + this.name + "is too dead to fight!]"
+    return console.log "[#{@name} is too dead to fight!]" if @life <= 0
 
     # Attack the opponent.
-    your_hit = Math.rand this.strength + weapon
-    console.log "[You hit with " + your_hit + "points of damage!]"
+    your_hit = Math.rand @strength + weapon
+    console.log "[You hit with #{your_hit}points of damage!]"
     enemy.hit your_hit
 
     # Retaliation.
     console.log enemy
     if enemy.life > 0
       enemy_hit = Math.rand enemy.strength + enemy.weapon
-      console.log "[Your enemy hit with " + enemy_hit + "points of damage!]"
-      this.hit enemy_hit
+      console.log "[Your enemy hit with #{enemy_hit}points of damage!]"
+      @hit enemy_hit
 
 
 
@@ -156,7 +156,7 @@ code_words.each (real, code) -> idea.replace(real, code)
 # Save the jibberish to a new file
 print "File encoded. Please enter a name for this idea: "
 idea_name = gets().strip()
-File.open "idea-" + idea_name + '.txt', 'w', (file) -> file.write idea
+File.open "idea-#{idea_name}.txt", 'w', (file) -> file.write idea
 
 
 
@@ -174,8 +174,8 @@ File.open "idea-" + idea_name + '.txt', 'w', (file) -> file.write idea
 
 wipe_mutterings_from = (sentence) ->
   throw new Error "cannot wipe mutterings" unless sentence.indexOf
-  while sentence.indexOf('(') >= 0
-    open     = sentence.indexOf('(') - 1
-    close    = sentence.indexOf(')') + 1
-    sentence = sentence.slice(0, open) + sentence.slice(close, sentence.length)
+  while '(' in sentence
+    open     = sentence.indexOf('(')
+    close    = sentence.indexOf(')')
+    sentence = "#{sentence[0...open]}#{sentence[close + 1..]}"
     sentence

examples/potion.coffee

@@ -45,7 +45,7 @@ foods[2]
 #   (key, ' is a ', val) join print.
 
 for key, val of {dog: 'canine', cat: 'feline', fox: 'vulpine'}
-  print key + ' is a ' + val
+  print "#{key} is a #{val}"
 
 
 # Person = class: /name, /age, /sex.
@@ -54,7 +54,7 @@ for key, val of {dog: 'canine', cat: 'feline', fox: 'vulpine'}
 
 class Person
   print: ->
-    print 'My name is ' + @name + '.'
+    print "My name is #{@name}."
 
 
 # p = Person ()
@@ -74,7 +74,7 @@ class Policeman extends Person
   (@rank) ->
 
   print: ->
-    print 'My name is ' + @name + " and I'm a " + @rank + '.'
+    print "My name is #{@name} and I'm a #{@rank}."
 
 print new Policeman 'Constable'
 
@@ -180,7 +180,7 @@ if 3.gender?
 #   session = url query ? at ('session').
 
 HomePage::get = (url) ->
-  session = url.query.session if url.query?
+  session = url.query?.session
 
 
 # BTree = class: /left, /right.

examples/web_server.coffee

@@ -7,6 +7,6 @@ server = http.createServer (req, res) ->
   res.write 'Hello, World!'
   res.end()
 
-server.listen 3000
+server.listen PORT = 3000
 
-console.log "Server running at http://localhost:3000/"
+console.log "Server running at http://localhost:#{PORT}/"

lib/coffee-script/browser.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 (function() {
   var CoffeeScript, compile, runScripts,
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
@@ -41,15 +41,18 @@
       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";
     };
   }
 
-  CoffeeScript.load = function(url, callback, options) {
+  CoffeeScript.load = function(url, callback, options, hold) {
     var xhr;
     if (options == null) {
       options = {};
     }
+    if (hold == null) {
+      hold = false;
+    }
     options.sourceFiles = [url];
     xhr = window.ActiveXObject ? new window.ActiveXObject('Microsoft.XMLHTTP') : new window.XMLHttpRequest();
     xhr.open('GET', url, true);
@@ -57,15 +60,18 @@
       xhr.overrideMimeType('text/plain');
     }
     xhr.onreadystatechange = function() {
-      var _ref;
+      var param, _ref;
       if (xhr.readyState === 4) {
         if ((_ref = xhr.status) === 0 || _ref === 200) {
-          CoffeeScript.run(xhr.responseText, options);
+          param = [xhr.responseText, options];
+          if (!hold) {
+            CoffeeScript.run.apply(CoffeeScript, param);
+          }
         } else {
           throw new Error("Could not load " + url);
         }
         if (callback) {
-          return callback();
+          return callback(param);
         }
       }
     };
@@ -73,7 +79,7 @@
   };
 
   runScripts = function() {
-    var coffees, coffeetypes, execute, index, length, s, scripts;
+    var coffees, coffeetypes, execute, i, index, s, script, scripts, _fn, _i, _len;
     scripts = window.document.getElementsByTagName('script');
     coffeetypes = ['text/coffeescript', 'text/literate-coffeescript'];
     coffees = (function() {
@@ -88,25 +94,35 @@
       return _results;
     })();
     index = 0;
-    length = coffees.length;
-    (execute = function() {
-      var mediatype, options, script;
-      script = coffees[index++];
-      mediatype = script != null ? script.type : void 0;
-      if (__indexOf.call(coffeetypes, mediatype) >= 0) {
-        options = {
-          literate: mediatype === 'text/literate-coffeescript'
-        };
-        if (script.src) {
-          return CoffeeScript.load(script.src, execute, options);
-        } else {
-          options.sourceFiles = ['embedded'];
-          CoffeeScript.run(script.innerHTML, options);
-          return execute();
-        }
+    execute = function() {
+      var param;
+      param = coffees[index];
+      if (param instanceof Array) {
+        CoffeeScript.run.apply(CoffeeScript, param);
+        index++;
+        return execute();
       }
-    })();
-    return null;
+    };
+    _fn = function(script, i) {
+      var options;
+      options = {
+        literate: script.type === coffeetypes[1]
+      };
+      if (script.src) {
+        return CoffeeScript.load(script.src, function(param) {
+          coffees[i] = param;
+          return execute();
+        }, options, true);
+      } else {
+        options.sourceFiles = ['embedded'];
+        return coffees[i] = [script.innerHTML, options];
+      }
+    };
+    for (i = _i = 0, _len = coffees.length; _i < _len; i = ++_i) {
+      script = coffees[i];
+      _fn(script, i);
+    }
+    return execute();
   };
 
   if (window.addEventListener) {

lib/coffee-script/cake.js

@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 (function() {
-  var CoffeeScript, cakefileDirectory, existsSync, fatalError, fs, helpers, missingTask, oparse, options, optparse, path, printTasks, switches, tasks;
+  var CoffeeScript, cakefileDirectory, fatalError, fs, helpers, missingTask, oparse, options, optparse, path, printTasks, switches, tasks;
 
   fs = require('fs');
 
@@ -12,7 +12,7 @@
 
   CoffeeScript = require('./coffee-script');
 
-  existsSync = fs.existsSync || path.existsSync;
+  CoffeeScript.register();
 
   tasks = {};
 
@@ -101,7 +101,7 @@
 
   cakefileDirectory = function(dir) {
     var parent;
-    if (existsSync(path.join(dir, 'Cakefile'))) {
+    if (fs.existsSync(path.join(dir, 'Cakefile'))) {
       return dir;
     }
     parent = path.normalize(path.join(dir, '..'));

lib/coffee-script/coffee-script.js

@@ -1,7 +1,8 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 (function() {
-  var Lexer, Module, SourceMap, child_process, compile, ext, findExtension, fork, formatSourcePosition, fs, helpers, lexer, loadFile, parser, patchStackTrace, patched, path, sourceMaps, vm, _i, _len, _ref,
-    __hasProp = {}.hasOwnProperty;
+  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; };
 
   fs = require('fs');
 
@@ -9,8 +10,6 @@
 
   path = require('path');
 
-  child_process = require('child_process');
-
   Lexer = require('./lexer').Lexer;
 
   parser = require('./parser').parser;
@@ -19,16 +18,31 @@
 
   SourceMap = require('./sourcemap');
 
-  exports.VERSION = '1.6.3';
+  exports.VERSION = '1.8.0';
+
+  exports.FILE_EXTENSIONS = ['.coffee', '.litcoffee', '.coffee.md'];
 
   exports.helpers = helpers;
 
-  exports.compile = compile = function(code, options) {
-    var answer, currentColumn, currentLine, fragment, fragments, header, js, map, merge, newLines, _i, _len;
-    if (options == null) {
-      options = {};
-    }
-    merge = helpers.merge;
+  withPrettyErrors = function(fn) {
+    return function(code, options) {
+      var err;
+      if (options == null) {
+        options = {};
+      }
+      try {
+        return fn.call(this, code, options);
+      } catch (_error) {
+        err = _error;
+        throw helpers.updateSyntaxError(err, code, options.filename);
+      }
+    };
+  };
+
+  exports.compile = compile = withPrettyErrors(function(code, options) {
+    var answer, currentColumn, currentLine, extend, fragment, fragments, header, js, map, merge, newLines, _i, _len;
+    merge = helpers.merge, extend = helpers.extend;
+    options = extend({}, options);
     if (options.sourceMap) {
       map = new SourceMap;
     }
@@ -52,7 +66,11 @@
         }
         newLines = helpers.count(fragment.code, "\n");
         currentLine += newLines;
-        currentColumn = fragment.code.length - (newLines ? fragment.code.lastIndexOf("\n") : 0);
+        if (newLines) {
+          currentColumn = fragment.code.length - (fragment.code.lastIndexOf("\n") + 1);
+        } else {
+          currentColumn += fragment.code.length;
+        }
       }
       js += fragment.code;
     }
@@ -70,40 +88,35 @@
     } else {
       return js;
     }
-  };
+  });
 
-  exports.tokens = function(code, options) {
+  exports.tokens = withPrettyErrors(function(code, options) {
     return lexer.tokenize(code, options);
-  };
+  });
 
-  exports.nodes = function(source, options) {
+  exports.nodes = withPrettyErrors(function(source, options) {
     if (typeof source === 'string') {
       return parser.parse(lexer.tokenize(source, options));
     } else {
       return parser.parse(source);
     }
-  };
+  });
 
   exports.run = function(code, options) {
-    var answer, mainModule;
+    var answer, dir, mainModule, _ref;
     if (options == null) {
       options = {};
     }
     mainModule = require.main;
-    if (options.sourceMap == null) {
-      options.sourceMap = true;
-    }
     mainModule.filename = process.argv[1] = options.filename ? fs.realpathSync(options.filename) : '.';
     mainModule.moduleCache && (mainModule.moduleCache = {});
-    mainModule.paths = require('module')._nodeModulePaths(path.dirname(fs.realpathSync(options.filename || '.')));
+    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);
-      patchStackTrace();
-      sourceMaps[mainModule.filename] = answer.sourceMap;
-      return mainModule._compile(answer.js, mainModule.filename);
-    } else {
-      return mainModule._compile(code, mainModule.filename);
+      code = (_ref = answer.js) != null ? _ref : answer;
     }
+    return mainModule._compile(code, mainModule.filename);
   };
 
   exports["eval"] = function(code, options) {
@@ -169,69 +182,41 @@
     }
   };
 
-  loadFile = function(module, filename) {
-    var answer, raw, stripped;
-    raw = fs.readFileSync(filename, 'utf8');
-    stripped = raw.charCodeAt(0) === 0xFEFF ? raw.substring(1) : raw;
-    answer = compile(stripped, {
-      filename: filename,
-      sourceMap: true,
-      literate: helpers.isLiterate(filename)
-    });
-    sourceMaps[filename] = answer.sourceMap;
-    return module._compile(answer.js, filename);
+  exports.register = function() {
+    return require('./register');
   };
 
   if (require.extensions) {
-    _ref = ['.coffee', '.litcoffee', '.coffee.md'];
+    _ref = this.FILE_EXTENSIONS;
     for (_i = 0, _len = _ref.length; _i < _len; _i++) {
       ext = _ref[_i];
-      require.extensions[ext] = loadFile;
+      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.");
+        };
+      }
     }
-    Module = require('module');
-    findExtension = function(filename) {
-      var curExtension, extensions;
-      extensions = path.basename(filename).split('.');
-      if (extensions[0] === '') {
-        extensions.shift();
-      }
-      while (extensions.shift()) {
-        curExtension = '.' + extensions.join('.');
-        if (Module._extensions[curExtension]) {
-          return curExtension;
-        }
-      }
-      return '.js';
-    };
-    Module.prototype.load = function(filename) {
-      var extension;
-      this.filename = filename;
-      this.paths = Module._nodeModulePaths(path.dirname(filename));
-      extension = findExtension(filename);
-      Module._extensions[extension](this, filename);
-      return this.loaded = true;
-    };
   }
 
-  if (child_process) {
-    fork = child_process.fork;
-    child_process.fork = function(path, args, options) {
-      var execPath;
-      if (args == null) {
-        args = [];
-      }
-      if (options == null) {
-        options = {};
-      }
-      execPath = helpers.isCoffee(path) ? 'coffee' : null;
-      if (!Array.isArray(args)) {
-        args = [];
-        options = args || {};
-      }
-      options.execPath || (options.execPath = execPath);
-      return fork(path, args, options);
-    };
-  }
+  exports._compileFile = function(filename, sourceMap) {
+    var answer, err, raw, stripped;
+    if (sourceMap == null) {
+      sourceMap = false;
+    }
+    raw = fs.readFileSync(filename, 'utf8');
+    stripped = raw.charCodeAt(0) === 0xFEFF ? raw.substring(1) : raw;
+    try {
+      answer = compile(stripped, {
+        filename: filename,
+        sourceMap: sourceMap,
+        literate: helpers.isLiterate(filename)
+      });
+    } catch (_error) {
+      err = _error;
+      throw helpers.updateSyntaxError(err, stripped, filename);
+    }
+    return answer;
+  };
 
   lexer = new Lexer;
 
@@ -241,6 +226,7 @@
       token = this.tokens[this.pos++];
       if (token) {
         tag = token[0], this.yytext = token[1], this.yylloc = token[2];
+        this.errorToken = token.origin || token;
         this.yylineno = this.yylloc.first_line;
       } else {
         tag = '';
@@ -259,52 +245,12 @@
   parser.yy = require('./nodes');
 
   parser.yy.parseError = function(message, _arg) {
-    var token;
+    var errorLoc, errorTag, errorText, errorToken, token, tokens, _ref1;
     token = _arg.token;
-    message = "unexpected " + (token === 1 ? 'end of input' : token);
-    return helpers.throwSyntaxError(message, parser.lexer.yylloc);
-  };
-
-  patched = false;
-
-  sourceMaps = {};
-
-  patchStackTrace = function() {
-    var mainModule;
-    if (patched) {
-      return;
-    }
-    patched = true;
-    mainModule = require.main;
-    return Error.prepareStackTrace = function(err, stack) {
-      var frame, frames, getSourceMapping, sourceFiles, _ref1;
-      sourceFiles = {};
-      getSourceMapping = function(filename, line, column) {
-        var answer, sourceMap;
-        sourceMap = sourceMaps[filename];
-        if (sourceMap) {
-          answer = sourceMap.sourceLocation([line - 1, column - 1]);
-        }
-        if (answer) {
-          return [answer[0] + 1, answer[1] + 1];
-        } else {
-          return null;
-        }
-      };
-      frames = (function() {
-        var _j, _len1, _results;
-        _results = [];
-        for (_j = 0, _len1 = stack.length; _j < _len1; _j++) {
-          frame = stack[_j];
-          if (frame.getFunction() === exports.run) {
-            break;
-          }
-          _results.push("  at " + (formatSourcePosition(frame, getSourceMapping)));
-        }
-        return _results;
-      })();
-      return "" + err.name + ": " + ((_ref1 = err.message) != null ? _ref1 : '') + "\n" + (frames.join('\n')) + "\n";
-    };
+    _ref1 = parser.lexer, errorToken = _ref1.errorToken, tokens = _ref1.tokens;
+    errorTag = errorToken[0], errorText = errorToken[1], errorLoc = errorToken[2];
+    errorText = errorToken === tokens[tokens.length - 1] ? 'end of input' : errorTag === 'INDENT' || errorTag === 'OUTDENT' ? 'indentation' : helpers.nameWhitespaceCharacter(errorText);
+    return helpers.throwSyntaxError("unexpected " + errorText, errorLoc);
   };
 
   formatSourcePosition = function(frame, getSourceMapping) {
@@ -326,7 +272,7 @@
       line = frame.getLineNumber();
       column = frame.getColumnNumber();
       source = getSourceMapping(fileName, line, column);
-      fileLocation = source ? "" + fileName + ":" + source[0] + ":" + source[1] + ", <js>:" + line + ":" + column : "" + fileName + ":" + line + ":" + column;
+      fileLocation = source ? "" + fileName + ":" + source[0] + ":" + source[1] : "" + fileName + ":" + line + ":" + column;
     }
     functionName = frame.getFunctionName();
     isConstructor = frame.isConstructor();
@@ -355,4 +301,47 @@
     }
   };
 
+  sourceMaps = {};
+
+  getSourceMap = function(filename) {
+    var answer, _ref1;
+    if (sourceMaps[filename]) {
+      return sourceMaps[filename];
+    }
+    if (_ref1 = path != null ? path.extname(filename) : void 0, __indexOf.call(exports.FILE_EXTENSIONS, _ref1) < 0) {
+      return;
+    }
+    answer = exports._compileFile(filename, true);
+    return sourceMaps[filename] = answer.sourceMap;
+  };
+
+  Error.prepareStackTrace = function(err, stack) {
+    var frame, frames, getSourceMapping;
+    getSourceMapping = function(filename, line, column) {
+      var answer, sourceMap;
+      sourceMap = getSourceMap(filename);
+      if (sourceMap) {
+        answer = sourceMap.sourceLocation([line - 1, column - 1]);
+      }
+      if (answer) {
+        return [answer[0] + 1, answer[1] + 1];
+      } else {
+        return null;
+      }
+    };
+    frames = (function() {
+      var _j, _len1, _results;
+      _results = [];
+      for (_j = 0, _len1 = stack.length; _j < _len1; _j++) {
+        frame = stack[_j];
+        if (frame.getFunction() === exports.run) {
+          break;
+        }
+        _results.push("  at " + (formatSourcePosition(frame, getSourceMapping)));
+      }
+      return _results;
+    })();
+    return "" + (err.toString()) + "\n" + (frames.join('\n')) + "\n";
+  };
+
 }).call(this);

lib/coffee-script/command.js

@@ -1,6 +1,7 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 (function() {
-  var BANNER, CoffeeScript, EventEmitter, SWITCHES, compileJoin, compileOptions, compilePath, compileScript, compileStdio, exec, exists, forkNode, fs, helpers, hidden, joinTimeout, notSources, optionParser, optparse, opts, outputPath, parseOptions, path, printLine, printTokens, printWarn, removeSource, sourceCode, sources, spawn, timeLog, unwatchDir, usage, useWinPathSep, version, wait, watch, watchDir, watchers, writeJs, _ref;
+  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; };
 
   fs = require('fs');
 
@@ -12,12 +13,12 @@
 
   CoffeeScript = require('./coffee-script');
 
+  mkdirp = require('mkdirp');
+
   _ref = require('child_process'), spawn = _ref.spawn, exec = _ref.exec;
 
   EventEmitter = require('events').EventEmitter;
 
-  exists = fs.exists || path.exists;
-
   useWinPathSep = path.sep === '\\';
 
   helpers.extend(CoffeeScript, new EventEmitter);
@@ -36,7 +37,7 @@
 
   BANNER = 'Usage: coffee [options] path/to/script.coffee -- [args]\n\nIf called without options, `coffee` will run your script.';
 
-  SWITCHES = [['-b', '--bare', 'compile without a top-level function wrapper'], ['-c', '--compile', 'compile to JavaScript and save as .js files'], ['-e', '--eval', 'pass a string from the command line as input'], ['-h', '--help', 'display this help message'], ['-i', '--interactive', 'run an interactive CoffeeScript REPL'], ['-j', '--join [FILE]', 'concatenate the source CoffeeScript before compiling'], ['-m', '--map', 'generate source map and save as .map files'], ['-n', '--nodes', 'print out the parse tree that the parser produces'], ['--nodejs [ARGS]', 'pass options directly to the "node" binary'], ['-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 = {};
 
@@ -46,13 +47,16 @@
 
   notSources = {};
 
-  watchers = {};
+  watchedDirs = {};
 
   optionParser = null;
 
   exports.run = function() {
-    var literals, source, _i, _len, _results;
+    var literals, replCliOpts, source, _i, _len, _ref1, _results;
     parseOptions();
+    replCliOpts = {
+      useGlobal: true
+    };
     if (opts.nodejs) {
       return forkNode();
     }
@@ -63,94 +67,126 @@
       return version();
     }
     if (opts.interactive) {
-      return require('./repl').start();
-    }
-    if (opts.watch && !fs.watch) {
-      return printWarn("The --watch feature depends on Node v0.6.0+. You are running " + process.version + ".");
+      return require('./repl').start(replCliOpts);
     }
     if (opts.stdio) {
       return compileStdio();
     }
     if (opts["eval"]) {
-      return compileScript(null, sources[0]);
+      return compileScript(null, opts["arguments"][0]);
     }
-    if (!sources.length) {
-      return require('./repl').start();
+    if (!opts["arguments"].length) {
+      return require('./repl').start(replCliOpts);
     }
-    literals = opts.run ? sources.splice(1) : [];
+    literals = opts.run ? opts["arguments"].splice(1) : [];
     process.argv = process.argv.slice(0, 2).concat(literals);
     process.argv[0] = 'coffee';
+    if (opts.output) {
+      opts.output = path.resolve(opts.output);
+    }
+    if (opts.join) {
+      opts.join = path.resolve(opts.join);
+      console.error('\nThe --join option is deprecated and will be removed in a future version.\n\nIf for some reason it\'s necessary to share local variables between files,\nreplace...\n\n    $ coffee --compile --join bundle.js -- a.coffee b.coffee c.coffee\n\nwith...\n\n    $ cat a.coffee b.coffee c.coffee | coffee --compile --stdio > bundle.js\n');
+    }
+    _ref1 = opts["arguments"];
     _results = [];
-    for (_i = 0, _len = sources.length; _i < _len; _i++) {
-      source = sources[_i];
-      _results.push(compilePath(source, true, path.normalize(source)));
+    for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+      source = _ref1[_i];
+      source = path.resolve(source);
+      _results.push(compilePath(source, true, source));
     }
     return _results;
   };
 
   compilePath = function(source, topLevel, base) {
-    return fs.stat(source, function(err, stats) {
-      if (err && err.code !== 'ENOENT') {
-        throw err;
-      }
-      if ((err != null ? err.code : void 0) === 'ENOENT') {
+    var code, err, file, files, stats, _i, _len, _results;
+    if (__indexOf.call(sources, source) >= 0 || watchedDirs[source] || !topLevel && (notSources[source] || hidden(source))) {
+      return;
+    }
+    try {
+      stats = fs.statSync(source);
+    } catch (_error) {
+      err = _error;
+      if (err.code === 'ENOENT') {
         console.error("File not found: " + source);
         process.exit(1);
       }
-      if (stats.isDirectory() && path.dirname(source) !== 'node_modules') {
-        if (opts.watch) {
-          watchDir(source, base);
-        }
-        return fs.readdir(source, function(err, files) {
-          var file, index, _ref1, _ref2;
-          if (err && err.code !== 'ENOENT') {
-            throw err;
-          }
-          if ((err != null ? err.code : void 0) === 'ENOENT') {
-            return;
-          }
-          index = sources.indexOf(source);
-          files = files.filter(function(file) {
-            return !hidden(file);
-          });
-          [].splice.apply(sources, [index, index - index + 1].concat(_ref1 = (function() {
-            var _i, _len, _results;
-            _results = [];
-            for (_i = 0, _len = files.length; _i < _len; _i++) {
-              file = files[_i];
-              _results.push(path.join(source, file));
-            }
-            return _results;
-          })())), _ref1;
-          [].splice.apply(sourceCode, [index, index - index + 1].concat(_ref2 = files.map(function() {
-            return null;
-          }))), _ref2;
-          return files.forEach(function(file) {
-            return compilePath(path.join(source, file), false, base);
-          });
-        });
-      } else if (topLevel || helpers.isCoffee(source)) {
-        if (opts.watch) {
-          watch(source, base);
-        }
-        return fs.readFile(source, function(err, code) {
-          if (err && err.code !== 'ENOENT') {
-            throw err;
-          }
-          if ((err != null ? err.code : void 0) === 'ENOENT') {
-            return;
-          }
-          return compileScript(source, code.toString(), base);
-        });
-      } else {
+      throw err;
+    }
+    if (stats.isDirectory()) {
+      if (path.basename(source) === 'node_modules') {
         notSources[source] = true;
-        return removeSource(source, base);
+        return;
       }
-    });
+      if (opts.run) {
+        compilePath(findDirectoryIndex(source), topLevel, base);
+        return;
+      }
+      if (opts.watch) {
+        watchDir(source, base);
+      }
+      try {
+        files = fs.readdirSync(source);
+      } catch (_error) {
+        err = _error;
+        if (err.code === 'ENOENT') {
+          return;
+        } else {
+          throw err;
+        }
+      }
+      _results = [];
+      for (_i = 0, _len = files.length; _i < _len; _i++) {
+        file = files[_i];
+        _results.push(compilePath(path.join(source, file), false, base));
+      }
+      return _results;
+    } else if (topLevel || helpers.isCoffee(source)) {
+      sources.push(source);
+      sourceCode.push(null);
+      delete notSources[source];
+      if (opts.watch) {
+        watch(source, base);
+      }
+      try {
+        code = fs.readFileSync(source);
+      } catch (_error) {
+        err = _error;
+        if (err.code === 'ENOENT') {
+          return;
+        } else {
+          throw err;
+        }
+      }
+      return compileScript(source, code.toString(), base);
+    } else {
+      return notSources[source] = true;
+    }
+  };
+
+  findDirectoryIndex = function(source) {
+    var err, ext, index, _i, _len, _ref1;
+    _ref1 = CoffeeScript.FILE_EXTENSIONS;
+    for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+      ext = _ref1[_i];
+      index = path.join(source, "index" + ext);
+      try {
+        if ((fs.statSync(index)).isFile()) {
+          return index;
+        }
+      } catch (_error) {
+        err = _error;
+        if (err.code !== 'ENOENT') {
+          throw err;
+        }
+      }
+    }
+    console.error("Missing index.coffee or index.litcoffee in " + source);
+    return process.exit(1);
   };
 
   compileScript = function(file, input, base) {
-    var compiled, err, message, o, options, t, task, useColors;
+    var compiled, err, message, o, options, t, task;
     if (base == null) {
       base = null;
     }
@@ -168,6 +204,7 @@
       } else if (o.nodes) {
         return printLine(CoffeeScript.nodes(t.input, t.options).toString().trim());
       } else if (o.run) {
+        CoffeeScript.register();
         return CoffeeScript.run(t.input, t.options);
       } else if (o.join && t.file !== o.join) {
         if (helpers.isLiterate(file)) {
@@ -195,8 +232,7 @@
       if (CoffeeScript.listeners('failure').length) {
         return;
       }
-      useColors = process.stdout.isTTY && !process.env.NODE_DISABLE_COLORS;
-      message = helpers.prettyErrorMessage(err, file || '[stdin]', input, useColors);
+      message = err.stack || ("" + err);
       if (o.watch) {
         return printLine(message + '\x07');
       } else {
@@ -237,24 +273,23 @@
   };
 
   watch = function(source, base) {
-    var compile, compileTimeout, e, prevStats, rewatch, watchErr, watcher;
+    var compile, compileTimeout, err, prevStats, rewatch, startWatcher, watchErr, watcher;
+    watcher = null;
     prevStats = null;
     compileTimeout = null;
-    watchErr = function(e) {
-      if (e.code === 'ENOENT') {
-        if (sources.indexOf(source) === -1) {
-          return;
-        }
-        try {
-          rewatch();
-          return compile();
-        } catch (_error) {
-          e = _error;
-          removeSource(source, base, true);
-          return compileJoin();
-        }
-      } else {
-        throw e;
+    watchErr = function(err) {
+      if (err.code !== 'ENOENT') {
+        throw err;
+      }
+      if (__indexOf.call(sources, source) < 0) {
+        return;
+      }
+      try {
+        rewatch();
+        return compile();
+      } catch (_error) {
+        removeSource(source, base);
+        return compileJoin();
       }
     };
     compile = function() {
@@ -278,119 +313,130 @@
         });
       });
     };
-    try {
-      watcher = fs.watch(source, compile);
-    } catch (_error) {
-      e = _error;
-      watchErr(e);
-    }
-    return rewatch = function() {
+    startWatcher = function() {
+      return watcher = fs.watch(source).on('change', compile).on('error', function(err) {
+        if (err.code !== 'EPERM') {
+          throw err;
+        }
+        return removeSource(source, base);
+      });
+    };
+    rewatch = function() {
       if (watcher != null) {
         watcher.close();
       }
-      return watcher = fs.watch(source, compile);
+      return startWatcher();
     };
+    try {
+      return startWatcher();
+    } catch (_error) {
+      err = _error;
+      return watchErr(err);
+    }
   };
 
   watchDir = function(source, base) {
-    var e, readdirTimeout, watcher;
+    var err, readdirTimeout, startWatcher, stopWatcher, watcher;
+    watcher = null;
     readdirTimeout = null;
-    try {
-      return watcher = fs.watch(source, function() {
+    startWatcher = function() {
+      return watcher = fs.watch(source).on('error', function(err) {
+        if (err.code !== 'EPERM') {
+          throw err;
+        }
+        return stopWatcher();
+      }).on('change', function() {
         clearTimeout(readdirTimeout);
         return readdirTimeout = wait(25, function() {
-          return fs.readdir(source, function(err, files) {
-            var file, _i, _len, _results;
-            if (err) {
-              if (err.code !== 'ENOENT') {
-                throw err;
-              }
-              watcher.close();
-              return unwatchDir(source, base);
+          var err, file, files, _i, _len, _results;
+          try {
+            files = fs.readdirSync(source);
+          } catch (_error) {
+            err = _error;
+            if (err.code !== 'ENOENT') {
+              throw err;
             }
-            _results = [];
-            for (_i = 0, _len = files.length; _i < _len; _i++) {
-              file = files[_i];
-              if (!(!hidden(file) && !notSources[file])) {
-                continue;
-              }
-              file = path.join(source, file);
-              if (sources.some(function(s) {
-                return s.indexOf(file) >= 0;
-              })) {
-                continue;
-              }
-              sources.push(file);
-              sourceCode.push(null);
-              _results.push(compilePath(file, false, base));
-            }
-            return _results;
-          });
+            return stopWatcher();
+          }
+          _results = [];
+          for (_i = 0, _len = files.length; _i < _len; _i++) {
+            file = files[_i];
+            _results.push(compilePath(path.join(source, file), false, base));
+          }
+          return _results;
         });
       });
+    };
+    stopWatcher = function() {
+      watcher.close();
+      return removeSourceDir(source, base);
+    };
+    watchedDirs[source] = true;
+    try {
+      return startWatcher();
     } catch (_error) {
-      e = _error;
-      if (e.code !== 'ENOENT') {
-        throw e;
+      err = _error;
+      if (err.code !== 'ENOENT') {
+        throw err;
       }
     }
   };
 
-  unwatchDir = function(source, base) {
-    var file, prevSources, toRemove, _i, _len;
-    prevSources = sources.slice(0);
-    toRemove = (function() {
-      var _i, _len, _results;
-      _results = [];
-      for (_i = 0, _len = sources.length; _i < _len; _i++) {
-        file = sources[_i];
-        if (file.indexOf(source) >= 0) {
-          _results.push(file);
-        }
+  removeSourceDir = function(source, base) {
+    var file, sourcesChanged, _i, _len;
+    delete watchedDirs[source];
+    sourcesChanged = false;
+    for (_i = 0, _len = sources.length; _i < _len; _i++) {
+      file = sources[_i];
+      if (!(source === path.dirname(file))) {
+        continue;
       }
-      return _results;
-    })();
-    for (_i = 0, _len = toRemove.length; _i < _len; _i++) {
-      file = toRemove[_i];
-      removeSource(file, base, true);
+      removeSource(file, base);
+      sourcesChanged = true;
     }
-    if (!sources.some(function(s, i) {
-      return prevSources[i] !== s;
-    })) {
-      return;
+    if (sourcesChanged) {
+      return compileJoin();
     }
-    return compileJoin();
   };
 
-  removeSource = function(source, base, removeJs) {
-    var index, jsPath;
+  removeSource = function(source, base) {
+    var index;
     index = sources.indexOf(source);
     sources.splice(index, 1);
     sourceCode.splice(index, 1);
-    if (removeJs && !opts.join) {
-      jsPath = outputPath(source, base);
-      return exists(jsPath, function(itExists) {
-        if (itExists) {
-          return fs.unlink(jsPath, function(err) {
-            if (err && err.code !== 'ENOENT') {
-              throw err;
-            }
-            return timeLog("removed " + source);
-          });
-        }
-      });
+    if (!opts.join) {
+      silentUnlink(outputPath(source, base));
+      silentUnlink(outputPath(source, base, '.js.map'));
+      return timeLog("removed " + source);
+    }
+  };
+
+  silentUnlink = function(path) {
+    var err, _ref1;
+    try {
+      return fs.unlinkSync(path);
+    } catch (_error) {
+      err = _error;
+      if ((_ref1 = err.code) !== 'ENOENT' && _ref1 !== 'EPERM') {
+        throw err;
+      }
     }
   };
 
   outputPath = function(source, base, extension) {
-    var baseDir, basename, dir, srcDir;
+    var basename, dir, srcDir;
     if (extension == null) {
       extension = ".js";
     }
     basename = helpers.baseFileName(source, true, useWinPathSep);
     srcDir = path.dirname(source);
-    baseDir = base === '.' ? srcDir : srcDir.substring(base.length);
-    dir = opts.output ? path.join(opts.output, baseDir) : srcDir;
+    if (!opts.output) {
+      dir = srcDir;
+    } else if (source === base) {
+      dir = opts.output;
+    } else {
+      dir = path.join(opts.output, path.relative(base, srcDir));
+    }
     return path.join(dir, basename + extension);
   };
 
@@ -399,7 +445,7 @@
     if (generatedSourceMap == null) {
       generatedSourceMap = null;
     }
-    sourceMapPath = outputPath(sourcePath, base, ".map");
+    sourceMapPath = outputPath(sourcePath, base, ".js.map");
     jsDir = path.dirname(jsPath);
     compile = function() {
       if (opts.compile) {
@@ -407,11 +453,12 @@
           js = ' ';
         }
         if (generatedSourceMap) {
-          js = "" + js + "\n/*\n//@ sourceMappingURL=" + (helpers.baseFileName(sourceMapPath, false, useWinPathSep)) + "\n*/\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);
           }
@@ -420,16 +467,17 @@
       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);
           }
         });
       }
     };
-    return exists(jsDir, function(itExists) {
+    return fs.exists(jsDir, function(itExists) {
       if (itExists) {
         return compile();
       } else {
-        return exec("mkdir -p " + jsDir, compile);
+        return mkdirp(jsDir, compile);
       }
     });
   };
@@ -459,17 +507,12 @@
   };
 
   parseOptions = function() {
-    var i, o, source, _i, _len;
+    var o;
     optionParser = new optparse.OptionParser(SWITCHES, BANNER);
     o = opts = optionParser.parse(process.argv.slice(2));
     o.compile || (o.compile = !!o.output);
     o.run = !(o.compile || o.print || o.map);
-    o.print = !!(o.print || (o["eval"] || o.stdio && o.compile));
-    sources = o["arguments"];
-    for (i = _i = 0, _len = sources.length; _i < _len; i = ++_i) {
-      source = sources[i];
-      sourceCode[i] = null;
-    }
+    return o.print = !!(o.print || (o["eval"] || o.stdio && o.compile));
   };
 
   compileOptions = function(filename, base) {
@@ -478,7 +521,7 @@
       filename: filename,
       literate: opts.literate || helpers.isLiterate(filename),
       bare: opts.bare,
-      header: opts.compile,
+      header: opts.compile && !opts['no-header'],
       sourceMap: opts.map
     };
     if (filename) {
@@ -504,15 +547,18 @@
   };
 
   forkNode = function() {
-    var args, nodeArgs;
+    var args, nodeArgs, p;
     nodeArgs = opts.nodejs.split(/\s+/);
     args = process.argv.slice(1);
     args.splice(args.indexOf('--nodejs'), 2);
-    return spawn(process.execPath, nodeArgs.concat(args), {
+    p = spawn(process.execPath, nodeArgs.concat(args), {
       cwd: process.cwd(),
       env: process.env,
       customFds: [0, 1, 2]
     });
+    return p.on('exit', function(code) {
+      return process.exit(code);
+    });
   };
 
   usage = function() {

lib/coffee-script/grammar.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 (function() {
   var Parser, alt, alternatives, grammar, name, o, operators, token, tokens, unwrap;
 
@@ -32,7 +32,7 @@
     Root: [
       o('', function() {
         return new Block;
-      }), o('Body'), o('Block TERMINATOR')
+      }), o('Body')
     ],
     Body: [
       o('Line', function() {
@@ -96,8 +96,7 @@
         return new Value($1);
       }), o('ObjAssignable : Expression', function() {
         return new Assign(LOC(1)(new Value($1)), $3, 'object');
-      }), o('ObjAssignable :\
-       INDENT Expression OUTDENT', function() {
+      }), o('ObjAssignable : INDENT Expression OUTDENT', function() {
         return new Assign(LOC(1)(new Value($1)), $4, 'object');
       }), o('Comment')
     ],
@@ -149,6 +148,8 @@
         return new Param($1, null, true);
       }), o('ParamVar = Expression', function() {
         return new Param($1, $3);
+      }), o('...', function() {
+        return new Expansion;
       })
     ],
     ParamVar: [o('Identifier'), o('ThisProperty'), o('Array'), o('Object')],
@@ -328,7 +329,11 @@
         return $1.concat($4);
       })
     ],
-    Arg: [o('Expression'), o('Splat')],
+    Arg: [
+      o('Expression'), o('Splat'), o('...', function() {
+        return new Expansion;
+      })
+    ],
     SimpleArgs: [
       o('Expression'), o('SimpleArgs , Expression', function() {
         return [].concat($1, $3);
@@ -514,9 +519,9 @@
           type: $1
         });
       }), o('IfBlock ELSE IF Expression Block', function() {
-        return $1.addElse(new If($4, $5, {
+        return $1.addElse(LOC(3, 5)(new If($4, $5, {
           type: $3
-        }));
+        })));
       })
     ],
     If: [
@@ -537,14 +542,16 @@
     Operation: [
       o('UNARY Expression', function() {
         return new Op($1, $2);
+      }), o('UNARY_MATH Expression', function() {
+        return new Op($1, $2);
       }), o('-     Expression', (function() {
         return new Op('-', $2);
       }), {
-        prec: 'UNARY'
+        prec: 'UNARY_MATH'
       }), o('+     Expression', (function() {
         return new Op('+', $2);
       }), {
-        prec: 'UNARY'
+        prec: 'UNARY_MATH'
       }), o('-- SimpleAssignable', function() {
         return new Op('--', $2);
       }), o('++ SimpleAssignable', function() {
@@ -561,6 +568,8 @@
         return new Op('-', $1, $3);
       }), o('Expression MATH     Expression', function() {
         return new Op($2, $1, $3);
+      }), o('Expression **       Expression', function() {
+        return new Op($2, $1, $3);
       }), o('Expression SHIFT    Expression', function() {
         return new Op($2, $1, $3);
       }), o('Expression COMPARE  Expression', function() {
@@ -573,14 +582,11 @@
         } else {
           return new Op($2, $1, $3);
         }
-      }), o('SimpleAssignable COMPOUND_ASSIGN\
-       Expression', function() {
+      }), o('SimpleAssignable COMPOUND_ASSIGN Expression', function() {
         return new Assign($1, $3, $2);
-      }), o('SimpleAssignable COMPOUND_ASSIGN\
-       INDENT Expression OUTDENT', function() {
+      }), o('SimpleAssignable COMPOUND_ASSIGN INDENT Expression OUTDENT', function() {
         return new Assign($1, $4, $2);
-      }), o('SimpleAssignable COMPOUND_ASSIGN TERMINATOR\
-       Expression', function() {
+      }), o('SimpleAssignable COMPOUND_ASSIGN TERMINATOR Expression', function() {
         return new Assign($1, $4, $2);
       }), o('SimpleAssignable EXTENDS Expression', function() {
         return new Extends($1, $3);
@@ -588,7 +594,7 @@
     ]
   };
 
-  operators = [['left', '.', '?.', '::', '?::'], ['left', 'CALL_START', 'CALL_END'], ['nonassoc', '++', '--'], ['left', '?'], ['right', 'UNARY'], ['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'], ['right', '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', '=', ':', '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,6 +1,6 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 (function() {
-  var buildLocationData, extend, flatten, last, repeat, _ref;
+  var buildLocationData, extend, flatten, last, repeat, syntaxErrorToString, _ref;
 
   exports.starts = function(string, literal, start) {
     return literal === string.substr(start, literal.length);
@@ -167,7 +167,7 @@
     pathSep = useWinPathSep ? /\\|\// : /\//;
     parts = file.split(pathSep);
     file = parts[parts.length - 1];
-    if (!stripExt) {
+    if (!(stripExt && file.indexOf('.') >= 0)) {
       return file;
     }
     parts = file.split('.');
@@ -188,36 +188,65 @@
 
   exports.throwSyntaxError = function(message, location) {
     var error;
-    if (location.last_line == null) {
-      location.last_line = location.first_line;
-    }
-    if (location.last_column == null) {
-      location.last_column = location.first_column;
-    }
     error = new SyntaxError(message);
     error.location = location;
+    error.toString = syntaxErrorToString;
+    error.stack = error.toString();
     throw error;
   };
 
-  exports.prettyErrorMessage = function(error, fileName, code, useColors) {
-    var codeLine, colorize, end, first_column, first_line, last_column, last_line, marker, message, start, _ref1;
-    if (!error.location) {
-      return error.stack || ("" + error);
+  exports.updateSyntaxError = function(error, code, filename) {
+    if (error.toString === syntaxErrorToString) {
+      error.code || (error.code = code);
+      error.filename || (error.filename = filename);
+      error.stack = error.toString();
     }
-    _ref1 = error.location, first_line = _ref1.first_line, first_column = _ref1.first_column, last_line = _ref1.last_line, last_column = _ref1.last_column;
-    codeLine = code.split('\n')[first_line];
+    return error;
+  };
+
+  syntaxErrorToString = function() {
+    var codeLine, colorize, colorsEnabled, end, filename, first_column, first_line, last_column, last_line, marker, start, _ref1, _ref2;
+    if (!(this.code && this.location)) {
+      return Error.prototype.toString.call(this);
+    }
+    _ref1 = this.location, first_line = _ref1.first_line, first_column = _ref1.first_column, last_line = _ref1.last_line, last_column = _ref1.last_column;
+    if (last_line == null) {
+      last_line = first_line;
+    }
+    if (last_column == null) {
+      last_column = first_column;
+    }
+    filename = this.filename || '[stdin]';
+    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);
-    if (useColors) {
+    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;
+    }
+    if ((_ref2 = this.colorful) != null ? _ref2 : colorsEnabled) {
       colorize = function(str) {
         return "\x1B[1;31m" + str + "\x1B[0m";
       };
       codeLine = codeLine.slice(0, start) + colorize(codeLine.slice(start, end)) + codeLine.slice(end);
       marker = colorize(marker);
     }
-    message = "" + fileName + ":" + (first_line + 1) + ":" + (first_column + 1) + ": error: " + error.message + "\n" + codeLine + "\n" + marker;
-    return message;
+    return "" + filename + ":" + (first_line + 1) + ":" + (first_column + 1) + ": error: " + this.message + "\n" + codeLine + "\n" + marker;
+  };
+
+  exports.nameWhitespaceCharacter = function(string) {
+    switch (string) {
+      case ' ':
+        return 'space';
+      case '\n':
+        return 'newline';
+      case '\r':
+        return 'carriage return';
+      case '\t':
+        return 'tab';
+      default:
+        return string;
+    }
   };
 
 }).call(this);

lib/coffee-script/index.js

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

lib/coffee-script/lexer.js

@@ -1,6 +1,6 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 (function() {
-  var BOM, BOOL, CALLABLE, CODE, COFFEE_ALIASES, COFFEE_ALIAS_MAP, COFFEE_KEYWORDS, COMMENT, COMPARE, COMPOUND_ASSIGN, HEREDOC, HEREDOC_ILLEGAL, HEREDOC_INDENT, HEREGEX, HEREGEX_OMIT, IDENTIFIER, 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, 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, HEREDOC, HEREDOC_ILLEGAL, HEREDOC_INDENT, HEREGEX, HEREGEX_OMIT, IDENTIFIER, INDENTABLE_CLOSERS, INDEXABLE, INVERSES, JSTOKEN, JS_FORBIDDEN, JS_KEYWORDS, LINE_BREAK, LINE_CONTINUER, LOGIC, Lexer, MATH, MULTILINER, MULTI_DENT, NOT_REGEX, NOT_SPACED_REGEX, NUMBER, OPERATOR, REGEX, RELATION, RESERVED, Rewriter, SHIFT, SIMPLESTR, STRICT_PROSCRIBED, TRAILING_SPACES, UNARY, UNARY_MATH, WHITESPACE, compact, count, invertLiterate, key, last, locationDataToString, repeat, starts, throwSyntaxError, _ref, _ref1,
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   _ref = require('./rewriter'), Rewriter = _ref.Rewriter, INVERSES = _ref.INVERSES;
@@ -17,6 +17,7 @@
       }
       this.literate = opts.literate;
       this.indent = 0;
+      this.baseIndent = 0;
       this.indebt = 0;
       this.outdebt = 0;
       this.indents = [];
@@ -165,30 +166,31 @@
     };
 
     Lexer.prototype.stringToken = function() {
-      var match, octalEsc, string;
-      switch (this.chunk.charAt(0)) {
+      var inner, innerLen, numBreak, octalEsc, pos, quote, string, trimmed;
+      switch (quote = this.chunk.charAt(0)) {
         case "'":
-          if (!(match = SIMPLESTR.exec(this.chunk))) {
-            return 0;
-          }
-          string = match[0];
-          this.token('STRING', string.replace(MULTILINER, '\\\n'), 0, string.length);
+          string = (SIMPLESTR.exec(this.chunk) || [])[0];
           break;
         case '"':
-          if (!(string = this.balancedString(this.chunk, '"'))) {
-            return 0;
-          }
-          if (0 < string.indexOf('#{', 1)) {
-            this.interpolateString(string.slice(1, -1), {
-              strOffset: 1,
-              lexedLength: string.length
-            });
-          } else {
-            this.token('STRING', this.escapeLines(string, 0, string.length));
-          }
-          break;
-        default:
-          return 0;
+          string = this.balancedString(this.chunk, '"');
+      }
+      if (!string) {
+        return 0;
+      }
+      inner = string.slice(1, -1);
+      trimmed = this.removeNewlines(inner);
+      if (quote === '"' && 0 < string.indexOf('#{', 1)) {
+        numBreak = pos = 0;
+        innerLen = inner.length;
+        while (inner.charAt(pos++) === '\n' && pos < innerLen) {
+          numBreak++;
+        }
+        this.interpolateString(trimmed, {
+          strOffset: 1 + numBreak,
+          lexedLength: string.length
+        });
+      } else {
+        this.token('STRING', quote + this.escapeLines(trimmed) + quote, 0, string.length);
       }
       if (octalEsc = /^(?:\\.|[^\\])*\\(?:0[0-7]|[1-7])/.test(string)) {
         this.error("octal escape sequences " + string + " are not allowed");
@@ -197,7 +199,7 @@
     };
 
     Lexer.prototype.heredocToken = function() {
-      var doc, heredoc, match, quote;
+      var doc, heredoc, match, quote, strOffset;
       if (!(match = HEREDOC.exec(this.chunk))) {
         return 0;
       }
@@ -208,9 +210,10 @@
         indent: null
       });
       if (quote === '"' && 0 <= doc.indexOf('#{')) {
+        strOffset = match[2].charAt(0) === '\n' ? 4 : 3;
         this.interpolateString(doc, {
           heredoc: true,
-          strOffset: 3,
+          strOffset: strOffset,
           lexedLength: heredoc.length
         });
       } else {
@@ -248,8 +251,7 @@
       if (this.chunk.charAt(0) !== '/') {
         return 0;
       }
-      if (match = HEREGEX.exec(this.chunk)) {
-        length = this.heregexToken(match);
+      if (length = this.heregexToken()) {
         return length;
       }
       prev = last(this.tokens);
@@ -260,21 +262,24 @@
         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 `*`');
       }
-      if (regex === '//') {
-        regex = '/(?:)/';
-      }
       this.token('REGEX', "" + regex + flags, 0, match.length);
       return match.length;
     };
 
-    Lexer.prototype.heregexToken = function(match) {
-      var body, flags, flagsOffset, heregex, plusToken, prev, re, tag, token, tokens, value, _i, _len, _ref2, _ref3, _ref4;
+    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 = body.replace(HEREGEX_OMIT, '').replace(/\//g, '\\/');
+        re = this.escapeLines(body.replace(HEREGEX_OMIT, '$1$2').replace(/\//g, '\\/'), true);
         if (re.match(/^\*/)) {
           this.error('regular expressions cannot begin with `*`');
         }
@@ -285,7 +290,8 @@
       this.token('CALL_START', '(', 0, 0);
       tokens = [];
       _ref2 = this.interpolateString(body, {
-        regex: true
+        regex: true,
+        strOffset: 3
       });
       for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
         token = _ref2[_i];
@@ -293,7 +299,7 @@
         if (tag === 'TOKENS') {
           tokens.push.apply(tokens, value);
         } else if (tag === 'NEOSTRING') {
-          if (!(value = value.replace(HEREGEX_OMIT, ''))) {
+          if (!(value = value.replace(HEREGEX_OMIT, '$1$2'))) {
             continue;
           }
           value = value.replace(/\\/g, '\\\\');
@@ -346,37 +352,48 @@
           this.suppressNewlines();
           return indent.length;
         }
+        if (!this.tokens.length) {
+          this.baseIndent = this.indent = size;
+          return indent.length;
+        }
         diff = size - this.indent + this.outdebt;
         this.token('INDENT', diff, indent.length - size, size);
         this.indents.push(diff);
         this.ends.push('OUTDENT');
         this.outdebt = this.indebt = 0;
+        this.indent = size;
+      } else if (size < this.baseIndent) {
+        this.error('missing indentation', indent.length);
       } else {
         this.indebt = 0;
         this.outdentToken(this.indent - size, noNewlines, indent.length);
       }
-      this.indent = size;
       return indent.length;
     };
 
     Lexer.prototype.outdentToken = function(moveOut, noNewlines, outdentLength) {
-      var dent, len;
+      var decreasedIndent, dent, lastIndent, _ref2;
+      decreasedIndent = this.indent - moveOut;
       while (moveOut > 0) {
-        len = this.indents.length - 1;
-        if (this.indents[len] === void 0) {
+        lastIndent = this.indents[this.indents.length - 1];
+        if (!lastIndent) {
           moveOut = 0;
-        } else if (this.indents[len] === this.outdebt) {
+        } else if (lastIndent === this.outdebt) {
           moveOut -= this.outdebt;
           this.outdebt = 0;
-        } else if (this.indents[len] < this.outdebt) {
-          this.outdebt -= this.indents[len];
-          moveOut -= this.indents[len];
+        } else if (lastIndent < this.outdebt) {
+          this.outdebt -= lastIndent;
+          moveOut -= lastIndent;
         } else {
           dent = this.indents.pop() + this.outdebt;
-          moveOut -= dent;
+          if (outdentLength && (_ref2 = this.chunk[outdentLength], __indexOf.call(INDENTABLE_CLOSERS, _ref2) >= 0)) {
+            decreasedIndent -= dent - moveOut;
+            moveOut = dent;
+          }
           this.outdebt = 0;
           this.pair('OUTDENT');
-          this.token('OUTDENT', dent, 0, outdentLength);
+          this.token('OUTDENT', moveOut, 0, outdentLength);
+          moveOut -= dent;
         }
       }
       if (dent) {
@@ -388,6 +405,7 @@
       if (!(this.tag() === 'TERMINATOR' || noNewlines)) {
         this.token('TERMINATOR', '\n', outdentLength, 0);
       }
+      this.indent = decreasedIndent;
       return this;
     };
 
@@ -457,6 +475,8 @@
         tag = 'COMPOUND_ASSIGN';
       } else if (__indexOf.call(UNARY, value) >= 0) {
         tag = 'UNARY';
+      } else if (__indexOf.call(UNARY_MATH, value) >= 0) {
+        tag = 'UNARY_MATH';
       } else if (__indexOf.call(SHIFT, value) >= 0) {
         tag = 'SHIFT';
       } else if (__indexOf.call(LOGIC, value) >= 0 || value === '?' && (prev != null ? prev.spaced : void 0)) {
@@ -586,18 +606,14 @@
     };
 
     Lexer.prototype.interpolateString = function(str, options) {
-      var column, 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;
+      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;
-      if (heredoc && str.length > 0 && str[0] === '\n') {
-        str = str.slice(1);
-        strOffset++;
-      }
+      offsetInChunk || (offsetInChunk = 0);
+      strOffset || (strOffset = 0);
+      lexedLength || (lexedLength = str.length);
       tokens = [];
       pi = 0;
       i = -1;
@@ -612,9 +628,12 @@
         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];
+          _ref2 = this.getLineAndColumnFromChunk(strOffset + i + 2), line = _ref2[0], column = _ref2[1];
           nested = new Lexer().tokenize(inner, {
             line: line,
             column: column,
@@ -648,7 +667,7 @@
         tokens.unshift(this.makeToken('NEOSTRING', '', offsetInChunk));
       }
       if (interpolated = tokens.length > 1) {
-        this.token('(', '(', offsetInChunk, 0);
+        this.token('(', '(', offsetInChunk, 0, errorToken);
       }
       for (i = _i = 0, _len = tokens.length; _i < _len; i = ++_i) {
         token = tokens[i];
@@ -684,13 +703,12 @@
     };
 
     Lexer.prototype.pair = function(tag) {
-      var size, wanted;
+      var wanted;
       if (tag !== (wanted = last(this.ends))) {
         if ('OUTDENT' !== wanted) {
           this.error("unmatched " + tag);
         }
-        this.indent -= size = last(this.indents);
-        this.outdentToken(size, true);
+        this.outdentToken(last(this.indents), true);
         return this.pair(tag);
       }
       return this.ends.pop();
@@ -733,9 +751,12 @@
       return token;
     };
 
-    Lexer.prototype.token = function(tag, value, offsetInChunk, length) {
+    Lexer.prototype.token = function(tag, value, offsetInChunk, length, origin) {
       var token;
       token = this.makeToken(tag, value, offsetInChunk, length);
+      if (origin) {
+        token.origin = origin;
+      }
       this.tokens.push(token);
       return token;
     };
@@ -752,19 +773,34 @@
 
     Lexer.prototype.unfinished = function() {
       var _ref2;
-      return LINE_CONTINUER.test(this.chunk) || ((_ref2 = this.tag()) === '\\' || _ref2 === '.' || _ref2 === '?.' || _ref2 === '?::' || _ref2 === 'UNARY' || _ref2 === 'MATH' || _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 === '**' || _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) {
-      return str.replace(MULTILINER, heredoc ? '\\n' : '');
+      str = 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) {
       if (!body) {
         return quote + quote;
       }
-      body = body.replace(/\\([\s\S])/g, function(match, contents) {
-        if (contents === '\n' || contents === quote) {
+      body = body.replace(RegExp("\\\\(" + quote + "|\\\\)", "g"), function(match, contents) {
+        if (contents === quote) {
           return contents;
         } else {
           return match;
@@ -774,10 +810,15 @@
       return quote + this.escapeLines(body, heredoc) + quote;
     };
 
-    Lexer.prototype.error = function(message) {
+    Lexer.prototype.error = function(message, offset) {
+      var first_column, first_line, _ref2;
+      if (offset == null) {
+        offset = 0;
+      }
+      _ref2 = this.getLineAndColumnFromChunk(offset), first_line = _ref2[0], first_column = _ref2[1];
       return throwSyntaxError(message, {
-        first_line: this.chunkLine,
-        first_column: this.chunkColumn
+        first_line: first_line,
+        first_column: first_column
       });
     };
 
@@ -828,27 +869,27 @@
 
   NUMBER = /^0b[01]+|^0o[0-7]+|^0x[\da-f]+|^\d*\.?\d+(?:e[+-]?\d+)?/i;
 
-  HEREDOC = /^("""|''')([\s\S]*?)(?:\n[^\n\S]*)?\1/;
+  HEREDOC = /^("""|''')((?:\\[\s\S]|[^\\])*?)(?:\n[^\n\S]*)?\1/;
 
-  OPERATOR = /^(?:[-=]>|[-+*\/%<>&|^!?=]=|>>>=?|([-+:])\1|([&|<>])\2=?|\?(\.|::)|\.{2,3})/;
+  OPERATOR = /^(?:[-=]>|[-+*\/%<>&|^!?=]=|>>>=?|([-+:])\1|([&|<>*\/%])\2=?|\?(\.|::)|\.{2,3})/;
 
   WHITESPACE = /^[^\n\S]+/;
 
-  COMMENT = /^###([^#][\s\S]*?)(?:###[^\n\S]*|(?:###)$)|^(?:\s*#(?!##[^#]).*)+/;
+  COMMENT = /^###([^#][\s\S]*?)(?:###[^\n\S]*|###$)|^(?:\s*#(?!##[^#]).*)+/;
 
   CODE = /^[-=]>/;
 
   MULTI_DENT = /^(?:\n[^\n\S]*)+/;
 
-  SIMPLESTR = /^'[^\\']*(?:\\.[^\\']*)*'/;
+  SIMPLESTR = /^'[^\\']*(?:\\[\s\S][^\\']*)*'/;
 
   JSTOKEN = /^`[^\\`]*(?:\\.[^\\`]*)*`/;
 
   REGEX = /^(\/(?![\s=])[^[\/\n\\]*(?:(?:\\[\s\S]|\[[^\]\n\\]*(?:\\[\s\S][^\]\n\\]*)*])[^[\/\n\\]*)*\/)([imgy]{0,4})(?!\w)/;
 
-  HEREGEX = /^\/{3}([\s\S]+?)\/{3}([imgy]{0,4})(?!\w)/;
+  HEREGEX = /^\/{3}((?:\\?[\s\S])+?)\/{3}([imgy]{0,4})(?!\w)/;
 
-  HEREGEX_OMIT = /\s+(?:#.*)?/g;
+  HEREGEX_OMIT = /((?:\\\\)+)|\\(\s|\/)|\s+(?:#.*)?/g;
 
   MULTILINER = /\n/g;
 
@@ -860,9 +901,11 @@
 
   TRAILING_SPACES = /\s+$/;
 
-  COMPOUND_ASSIGN = ['-=', '+=', '/=', '*=', '%=', '||=', '&&=', '?=', '<<=', '>>=', '>>>=', '&=', '^=', '|='];
+  COMPOUND_ASSIGN = ['-=', '+=', '/=', '*=', '%=', '||=', '&&=', '?=', '<<=', '>>=', '>>>=', '&=', '^=', '|=', '**=', '//=', '%%='];
 
-  UNARY = ['!', '~', 'NEW', 'TYPEOF', 'DELETE', 'DO'];
+  UNARY = ['NEW', 'TYPEOF', 'DELETE', 'DO'];
+
+  UNARY_MATH = ['!', '~'];
 
   LOGIC = ['&&', '||', '&', '|', '^'];
 
@@ -870,7 +913,7 @@
 
   COMPARE = ['==', '!=', '<', '>', '<=', '>='];
 
-  MATH = ['*', '/', '%'];
+  MATH = ['*', '/', '%', '//', '%%'];
 
   RELATION = ['IN', 'OF', 'INSTANCEOF'];
 
@@ -886,4 +929,6 @@
 
   LINE_BREAK = ['INDENT', 'OUTDENT', 'TERMINATOR'];
 
+  INDENTABLE_CLOSERS = [')', '}', ']'];
+
 }).call(this);

lib/coffee-script/optparse.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.8.0
 (function() {
   var LONG_FLAG, MULTI_FLAG, OPTIONAL, OptionParser, SHORT_FLAG, buildRule, buildRules, normalizeArguments, repeat;
 

lib/coffee-script/register.js

@@ -0,0 +1,66 @@
+// Generated by CoffeeScript 1.8.0
+(function() {
+  var CoffeeScript, Module, binary, child_process, ext, findExtension, fork, helpers, loadFile, path, _i, _len, _ref;
+
+  CoffeeScript = require('./coffee-script');
+
+  child_process = require('child_process');
+
+  helpers = require('./helpers');
+
+  path = require('path');
+
+  loadFile = function(module, filename) {
+    var answer;
+    answer = CoffeeScript._compileFile(filename, false);
+    return module._compile(answer, filename);
+  };
+
+  if (require.extensions) {
+    _ref = CoffeeScript.FILE_EXTENSIONS;
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      ext = _ref[_i];
+      require.extensions[ext] = loadFile;
+    }
+    Module = require('module');
+    findExtension = function(filename) {
+      var curExtension, extensions;
+      extensions = path.basename(filename).split('.');
+      if (extensions[0] === '') {
+        extensions.shift();
+      }
+      while (extensions.shift()) {
+        curExtension = '.' + extensions.join('.');
+        if (Module._extensions[curExtension]) {
+          return curExtension;
+        }
+      }
+      return '.js';
+    };
+    Module.prototype.load = function(filename) {
+      var extension;
+      this.filename = filename;
+      this.paths = Module._nodeModulePaths(path.dirname(filename));
+      extension = findExtension(filename);
+      Module._extensions[extension](this, filename);
+      return this.loaded = true;
+    };
+  }
+
+  if (child_process) {
+    fork = child_process.fork;
+    binary = require.resolve('../../bin/coffee');
+    child_process.fork = function(path, args, options) {
+      if (helpers.isCoffee(path)) {
+        if (!Array.isArray(args)) {
+          options = args || {};
+          args = [];
+        }
+        args = [path].concat(args);
+        path = binary;
+      }
+      return fork(path, args, options);
+    };
+  }
+
+}).call(this);