Replace .npmignore with "files": [...] in package.json

Be much more careful about parsing `*` in import and export statements

.npmignore

@@ -1,11 +0,0 @@
-*.coffee
-*.html
-.DS_Store
-.git*
-Cakefile
-documentation/
-examples/
-extras/coffee-script.js
-raw/
-src/
-test/

CNAME

@@ -1 +1 @@
-coffeescript.org
+coffeescript.org

CONTRIBUTING.md

@@ -6,4 +6,4 @@
 
 * 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.
+* 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

@@ -54,6 +54,9 @@ codeFor = ->
     js = js.replace /^\/\/ generated.*?\n/i, ''
 
     cshtml = "<pre><code>#{hljs.highlight('coffeescript', cs).value}</code></pre>"
+    # Temporary fix until highlight.js adds support for newer CoffeeScript reserved words
+    if file is 'modules'
+      cshtml = cshtml.replace /(import|export|from|as|default) /g, '<span class="reserved">$1</span> '
     jshtml = "<pre><code>#{hljs.highlight('javascript', js).value}</code></pre>"
     append = if executable is yes then '' else "alert(#{executable});"
     if executable and executable != yes
@@ -276,6 +279,12 @@ runTests = (CoffeeScript) ->
 
   # Run every test in the `test` folder, recording failures.
   files = fs.readdirSync 'test'
+
+  # Ignore generators test file if generators are not available
+  generatorsAreAvailable = '--harmony' in process.execArgv or
+    '--harmony-generators' in process.execArgv
+  files.splice files.indexOf('generators.coffee'), 1 if not generatorsAreAvailable
+
   for file in files when helpers.isCoffee file
     literate = helpers.isLiterate file
     currentFile = filename = path.join 'test', file

LICENSE

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

README

@@ -1,50 +0,0 @@
-            {
-         }   }   {
-        {   {  }  }
-         }   }{  {
-        {  }{  }  }                    _____       __  __
-       { }{ }{  { }                   / ____|     / _|/ _|
-     .- { { }  { }} -.               | |     ___ | |_| |_ ___  ___
-    (  { } { } { } }  )              | |    / _ \|  _|  _/ _ \/ _ \
-    |`-..________ ..-'|              | |___| (_) | | | ||  __/  __/
-    |                 |               \_____\___/|_| |_| \___|\___|
-    |                 ;--.
-    |                (__  \            _____           _       _
-    |                 | )  )          / ____|         (_)     | |
-    |                 |/  /          | (___   ___ _ __ _ _ __ | |_
-    |                 (  /            \___ \ / __| '__| | '_ \| __|
-    |                 |/              ____) | (__| |  | | |_) | |_
-    |                 |              |_____/ \___|_|  |_| .__/ \__|
-     `-.._________..-'                                  | |
-                                                        |_|
-
-
-  CoffeeScript is a little language that compiles into JavaScript.
-
-  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
-
-  Compile a script:
-  coffee -c /path/to/script.coffee
-
-  For documentation, usage, and examples, see:
-  http://coffeescript.org/
-
-  To suggest a feature, report a bug, or general discussion:
-  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/coffeescript.git
-
-  Top 100 contributors are listed here:
-  http://github.com/jashkenas/coffeescript/contributors

README.md

@@ -57,4 +57,6 @@ If you'd like to chat, drop by #coffeescript on Freenode IRC.
 
 The source repository: https://github.com/jashkenas/coffeescript.git
 
+Changelog: http://coffeescript.org/#changelog
+
 Our lovely and talented contributors are listed here: http://github.com/jashkenas/coffeescript/contributors

bower.json

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

documentation/coffee/block_comment.coffee

@@ -2,5 +2,3 @@
 SkinnyMochaHalfCaffScript Compiler v1.0
 Released under the MIT License
 ###
-
-

documentation/coffee/cake_tasks.coffee

@@ -6,4 +6,4 @@ task 'build:parser', 'rebuild the Jison parser', (options) ->
   require 'jison'
   code = require('./lib/grammar').parser.generate()
   dir  = options.output or 'lib'
-  fs.writeFile "#{dir}/parser.js", code
+  fs.writeFile "#{dir}/parser.js", code

documentation/coffee/chaining.coffee

@@ -4,5 +4,3 @@ $ 'body'
   .fadeIn 'fast'
   .addClass '.active'
 .css 'background', 'white'
-
-

documentation/coffee/classes.coffee

@@ -19,7 +19,3 @@ tom = new Horse "Tommy the Palomino"
 
 sam.move()
 tom.move()
-
-
-
-

documentation/coffee/comparisons.coffee

@@ -1,5 +1,3 @@
 cholesterol = 127
 
 healthy = 200 > cholesterol > 60
-
-

documentation/coffee/conditionals.coffee

@@ -7,6 +7,3 @@ else
   showIt()
 
 date = if friday then sue else jill
-
-
-

documentation/coffee/constructor_destructuring.coffee

@@ -1,6 +1,5 @@
 class Person
-  constructor: (options) -> 
-    {@name, @age, @height} = options
-
-tim = new Person age: 4
+  constructor: (options) ->
+    {@name, @age, @height = 'average'} = options
 
+tim = new Person name: 'Tim', age: 4

documentation/coffee/default_args.coffee

@@ -1,8 +1,2 @@
 fill = (container, liquid = "coffee") ->
   "Filling the #{container} with #{liquid}..."
-
-
-
-
-
-

documentation/coffee/do.coffee

@@ -1,4 +1,4 @@
 for filename in list
   do (filename) ->
     fs.readFile filename, (err, contents) ->
-      compile filename, contents.toString()
+      compile filename, contents.toString()

documentation/coffee/embedded.coffee

@@ -1,6 +1,3 @@
 hi = `function() {
   return [document.title, "Hello JavaScript"].join(": ");
 }`
-
-
-

documentation/coffee/existence.coffee

@@ -4,10 +4,3 @@ speed = 0
 speed ?= 15
 
 footprints = yeti ? "bear"
-
-
-
-
-
-
- 

documentation/coffee/expansion.coffee

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

documentation/coffee/expressions.coffee

@@ -6,4 +6,4 @@ grade = (student) ->
   else
     "C"
 
-eldest = if 24 > 21 then "Liz" else "Ike"
+eldest = if 24 > 21 then "Liz" else "Ike"

documentation/coffee/expressions_assignment.coffee

@@ -1,3 +1 @@
 six = (one = 1) + (two = 2) + (three = 3)
-
-

documentation/coffee/expressions_comprehension.coffee

@@ -1,3 +1,3 @@
 # The first ten global properties.
 
-globals = (name for name of window)[0...10]
+globals = (name for name of window)[0...10]

documentation/coffee/expressions_try.coffee

@@ -4,4 +4,3 @@ alert(
   catch error
     "And the error is ... #{error}"
 )
-

documentation/coffee/fat_arrow.coffee

@@ -2,5 +2,5 @@ Account = (customer, cart) ->
   @customer = customer
   @cart = cart
 
-  $('.shopping_cart').bind 'click', (event) =>
-    @customer.purchase @cart
+  $('.shopping_cart').on 'click', (event) =>
+    @customer.purchase @cart

documentation/coffee/generators.coffee

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

documentation/coffee/heredocs.coffee

@@ -3,4 +3,3 @@ html = """
          cup of coffeescript
        </strong>
        """
-       

documentation/coffee/heregexes.coffee

@@ -7,5 +7,3 @@ OPERATOR = /// ^ (
    | \?\.              # soak access
    | \.{2,3}           # range or splat
 ) ///
-
-

documentation/coffee/interpolation.coffee

@@ -2,8 +2,3 @@ author = "Wittgenstein"
 quote  = "A picture is a fact. -- #{ author }"
 
 sentence = "#{ 22 / 7 } is a decent approximation of π"
-
-
-
-
-

documentation/coffee/modules.coffee

@@ -0,0 +1,22 @@
+import 'local-file.coffee'
+import 'coffee-script'
+
+import _ from 'underscore'
+import * as underscore from 'underscore'
+
+import { now } from 'underscore'
+import { now as currentTimestamp } from 'underscore'
+import { first, last } from 'underscore'
+import utilityBelt, { each } from 'underscore'
+
+export default Math
+export square = (x) -> x * x
+export class Mathematics
+  least: (x, y) -> if x < y then x else y
+
+export { sqrt }
+export { sqrt as squareRoot }
+export { Mathematics as default, sqrt as squareRoot }
+
+export * from 'underscore'
+export { max, min } from 'underscore'

documentation/coffee/modulo.coffee

@@ -0,0 +1,4 @@
+-7 % 5 == -2 # The remainder of 7 / 5
+-7 %% 5 == 3 # n %% 5 is always between 0 and 4
+
+tabs.selectTabAtIndex((tabs.currentIndex - count) %% tabs.length)

documentation/coffee/multiple_return_values.coffee

@@ -3,7 +3,3 @@ weatherReport = (location) ->
   [location, 72, "Mostly Sunny"]
 
 [city, temp, forecast] = weatherReport "Berkeley, CA"
-
-
-
-

documentation/coffee/object_extraction.coffee

@@ -9,6 +9,3 @@ futurists =
     ]
 
 {poet: {name, address: [street, city]}} = futurists
-
-
-

documentation/coffee/objects_and_arrays.coffee

@@ -15,5 +15,3 @@ kids =
   sister:
     name: "Ida"
     age:  9
-
-

documentation/coffee/objects_reserved.coffee

@@ -1,5 +1,3 @@
 $('.account').attr class: 'active'
 
 log object.class
-
-

documentation/coffee/parallel_assignment.coffee

@@ -2,8 +2,3 @@ theBait   = 1000
 theSwitch = 0
 
 [theBait, theSwitch] = [theSwitch, theBait]
-
-
-
-
- 

documentation/coffee/patterns_and_splats.coffee

@@ -1,9 +1,3 @@
 tag = "<impossible>"
 
 [open, contents..., close] = tag.split("")
-
-
-
-
-
-

documentation/coffee/prototypes.coffee

@@ -1,3 +1,2 @@
 String::dasherize = ->
   this.replace /_/g, "-"
-

documentation/coffee/range_comprehensions.coffee

@@ -1,2 +1 @@
 countdown = (num for num in [10..1])
-

documentation/coffee/scope.coffee

@@ -2,4 +2,4 @@ outer = 1
 changeNumbers = ->
   inner = -1
   outer = 10
-inner = changeNumbers()
+inner = changeNumbers()

documentation/coffee/splats.coffee

@@ -23,5 +23,3 @@ awardMedals contenders...
 alert "Gold: " + gold
 alert "Silver: " + silver
 alert "The Field: " + rest
-
-

documentation/coffee/splices.coffee

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

documentation/coffee/switch.coffee

@@ -7,4 +7,4 @@ switch day
       go bingo
       go dancing
   when "Sun" then go church
-  else go work
+  else go work

documentation/coffee/try.coffee

@@ -5,4 +5,3 @@ catch error
   print error
 finally
   cleanUp()
-

documentation/css/docs.css

@@ -9,6 +9,7 @@ body {
   width: 950px;
   margin: 0;
   padding: 80px 0px 50px 50px;
+  clear: both;
 }
 p, li {
   width: 625px;
@@ -38,7 +39,7 @@ li {
 }
 table {
   margin: 16px 0 0 13px; padding: 0;
-  width: 625px;
+  width: 690px;
 }
   tr, td {
     margin: 0; padding: 0;
@@ -56,7 +57,7 @@ table.definitions {
     text-align: center;
     padding: 5px 20px;
   }
-code, pre, tt, textarea {
+code, pre, textarea {
   font-family: Monaco, Consolas, "Lucida Console", monospace;
   font-size: 12px;
   line-height: 18px;
@@ -64,7 +65,7 @@ code, pre, tt, textarea {
   white-space: pre-wrap;
   word-wrap: break-word;
 }
-  tt {
+  p > code, li > code {
     display: inline-block;
     background: #fff;
     border: 1px solid #dedede;
@@ -111,9 +112,12 @@ div.code {
     float: left;
     width: 450px;
     background: #fff;
-    border-left: 1px dotted #d0d0d0;
-    margin: 10px 0 15px 3px;
-    padding: 0 0 0 12px;
+    border: 1px dotted #d0d0d0;
+    border-top-width: 0;
+    border-bottom-width: 0;
+    border-right-width: 0;
+    margin: 15px 3px;
+    padding: 0 0 26px 12px;
   }
     div.code pre:first-child {
       border-left: 0;
@@ -134,7 +138,6 @@ div.code {
   height: 50px;
   min-width: 490px;
   left: 40px; right: 40px; top: 25px;
-  padding-left: 252px;
   background: #eee;
   background: -webkit-gradient(linear, left top, left bottom, from(#f8f8f8), to(#dadada));
   background: -moz-linear-gradient(top, #f8f8f8, #dadada);
@@ -149,8 +152,9 @@ div.code {
   #logo {
     display: block;
     outline: none;
-    position: absolute;
-    top: 0px; left: 10px;
+    float: left;
+    width: 242px;
+    margin-left: 10px;
   }
     #logo img {
       margin: 5px 0 0 3px;
@@ -221,6 +225,7 @@ div.code {
         display: block;
       }
       .navigation .contents.menu {
+        z-index: 100;
         border-top: 0;
         -webkit-border-top-left-radius: 0; -moz-border-radius-topleft: 0; border-top-left-radius: 0;
         -webkit-border-top-right-radius: 0; -moz-border-radius-topright: 0; border-top-right-radius: 0;
@@ -377,3 +382,38 @@ div.code {
      cursor: not-allowed;
   }
 
+@media (max-width: 820px) {
+  .container {
+    width: auto;
+    padding: 1em;
+  }
+  p, li, table {
+    width: auto;
+  }
+  #fadeout {
+    display: none;
+  }
+  #flybar {
+    position: static;
+    height: auto;
+    min-width: 245px;
+  }
+    #logo {
+      float: none;
+    }
+    .navigation {
+      float: none;
+      border: none;
+    }
+  div.code pre, div.code textarea {
+    border-left: none;
+    border-top-width: 1px;
+    width: auto;
+    float: none;
+    margin: 5px;
+    padding: 10px 5px;
+  }
+    div.code pre:first-child {
+      border-top: none;
+    }
+}

documentation/docs/browser.html

@@ -140,7 +140,7 @@ compile = CoffeeScript.compile</pre></div></div>
 
             </div>
             
-            <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>
+            <div class="content"><div class='highlight'><pre>CoffeeScript.eval = <span class="hljs-function"><span class="hljs-params">(code, options = {})</span> -&gt;</span>
   options.bare ?= <span class="hljs-literal">on</span>
   eval compile code, options</pre></div></div>
             
@@ -157,8 +157,8 @@ compile = CoffeeScript.compile</pre></div></div>
 
             </div>
             
-            <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>
+            <div class="content"><div class='highlight'><pre>CoffeeScript.run = <span class="hljs-function"><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>
             
@@ -192,12 +192,10 @@ Ported from <a href="https://developer.mozilla.org/en-US/docs/DOM/window.btoa">h
 
             </div>
             
-            <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="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>
+            <div class="content"><div class='highlight'><pre><span class="hljs-keyword">if</span> btoa? <span class="hljs-keyword">and</span> JSON?
+<span class="hljs-function">  <span class="hljs-title">compile</span> = <span class="hljs-params">(code, options = {})</span> -&gt;</span>
+    options.inlineMap = <span class="hljs-literal">true</span>
+    CoffeeScript.compile code, options</pre></div></div>
             
         </li>
         
@@ -212,7 +210,7 @@ Ported from <a href="https://developer.mozilla.org/en-US/docs/DOM/window.btoa">h
 
             </div>
             
-            <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>
+            <div class="content"><div class='highlight'><pre>CoffeeScript.load = <span class="hljs-function"><span class="hljs-params">(url, callback, options = {}, hold = <span class="hljs-literal">false</span>)</span> -&gt;</span>
   options.sourceFiles = [url]
   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>)
@@ -220,7 +218,7 @@ Ported from <a href="https://developer.mozilla.org/en-US/docs/DOM/window.btoa">h
     <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>
+  xhr.onreadystatechange = <span class="hljs-function">-&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]
@@ -250,8 +248,8 @@ This happens on page load.</p>
   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>
+<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...
@@ -259,10 +257,11 @@ This happens on page load.</p>
       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-keyword">do</span> (script, i) -&gt;
+      options = literate: script.type <span class="hljs-keyword">is</span> coffeetypes[<span class="hljs-number">1</span>]
+      source = script.src <span class="hljs-keyword">or</span> script.getAttribute(<span class="hljs-string">'data-src'</span>)
+      <span class="hljs-keyword">if</span> source
+        CoffeeScript.load source,
           <span class="hljs-function"><span class="hljs-params">(param)</span> -&gt;</span>
             coffees[i] = param
             execute()

documentation/docs/cake.html

@@ -205,7 +205,7 @@ and the function to run as the action itself.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>  task: <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>
             
@@ -224,7 +224,7 @@ as the first argument to the action.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>  option: <span class="hljs-function"><span class="hljs-params">(letter, flag, description)</span> -&gt;</span>
     switches.push [letter, flag, description]</pre></div></div>
             
         </li>
@@ -240,7 +240,7 @@ as the first argument to the action.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>  invoke: <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>
             
@@ -260,11 +260,11 @@ original directory name, when running Cake tasks from subdirectories.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>exports.run = <span class="hljs-function">-&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>
+  CoffeeScript.run fs.readFileSync(<span class="hljs-string">'Cakefile'</span>).toString(), filename: <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>
@@ -314,8 +314,8 @@ original directory name, when running Cake tasks from subdirectories.</p>
   <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>
+<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>
         

documentation/docs/coffee-script.html

@@ -144,9 +144,9 @@ SourceMap     = <span class="hljs-built_in">require</span> <span class="hljs-str
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.VERSION = <span class="hljs-string">'1.8.0'</span>
+            <div class="content"><div class='highlight'><pre>exports.VERSION = <span class="hljs-string">'1.11.0'</span>
 
-<span class="hljs-built_in">exports</span>.FILE_EXTENSIONS = [<span class="hljs-string">'.coffee'</span>, <span class="hljs-string">'.litcoffee'</span>, <span class="hljs-string">'.coffee.md'</span>]</pre></div></div>
+exports.FILE_EXTENSIONS = [<span class="hljs-string">'.coffee'</span>, <span class="hljs-string">'.litcoffee'</span>, <span class="hljs-string">'.coffee.md'</span>]</pre></div></div>
             
         </li>
         
@@ -161,7 +161,7 @@ SourceMap     = <span class="hljs-built_in">require</span> <span class="hljs-str
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.helpers = helpers</pre></div></div>
+            <div class="content"><div class='highlight'><pre>exports.helpers = helpers</pre></div></div>
             
         </li>
         
@@ -172,17 +172,17 @@ SourceMap     = <span class="hljs-built_in">require</span> <span class="hljs-str
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
-              <p>Function wrapper to add source file information to SyntaxErrors thrown by the
-lexer/parser/compiler.</p>
+              <p>Function that allows for btoa in both nodejs and the browser.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">withPrettyErrors</span> = <span class="hljs-params">(fn)</span> -&gt;</span>
-  <span class="hljs-function"><span class="hljs-params">(code, options = {})</span> -&gt;</span>
-    <span class="hljs-keyword">try</span>
-      fn.call @, code, options
-    <span class="hljs-keyword">catch</span> err
-      <span class="hljs-keyword">throw</span> helpers.updateSyntaxError err, code, options.filename</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">base64encode</span> = <span class="hljs-params">(src)</span> -&gt;</span> <span class="hljs-keyword">switch</span>
+  <span class="hljs-keyword">when</span> <span class="hljs-keyword">typeof</span> Buffer <span class="hljs-keyword">is</span> <span class="hljs-string">'function'</span>
+    <span class="hljs-keyword">new</span> Buffer(src).toString(<span class="hljs-string">'base64'</span>)
+  <span class="hljs-keyword">when</span> <span class="hljs-keyword">typeof</span> btoa <span class="hljs-keyword">is</span> <span class="hljs-string">'function'</span>
+    btoa(src)
+  <span class="hljs-keyword">else</span>
+    <span class="hljs-keyword">throw</span> <span class="hljs-keyword">new</span> Error(<span class="hljs-string">'Unable to base64 encode inline sourcemap.'</span>)</pre></div></div>
             
         </li>
         
@@ -193,6 +193,28 @@ lexer/parser/compiler.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-5">&#182;</a>
               </div>
+              <p>Function wrapper to add source file information to SyntaxErrors thrown by the
+lexer/parser/compiler.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">withPrettyErrors</span> = <span class="hljs-params">(fn)</span> -&gt;</span>
+  (code, options = {}) -&gt;
+    <span class="hljs-keyword">try</span>
+      fn.call @, code, options
+    <span class="hljs-keyword">catch</span> err
+      <span class="hljs-keyword">throw</span> err <span class="hljs-keyword">if</span> <span class="hljs-keyword">typeof</span> code <span class="hljs-keyword">isnt</span> <span class="hljs-string">'string'</span> <span class="hljs-comment"># Support `CoffeeScript.nodes(tokens)`.</span>
+      <span class="hljs-keyword">throw</span> helpers.updateSyntaxError err, code, options.filename</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-6">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-6">&#182;</a>
+              </div>
               <p>Compile CoffeeScript code to JavaScript, using the Coffee/Jison compiler.</p>
 <p>If <code>options.sourceMap</code> is specified, then <code>options.filename</code> must also be specified.  All
 options that can be passed to <code>SourceMap#generate</code> may also be passed here.</p>
@@ -203,14 +225,54 @@ lookups.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.compile = compile = withPrettyErrors <span class="hljs-function"><span class="hljs-params">(code, options)</span> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>exports.compile = compile = withPrettyErrors (code, options) -&gt;
   {merge, extend} = helpers
   options = extend {}, options
+  generateSourceMap = options.sourceMap <span class="hljs-keyword">or</span> options.inlineMap
 
-  <span class="hljs-keyword">if</span> options.sourceMap
+  <span class="hljs-keyword">if</span> generateSourceMap
     map = <span class="hljs-keyword">new</span> SourceMap
 
-  fragments = parser.parse(lexer.tokenize code, options).compileToFragments options
+  tokens = lexer.tokenize code, options</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-7">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-7">&#182;</a>
+              </div>
+              <p>Pass a list of referenced variables, so that generated variables won’t get
+the same name.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>  options.referencedVars = (
+    token[<span class="hljs-number">1</span>] <span class="hljs-keyword">for</span> token <span class="hljs-keyword">in</span> tokens <span class="hljs-keyword">when</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'IDENTIFIER'</span>
+  )</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-8">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-8">&#182;</a>
+              </div>
+              <p>Check for import or export; if found, force bare mode</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-keyword">unless</span> options.bare? <span class="hljs-keyword">and</span> options.bare <span class="hljs-keyword">is</span> <span class="hljs-literal">yes</span>
+    <span class="hljs-keyword">for</span> token <span class="hljs-keyword">in</span> tokens
+      <span class="hljs-keyword">if</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> [<span class="hljs-string">'IMPORT'</span>, <span class="hljs-string">'EXPORT'</span>]
+        options.bare = <span class="hljs-literal">yes</span>
+        <span class="hljs-keyword">break</span>
+
+  fragments = parser.parse(tokens).compileToFragments options
 
   currentLine = <span class="hljs-number">0</span>
   currentLine += <span class="hljs-number">1</span> <span class="hljs-keyword">if</span> options.header
@@ -222,92 +284,17 @@ lookups.</p>
         </li>
         
         
-        <li id="section-6">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-6">&#182;</a>
-              </div>
-              <p>Update the sourcemap with data from each fragment</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>    <span class="hljs-keyword">if</span> options.sourceMap
-      <span class="hljs-keyword">if</span> fragment.locationData
-        map.add(
-          [fragment.locationData.first_line, fragment.locationData.first_column]
-          [currentLine, currentColumn]
-          {<span class="hljs-attribute">noReplace</span>: <span class="hljs-literal">true</span>})
-      newLines = helpers.count fragment.code, <span class="hljs-string">"\n"</span>
-      currentLine += newLines
-      <span class="hljs-keyword">if</span> newLines
-        currentColumn = fragment.code.length - (fragment.code.lastIndexOf(<span class="hljs-string">"\n"</span>) + <span class="hljs-number">1</span>)
-      <span class="hljs-keyword">else</span>
-        currentColumn += fragment.code.length</pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-7">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-7">&#182;</a>
-              </div>
-              <p>Copy the code from each fragment into the final JavaScript.</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>    js += fragment.code
-
-  <span class="hljs-keyword">if</span> options.header
-    header = <span class="hljs-string">"Generated by CoffeeScript <span class="hljs-subst">#{<span class="hljs-property">@VERSION</span>}</span>"</span>
-    js = <span class="hljs-string">"// <span class="hljs-subst">#{header}</span>\n<span class="hljs-subst">#{js}</span>"</span>
-
-  <span class="hljs-keyword">if</span> options.sourceMap
-    answer = {js}
-    answer.sourceMap = map
-    answer.v3SourceMap = map.generate(options, code)
-    answer
-  <span class="hljs-keyword">else</span>
-    js</pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-8">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-8">&#182;</a>
-              </div>
-              <p>Tokenize a string of CoffeeScript code, and return the array of tokens.</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.tokens = withPrettyErrors <span class="hljs-function"><span class="hljs-params">(code, options)</span> -&gt;</span>
-  lexer.tokenize code, options</pre></div></div>
-            
-        </li>
-        
-        
         <li id="section-9">
             <div class="annotation">
               
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-9">&#182;</a>
               </div>
-              <p>Parse a string of CoffeeScript code or an array of lexed tokens, and
-return the AST. You can then compile it by calling <code>.compile()</code> on the root,
-or traverse it by using <code>.traverseChildren()</code> with a callback.</p>
+              <p>Update the sourcemap with data from each fragment</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.nodes = withPrettyErrors <span class="hljs-function"><span class="hljs-params">(source, options)</span> -&gt;</span>
-  <span class="hljs-keyword">if</span> <span class="hljs-keyword">typeof</span> source <span class="hljs-keyword">is</span> <span class="hljs-string">'string'</span>
-    parser.parse lexer.tokenize source, options
-  <span class="hljs-keyword">else</span>
-    parser.parse source</pre></div></div>
+            <div class="content"><div class='highlight'><pre>    <span class="hljs-keyword">if</span> generateSourceMap</pre></div></div>
             
         </li>
         
@@ -318,13 +305,21 @@ or traverse it by using <code>.traverseChildren()</code> with a callback.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-10">&#182;</a>
               </div>
-              <p>Compile and execute a string of CoffeeScript (on the server), correctly
-setting <code>__filename</code>, <code>__dirname</code>, and relative <code>require()</code>.</p>
+              <p>Do not include empty, whitespace, or semicolon-only fragments.</p>
 
             </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> = <span class="hljs-params">(code, options = {})</span> -&gt;</span>
-  mainModule = <span class="hljs-built_in">require</span>.main</pre></div></div>
+            <div class="content"><div class='highlight'><pre>      <span class="hljs-keyword">if</span> fragment.locationData <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> <span class="hljs-regexp">/^[;\s]*$/</span>.test fragment.code
+        map.add(
+          [fragment.locationData.first_line, fragment.locationData.first_column]
+          [currentLine, currentColumn]
+          {noReplace: <span class="hljs-literal">true</span>})
+      newLines = helpers.count fragment.code, <span class="hljs-string">"\n"</span>
+      currentLine += newLines
+      <span class="hljs-keyword">if</span> newLines
+        currentColumn = fragment.code.length - (fragment.code.lastIndexOf(<span class="hljs-string">"\n"</span>) + <span class="hljs-number">1</span>)
+      <span class="hljs-keyword">else</span>
+        currentColumn += fragment.code.length</pre></div></div>
             
         </li>
         
@@ -335,6 +330,97 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-11">&#182;</a>
               </div>
+              <p>Copy the code from each fragment into the final JavaScript.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    js += fragment.code
+
+  <span class="hljs-keyword">if</span> options.header
+    header = <span class="hljs-string">"Generated by CoffeeScript <span class="hljs-subst">#{@VERSION}</span>"</span>
+    js = <span class="hljs-string">"// <span class="hljs-subst">#{header}</span>\n<span class="hljs-subst">#{js}</span>"</span>
+
+  <span class="hljs-keyword">if</span> generateSourceMap
+    v3SourceMap = map.generate(options, code)
+
+  <span class="hljs-keyword">if</span> options.inlineMap
+    encoded = base64encode JSON.stringify v3SourceMap
+    sourceMapDataURI = <span class="hljs-string">"//# sourceMappingURL=data:application/json;base64,<span class="hljs-subst">#{encoded}</span>"</span>
+    sourceURL = <span class="hljs-string">"//# sourceURL=<span class="hljs-subst">#{options.filename ? <span class="hljs-string">'coffeescript'</span>}</span>"</span>
+    js = <span class="hljs-string">"<span class="hljs-subst">#{js}</span>\n<span class="hljs-subst">#{sourceMapDataURI}</span>\n<span class="hljs-subst">#{sourceURL}</span>"</span>
+
+  <span class="hljs-keyword">if</span> options.sourceMap
+    {
+      js
+      sourceMap: map
+      v3SourceMap: JSON.stringify v3SourceMap, <span class="hljs-literal">null</span>, <span class="hljs-number">2</span>
+    }
+  <span class="hljs-keyword">else</span>
+    js</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-12">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-12">&#182;</a>
+              </div>
+              <p>Tokenize a string of CoffeeScript code, and return the array of tokens.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>exports.tokens = withPrettyErrors (code, options) -&gt;
+  lexer.tokenize code, options</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-13">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-13">&#182;</a>
+              </div>
+              <p>Parse a string of CoffeeScript code or an array of lexed tokens, and
+return the AST. You can then compile it by calling <code>.compile()</code> on the root,
+or traverse it by using <code>.traverseChildren()</code> with a callback.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>exports.nodes = withPrettyErrors (source, options) -&gt;
+  <span class="hljs-keyword">if</span> <span class="hljs-keyword">typeof</span> source <span class="hljs-keyword">is</span> <span class="hljs-string">'string'</span>
+    parser.parse lexer.tokenize source, options
+  <span class="hljs-keyword">else</span>
+    parser.parse source</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-14">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-14">&#182;</a>
+              </div>
+              <p>Compile and execute a string of CoffeeScript (on the server), correctly
+setting <code>__filename</code>, <code>__dirname</code>, and relative <code>require()</code>.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>exports.run = <span class="hljs-function"><span class="hljs-params">(code, options = {})</span> -&gt;</span>
+  mainModule = <span class="hljs-built_in">require</span>.main</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-15">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-15">&#182;</a>
+              </div>
               <p>Set the filename.</p>
 
             </div>
@@ -345,11 +431,11 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
         </li>
         
         
-        <li id="section-12">
+        <li id="section-16">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-12">&#182;</a>
+                <a class="pilcrow" href="#section-16">&#182;</a>
               </div>
               <p>Clear the module cache.</p>
 
@@ -360,11 +446,11 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
         </li>
         
         
-        <li id="section-13">
+        <li id="section-17">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-13">&#182;</a>
+                <a class="pilcrow" href="#section-17">&#182;</a>
               </div>
               <p>Assign paths for node_modules loading</p>
 
@@ -379,11 +465,11 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
         </li>
         
         
-        <li id="section-14">
+        <li id="section-18">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-14">&#182;</a>
+                <a class="pilcrow" href="#section-18">&#182;</a>
               </div>
               <p>Compile.</p>
 
@@ -398,26 +484,30 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
         </li>
         
         
-        <li id="section-15">
+        <li id="section-19">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-15">&#182;</a>
+                <a class="pilcrow" href="#section-19">&#182;</a>
               </div>
               <p>Compile and evaluate a string of CoffeeScript (in a Node.js-like environment).
 The CoffeeScript REPL uses this to run the input.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">eval</span> = <span class="hljs-params">(code, options = {})</span> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>exports.eval = <span class="hljs-function"><span class="hljs-params">(code, options = {})</span> -&gt;</span>
   <span class="hljs-keyword">return</span> <span class="hljs-keyword">unless</span> code = code.trim()
-  Script = vm.Script
-  <span class="hljs-keyword">if</span> Script
+  createContext = vm.Script.createContext ? vm.createContext
+
+  isContext = vm.isContext ? (ctx) -&gt;
+    options.sandbox <span class="hljs-keyword">instanceof</span> createContext().constructor
+
+  <span class="hljs-keyword">if</span> createContext
     <span class="hljs-keyword">if</span> options.sandbox?
-      <span class="hljs-keyword">if</span> options.sandbox <span class="hljs-keyword">instanceof</span> Script.createContext().constructor
+      <span class="hljs-keyword">if</span> isContext options.sandbox
         sandbox = options.sandbox
       <span class="hljs-keyword">else</span>
-        sandbox = Script.createContext()
+        sandbox = createContext()
         sandbox[k] = v <span class="hljs-keyword">for</span> own k, v <span class="hljs-keyword">of</span> options.sandbox
       sandbox.<span class="hljs-built_in">global</span> = sandbox.root = sandbox.GLOBAL = sandbox
     <span class="hljs-keyword">else</span>
@@ -428,11 +518,11 @@ The CoffeeScript REPL uses this to run the input.</p>
         </li>
         
         
-        <li id="section-16">
+        <li id="section-20">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-16">&#182;</a>
+                <a class="pilcrow" href="#section-20">&#182;</a>
               </div>
               <p>define module/require only if they chose not to specify their own</p>
 
@@ -441,25 +531,26 @@ The CoffeeScript REPL uses this to run the input.</p>
             <div class="content"><div class='highlight'><pre>    <span class="hljs-keyword">unless</span> sandbox <span class="hljs-keyword">isnt</span> <span class="hljs-built_in">global</span> <span class="hljs-keyword">or</span> sandbox.<span class="hljs-built_in">module</span> <span class="hljs-keyword">or</span> sandbox.<span class="hljs-built_in">require</span>
       Module = <span class="hljs-built_in">require</span> <span class="hljs-string">'module'</span>
       sandbox.<span class="hljs-built_in">module</span>  = _module  = <span class="hljs-keyword">new</span> Module(options.modulename || <span class="hljs-string">'eval'</span>)
-      sandbox.<span class="hljs-built_in">require</span> = <span class="hljs-function"><span class="hljs-title">_require</span> = <span class="hljs-params">(path)</span> -&gt;</span>  Module._load path, _module, <span class="hljs-literal">true</span>
+      sandbox.<span class="hljs-built_in">require</span> = _require = <span class="hljs-function"><span class="hljs-params">(path)</span> -&gt;</span>  Module._load path, _module, <span class="hljs-literal">true</span>
       _module.filename = sandbox.__filename
-      _require[r] = <span class="hljs-built_in">require</span>[r] <span class="hljs-keyword">for</span> r <span class="hljs-keyword">in</span> Object.getOwnPropertyNames <span class="hljs-built_in">require</span> <span class="hljs-keyword">when</span> r <span class="hljs-keyword">isnt</span> <span class="hljs-string">'paths'</span></pre></div></div>
+      <span class="hljs-keyword">for</span> r <span class="hljs-keyword">in</span> Object.getOwnPropertyNames <span class="hljs-built_in">require</span> <span class="hljs-keyword">when</span> r <span class="hljs-keyword">not</span> <span class="hljs-keyword">in</span> [<span class="hljs-string">'paths'</span>, <span class="hljs-string">'arguments'</span>, <span class="hljs-string">'caller'</span>]
+        _require[r] = <span class="hljs-built_in">require</span>[r]</pre></div></div>
             
         </li>
         
         
-        <li id="section-17">
+        <li id="section-21">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-17">&#182;</a>
+                <a class="pilcrow" href="#section-21">&#182;</a>
               </div>
               <p>use the same hack node currently uses for their own REPL</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>      _require.paths = _module.paths = Module._nodeModulePaths process.cwd()
-      _require.<span class="hljs-function"><span class="hljs-title">resolve</span> = <span class="hljs-params">(request)</span> -&gt;</span> Module._resolveFilename request, _module
+      _require.resolve = <span class="hljs-function"><span class="hljs-params">(request)</span> -&gt;</span> Module._resolveFilename request, _module
   o = {}
   o[k] = v <span class="hljs-keyword">for</span> own k, v <span class="hljs-keyword">of</span> options
   o.bare = <span class="hljs-literal">on</span> <span class="hljs-comment"># ensure return value</span>
@@ -469,44 +560,48 @@ The CoffeeScript REPL uses this to run the input.</p>
   <span class="hljs-keyword">else</span>
     vm.runInContext js, sandbox
 
-<span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">register</span> = -&gt;</span> <span class="hljs-built_in">require</span> <span class="hljs-string">'./register'</span></pre></div></div>
+exports.register = <span class="hljs-function">-&gt;</span> <span class="hljs-built_in">require</span> <span class="hljs-string">'./register'</span></pre></div></div>
             
         </li>
         
         
-        <li id="section-18">
+        <li id="section-22">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-18">&#182;</a>
+                <a class="pilcrow" href="#section-22">&#182;</a>
               </div>
               <p>Throw error with deprecation warning when depending upon implicit <code>require.extensions</code> registration</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> <span class="hljs-property">@FILE_EXTENSIONS</span>
-    <span class="hljs-built_in">require</span>.extensions[ext] ?=<span class="hljs-function"> -&gt;</span>
+  <span class="hljs-keyword">for</span> ext <span class="hljs-keyword">in</span> @FILE_EXTENSIONS <span class="hljs-keyword">then</span> <span class="hljs-keyword">do</span> (ext) -&gt;
+    <span class="hljs-built_in">require</span>.extensions[ext] ?= <span class="hljs-function">-&gt;</span>
       <span class="hljs-keyword">throw</span> <span class="hljs-keyword">new</span> Error <span class="hljs-string">"""
       Use CoffeeScript.register() or require the coffee-script/register module to require <span class="hljs-subst">#{ext}</span> files.
       """</span>
 
-<span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">_compileFile</span> = <span class="hljs-params">(filename, sourceMap = <span class="hljs-literal">no</span>)</span> -&gt;</span>
+exports._compileFile = <span class="hljs-function"><span class="hljs-params">(filename, sourceMap = <span class="hljs-literal">no</span>, inlineMap = <span class="hljs-literal">no</span>)</span> -&gt;</span>
   raw = fs.readFileSync filename, <span class="hljs-string">'utf8'</span>
   stripped = <span class="hljs-keyword">if</span> raw.charCodeAt(<span class="hljs-number">0</span>) <span class="hljs-keyword">is</span> <span class="hljs-number">0xFEFF</span> <span class="hljs-keyword">then</span> raw.substring <span class="hljs-number">1</span> <span class="hljs-keyword">else</span> raw
 
   <span class="hljs-keyword">try</span>
-    answer = compile(stripped, {filename, sourceMap, <span class="hljs-attribute">literate</span>: helpers.isLiterate filename})
+    answer = compile stripped, {
+      filename, sourceMap, inlineMap
+      sourceFiles: [filename]
+      literate: helpers.isLiterate filename
+    }
   <span class="hljs-keyword">catch</span> err</pre></div></div>
             
         </li>
         
         
-        <li id="section-19">
+        <li id="section-23">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-19">&#182;</a>
+                <a class="pilcrow" href="#section-23">&#182;</a>
               </div>
               <p>As the filename and code of a dynamically loaded file will be different
 from the original file compiled with CoffeeScript.run, add that
@@ -521,11 +616,11 @@ information to error so it can be pretty-printed later.</p>
         </li>
         
         
-        <li id="section-20">
+        <li id="section-24">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-20">&#182;</a>
+                <a class="pilcrow" href="#section-24">&#182;</a>
               </div>
               <p>Instantiate a Lexer for our use here.</p>
 
@@ -536,11 +631,11 @@ information to error so it can be pretty-printed later.</p>
         </li>
         
         
-        <li id="section-21">
+        <li id="section-25">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-21">&#182;</a>
+                <a class="pilcrow" href="#section-25">&#182;</a>
               </div>
               <p>The real Lexer produces a generic stream of tokens. This object provides a
 thin wrapper around it, compatible with the Jison API. We can then pass it
@@ -549,29 +644,30 @@ directly as a “Jison lexer”.</p>
             </div>
             
             <div class="content"><div class='highlight'><pre>parser.lexer =
-  <span class="hljs-attribute">lex</span>:<span class="hljs-function"> -&gt;</span>
-    token = <span class="hljs-property">@tokens</span>[<span class="hljs-property">@pos</span>++]
+  lex: <span class="hljs-function">-&gt;</span>
+    token = parser.tokens[@pos++]
     <span class="hljs-keyword">if</span> token
-      [tag, <span class="hljs-property">@yytext</span>, <span class="hljs-property">@yylloc</span>] = token
-      <span class="hljs-property">@errorToken</span> = token.origin <span class="hljs-keyword">or</span> token
-      <span class="hljs-property">@yylineno</span> = <span class="hljs-property">@yylloc</span>.first_line
+      [tag, @yytext, @yylloc] = token
+      parser.errorToken = token.origin <span class="hljs-keyword">or</span> token
+      @yylineno = @yylloc.first_line
     <span class="hljs-keyword">else</span>
       tag = <span class="hljs-string">''</span>
 
     tag
-  <span class="hljs-attribute">setInput</span>: <span class="hljs-function"><span class="hljs-params">(<span class="hljs-property">@tokens</span>)</span> -&gt;</span>
-    <span class="hljs-property">@pos</span> = <span class="hljs-number">0</span>
-  <span class="hljs-attribute">upcomingInput</span>:<span class="hljs-function"> -&gt;</span>
+  setInput: <span class="hljs-function"><span class="hljs-params">(tokens)</span> -&gt;</span>
+    parser.tokens = tokens
+    @pos = <span class="hljs-number">0</span>
+  upcomingInput: <span class="hljs-function">-&gt;</span>
     <span class="hljs-string">""</span></pre></div></div>
             
         </li>
         
         
-        <li id="section-22">
+        <li id="section-26">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-22">&#182;</a>
+                <a class="pilcrow" href="#section-26">&#182;</a>
               </div>
               <p>Make all the AST nodes visible to the parser.</p>
 
@@ -582,51 +678,54 @@ directly as a “Jison lexer”.</p>
         </li>
         
         
-        <li id="section-23">
+        <li id="section-27">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-23">&#182;</a>
+                <a class="pilcrow" href="#section-27">&#182;</a>
               </div>
               <p>Override Jison’s default error handling function.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>parser.yy.<span class="hljs-function"><span class="hljs-title">parseError</span> = <span class="hljs-params">(message, {token})</span> -&gt;</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>parser.yy.parseError = <span class="hljs-function"><span class="hljs-params">(message, {token})</span> -&gt;</span></pre></div></div>
             
         </li>
         
         
-        <li id="section-24">
+        <li id="section-28">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-24">&#182;</a>
+                <a class="pilcrow" href="#section-28">&#182;</a>
               </div>
-              <p>Disregard Jison’s message, it contains redundant line numer information.
+              <p>Disregard Jison’s message, it contains redundant line number information.
 Disregard the token, we take its value directly from the lexer in case
 the error is caused by a generated token which might refer to its origin.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  {errorToken, tokens} = parser.lexer
+            <div class="content"><div class='highlight'><pre>  {errorToken, tokens} = parser
   [errorTag, errorText, errorLoc] = errorToken
 
-  errorText = <span class="hljs-keyword">if</span> errorToken <span class="hljs-keyword">is</span> tokens[tokens.length - <span class="hljs-number">1</span>]
-    <span class="hljs-string">'end of input'</span>
-  <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> errorTag <span class="hljs-keyword">in</span> [<span class="hljs-string">'INDENT'</span>, <span class="hljs-string">'OUTDENT'</span>]
-    <span class="hljs-string">'indentation'</span>
-  <span class="hljs-keyword">else</span>
-    helpers.nameWhitespaceCharacter errorText</pre></div></div>
+  errorText = <span class="hljs-keyword">switch</span>
+    <span class="hljs-keyword">when</span> errorToken <span class="hljs-keyword">is</span> tokens[tokens.length - <span class="hljs-number">1</span>]
+      <span class="hljs-string">'end of input'</span>
+    <span class="hljs-keyword">when</span> errorTag <span class="hljs-keyword">in</span> [<span class="hljs-string">'INDENT'</span>, <span class="hljs-string">'OUTDENT'</span>]
+      <span class="hljs-string">'indentation'</span>
+    <span class="hljs-keyword">when</span> errorTag <span class="hljs-keyword">in</span> [<span class="hljs-string">'IDENTIFIER'</span>, <span class="hljs-string">'NUMBER'</span>, <span class="hljs-string">'INFINITY'</span>, <span class="hljs-string">'STRING'</span>, <span class="hljs-string">'STRING_START'</span>, <span class="hljs-string">'REGEX'</span>, <span class="hljs-string">'REGEX_START'</span>]
+      errorTag.replace(<span class="hljs-regexp">/_START$/</span>, <span class="hljs-string">''</span>).toLowerCase()
+    <span class="hljs-keyword">else</span>
+      helpers.nameWhitespaceCharacter errorText</pre></div></div>
             
         </li>
         
         
-        <li id="section-25">
+        <li id="section-29">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-25">&#182;</a>
+                <a class="pilcrow" href="#section-29">&#182;</a>
               </div>
               <p>The second argument has a <code>loc</code> property, which should have the location
 data for this token. Unfortunately, Jison seems to send an outdated <code>loc</code>
@@ -640,11 +739,11 @@ from the lexer.</p>
         </li>
         
         
-        <li id="section-26">
+        <li id="section-30">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-26">&#182;</a>
+                <a class="pilcrow" href="#section-30">&#182;</a>
               </div>
               <p>Based on <a href="http://v8.googlecode.com/svn/branches/bleeding_edge/src/messages.js">http://v8.googlecode.com/svn/branches/bleeding_edge/src/messages.js</a>
 Modified to handle sourceMap</p>
@@ -672,11 +771,11 @@ Modified to handle sourceMap</p>
         </li>
         
         
-        <li id="section-27">
+        <li id="section-31">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-27">&#182;</a>
+                <a class="pilcrow" href="#section-31">&#182;</a>
               </div>
               <p>Check for a sourceMap position</p>
 
@@ -717,11 +816,11 @@ Modified to handle sourceMap</p>
         </li>
         
         
-        <li id="section-28">
+        <li id="section-32">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-28">&#182;</a>
+                <a class="pilcrow" href="#section-32">&#182;</a>
               </div>
               <p>Map of filenames -&gt; sourceMap object.</p>
 
@@ -732,11 +831,11 @@ Modified to handle sourceMap</p>
         </li>
         
         
-        <li id="section-29">
+        <li id="section-33">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-29">&#182;</a>
+                <a class="pilcrow" href="#section-33">&#182;</a>
               </div>
               <p>Generates the source map for a coffee file and stores it in the local cache variable.</p>
 
@@ -744,18 +843,20 @@ Modified to handle sourceMap</p>
             
             <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">getSourceMap</span> = <span class="hljs-params">(filename)</span> -&gt;</span>
   <span class="hljs-keyword">return</span> sourceMaps[filename] <span class="hljs-keyword">if</span> sourceMaps[filename]
-  <span class="hljs-keyword">return</span> <span class="hljs-keyword">unless</span> path?.extname(filename) <span class="hljs-keyword">in</span> <span class="hljs-built_in">exports</span>.FILE_EXTENSIONS
-  answer = <span class="hljs-built_in">exports</span>._compileFile filename, <span class="hljs-literal">true</span>
-  sourceMaps[filename] = answer.sourceMap</pre></div></div>
+  <span class="hljs-keyword">for</span> ext <span class="hljs-keyword">in</span> exports.FILE_EXTENSIONS
+    <span class="hljs-keyword">if</span> helpers.ends filename, ext
+      answer = exports._compileFile filename, <span class="hljs-literal">true</span>
+      <span class="hljs-keyword">return</span> sourceMaps[filename] = answer.sourceMap
+  <span class="hljs-keyword">return</span> <span class="hljs-literal">null</span></pre></div></div>
             
         </li>
         
         
-        <li id="section-30">
+        <li id="section-34">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-30">&#182;</a>
+                <a class="pilcrow" href="#section-34">&#182;</a>
               </div>
               <p>Based on <a href="http://goo.gl/ZTx1p">michaelficarra/CoffeeScriptRedux</a>
 NodeJS / V8 have no support for transforming positions in stack traces using
@@ -764,14 +865,14 @@ positions.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>Error.<span class="hljs-function"><span class="hljs-title">prepareStackTrace</span> = <span class="hljs-params">(err, stack)</span> -&gt;</span>
-  <span class="hljs-function"><span class="hljs-title">getSourceMapping</span> = <span class="hljs-params">(filename, line, column)</span> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>Error.prepareStackTrace = <span class="hljs-function"><span class="hljs-params">(err, stack)</span> -&gt;</span>
+<span class="hljs-function">  <span class="hljs-title">getSourceMapping</span> = <span class="hljs-params">(filename, line, column)</span> -&gt;</span>
     sourceMap = getSourceMap filename
     answer = sourceMap.sourceLocation [line - <span class="hljs-number">1</span>, column - <span class="hljs-number">1</span>] <span class="hljs-keyword">if</span> sourceMap
     <span class="hljs-keyword">if</span> answer <span class="hljs-keyword">then</span> [answer[<span class="hljs-number">0</span>] + <span class="hljs-number">1</span>, answer[<span class="hljs-number">1</span>] + <span class="hljs-number">1</span>] <span class="hljs-keyword">else</span> <span class="hljs-literal">null</span>
 
   frames = <span class="hljs-keyword">for</span> frame <span class="hljs-keyword">in</span> stack
-    <span class="hljs-keyword">break</span> <span class="hljs-keyword">if</span> frame.getFunction() <span class="hljs-keyword">is</span> <span class="hljs-built_in">exports</span>.run
+    <span class="hljs-keyword">break</span> <span class="hljs-keyword">if</span> frame.getFunction() <span class="hljs-keyword">is</span> exports.run
     <span class="hljs-string">"  at <span class="hljs-subst">#{formatSourcePosition frame, getSourceMapping}</span>"</span>
 
   <span class="hljs-string">"<span class="hljs-subst">#{err.toString()}</span>\n<span class="hljs-subst">#{frames.join <span class="hljs-string">'\n'</span>}</span>\n"</span></pre></div></div>

documentation/docs/command.html

@@ -141,7 +141,6 @@ path           = <span class="hljs-built_in">require</span> <span class="hljs-st
 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>
-mkdirp         = <span class="hljs-built_in">require</span> <span class="hljs-string">'mkdirp'</span>
 {spawn, exec}  = <span class="hljs-built_in">require</span> <span class="hljs-string">'child_process'</span>
 {EventEmitter} = <span class="hljs-built_in">require</span> <span class="hljs-string">'events'</span>
 
@@ -161,11 +160,11 @@ useWinPathSep  = path.sep <span class="hljs-keyword">is</span> <span class="hljs
             </div>
             
             <div class="content"><div class='highlight'><pre>helpers.extend CoffeeScript, <span class="hljs-keyword">new</span> EventEmitter
-
-<span class="hljs-function"><span class="hljs-title">printLine</span> = <span class="hljs-params">(line)</span> -&gt;</span> process.stdout.write line + <span class="hljs-string">'\n'</span>
+<span class="hljs-function">
+<span class="hljs-title">printLine</span> = <span class="hljs-params">(line)</span> -&gt;</span> process.stdout.write line + <span class="hljs-string">'\n'</span>
 <span class="hljs-function"><span class="hljs-title">printWarn</span> = <span class="hljs-params">(line)</span> -&gt;</span> process.stderr.write line + <span class="hljs-string">'\n'</span>
-
-<span class="hljs-function"><span class="hljs-title">hidden</span> = <span class="hljs-params">(file)</span> -&gt;</span> <span class="hljs-regexp">/^\.|~$/</span>.test file</pre></div></div>
+<span class="hljs-function">
+<span class="hljs-title">hidden</span> = <span class="hljs-params">(file)</span> -&gt;</span> <span class="hljs-regexp">/^\.|~$/</span>.test file</pre></div></div>
             
         </li>
         
@@ -207,11 +206,13 @@ useWinPathSep  = path.sep <span class="hljs-keyword">is</span> <span class="hljs
   [<span class="hljs-string">'-i'</span>, <span class="hljs-string">'--interactive'</span>,     <span class="hljs-string">'run an interactive CoffeeScript REPL'</span>]
   [<span class="hljs-string">'-j'</span>, <span class="hljs-string">'--join [FILE]'</span>,     <span class="hljs-string">'concatenate the source CoffeeScript before compiling'</span>]
   [<span class="hljs-string">'-m'</span>, <span class="hljs-string">'--map'</span>,             <span class="hljs-string">'generate source map and save as .js.map files'</span>]
+  [<span class="hljs-string">'-M'</span>, <span class="hljs-string">'--inline-map'</span>,      <span class="hljs-string">'generate source map and include it directly in output'</span>]
   [<span class="hljs-string">'-n'</span>, <span class="hljs-string">'--nodes'</span>,           <span class="hljs-string">'print out the parse tree that the parser produces'</span>]
   [      <span class="hljs-string">'--nodejs [ARGS]'</span>,   <span class="hljs-string">'pass options directly to the "node" binary'</span>]
   [      <span class="hljs-string">'--no-header'</span>,       <span class="hljs-string">'suppress the "Generated by" header'</span>]
   [<span class="hljs-string">'-o'</span>, <span class="hljs-string">'--output [DIR]'</span>,    <span class="hljs-string">'set the output directory for compiled JavaScript'</span>]
   [<span class="hljs-string">'-p'</span>, <span class="hljs-string">'--print'</span>,           <span class="hljs-string">'print out the compiled JavaScript'</span>]
+  [<span class="hljs-string">'-r'</span>, <span class="hljs-string">'--require [MODULE*]'</span>, <span class="hljs-string">'require the given module before eval or REPL'</span>]
   [<span class="hljs-string">'-s'</span>, <span class="hljs-string">'--stdio'</span>,           <span class="hljs-string">'listen for and compile scripts over stdio'</span>]
   [<span class="hljs-string">'-l'</span>, <span class="hljs-string">'--literate'</span>,        <span class="hljs-string">'treat stdio as literate style coffee-script'</span>]
   [<span class="hljs-string">'-t'</span>, <span class="hljs-string">'--tokens'</span>,          <span class="hljs-string">'print out the tokens that the lexer/rewriter produce'</span>]
@@ -254,7 +255,7 @@ Many flags cause us to divert before compiling anything. Flags passed after
 
             </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>
+            <div class="content"><div class='highlight'><pre>exports.run = <span class="hljs-function">-&gt;</span>
   parseOptions()</pre></div></div>
             
         </li>
@@ -272,7 +273,9 @@ Many flags cause us to divert before compiling anything. Flags passed after
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  replCliOpts = <span class="hljs-attribute">useGlobal</span>: <span class="hljs-literal">yes</span>
+            <div class="content"><div class='highlight'><pre>  replCliOpts = useGlobal: <span class="hljs-literal">yes</span>
+  opts.prelude = makePrelude opts.<span class="hljs-built_in">require</span>       <span class="hljs-keyword">if</span> opts.<span class="hljs-built_in">require</span>
+  replCliOpts.prelude = opts.prelude
   <span class="hljs-keyword">return</span> forkNode()                             <span class="hljs-keyword">if</span> opts.nodejs
   <span class="hljs-keyword">return</span> usage()                                <span class="hljs-keyword">if</span> opts.help
   <span class="hljs-keyword">return</span> version()                              <span class="hljs-keyword">if</span> opts.version
@@ -303,7 +306,14 @@ Many flags cause us to divert before compiling anything. Flags passed after
     '''</span>
   <span class="hljs-keyword">for</span> source <span class="hljs-keyword">in</span> opts.arguments
     source = path.resolve source
-    compilePath source, <span class="hljs-literal">yes</span>, source</pre></div></div>
+    compilePath source, <span class="hljs-literal">yes</span>, source
+<span class="hljs-function">
+<span class="hljs-title">makePrelude</span> = <span class="hljs-params">(requires)</span> -&gt;</span>
+  requires.map (<span class="hljs-built_in">module</span>) -&gt;
+    [_, name, <span class="hljs-built_in">module</span>] = match <span class="hljs-keyword">if</span> match = <span class="hljs-built_in">module</span>.match(<span class="hljs-regexp">/^(.*)=(.*)$/</span>)
+    name ||= helpers.baseFileName <span class="hljs-built_in">module</span>, <span class="hljs-literal">yes</span>, useWinPathSep
+    <span class="hljs-string">"<span class="hljs-subst">#{name}</span> = require('<span class="hljs-subst">#{<span class="hljs-built_in">module</span>}</span>')"</span>
+  .join <span class="hljs-string">';'</span></pre></div></div>
             
         </li>
         
@@ -357,8 +367,8 @@ extension source files in it and all subdirectories.</p>
     compileScript(source, code.toString(), base)
   <span class="hljs-keyword">else</span>
     notSources[source] = <span class="hljs-literal">yes</span>
-
-<span class="hljs-function"><span class="hljs-title">findDirectoryIndex</span> = <span class="hljs-params">(source)</span> -&gt;</span>
+<span class="hljs-function">
+<span class="hljs-title">findDirectoryIndex</span> = <span class="hljs-params">(source)</span> -&gt;</span>
   <span class="hljs-keyword">for</span> ext <span class="hljs-keyword">in</span> CoffeeScript.FILE_EXTENSIONS
     index = path.join source, <span class="hljs-string">"index<span class="hljs-subst">#{ext}</span>"</span>
     <span class="hljs-keyword">try</span>
@@ -395,6 +405,7 @@ requested options. If evaluating the script directly sets <code>__filename</code
       printLine CoffeeScript.nodes(t.input, t.options).toString().trim()
     <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> o.run
       CoffeeScript.register()
+      CoffeeScript.eval opts.prelude, t.options <span class="hljs-keyword">if</span> opts.prelude
       CoffeeScript.run t.input, t.options
     <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> o.join <span class="hljs-keyword">and</span> t.file <span class="hljs-keyword">isnt</span> o.join
       t.input = helpers.invertLiterate t.input <span class="hljs-keyword">if</span> helpers.isLiterate file
@@ -415,7 +426,7 @@ requested options. If evaluating the script directly sets <code>__filename</code
   <span class="hljs-keyword">catch</span> err
     CoffeeScript.emit <span class="hljs-string">'failure'</span>, err, task
     <span class="hljs-keyword">return</span> <span class="hljs-keyword">if</span> CoffeeScript.listeners(<span class="hljs-string">'failure'</span>).length
-    message = err.stack <span class="hljs-keyword">or</span> <span class="hljs-string">"<span class="hljs-subst">#{err}</span>"</span>
+    message = err?.stack <span class="hljs-keyword">or</span> <span class="hljs-string">"<span class="hljs-subst">#{err}</span>"</span>
     <span class="hljs-keyword">if</span> o.watch
       printLine message + <span class="hljs-string">'\x07'</span>
     <span class="hljs-keyword">else</span>
@@ -437,12 +448,12 @@ and write them back to <strong>stdout</strong>.</p>
             </div>
             
             <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">compileStdio</span> = -&gt;</span>
-  code = <span class="hljs-string">''</span>
+  buffers = []
   stdin = process.openStdin()
   stdin.<span class="hljs-literal">on</span> <span class="hljs-string">'data'</span>, <span class="hljs-function"><span class="hljs-params">(buffer)</span> -&gt;</span>
-    code += buffer.toString() <span class="hljs-keyword">if</span> buffer
-  stdin.<span class="hljs-literal">on</span> <span class="hljs-string">'end'</span>,<span class="hljs-function"> -&gt;</span>
-    compileScript <span class="hljs-literal">null</span>, code</pre></div></div>
+    buffers.push buffer <span class="hljs-keyword">if</span> buffer
+  stdin.<span class="hljs-literal">on</span> <span class="hljs-string">'end'</span>, <span class="hljs-function">-&gt;</span>
+    compileScript <span class="hljs-literal">null</span>, Buffer.concat(buffers).toString()</pre></div></div>
             
         </li>
         
@@ -461,9 +472,9 @@ them together.</p>
             <div class="content"><div class='highlight'><pre>joinTimeout = <span class="hljs-literal">null</span>
 <span class="hljs-function"><span class="hljs-title">compileJoin</span> = -&gt;</span>
   <span class="hljs-keyword">return</span> <span class="hljs-keyword">unless</span> opts.join
-  <span class="hljs-keyword">unless</span> sourceCode.some<span class="hljs-function"><span class="hljs-params">((code) -&gt; code <span class="hljs-keyword">is</span> <span class="hljs-literal">null</span>)</span>
-    <span class="hljs-title">clearTimeout</span> <span class="hljs-title">joinTimeout</span>
-    <span class="hljs-title">joinTimeout</span> = <span class="hljs-title">wait</span> 100, -&gt;</span>
+  <span class="hljs-keyword">unless</span> sourceCode.some(<span class="hljs-function"><span class="hljs-params">(code)</span> -&gt;</span> code <span class="hljs-keyword">is</span> <span class="hljs-literal">null</span>)
+    clearTimeout joinTimeout
+    joinTimeout = wait <span class="hljs-number">100</span>, <span class="hljs-function">-&gt;</span>
       compileScript opts.join, sourceCode.join(<span class="hljs-string">'\n'</span>), opts.join</pre></div></div>
             
         </li>
@@ -485,8 +496,8 @@ such as <code>--print</code>.</p>
   watcher        = <span class="hljs-literal">null</span>
   prevStats      = <span class="hljs-literal">null</span>
   compileTimeout = <span class="hljs-literal">null</span>
-
-  <span class="hljs-function"><span class="hljs-title">watchErr</span> = <span class="hljs-params">(err)</span> -&gt;</span>
+<span class="hljs-function">
+  <span class="hljs-title">watchErr</span> = <span class="hljs-params">(err)</span> -&gt;</span>
     <span class="hljs-keyword">throw</span> err <span class="hljs-keyword">unless</span> err.code <span class="hljs-keyword">is</span> <span class="hljs-string">'ENOENT'</span>
     <span class="hljs-keyword">return</span> <span class="hljs-keyword">unless</span> source <span class="hljs-keyword">in</span> sources
     <span class="hljs-keyword">try</span>
@@ -495,10 +506,10 @@ such as <code>--print</code>.</p>
     <span class="hljs-keyword">catch</span>
       removeSource source, base
       compileJoin()
-
-  <span class="hljs-function"><span class="hljs-title">compile</span> = -&gt;</span>
+<span class="hljs-function">
+  <span class="hljs-title">compile</span> = -&gt;</span>
     clearTimeout compileTimeout
-    compileTimeout = wait <span class="hljs-number">25</span>,<span class="hljs-function"> -&gt;</span>
+    compileTimeout = wait <span class="hljs-number">25</span>, <span class="hljs-function">-&gt;</span>
       fs.stat source, <span class="hljs-function"><span class="hljs-params">(err, stats)</span> -&gt;</span>
         <span class="hljs-keyword">return</span> watchErr err <span class="hljs-keyword">if</span> err
         <span class="hljs-keyword">return</span> rewatch() <span class="hljs-keyword">if</span> prevStats <span class="hljs-keyword">and</span>
@@ -509,15 +520,15 @@ such as <code>--print</code>.</p>
           <span class="hljs-keyword">return</span> watchErr err <span class="hljs-keyword">if</span> err
           compileScript(source, code.toString(), base)
           rewatch()
-
-  <span class="hljs-function"><span class="hljs-title">startWatcher</span> = -&gt;</span>
+<span class="hljs-function">
+  <span class="hljs-title">startWatcher</span> = -&gt;</span>
     watcher = fs.watch source
     .<span class="hljs-literal">on</span> <span class="hljs-string">'change'</span>, compile
     .<span class="hljs-literal">on</span> <span class="hljs-string">'error'</span>, <span class="hljs-function"><span class="hljs-params">(err)</span> -&gt;</span>
       <span class="hljs-keyword">throw</span> err <span class="hljs-keyword">unless</span> err.code <span class="hljs-keyword">is</span> <span class="hljs-string">'EPERM'</span>
       removeSource source, base
-
-  <span class="hljs-function"><span class="hljs-title">rewatch</span> = -&gt;</span>
+<span class="hljs-function">
+  <span class="hljs-title">rewatch</span> = -&gt;</span>
     watcher?.close()
     startWatcher()
 
@@ -542,15 +553,15 @@ such as <code>--print</code>.</p>
             <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">watchDir</span> = <span class="hljs-params">(source, base)</span> -&gt;</span>
   watcher        = <span class="hljs-literal">null</span>
   readdirTimeout = <span class="hljs-literal">null</span>
-
-  <span class="hljs-function"><span class="hljs-title">startWatcher</span> = -&gt;</span>
+<span class="hljs-function">
+  <span class="hljs-title">startWatcher</span> = -&gt;</span>
     watcher = fs.watch source
     .<span class="hljs-literal">on</span> <span class="hljs-string">'error'</span>, <span class="hljs-function"><span class="hljs-params">(err)</span> -&gt;</span>
       <span class="hljs-keyword">throw</span> err <span class="hljs-keyword">unless</span> err.code <span class="hljs-keyword">is</span> <span class="hljs-string">'EPERM'</span>
       stopWatcher()
-    .<span class="hljs-literal">on</span> <span class="hljs-string">'change'</span>,<span class="hljs-function"> -&gt;</span>
+    .<span class="hljs-literal">on</span> <span class="hljs-string">'change'</span>, <span class="hljs-function">-&gt;</span>
       clearTimeout readdirTimeout
-      readdirTimeout = wait <span class="hljs-number">25</span>,<span class="hljs-function"> -&gt;</span>
+      readdirTimeout = wait <span class="hljs-number">25</span>, <span class="hljs-function">-&gt;</span>
         <span class="hljs-keyword">try</span>
           files = fs.readdirSync source
         <span class="hljs-keyword">catch</span> err
@@ -558,8 +569,8 @@ such as <code>--print</code>.</p>
           <span class="hljs-keyword">return</span> stopWatcher()
         <span class="hljs-keyword">for</span> file <span class="hljs-keyword">in</span> files
           compilePath (path.join source, file), <span class="hljs-literal">no</span>, base
-
-  <span class="hljs-function"><span class="hljs-title">stopWatcher</span> = -&gt;</span>
+<span class="hljs-function">
+  <span class="hljs-title">stopWatcher</span> = -&gt;</span>
     watcher.close()
     removeSourceDir source, base
 
@@ -568,8 +579,8 @@ such as <code>--print</code>.</p>
     startWatcher()
   <span class="hljs-keyword">catch</span> err
     <span class="hljs-keyword">throw</span> err <span class="hljs-keyword">unless</span> err.code <span class="hljs-keyword">is</span> <span class="hljs-string">'ENOENT'</span>
-
-<span class="hljs-function"><span class="hljs-title">removeSourceDir</span> = <span class="hljs-params">(source, base)</span> -&gt;</span>
+<span class="hljs-function">
+<span class="hljs-title">removeSourceDir</span> = <span class="hljs-params">(source, base)</span> -&gt;</span>
   <span class="hljs-keyword">delete</span> watchedDirs[source]
   sourcesChanged = <span class="hljs-literal">no</span>
   <span class="hljs-keyword">for</span> file <span class="hljs-keyword">in</span> sources <span class="hljs-keyword">when</span> source <span class="hljs-keyword">is</span> path.dirname file
@@ -599,8 +610,8 @@ the compiled JS version as well.</p>
     silentUnlink outputPath source, base
     silentUnlink outputPath source, base, <span class="hljs-string">'.js.map'</span>
     timeLog <span class="hljs-string">"removed <span class="hljs-subst">#{source}</span>"</span>
-
-<span class="hljs-function"><span class="hljs-title">silentUnlink</span> = <span class="hljs-params">(path)</span> -&gt;</span>
+<span class="hljs-function">
+<span class="hljs-title">silentUnlink</span> = <span class="hljs-params">(path)</span> -&gt;</span>
   <span class="hljs-keyword">try</span>
     fs.unlinkSync path
   <span class="hljs-keyword">catch</span> err
@@ -639,6 +650,32 @@ the compiled JS version as well.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-17">&#182;</a>
               </div>
+              <p>Recursively mkdir, like <code>mkdir -p</code>.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">mkdirp</span> = <span class="hljs-params">(dir, fn)</span> -&gt;</span>
+  mode = <span class="hljs-number">0</span>o777 &amp; ~process.umask()
+
+  <span class="hljs-keyword">do</span> mkdirs = <span class="hljs-function"><span class="hljs-params">(p = dir, fn)</span> -&gt;</span>
+    fs.exists p, <span class="hljs-function"><span class="hljs-params">(exists)</span> -&gt;</span>
+      <span class="hljs-keyword">if</span> exists
+        fn()
+      <span class="hljs-keyword">else</span>
+        mkdirs path.dirname(p), <span class="hljs-function">-&gt;</span>
+          fs.mkdir p, mode, <span class="hljs-function"><span class="hljs-params">(err)</span> -&gt;</span>
+            <span class="hljs-keyword">return</span> fn err <span class="hljs-keyword">if</span> err
+            fn()</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-18">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-18">&#182;</a>
+              </div>
               <p>Write out a JavaScript source file with the compiled code. By default, files
 are written out in <code>cwd</code> as <code>.js</code> files with the same name, but the output
 directory can be customized with <code>--output</code>.</p>
@@ -650,7 +687,7 @@ same directory as the <code>.js</code> file.</p>
             <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">writeJs</span> = <span class="hljs-params">(base, sourcePath, js, jsPath, generatedSourceMap = <span class="hljs-literal">null</span>)</span> -&gt;</span>
   sourceMapPath = outputPath sourcePath, base, <span class="hljs-string">".js.map"</span>
   jsDir  = path.dirname jsPath
-  <span class="hljs-function"><span class="hljs-title">compile</span> = -&gt;</span>
+<span class="hljs-function">  <span class="hljs-title">compile</span> = -&gt;</span>
     <span class="hljs-keyword">if</span> opts.compile
       js = <span class="hljs-string">' '</span> <span class="hljs-keyword">if</span> js.length &lt;= <span class="hljs-number">0</span>
       <span class="hljs-keyword">if</span> generatedSourceMap <span class="hljs-keyword">then</span> js = <span class="hljs-string">"<span class="hljs-subst">#{js}</span>\n//# sourceMappingURL=<span class="hljs-subst">#{helpers.baseFileName sourceMapPath, <span class="hljs-literal">no</span>, useWinPathSep}</span>\n"</span>
@@ -671,11 +708,11 @@ same directory as the <code>.js</code> file.</p>
         </li>
         
         
-        <li id="section-18">
+        <li id="section-19">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-18">&#182;</a>
+                <a class="pilcrow" href="#section-19">&#182;</a>
               </div>
               <p>Convenience for cleaner setTimeouts.</p>
 
@@ -686,11 +723,11 @@ same directory as the <code>.js</code> file.</p>
         </li>
         
         
-        <li id="section-19">
+        <li id="section-20">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-19">&#182;</a>
+                <a class="pilcrow" href="#section-20">&#182;</a>
               </div>
               <p>When watching scripts, it’s useful to log changes with the timestamp.</p>
 
@@ -702,11 +739,11 @@ same directory as the <code>.js</code> file.</p>
         </li>
         
         
-        <li id="section-20">
+        <li id="section-21">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-20">&#182;</a>
+                <a class="pilcrow" href="#section-21">&#182;</a>
               </div>
               <p>Pretty-print a stream of tokens, sans location data.</p>
 
@@ -722,11 +759,11 @@ same directory as the <code>.js</code> file.</p>
         </li>
         
         
-        <li id="section-21">
+        <li id="section-22">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-21">&#182;</a>
+                <a class="pilcrow" href="#section-22">&#182;</a>
               </div>
               <p>Use the <a href="optparse.html">OptionParser module</a> to extract all options from
 <code>process.argv</code> that are specified in <code>SWITCHES</code>.</p>
@@ -743,11 +780,11 @@ same directory as the <code>.js</code> file.</p>
         </li>
         
         
-        <li id="section-22">
+        <li id="section-23">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-22">&#182;</a>
+                <a class="pilcrow" href="#section-23">&#182;</a>
               </div>
               <p>The compile-time options to pass to the CoffeeScript compiler.</p>
 
@@ -756,10 +793,11 @@ same directory as the <code>.js</code> file.</p>
             <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-title">compileOptions</span> = <span class="hljs-params">(filename, base)</span> -&gt;</span>
   answer = {
     filename
-    <span class="hljs-attribute">literate</span>: opts.literate <span class="hljs-keyword">or</span> helpers.isLiterate(filename)
-    <span class="hljs-attribute">bare</span>: opts.bare
-    <span class="hljs-attribute">header</span>: opts.compile <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> opts[<span class="hljs-string">'no-header'</span>]
-    <span class="hljs-attribute">sourceMap</span>: opts.map
+    literate: opts.literate <span class="hljs-keyword">or</span> helpers.isLiterate(filename)
+    bare: opts.bare
+    header: opts.compile <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> opts[<span class="hljs-string">'no-header'</span>]
+    sourceMap: opts.map
+    inlineMap: opts[<span class="hljs-string">'inline-map'</span>]
   }
   <span class="hljs-keyword">if</span> filename
     <span class="hljs-keyword">if</span> base
@@ -768,25 +806,25 @@ same directory as the <code>.js</code> file.</p>
       jsDir = path.dirname jsPath
       answer = helpers.merge answer, {
         jsPath
-        <span class="hljs-attribute">sourceRoot</span>: path.relative jsDir, cwd
-        <span class="hljs-attribute">sourceFiles</span>: [path.relative cwd, filename]
-        <span class="hljs-attribute">generatedFile</span>: helpers.baseFileName(jsPath, <span class="hljs-literal">no</span>, useWinPathSep)
+        sourceRoot: path.relative jsDir, cwd
+        sourceFiles: [path.relative cwd, filename]
+        generatedFile: helpers.baseFileName(jsPath, <span class="hljs-literal">no</span>, useWinPathSep)
       }
     <span class="hljs-keyword">else</span>
       answer = helpers.merge answer,
-        <span class="hljs-attribute">sourceRoot</span>: <span class="hljs-string">""</span>
-        <span class="hljs-attribute">sourceFiles</span>: [helpers.baseFileName filename, <span class="hljs-literal">no</span>, useWinPathSep]
-        <span class="hljs-attribute">generatedFile</span>: helpers.baseFileName(filename, <span class="hljs-literal">yes</span>, useWinPathSep) + <span class="hljs-string">".js"</span>
+        sourceRoot: <span class="hljs-string">""</span>
+        sourceFiles: [helpers.baseFileName filename, <span class="hljs-literal">no</span>, useWinPathSep]
+        generatedFile: helpers.baseFileName(filename, <span class="hljs-literal">yes</span>, useWinPathSep) + <span class="hljs-string">".js"</span>
   answer</pre></div></div>
             
         </li>
         
         
-        <li id="section-23">
+        <li id="section-24">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-23">&#182;</a>
+                <a class="pilcrow" href="#section-24">&#182;</a>
               </div>
               <p>Start up a new Node.js instance with the arguments in <code>--nodejs</code> passed to
 the <code>node</code> binary, preserving the other options.</p>
@@ -798,19 +836,19 @@ the <code>node</code> binary, preserving the other options.</p>
   args     = process.argv[<span class="hljs-number">1.</span>.]
   args.splice args.indexOf(<span class="hljs-string">'--nodejs'</span>), <span class="hljs-number">2</span>
   p = spawn process.execPath, nodeArgs.concat(args),
-    <span class="hljs-attribute">cwd</span>:        process.cwd()
-    <span class="hljs-attribute">env</span>:        process.env
-    <span class="hljs-attribute">customFds</span>:  [<span class="hljs-number">0</span>, <span class="hljs-number">1</span>, <span class="hljs-number">2</span>]
+    cwd:        process.cwd()
+    env:        process.env
+    stdio:      [<span class="hljs-number">0</span>, <span class="hljs-number">1</span>, <span class="hljs-number">2</span>]
   p.<span class="hljs-literal">on</span> <span class="hljs-string">'exit'</span>, <span class="hljs-function"><span class="hljs-params">(code)</span> -&gt;</span> process.exit code</pre></div></div>
             
         </li>
         
         
-        <li id="section-24">
+        <li id="section-25">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-24">&#182;</a>
+                <a class="pilcrow" href="#section-25">&#182;</a>
               </div>
               <p>Print the <code>--help</code> usage message and exit. Deprecated switches are not
 shown.</p>
@@ -823,11 +861,11 @@ shown.</p>
         </li>
         
         
-        <li id="section-25">
+        <li id="section-26">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-25">&#182;</a>
+                <a class="pilcrow" href="#section-26">&#182;</a>
               </div>
               <p>Print the <code>--version</code> message and exit.</p>
 

documentation/docs/docco.css

@@ -21,11 +21,11 @@
 }
 
 @font-face {
-    font-family: 'novecento-bold';
-    src: url('public/fonts/novecento-bold.eot');
-    src: url('public/fonts/novecento-bold.eot?#iefix') format('embedded-opentype'),
-         url('public/fonts/novecento-bold.woff') format('woff'),
-         url('public/fonts/novecento-bold.ttf') format('truetype');
+    font-family: 'roboto-black';
+    src: url('public/fonts/roboto-black.eot');
+    src: url('public/fonts/roboto-black.eot?#iefix') format('embedded-opentype'),
+         url('public/fonts/roboto-black.woff') format('woff'),
+         url('public/fonts/roboto-black.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 }
@@ -67,7 +67,7 @@ h1, h2, h3, h4, h5, h6 {
   color: #112233;
   line-height: 1em;
   font-weight: normal;
-  font-family: "novecento-bold";
+  font-family: "roboto-black";
   text-transform: uppercase;
   margin: 30px 0 15px 0;
 }
@@ -75,6 +75,9 @@ h1, h2, h3, h4, h5, h6 {
 h1 {
   margin-top: 40px;
 }
+h2 {
+  font-size: 1.26em;
+}
 
 hr {
   border: 0;

documentation/docs/helpers.html

@@ -134,7 +134,7 @@ arrays, count characters, that sort of thing.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>exports.starts = <span class="hljs-function"><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>
@@ -150,7 +150,7 @@ arrays, count characters, that sort of thing.</p>
 
             </div>
             
-            <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>
+            <div class="content"><div class='highlight'><pre>exports.ends = <span class="hljs-function"><span class="hljs-params">(string, literal, back)</span> -&gt;</span>
   len = literal.length
   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>
             
@@ -167,7 +167,7 @@ arrays, count characters, that sort of thing.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>exports.repeat = repeat = <span class="hljs-function"><span class="hljs-params">(str, n)</span> -&gt;</span></pre></div></div>
             
         </li>
         
@@ -202,7 +202,7 @@ arrays, count characters, that sort of thing.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>exports.compact = <span class="hljs-function"><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>
@@ -218,7 +218,7 @@ arrays, count characters, that sort of thing.</p>
 
             </div>
             
-            <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>
+            <div class="content"><div class='highlight'><pre>exports.count = <span class="hljs-function"><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
@@ -239,7 +239,7 @@ options hash to propagate down the tree without polluting other branches.</p>
 
             </div>
             
-            <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>
+            <div class="content"><div class='highlight'><pre>exports.merge = <span class="hljs-function"><span class="hljs-params">(options, overrides)</span> -&gt;</span>
   extend (extend {}, options), overrides</pre></div></div>
             
         </li>
@@ -255,7 +255,7 @@ options hash to propagate down the tree without polluting other branches.</p>
 
             </div>
             
-            <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>
+            <div class="content"><div class='highlight'><pre>extend = exports.extend = <span class="hljs-function"><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>
@@ -274,10 +274,10 @@ Handy for getting a list of <code>children</code> from the nodes.</p>
 
             </div>
             
-            <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>
+            <div class="content"><div class='highlight'><pre>exports.flatten = flatten = <span class="hljs-function"><span class="hljs-params">(array)</span> -&gt;</span>
   flattened = []
   <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
+    <span class="hljs-keyword">if</span> <span class="hljs-string">'[object Array]'</span> <span class="hljs-keyword">is</span> Object::toString.call element
       flattened = flattened.concat flatten element
     <span class="hljs-keyword">else</span>
       flattened.push element
@@ -297,7 +297,7 @@ looking for a particular method in an options hash.</p>
 
             </div>
             
-            <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>
+            <div class="content"><div class='highlight'><pre>exports.del = <span class="hljs-function"><span class="hljs-params">(obj, key)</span> -&gt;</span>
   val =  obj[key]
   <span class="hljs-keyword">delete</span> obj[key]
   val</pre></div></div>
@@ -311,11 +311,13 @@ looking for a particular method in an options hash.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-12">&#182;</a>
               </div>
-              <p>Gets the last item of an array(-like) object.</p>
+              <p>Typical Array::some</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><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>
+            <div class="content"><div class='highlight'><pre>exports.some = Array::some ? (fn) -&gt;
+  <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>
         
@@ -326,30 +328,13 @@ looking for a particular method in an options hash.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-13">&#182;</a>
               </div>
-              <p>Typical Array::some</p>
-
-            </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>
-        
-        
-        <li id="section-14">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-14">&#182;</a>
-              </div>
               <p>Simple function for inverting Literate CoffeeScript code by putting the
 documentation in comments, producing a string of CoffeeScript code that
 can be compiled “normally”.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">invertLiterate</span> = <span class="hljs-params">(code)</span> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>exports.invertLiterate = <span class="hljs-function"><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
@@ -363,11 +348,11 @@ can be compiled “normally”.</p>
         </li>
         
         
-        <li id="section-15">
+        <li id="section-14">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-15">&#182;</a>
+                <a class="pilcrow" href="#section-14">&#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>
@@ -378,10 +363,32 @@ If <code>last</code> is not provided, this will simply return <code>first</code>
   <span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> last
     first
   <span class="hljs-keyword">else</span>
-    <span class="hljs-attribute">first_line</span>: first.first_line
-    <span class="hljs-attribute">first_column</span>: first.first_column
-    <span class="hljs-attribute">last_line</span>: last.last_line
-    <span class="hljs-attribute">last_column</span>: last.last_column</pre></div></div>
+    first_line: first.first_line
+    first_column: first.first_column
+    last_line: last.last_line
+    last_column: last.last_column</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-15">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-15">&#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’s locationData.
+The object is returned either way.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>exports.addLocationDataFn = <span class="hljs-function"><span class="hljs-params">(first, last)</span> -&gt;</span>
+  (obj) -&gt;
+    <span class="hljs-keyword">if</span> ((<span class="hljs-keyword">typeof</span> obj) <span class="hljs-keyword">is</span> <span class="hljs-string">'object'</span>) <span class="hljs-keyword">and</span> (!!obj[<span class="hljs-string">'updateLocationDataIfMissing'</span>])
+      obj.updateLocationDataIfMissing buildLocationData(first, last)
+
+    <span class="hljs-keyword">return</span> obj</pre></div></div>
             
         </li>
         
@@ -392,34 +399,12 @@ If <code>last</code> is not provided, this will simply return <code>first</code>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-16">&#182;</a>
               </div>
-              <p>This returns a function which takes an object as a parameter, and if that
-object is an AST node, updates that object’s locationData.
-The object is returned either way.</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">addLocationDataFn</span> = <span class="hljs-params">(first, last)</span> -&gt;</span>
-  <span class="hljs-function"><span class="hljs-params">(obj)</span> -&gt;</span>
-    <span class="hljs-keyword">if</span> ((<span class="hljs-keyword">typeof</span> obj) <span class="hljs-keyword">is</span> <span class="hljs-string">'object'</span>) <span class="hljs-keyword">and</span> (!!obj[<span class="hljs-string">'updateLocationDataIfMissing'</span>])
-      obj.updateLocationDataIfMissing buildLocationData(first, last)
-
-    <span class="hljs-keyword">return</span> obj</pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-17">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-17">&#182;</a>
-              </div>
               <p>Convert jison location data to a string.
 <code>obj</code> can be a token, or a locationData.</p>
 
             </div>
             
-            <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>
+            <div class="content"><div class='highlight'><pre>exports.locationDataToString = <span class="hljs-function"><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
 
@@ -432,18 +417,18 @@ The object is returned either way.</p>
         </li>
         
         
-        <li id="section-18">
+        <li id="section-17">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-18">&#182;</a>
+                <a class="pilcrow" href="#section-17">&#182;</a>
               </div>
               <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><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>/
+            <div class="content"><div class='highlight'><pre>exports.baseFileName = <span class="hljs-function"><span class="hljs-params">(file, stripExt = <span class="hljs-literal">no</span>, useWinPathSep = <span class="hljs-literal">no</span>)</span> -&gt;</span>
+  pathSep = <span class="hljs-keyword">if</span> useWinPathSep <span class="hljs-keyword">then</span> <span class="hljs-regexp">/\\|\//</span> <span class="hljs-keyword">else</span> <span class="hljs-regexp">/\//</span>
   parts = file.split(pathSep)
   file = parts[parts.length - <span class="hljs-number">1</span>]
   <span class="hljs-keyword">return</span> file <span class="hljs-keyword">unless</span> stripExt <span class="hljs-keyword">and</span> file.indexOf(<span class="hljs-string">'.'</span>) &gt;= <span class="hljs-number">0</span>
@@ -455,17 +440,32 @@ The object is returned either way.</p>
         </li>
         
         
+        <li id="section-18">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-18">&#182;</a>
+              </div>
+              <p>Determine if a filename represents a CoffeeScript file.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>exports.isCoffee = <span class="hljs-function"><span class="hljs-params">(file)</span> -&gt;</span> <span class="hljs-regexp">/\.((lit)?coffee|coffee\.md)$/</span>.test file</pre></div></div>
+            
+        </li>
+        
+        
         <li id="section-19">
             <div class="annotation">
               
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-19">&#182;</a>
               </div>
-              <p>Determine if a filename represents a CoffeeScript file.</p>
+              <p>Determine if a filename represents a Literate CoffeeScript file.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><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>
+            <div class="content"><div class='highlight'><pre>exports.isLiterate = <span class="hljs-function"><span class="hljs-params">(file)</span> -&gt;</span> <span class="hljs-regexp">/\.(litcoffee|coffee\.md)$/</span>.test file</pre></div></div>
             
         </li>
         
@@ -476,11 +476,17 @@ The object is returned either way.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-20">&#182;</a>
               </div>
-              <p>Determine if a filename represents a Literate CoffeeScript file.</p>
+              <p>Throws a SyntaxError from a given location.
+The error’s <code>toString</code> will return an error message following the “standard”
+format <filename>:<line>:<col>: <message> plus the line with the error and a
+marker showing where the error is.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><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>
+            <div class="content"><div class='highlight'><pre>exports.throwSyntaxError = <span class="hljs-function"><span class="hljs-params">(message, location)</span> -&gt;</span>
+  error = <span class="hljs-keyword">new</span> SyntaxError message
+  error.location = location
+  error.toString = syntaxErrorToString</pre></div></div>
             
         </li>
         
@@ -491,27 +497,6 @@ The object is returned either way.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-21">&#182;</a>
               </div>
-              <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><span class="hljs-built_in">exports</span>.<span class="hljs-function"><span class="hljs-title">throwSyntaxError</span> = <span class="hljs-params">(message, location)</span> -&gt;</span>
-  error = <span class="hljs-keyword">new</span> SyntaxError message
-  error.location = location
-  error.toString = syntaxErrorToString</pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-22">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-22">&#182;</a>
-              </div>
               <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>
@@ -525,27 +510,27 @@ compile CoffeeScript for example).</p>
         </li>
         
         
-        <li id="section-23">
+        <li id="section-22">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-23">&#182;</a>
+                <a class="pilcrow" href="#section-22">&#182;</a>
               </div>
               <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><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>
+            <div class="content"><div class='highlight'><pre>exports.updateSyntaxError = <span class="hljs-function"><span class="hljs-params">(error, code, filename)</span> -&gt;</span></pre></div></div>
             
         </li>
         
         
-        <li id="section-24">
+        <li id="section-23">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-24">&#182;</a>
+                <a class="pilcrow" href="#section-23">&#182;</a>
               </div>
               <p>Avoid screwing up the <code>stack</code> property of other errors (i.e. possible bugs).</p>
 
@@ -556,26 +541,26 @@ it already.</p>
     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> Error::toString.call @ <span class="hljs-keyword">unless</span> @code <span class="hljs-keyword">and</span> @location
 
-<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>
+  {first_line, first_column, last_line, last_column} = @location
   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]
+  filename = @filename <span class="hljs-keyword">or</span> <span class="hljs-string">'[stdin]'</span>
+  codeLine = @code.split(<span class="hljs-string">'\n'</span>)[first_line]
   start    = first_column</pre></div></div>
             
         </li>
         
         
-        <li id="section-25">
+        <li id="section-24">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-25">&#182;</a>
+                <a class="pilcrow" href="#section-24">&#182;</a>
               </div>
               <p>Show only the first line on multi-line errors.</p>
 
@@ -587,31 +572,31 @@ it already.</p>
         </li>
         
         
-        <li id="section-26">
+        <li id="section-25">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-26">&#182;</a>
+                <a class="pilcrow" href="#section-25">&#182;</a>
               </div>
               <p>Check to see if we’re running on a color-enabled TTY.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>  <span class="hljs-keyword">if</span> process?
-    colorsEnabled = process.stdout.isTTY <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> process.env.NODE_DISABLE_COLORS
+    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>
+  <span class="hljs-keyword">if</span> @colorful ? 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">#{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">#{@message}</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>
+exports.nameWhitespaceCharacter = <span class="hljs-function"><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>

documentation/docs/index.html

@@ -119,7 +119,7 @@
 
             </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>
+            <div class="content"><div class='highlight'><pre>exports[key] = val <span class="hljs-keyword">for</span> key, val <span class="hljs-keyword">of</span> <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffee-script'</span></pre></div></div>
             
         </li>
         

documentation/docs/optparse.html

@@ -138,7 +138,7 @@ option) list, and all subsequent arguments are left unparsed.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>exports.OptionParser = <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">OptionParser</span></span></pre></div></div>
             
         </li>
         
@@ -151,12 +151,12 @@ option) list, and all subsequent arguments are left unparsed.</p>
               </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>
+</code></pre><p>Along with an optional banner for the usage help.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>  constructor: <span class="hljs-function"><span class="hljs-params">(rules, @banner)</span> -&gt;</span>
+    @rules = buildRules rules</pre></div></div>
             
         </li>
         
@@ -176,8 +176,8 @@ you’re responsible for interpreting the options object.</p>
 
             </div>
             
-            <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>: []
+            <div class="content"><div class='highlight'><pre>  parse: <span class="hljs-function"><span class="hljs-params">(args)</span> -&gt;</span>
+    options = arguments: []
     skippingArgument = <span class="hljs-literal">no</span>
     originalArgs = args
     args = normalizeArguments args
@@ -208,7 +208,7 @@ non-option argument are treated as non-option arguments themselves</p>
             <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">for</span> rule <span class="hljs-keyword">in</span> @rules
           <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
@@ -236,10 +236,10 @@ of the valid options, for <code>--help</code> and such.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">help</span>:<span class="hljs-function"> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>  help: <span class="hljs-function">-&gt;</span>
     lines = []
-    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>
+    lines.unshift <span class="hljs-string">"<span class="hljs-subst">#{@banner}</span>\n"</span> <span class="hljs-keyword">if</span> @banner
+    <span class="hljs-keyword">for</span> rule <span class="hljs-keyword">in</span> @rules
       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>
@@ -326,12 +326,12 @@ description of what the option does.</p>
   match     = longFlag.match(OPTIONAL)
   longFlag  = longFlag.match(LONG_FLAG)[<span class="hljs-number">1</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>])
+    name:         longFlag.substr <span class="hljs-number">2</span>
+    shortFlag:    shortFlag
+    longFlag:     longFlag
+    description:  description
+    hasArgument:  !!(match <span class="hljs-keyword">and</span> match[<span class="hljs-number">1</span>])
+    isList:       !!(match <span class="hljs-keyword">and</span> match[<span class="hljs-number">2</span>])
   }</pre></div></div>
             
         </li>

documentation/docs/register.html

@@ -137,7 +137,7 @@ path          = <span class="hljs-built_in">require</span> <span class="hljs-str
             </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>
+  answer = CoffeeScript._compileFile filename, <span class="hljs-literal">no</span>, <span class="hljs-literal">yes</span>
   <span class="hljs-built_in">module</span>._compile answer, filename</pre></div></div>
             
         </li>
@@ -173,8 +173,8 @@ 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>
+<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>
@@ -210,12 +210,12 @@ This is a horrible thing that should not be required.</p>
       <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
+  Module::load = <span class="hljs-function"><span class="hljs-params">(filename)</span> -&gt;</span>
+    @filename = filename
+    @paths = 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>
+    @loaded = <span class="hljs-literal">true</span></pre></div></div>
             
         </li>
         
@@ -234,7 +234,7 @@ to fork both CoffeeScript files, and JavaScript files, directly.</p>
             <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>
+  child_process.fork = <span class="hljs-function"><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> {}

documentation/docs/repl.html

@@ -126,10 +126,10 @@ CoffeeScript = <span class="hljs-built_in">require</span> <span class="hljs-stri
 {merge, updateSyntaxError} = <span class="hljs-built_in">require</span> <span class="hljs-string">'./helpers'</span>
 
 replDefaults =
-  <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>
+  prompt: <span class="hljs-string">'coffee&gt; '</span>,
+  historyFile: path.join process.env.HOME, <span class="hljs-string">'.coffee_history'</span> <span class="hljs-keyword">if</span> process.env.HOME
+  historyMaxInputSize: <span class="hljs-number">10240</span>
+  eval: <span class="hljs-function"><span class="hljs-params">(input, context, filename, cb)</span> -&gt;</span></pre></div></div>
             
         </li>
         
@@ -188,11 +188,11 @@ parens. Unwrap all that.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-5">&#182;</a>
               </div>
-              <p>Generate the AST of the clean input.</p>
+              <p>Tokenize the clean input.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      ast = CoffeeScript.nodes input</pre></div></div>
+            <div class="content"><div class='highlight'><pre>      tokens = CoffeeScript.tokens input</pre></div></div>
             
         </li>
         
@@ -203,20 +203,13 @@ parens. Unwrap all that.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-6">&#182;</a>
               </div>
-              <p>Add assignment to <code>_</code> variable to force the input to be an expression.</p>
+              <p>Collect referenced variable names just like in <code>CoffeeScript.compile</code>.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      ast = <span class="hljs-keyword">new</span> Block [
-        <span class="hljs-keyword">new</span> Assign (<span class="hljs-keyword">new</span> Value <span class="hljs-keyword">new</span> Literal <span class="hljs-string">'_'</span>), ast, <span class="hljs-string">'='</span>
-      ]
-      js = ast.compile <span class="hljs-attribute">bare</span>: <span class="hljs-literal">yes</span>, <span class="hljs-attribute">locals</span>: Object.keys(context)
-      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>
+            <div class="content"><div class='highlight'><pre>      referencedVars = (
+        token[<span class="hljs-number">1</span>] <span class="hljs-keyword">for</span> token <span class="hljs-keyword">in</span> tokens <span class="hljs-keyword">when</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'IDENTIFIER'</span>
+      )</pre></div></div>
             
         </li>
         
@@ -227,15 +220,11 @@ parens. Unwrap all that.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-7">&#182;</a>
               </div>
-              <p>AST’s <code>compile</code> does not add source code information to syntax errors.</p>
+              <p>Generate the AST of the tokens.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>      ast = CoffeeScript.nodes tokens</pre></div></div>
             
         </li>
         
@@ -246,17 +235,16 @@ parens. Unwrap all that.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-8">&#182;</a>
               </div>
-              <p>Node 0.11.12 changed API, prompt is now _prompt.</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>  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>
+            <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="hljs-literal">yes</span>, locals: Object.keys(context), referencedVars}
+      cb <span class="hljs-literal">null</span>, runInContext js, context, filename
+    <span class="hljs-keyword">catch</span> err</pre></div></div>
             
         </li>
         
@@ -267,6 +255,52 @@ parens. Unwrap all that.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-9">&#182;</a>
               </div>
+              <p>AST’s <code>compile</code> does not add source code information to syntax errors.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>      updateSyntaxError err, input
+      cb err
+<span class="hljs-function">
+<span class="hljs-title">runInContext</span> = <span class="hljs-params">(js, context, filename)</span> -&gt;</span>
+  <span class="hljs-keyword">if</span> context <span class="hljs-keyword">is</span> <span class="hljs-built_in">global</span>
+    vm.runInThisContext js, filename
+  <span class="hljs-keyword">else</span>
+    vm.runInContext js, context, filename
+<span class="hljs-function">
+<span class="hljs-title">addMultilineHandler</span> = <span class="hljs-params">(repl)</span> -&gt;</span>
+  {rli, inputStream, outputStream} = repl</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-10">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-10">&#182;</a>
+              </div>
+              <p>Node 0.11.12 changed API, prompt is now _prompt.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>  origPrompt = repl._prompt ? repl.prompt
+
+  multiline =
+    enabled: <span class="hljs-literal">off</span>
+    initialPrompt: 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>
+    prompt: 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>
+    buffer: <span class="hljs-string">''</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-11">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-11">&#182;</a>
+              </div>
               <p>Proxy node’s line listener</p>
 
             </div>
@@ -286,11 +320,11 @@ parens. Unwrap all that.</p>
         </li>
         
         
-        <li id="section-10">
+        <li id="section-12">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-10">&#182;</a>
+                <a class="pilcrow" href="#section-12">&#182;</a>
               </div>
               <p>Handle Ctrl-v</p>
 
@@ -303,11 +337,11 @@ parens. Unwrap all that.</p>
         </li>
         
         
-        <li id="section-11">
+        <li id="section-13">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-11">&#182;</a>
+                <a class="pilcrow" href="#section-13">&#182;</a>
               </div>
               <p>allow arbitrarily switching between modes any time before multiple lines are entered</p>
 
@@ -322,11 +356,11 @@ parens. Unwrap all that.</p>
         </li>
         
         
-        <li id="section-12">
+        <li id="section-14">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-12">&#182;</a>
+                <a class="pilcrow" href="#section-14">&#182;</a>
               </div>
               <p>no-op unless the current line is empty</p>
 
@@ -337,11 +371,11 @@ parens. Unwrap all that.</p>
         </li>
         
         
-        <li id="section-13">
+        <li id="section-15">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-13">&#182;</a>
+                <a class="pilcrow" href="#section-15">&#182;</a>
               </div>
               <p>eval, print, loop</p>
 
@@ -356,11 +390,11 @@ parens. Unwrap all that.</p>
         </li>
         
         
-        <li id="section-14">
+        <li id="section-16">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-14">&#182;</a>
+                <a class="pilcrow" href="#section-16">&#182;</a>
               </div>
               <p>XXX: multiline hack</p>
 
@@ -378,11 +412,11 @@ parens. Unwrap all that.</p>
         </li>
         
         
-        <li id="section-15">
+        <li id="section-17">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-15">&#182;</a>
+                <a class="pilcrow" href="#section-17">&#182;</a>
               </div>
               <p>Store and load command history from a file</p>
 
@@ -395,11 +429,11 @@ parens. Unwrap all that.</p>
         </li>
         
         
-        <li id="section-16">
+        <li id="section-18">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-16">&#182;</a>
+                <a class="pilcrow" href="#section-18">&#182;</a>
               </div>
               <p>Get file info and at most maxSize of command history</p>
 
@@ -411,11 +445,11 @@ parens. Unwrap all that.</p>
         </li>
         
         
-        <li id="section-17">
+        <li id="section-19">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-17">&#182;</a>
+                <a class="pilcrow" href="#section-19">&#182;</a>
               </div>
               <p>Read last <code>size</code> bytes from the file</p>
 
@@ -423,37 +457,8 @@ parens. Unwrap all that.</p>
             
             <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>
-        
-        
-        <li id="section-18">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-18">&#182;</a>
-              </div>
-              <p>Set the history on the interpreter</p>
-
-            </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>
-        
-        
-        <li id="section-19">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-19">&#182;</a>
-              </div>
-              <p>If the history file was truncated we should pop off a potential partial line</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>    repl.rli.history.pop() <span class="hljs-keyword">if</span> stat.size &gt; maxSize</pre></div></div>
+    fs.readSync readFd, buffer, <span class="hljs-number">0</span>, size, stat.size - size
+    fs.close readFd</pre></div></div>
             
         </li>
         
@@ -464,18 +469,11 @@ parens. Unwrap all that.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-20">&#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="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>
+            <div class="content"><div class='highlight'><pre>    repl.rli.history = buffer.toString().split(<span class="hljs-string">'\n'</span>).reverse()</pre></div></div>
             
         </li>
         
@@ -486,14 +484,11 @@ parens. Unwrap all that.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-21">&#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="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>
+            <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>
         
@@ -504,17 +499,18 @@ parens. Unwrap all that.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-22">&#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[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()
+            <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>]
 
-<span class="hljs-function"><span class="hljs-title">getCommandId</span> = <span class="hljs-params">(repl, commandName)</span> -&gt;</span></pre></div></div>
+  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> code <span class="hljs-keyword">isnt</span> <span class="hljs-string">'.exit'</span> <span class="hljs-keyword">and</span> lastLine <span class="hljs-keyword">isnt</span> code</pre></div></div>
             
         </li>
         
@@ -525,28 +521,14 @@ parens. Unwrap all that.</p>
               <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>
+              <p>Save the latest command in the file</p>
 
             </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
+            <div class="content"><div class='highlight'><pre>      fs.write fd, <span class="hljs-string">"<span class="hljs-subst">#{code}</span>\n"</span>
+      lastLine = code
 
-<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="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="hljs-keyword">if</span> opts.historyFile</pre></div></div>
+  repl.<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>
         
@@ -557,6 +539,60 @@ parens. Unwrap all that.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-24">&#182;</a>
               </div>
+              <p>Add a command to show the history stack</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>  repl.commands[getCommandId(repl, <span class="hljs-string">'history'</span>)] =
+    help: <span class="hljs-string">'Show command history'</span>
+    action: <span class="hljs-function">-&gt;</span>
+      repl.outputStream.write <span class="hljs-string">"<span class="hljs-subst">#{repl.rli.history[..].reverse().join <span class="hljs-string">'\n'</span>}</span>\n"</span>
+      repl.displayPrompt()
+<span class="hljs-function">
+<span class="hljs-title">getCommandId</span> = <span class="hljs-params">(repl, commandName)</span> -&gt;</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-25">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-25">&#182;</a>
+              </div>
+              <p>Node 0.11 changed API, a command such as ‘.help’ is now stored as ‘help’</p>
+
+            </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>.exports =
+  start: <span class="hljs-function"><span class="hljs-params">(opts = {})</span> -&gt;</span>
+    [major, minor, build] = process.versions.node.split(<span class="hljs-string">'.'</span>).map (n) -&gt; 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
+    runInContext opts.prelude, repl.context, <span class="hljs-string">'prelude'</span> <span class="hljs-keyword">if</span> opts.prelude
+    repl.<span class="hljs-literal">on</span> <span class="hljs-string">'exit'</span>, <span class="hljs-function">-&gt;</span> repl.outputStream.write <span class="hljs-string">'\n'</span> <span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> repl.rli.closed
+    addMultilineHandler repl
+    addHistory repl, opts.historyFile, opts.historyMaxInputSize <span class="hljs-keyword">if</span> opts.historyFile</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-26">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-26">&#182;</a>
+              </div>
               <p>Adapt help inherited from the node REPL</p>
 
             </div>

documentation/docs/rewriter.html

@@ -169,7 +169,7 @@ its internal array of tokens.</p>
                 <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
               <p>Helpful snippet for debugging:</p>
-<pre><code><span class="hljs-built_in">console</span>.log (t[<span class="hljs-number">0</span>] + <span class="hljs-string">'/'</span> + t[<span class="hljs-number">1</span>] <span class="hljs-keyword">for</span> t <span class="hljs-keyword">in</span> <span class="hljs-property">@tokens</span>).join <span class="hljs-string">' '</span>
+<pre><code><span class="hljs-built_in">console</span>.log (t[<span class="hljs-number">0</span>] + <span class="hljs-string">'/'</span> + t[<span class="hljs-number">1</span>] <span class="hljs-keyword">for</span> t <span class="hljs-keyword">in</span> @tokens).join <span class="hljs-string">' '</span>
 </code></pre>
             </div>
             
@@ -185,20 +185,20 @@ its internal array of tokens.</p>
               <p>Rewrite the token stream in multiple passes, one logical filter at
 a time. This could certainly be changed into a single pass through the
 stream, with a big ol’ efficient switch, but it’s much nicer to work with
-like this. The order of these passes matters — indentation must be
+like this. The order of these passes matters – indentation must be
 corrected before implicit parentheses can be wrapped around blocks of code.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">rewrite</span>: <span class="hljs-function"><span class="hljs-params">(<span class="hljs-property">@tokens</span>)</span> -&gt;</span>
-    <span class="hljs-property">@removeLeadingNewlines</span>()
-    <span class="hljs-property">@closeOpenCalls</span>()
-    <span class="hljs-property">@closeOpenIndexes</span>()
-    <span class="hljs-property">@normalizeLines</span>()
-    <span class="hljs-property">@tagPostfixConditionals</span>()
-    <span class="hljs-property">@addImplicitBracesAndParens</span>()
-    <span class="hljs-property">@addLocationDataToGeneratedTokens</span>()
-    <span class="hljs-property">@tokens</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  rewrite: <span class="hljs-function"><span class="hljs-params">(@tokens)</span> -&gt;</span>
+    @removeLeadingNewlines()
+    @closeOpenCalls()
+    @closeOpenIndexes()
+    @normalizeLines()
+    @tagPostfixConditionals()
+    @addImplicitBracesAndParens()
+    @addLocationDataToGeneratedTokens()
+    @tokens</pre></div></div>
             
         </li>
         
@@ -217,13 +217,13 @@ our feet.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">scanTokens</span>: <span class="hljs-function"><span class="hljs-params">(block)</span> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>  scanTokens: <span class="hljs-function"><span class="hljs-params">(block)</span> -&gt;</span>
     {tokens} = <span class="hljs-keyword">this</span>
     i = <span class="hljs-number">0</span>
     i += block.call <span class="hljs-keyword">this</span>, token, i, tokens <span class="hljs-keyword">while</span> token = tokens[i]
     <span class="hljs-literal">true</span>
 
-  <span class="hljs-attribute">detectEnd</span>: <span class="hljs-function"><span class="hljs-params">(i, condition, action)</span> -&gt;</span>
+  detectEnd: <span class="hljs-function"><span class="hljs-params">(i, condition, action)</span> -&gt;</span>
     {tokens} = <span class="hljs-keyword">this</span>
     levels = <span class="hljs-number">0</span>
     <span class="hljs-keyword">while</span> token = tokens[i]
@@ -250,9 +250,9 @@ dispatch them here.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">removeLeadingNewlines</span>:<span class="hljs-function"> -&gt;</span>
-    <span class="hljs-keyword">break</span> <span class="hljs-keyword">for</span> [tag], i <span class="hljs-keyword">in</span> <span class="hljs-property">@tokens</span> <span class="hljs-keyword">when</span> tag <span class="hljs-keyword">isnt</span> <span class="hljs-string">'TERMINATOR'</span>
-    <span class="hljs-property">@tokens</span>.splice <span class="hljs-number">0</span>, i <span class="hljs-keyword">if</span> i</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  removeLeadingNewlines: <span class="hljs-function">-&gt;</span>
+    <span class="hljs-keyword">break</span> <span class="hljs-keyword">for</span> [tag], i <span class="hljs-keyword">in</span> @tokens <span class="hljs-keyword">when</span> tag <span class="hljs-keyword">isnt</span> <span class="hljs-string">'TERMINATOR'</span>
+    @tokens.splice <span class="hljs-number">0</span>, i <span class="hljs-keyword">if</span> i</pre></div></div>
             
         </li>
         
@@ -269,16 +269,16 @@ calls that close on the same line, just before their outdent.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">closeOpenCalls</span>:<span class="hljs-function"> -&gt;</span>
-    <span class="hljs-function"><span class="hljs-title">condition</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>  closeOpenCalls: <span class="hljs-function">-&gt;</span>
+<span class="hljs-function">    <span class="hljs-title">condition</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
       token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> [<span class="hljs-string">')'</span>, <span class="hljs-string">'CALL_END'</span>] <span class="hljs-keyword">or</span>
-      token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'OUTDENT'</span> <span class="hljs-keyword">and</span> <span class="hljs-property">@tag</span>(i - <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">')'</span>
+      token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'OUTDENT'</span> <span class="hljs-keyword">and</span> @tag(i - <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">')'</span>
+<span class="hljs-function">
+    <span class="hljs-title">action</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
+      @tokens[<span class="hljs-keyword">if</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'OUTDENT'</span> <span class="hljs-keyword">then</span> i - <span class="hljs-number">1</span> <span class="hljs-keyword">else</span> i][<span class="hljs-number">0</span>] = <span class="hljs-string">'CALL_END'</span>
 
-    <span class="hljs-function"><span class="hljs-title">action</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
-      <span class="hljs-property">@tokens</span>[<span class="hljs-keyword">if</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'OUTDENT'</span> <span class="hljs-keyword">then</span> i - <span class="hljs-number">1</span> <span class="hljs-keyword">else</span> i][<span class="hljs-number">0</span>] = <span class="hljs-string">'CALL_END'</span>
-
-    <span class="hljs-property">@scanTokens</span> <span class="hljs-function"><span class="hljs-params">(token, i)</span> -&gt;</span>
-      <span class="hljs-property">@detectEnd</span> i + <span class="hljs-number">1</span>, condition, action <span class="hljs-keyword">if</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'CALL_START'</span>
+    @scanTokens (token, i) -&gt;
+      @detectEnd i + <span class="hljs-number">1</span>, condition, action <span class="hljs-keyword">if</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'CALL_START'</span>
       <span class="hljs-number">1</span></pre></div></div>
             
         </li>
@@ -295,15 +295,15 @@ Match it with its paired close.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">closeOpenIndexes</span>:<span class="hljs-function"> -&gt;</span>
-    <span class="hljs-function"><span class="hljs-title">condition</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>  closeOpenIndexes: <span class="hljs-function">-&gt;</span>
+<span class="hljs-function">    <span class="hljs-title">condition</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
       token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> [<span class="hljs-string">']'</span>, <span class="hljs-string">'INDEX_END'</span>]
-
-    <span class="hljs-function"><span class="hljs-title">action</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
+<span class="hljs-function">
+    <span class="hljs-title">action</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
       token[<span class="hljs-number">0</span>] = <span class="hljs-string">'INDEX_END'</span>
 
-    <span class="hljs-property">@scanTokens</span> <span class="hljs-function"><span class="hljs-params">(token, i)</span> -&gt;</span>
-      <span class="hljs-property">@detectEnd</span> i + <span class="hljs-number">1</span>, condition, action <span class="hljs-keyword">if</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'INDEX_START'</span>
+    @scanTokens (token, i) -&gt;
+      @detectEnd i + <span class="hljs-number">1</span>, condition, action <span class="hljs-keyword">if</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'INDEX_START'</span>
       <span class="hljs-number">1</span></pre></div></div>
             
         </li>
@@ -315,20 +315,20 @@ Match it with its paired close.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-10">&#182;</a>
               </div>
-              <p>Match tags in token stream starting at i with pattern, skipping HERECOMMENTs
-Pattern may consist of strings (equality), an array of strings (one of)
-or null (wildcard)</p>
+              <p>Match tags in token stream starting at <code>i</code> with <code>pattern</code>, skipping ‘HERECOMMENT’s.
+<code>pattern</code> may consist of strings (equality), an array of strings (one of)
+or null (wildcard). Returns the index of the match or -1 if no match.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">matchTags</span>: <span class="hljs-function"><span class="hljs-params">(i, pattern...)</span> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>  indexOfTag: <span class="hljs-function"><span class="hljs-params">(i, pattern...)</span> -&gt;</span>
     fuzz = <span class="hljs-number">0</span>
     <span class="hljs-keyword">for</span> j <span class="hljs-keyword">in</span> [<span class="hljs-number">0</span> ... pattern.length]
-      fuzz += <span class="hljs-number">2</span> <span class="hljs-keyword">while</span> <span class="hljs-property">@tag</span>(i + j + fuzz) <span class="hljs-keyword">is</span> <span class="hljs-string">'HERECOMMENT'</span>
+      fuzz += <span class="hljs-number">2</span> <span class="hljs-keyword">while</span> @tag(i + j + fuzz) <span class="hljs-keyword">is</span> <span class="hljs-string">'HERECOMMENT'</span>
       <span class="hljs-keyword">continue</span> <span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> pattern[j]?
       pattern[j] = [pattern[j]] <span class="hljs-keyword">if</span> <span class="hljs-keyword">typeof</span> pattern[j] <span class="hljs-keyword">is</span> <span class="hljs-string">'string'</span>
-      <span class="hljs-keyword">return</span> <span class="hljs-literal">no</span> <span class="hljs-keyword">if</span> <span class="hljs-property">@tag</span>(i + j + fuzz) <span class="hljs-keyword">not</span> <span class="hljs-keyword">in</span> pattern[j]
-    <span class="hljs-literal">yes</span></pre></div></div>
+      <span class="hljs-keyword">return</span> <span class="hljs-number">-1</span> <span class="hljs-keyword">if</span> @tag(i + j + fuzz) <span class="hljs-keyword">not</span> <span class="hljs-keyword">in</span> pattern[j]
+    i + j + fuzz - <span class="hljs-number">1</span></pre></div></div>
             
         </li>
         
@@ -339,13 +339,20 @@ or null (wildcard)</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-11">&#182;</a>
               </div>
-              <p>yes iff standing in front of something looking like
-@<x>: or <x>:, skipping over ‘HERECOMMENT’s</p>
+              <p>Returns <code>yes</code> if standing in front of something looking like
+<code>@&lt;x&gt;:</code>, <code>&lt;x&gt;:</code> or <code>&lt;EXPRESSION_START&gt;&lt;x&gt;...&lt;EXPRESSION_END&gt;:</code>,
+skipping over ‘HERECOMMENT’s.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">looksObjectish</span>: <span class="hljs-function"><span class="hljs-params">(j)</span> -&gt;</span>
-    <span class="hljs-property">@matchTags</span>(j, <span class="hljs-string">'@'</span>, <span class="hljs-literal">null</span>, <span class="hljs-string">':'</span>) <span class="hljs-keyword">or</span> <span class="hljs-property">@matchTags</span>(j, <span class="hljs-literal">null</span>, <span class="hljs-string">':'</span>)</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  looksObjectish: <span class="hljs-function"><span class="hljs-params">(j)</span> -&gt;</span>
+    <span class="hljs-keyword">return</span> <span class="hljs-literal">yes</span> <span class="hljs-keyword">if</span> @indexOfTag(j, <span class="hljs-string">'@'</span>, <span class="hljs-literal">null</span>, <span class="hljs-string">':'</span>) &gt; <span class="hljs-number">-1</span> <span class="hljs-keyword">or</span> @indexOfTag(j, <span class="hljs-literal">null</span>, <span class="hljs-string">':'</span>) &gt; <span class="hljs-number">-1</span>
+    index = @indexOfTag(j, EXPRESSION_START)
+    <span class="hljs-keyword">if</span> index &gt; <span class="hljs-number">-1</span>
+      end = <span class="hljs-literal">null</span>
+      @detectEnd index + <span class="hljs-number">1</span>, <span class="hljs-function">(<span class="hljs-params">(token)</span> -&gt;</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> EXPRESSION_END), <span class="hljs-function">(<span class="hljs-params">(token, i)</span> -&gt;</span> end = i)
+      <span class="hljs-keyword">return</span> <span class="hljs-literal">yes</span> <span class="hljs-keyword">if</span> @tag(end + <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">':'</span>
+    <span class="hljs-literal">no</span></pre></div></div>
             
         </li>
         
@@ -356,22 +363,22 @@ or null (wildcard)</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-12">&#182;</a>
               </div>
-              <p>yes iff current line of tokens contain an element of tags on same
+              <p>Returns <code>yes</code> if current line of tokens contain an element of tags on same
 expression level. Stop searching at LINEBREAKS or explicit start of
 containing balanced expression.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">findTagsBackwards</span>: <span class="hljs-function"><span class="hljs-params">(i, tags)</span> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>  findTagsBackwards: <span class="hljs-function"><span class="hljs-params">(i, tags)</span> -&gt;</span>
     backStack = []
     <span class="hljs-keyword">while</span> i &gt;= <span class="hljs-number">0</span> <span class="hljs-keyword">and</span> (backStack.length <span class="hljs-keyword">or</span>
-          <span class="hljs-property">@tag</span>(i) <span class="hljs-keyword">not</span> <span class="hljs-keyword">in</span> tags <span class="hljs-keyword">and</span>
-          (<span class="hljs-property">@tag</span>(i) <span class="hljs-keyword">not</span> <span class="hljs-keyword">in</span> EXPRESSION_START <span class="hljs-keyword">or</span> <span class="hljs-property">@tokens</span>[i].generated) <span class="hljs-keyword">and</span>
-          <span class="hljs-property">@tag</span>(i) <span class="hljs-keyword">not</span> <span class="hljs-keyword">in</span> LINEBREAKS)
-      backStack.push <span class="hljs-property">@tag</span>(i) <span class="hljs-keyword">if</span> <span class="hljs-property">@tag</span>(i) <span class="hljs-keyword">in</span> EXPRESSION_END
-      backStack.pop() <span class="hljs-keyword">if</span> <span class="hljs-property">@tag</span>(i) <span class="hljs-keyword">in</span> EXPRESSION_START <span class="hljs-keyword">and</span> backStack.length
+          @tag(i) <span class="hljs-keyword">not</span> <span class="hljs-keyword">in</span> tags <span class="hljs-keyword">and</span>
+          (@tag(i) <span class="hljs-keyword">not</span> <span class="hljs-keyword">in</span> EXPRESSION_START <span class="hljs-keyword">or</span> @tokens[i].generated) <span class="hljs-keyword">and</span>
+          @tag(i) <span class="hljs-keyword">not</span> <span class="hljs-keyword">in</span> LINEBREAKS)
+      backStack.push @tag(i) <span class="hljs-keyword">if</span> @tag(i) <span class="hljs-keyword">in</span> EXPRESSION_END
+      backStack.pop() <span class="hljs-keyword">if</span> @tag(i) <span class="hljs-keyword">in</span> EXPRESSION_START <span class="hljs-keyword">and</span> backStack.length
       i -= <span class="hljs-number">1</span>
-    <span class="hljs-property">@tag</span>(i) <span class="hljs-keyword">in</span> tags</pre></div></div>
+    @tag(i) <span class="hljs-keyword">in</span> tags</pre></div></div>
             
         </li>
         
@@ -387,7 +394,7 @@ add them.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">addImplicitBracesAndParens</span>:<span class="hljs-function"> -&gt;</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  addImplicitBracesAndParens: <span class="hljs-function">-&gt;</span></pre></div></div>
             
         </li>
         
@@ -403,12 +410,13 @@ add them.</p>
             </div>
             
             <div class="content"><div class='highlight'><pre>    stack = []
+    start = <span class="hljs-literal">null</span>
 
-    <span class="hljs-property">@scanTokens</span> <span class="hljs-function"><span class="hljs-params">(token, i, tokens)</span> -&gt;</span>
+    @scanTokens (token, i, tokens) -&gt;
       [tag]     = token
       [prevTag] = prevToken = <span class="hljs-keyword">if</span> i &gt; <span class="hljs-number">0</span> <span class="hljs-keyword">then</span> tokens[i - <span class="hljs-number">1</span>] <span class="hljs-keyword">else</span> []
       [nextTag] = <span class="hljs-keyword">if</span> i &lt; tokens.length - <span class="hljs-number">1</span> <span class="hljs-keyword">then</span> tokens[i + <span class="hljs-number">1</span>] <span class="hljs-keyword">else</span> []
-      <span class="hljs-function"><span class="hljs-title">stackTop</span>  = -&gt;</span> stack[stack.length - <span class="hljs-number">1</span>]
+<span class="hljs-function">      <span class="hljs-title">stackTop</span>  = -&gt;</span> stack[stack.length - <span class="hljs-number">1</span>]
       startIdx  = i</pre></div></div>
             
         </li>
@@ -425,7 +433,7 @@ and spliced, when returning for getting a new token.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="hljs-function"><span class="hljs-title">forward</span>   = <span class="hljs-params">(n)</span> -&gt;</span> i - startIdx + n</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function">      <span class="hljs-title">forward</span>   = <span class="hljs-params">(n)</span> -&gt;</span> i - startIdx + n</pre></div></div>
             
         </li>
         
@@ -440,9 +448,9 @@ and spliced, when returning for getting a new token.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="hljs-function"><span class="hljs-title">inImplicit</span>        = -&gt;</span> stackTop()?[<span class="hljs-number">2</span>]?.ours
-      <span class="hljs-function"><span class="hljs-title">inImplicitCall</span>    = -&gt;</span> inImplicit() <span class="hljs-keyword">and</span> stackTop()?[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'('</span>
-      <span class="hljs-function"><span class="hljs-title">inImplicitObject</span>  = -&gt;</span> inImplicit() <span class="hljs-keyword">and</span> stackTop()?[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'{'</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function">      <span class="hljs-title">inImplicit</span>        = -&gt;</span> stackTop()?[<span class="hljs-number">2</span>]?.ours
+<span class="hljs-function">      <span class="hljs-title">inImplicitCall</span>    = -&gt;</span> inImplicit() <span class="hljs-keyword">and</span> stackTop()?[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'('</span>
+<span class="hljs-function">      <span class="hljs-title">inImplicitObject</span>  = -&gt;</span> inImplicit() <span class="hljs-keyword">and</span> stackTop()?[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'{'</span></pre></div></div>
             
         </li>
         
@@ -458,26 +466,28 @@ class declaration or if-conditionals)</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="hljs-function"><span class="hljs-title">inImplicitControl</span> = -&gt;</span> inImplicit <span class="hljs-keyword">and</span> stackTop()?[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'CONTROL'</span>
-
-      <span class="hljs-function"><span class="hljs-title">startImplicitCall</span> = <span class="hljs-params">(j)</span> -&gt;</span>
+            <div class="content"><div class='highlight'><pre><span class="hljs-function">      <span class="hljs-title">inImplicitControl</span> = -&gt;</span> inImplicit <span class="hljs-keyword">and</span> stackTop()?[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'CONTROL'</span>
+<span class="hljs-function">
+      <span class="hljs-title">startImplicitCall</span> = <span class="hljs-params">(j)</span> -&gt;</span>
         idx = j ? i
-        stack.push [<span class="hljs-string">'('</span>, idx, <span class="hljs-attribute">ours</span>: <span class="hljs-literal">yes</span>]
+        stack.push [<span class="hljs-string">'('</span>, idx, ours: <span class="hljs-literal">yes</span>]
         tokens.splice idx, <span class="hljs-number">0</span>, generate <span class="hljs-string">'CALL_START'</span>, <span class="hljs-string">'('</span>
         i += <span class="hljs-number">1</span> <span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> j?
-
-      <span class="hljs-function"><span class="hljs-title">endImplicitCall</span> = -&gt;</span>
+<span class="hljs-function">
+      <span class="hljs-title">endImplicitCall</span> = -&gt;</span>
         stack.pop()
-        tokens.splice i, <span class="hljs-number">0</span>, generate <span class="hljs-string">'CALL_END'</span>, <span class="hljs-string">')'</span>
+        tokens.splice i, <span class="hljs-number">0</span>, generate <span class="hljs-string">'CALL_END'</span>, <span class="hljs-string">')'</span>, [<span class="hljs-string">''</span>, <span class="hljs-string">'end of input'</span>, token[<span class="hljs-number">2</span>]]
         i += <span class="hljs-number">1</span>
-
-      <span class="hljs-function"><span class="hljs-title">startImplicitObject</span> = <span class="hljs-params">(j, startsLine = <span class="hljs-literal">yes</span>)</span> -&gt;</span>
+<span class="hljs-function">
+      <span class="hljs-title">startImplicitObject</span> = <span class="hljs-params">(j, startsLine = <span class="hljs-literal">yes</span>)</span> -&gt;</span>
         idx = j ? i
-        stack.push [<span class="hljs-string">'{'</span>, idx, <span class="hljs-attribute">sameLine</span>: <span class="hljs-literal">yes</span>, <span class="hljs-attribute">startsLine</span>: startsLine, <span class="hljs-attribute">ours</span>: <span class="hljs-literal">yes</span>]
-        tokens.splice idx, <span class="hljs-number">0</span>, generate <span class="hljs-string">'{'</span>, generate(<span class="hljs-keyword">new</span> String(<span class="hljs-string">'{'</span>)), token
+        stack.push [<span class="hljs-string">'{'</span>, idx, sameLine: <span class="hljs-literal">yes</span>, startsLine: startsLine, ours: <span class="hljs-literal">yes</span>]
+        val = <span class="hljs-keyword">new</span> String <span class="hljs-string">'{'</span>
+        val.generated = <span class="hljs-literal">yes</span>
+        tokens.splice idx, <span class="hljs-number">0</span>, generate <span class="hljs-string">'{'</span>, val, token
         i += <span class="hljs-number">1</span> <span class="hljs-keyword">if</span> <span class="hljs-keyword">not</span> j?
-
-      <span class="hljs-function"><span class="hljs-title">endImplicitObject</span> = <span class="hljs-params">(j)</span> -&gt;</span>
+<span class="hljs-function">
+      <span class="hljs-title">endImplicitObject</span> = <span class="hljs-params">(j)</span> -&gt;</span>
         j = j ? i
         stack.pop()
         tokens.splice j, <span class="hljs-number">0</span>, generate <span class="hljs-string">'}'</span>, <span class="hljs-string">'}'</span>, token
@@ -498,7 +508,7 @@ class declaration or if-conditionals)</p>
             
             <div class="content"><div class='highlight'><pre>      <span class="hljs-keyword">if</span> inImplicitCall() <span class="hljs-keyword">and</span> tag <span class="hljs-keyword">in</span> [<span class="hljs-string">'IF'</span>, <span class="hljs-string">'TRY'</span>, <span class="hljs-string">'FINALLY'</span>, <span class="hljs-string">'CATCH'</span>,
         <span class="hljs-string">'CLASS'</span>, <span class="hljs-string">'SWITCH'</span>]
-        stack.push [<span class="hljs-string">'CONTROL'</span>, i, <span class="hljs-attribute">ours</span>: <span class="hljs-literal">true</span>]
+        stack.push [<span class="hljs-string">'CONTROL'</span>, i, ours: <span class="hljs-literal">true</span>]
         <span class="hljs-keyword">return</span> forward(<span class="hljs-number">1</span>)
 
       <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'INDENT'</span> <span class="hljs-keyword">and</span> inImplicit()</pre></div></div>
@@ -564,7 +574,7 @@ class declaration or if-conditionals)</p>
             endImplicitObject()
           <span class="hljs-keyword">else</span>
             stack.pop()
-        stack.pop()</pre></div></div>
+        start = stack.pop()</pre></div></div>
             
         </li>
         
@@ -580,7 +590,7 @@ f a, f() b, f? c, h[0] d etc.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="hljs-keyword">if</span> (tag <span class="hljs-keyword">in</span> IMPLICIT_FUNC <span class="hljs-keyword">and</span> token.spaced <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> token.stringEnd <span class="hljs-keyword">or</span>
+            <div class="content"><div class='highlight'><pre>      <span class="hljs-keyword">if</span> (tag <span class="hljs-keyword">in</span> IMPLICIT_FUNC <span class="hljs-keyword">and</span> token.spaced <span class="hljs-keyword">or</span>
           tag <span class="hljs-keyword">is</span> <span class="hljs-string">'?'</span> <span class="hljs-keyword">and</span> i &gt; <span class="hljs-number">0</span> <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> tokens[i - <span class="hljs-number">1</span>].spaced) <span class="hljs-keyword">and</span>
          (nextTag <span class="hljs-keyword">in</span> IMPLICIT_CALL <span class="hljs-keyword">or</span>
           nextTag <span class="hljs-keyword">in</span> IMPLICIT_UNSPACED_CALL <span class="hljs-keyword">and</span>
@@ -600,27 +610,28 @@ f a, f() b, f? c, h[0] d etc.</p>
               </div>
               <p>Implicit call taking an implicit indented object as first argument.</p>
 <pre><code>f
-  <span class="hljs-attribute">a</span>: b
-  <span class="hljs-attribute">c</span>: d
+  a: b
+  c: d
 </code></pre><p>and</p>
 <pre><code>f
   <span class="hljs-number">1</span>
-  <span class="hljs-attribute">a</span>: b
-  <span class="hljs-attribute">b</span>: c
+  a: b
+  b: c
 </code></pre><p>Don’t accept implicit calls of this type, when on the same line
 as the control strucutures below as that may misinterpret constructs like:</p>
 <pre><code><span class="hljs-keyword">if</span> f
-   <span class="hljs-attribute">a</span>: <span class="hljs-number">1</span>
+   a: <span class="hljs-number">1</span>
 </code></pre><p>as</p>
-<pre><code><span class="hljs-keyword">if</span> f(<span class="hljs-attribute">a</span>: <span class="hljs-number">1</span>)
+<pre><code><span class="hljs-keyword">if</span> f(a: <span class="hljs-number">1</span>)
 </code></pre><p>which is probably always unintended.
 Furthermore don’t allow this in literal arrays, as
 that creates grammatical ambiguities.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">in</span> IMPLICIT_FUNC <span class="hljs-keyword">and</span> <span class="hljs-property">@matchTags</span>(i + <span class="hljs-number">1</span>, <span class="hljs-string">'INDENT'</span>, <span class="hljs-literal">null</span>, <span class="hljs-string">':'</span>) <span class="hljs-keyword">and</span>
-         <span class="hljs-keyword">not</span> <span class="hljs-property">@findTagsBackwards</span>(i, [<span class="hljs-string">'CLASS'</span>, <span class="hljs-string">'EXTENDS'</span>, <span class="hljs-string">'IF'</span>, <span class="hljs-string">'CATCH'</span>,
+            <div class="content"><div class='highlight'><pre>      <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">in</span> IMPLICIT_FUNC <span class="hljs-keyword">and</span>
+         @indexOfTag(i + <span class="hljs-number">1</span>, <span class="hljs-string">'INDENT'</span>) &gt; <span class="hljs-number">-1</span> <span class="hljs-keyword">and</span> @looksObjectish(i + <span class="hljs-number">2</span>) <span class="hljs-keyword">and</span>
+         <span class="hljs-keyword">not</span> @findTagsBackwards(i, [<span class="hljs-string">'CLASS'</span>, <span class="hljs-string">'EXTENDS'</span>, <span class="hljs-string">'IF'</span>, <span class="hljs-string">'CATCH'</span>,
           <span class="hljs-string">'SWITCH'</span>, <span class="hljs-string">'LEADING_WHEN'</span>, <span class="hljs-string">'FOR'</span>, <span class="hljs-string">'WHILE'</span>, <span class="hljs-string">'UNTIL'</span>])
         startImplicitCall i + <span class="hljs-number">1</span>
         stack.push [<span class="hljs-string">'INDENT'</span>, i + <span class="hljs-number">2</span>]
@@ -654,8 +665,11 @@ that creates grammatical ambiguities.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>        <span class="hljs-keyword">if</span> <span class="hljs-property">@tag</span>(i - <span class="hljs-number">2</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'@'</span> <span class="hljs-keyword">then</span> s = i - <span class="hljs-number">2</span> <span class="hljs-keyword">else</span> s = i - <span class="hljs-number">1</span>
-        s -= <span class="hljs-number">2</span> <span class="hljs-keyword">while</span> <span class="hljs-property">@tag</span>(s - <span class="hljs-number">2</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'HERECOMMENT'</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>        s = <span class="hljs-keyword">switch</span>
+          <span class="hljs-keyword">when</span> @tag(i - <span class="hljs-number">1</span>) <span class="hljs-keyword">in</span> EXPRESSION_END <span class="hljs-keyword">then</span> start[<span class="hljs-number">1</span>]
+          <span class="hljs-keyword">when</span> @tag(i - <span class="hljs-number">2</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'@'</span> <span class="hljs-keyword">then</span> i - <span class="hljs-number">2</span>
+          <span class="hljs-keyword">else</span> i - <span class="hljs-number">1</span>
+        s -= <span class="hljs-number">2</span> <span class="hljs-keyword">while</span> @tag(s - <span class="hljs-number">2</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'HERECOMMENT'</span></pre></div></div>
             
         </li>
         
@@ -670,9 +684,9 @@ that creates grammatical ambiguities.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>        <span class="hljs-property">@insideForDeclaration</span> = nextTag <span class="hljs-keyword">is</span> <span class="hljs-string">'FOR'</span>
+            <div class="content"><div class='highlight'><pre>        @insideForDeclaration = nextTag <span class="hljs-keyword">is</span> <span class="hljs-string">'FOR'</span>
 
-        startsLine = s <span class="hljs-keyword">is</span> <span class="hljs-number">0</span> <span class="hljs-keyword">or</span> <span class="hljs-property">@tag</span>(s - <span class="hljs-number">1</span>) <span class="hljs-keyword">in</span> LINEBREAKS <span class="hljs-keyword">or</span> tokens[s - <span class="hljs-number">1</span>].newLine</pre></div></div>
+        startsLine = s <span class="hljs-keyword">is</span> <span class="hljs-number">0</span> <span class="hljs-keyword">or</span> @tag(s - <span class="hljs-number">1</span>) <span class="hljs-keyword">in</span> LINEBREAKS <span class="hljs-keyword">or</span> tokens[s - <span class="hljs-number">1</span>].newLine</pre></div></div>
             
         </li>
         
@@ -689,8 +703,8 @@ that creates grammatical ambiguities.</p>
             
             <div class="content"><div class='highlight'><pre>        <span class="hljs-keyword">if</span> stackTop()
           [stackTag, stackIdx] = stackTop()
-          <span class="hljs-keyword">if</span> (stackTag <span class="hljs-keyword">is</span> <span class="hljs-string">'{'</span> <span class="hljs-keyword">or</span> stackTag <span class="hljs-keyword">is</span> <span class="hljs-string">'INDENT'</span> <span class="hljs-keyword">and</span> <span class="hljs-property">@tag</span>(stackIdx - <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'{'</span>) <span class="hljs-keyword">and</span>
-             (startsLine <span class="hljs-keyword">or</span> <span class="hljs-property">@tag</span>(s - <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">','</span> <span class="hljs-keyword">or</span> <span class="hljs-property">@tag</span>(s - <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'{'</span>)
+          <span class="hljs-keyword">if</span> (stackTag <span class="hljs-keyword">is</span> <span class="hljs-string">'{'</span> <span class="hljs-keyword">or</span> stackTag <span class="hljs-keyword">is</span> <span class="hljs-string">'INDENT'</span> <span class="hljs-keyword">and</span> @tag(stackIdx - <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'{'</span>) <span class="hljs-keyword">and</span>
+             (startsLine <span class="hljs-keyword">or</span> @tag(s - <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">','</span> <span class="hljs-keyword">or</span> @tag(s - <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'{'</span>)
             <span class="hljs-keyword">return</span> forward(<span class="hljs-number">1</span>)
 
         startImplicitObject(s, !!startsLine)
@@ -707,9 +721,9 @@ that creates grammatical ambiguities.</p>
               </div>
               <p>End implicit calls when chaining method calls
 like e.g.:</p>
-<pre><code>f<span class="hljs-function"> -&gt;</span>
+<pre><code>f -&gt;
   a
-.g b,<span class="hljs-function"> -&gt;</span>
+.g b, <span class="hljs-function">-&gt;</span>
   c
 .h a
 </code></pre><p>and also</p>
@@ -757,8 +771,8 @@ return a: 1, b: 2 unless true</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>          <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> inImplicitObject() <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> <span class="hljs-property">@insideForDeclaration</span> <span class="hljs-keyword">and</span> sameLine <span class="hljs-keyword">and</span>
-                  tag <span class="hljs-keyword">isnt</span> <span class="hljs-string">'TERMINATOR'</span> <span class="hljs-keyword">and</span> prevTag <span class="hljs-keyword">isnt</span> <span class="hljs-string">':'</span> <span class="hljs-keyword">and</span>
+            <div class="content"><div class='highlight'><pre>          <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> inImplicitObject() <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> @insideForDeclaration <span class="hljs-keyword">and</span> sameLine <span class="hljs-keyword">and</span>
+                  tag <span class="hljs-keyword">isnt</span> <span class="hljs-string">'TERMINATOR'</span> <span class="hljs-keyword">and</span> prevTag <span class="hljs-keyword">isnt</span> <span class="hljs-string">':'</span>
             endImplicitObject()</pre></div></div>
             
         </li>
@@ -777,7 +791,8 @@ the continuation of an object.</p>
             </div>
             
             <div class="content"><div class='highlight'><pre>          <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> inImplicitObject() <span class="hljs-keyword">and</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'TERMINATOR'</span> <span class="hljs-keyword">and</span> prevTag <span class="hljs-keyword">isnt</span> <span class="hljs-string">','</span> <span class="hljs-keyword">and</span>
-                  <span class="hljs-keyword">not</span> (startsLine <span class="hljs-keyword">and</span> <span class="hljs-property">@looksObjectish</span>(i + <span class="hljs-number">1</span>))
+                  <span class="hljs-keyword">not</span> (startsLine <span class="hljs-keyword">and</span> @looksObjectish(i + <span class="hljs-number">1</span>))
+            <span class="hljs-keyword">return</span> forward <span class="hljs-number">1</span> <span class="hljs-keyword">if</span> nextTag <span class="hljs-keyword">is</span> <span class="hljs-string">'HERECOMMENT'</span>
             endImplicitObject()
           <span class="hljs-keyword">else</span>
             <span class="hljs-keyword">break</span></pre></div></div>
@@ -795,17 +810,17 @@ the continuation of an object.</p>
 and what comes after doesn’t look like it belongs.
 This is used for trailing commas and calls, like:</p>
 <pre><code>x =
-    <span class="hljs-attribute">a</span>: b,
-    <span class="hljs-attribute">c</span>: d,
+    a: b,
+    c: d,
 e = <span class="hljs-number">2</span>
 </code></pre><p>and</p>
-<pre><code>f a, <span class="hljs-attribute">b</span>: c, <span class="hljs-attribute">d</span>: e, f, <span class="hljs-attribute">g</span>: <span class="hljs-attribute">h</span>: i, j
+<pre><code>f a, b: c, d: e, f, g: h: i, j
 </code></pre>
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">','</span> <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> <span class="hljs-property">@looksObjectish</span>(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">and</span> inImplicitObject() <span class="hljs-keyword">and</span>
-         <span class="hljs-keyword">not</span> <span class="hljs-property">@insideForDeclaration</span> <span class="hljs-keyword">and</span>
-         (nextTag <span class="hljs-keyword">isnt</span> <span class="hljs-string">'TERMINATOR'</span> <span class="hljs-keyword">or</span> <span class="hljs-keyword">not</span> <span class="hljs-property">@looksObjectish</span>(i + <span class="hljs-number">2</span>))</pre></div></div>
+            <div class="content"><div class='highlight'><pre>      <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">','</span> <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> @looksObjectish(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">and</span> inImplicitObject() <span class="hljs-keyword">and</span>
+         <span class="hljs-keyword">not</span> @insideForDeclaration <span class="hljs-keyword">and</span>
+         (nextTag <span class="hljs-keyword">isnt</span> <span class="hljs-string">'TERMINATOR'</span> <span class="hljs-keyword">or</span> <span class="hljs-keyword">not</span> @looksObjectish(i + <span class="hljs-number">2</span>))</pre></div></div>
             
         </li>
         
@@ -842,21 +857,21 @@ array further up the stack, so give it a chance.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">addLocationDataToGeneratedTokens</span>:<span class="hljs-function"> -&gt;</span>
-    <span class="hljs-property">@scanTokens</span> <span class="hljs-function"><span class="hljs-params">(token, i, tokens)</span> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>  addLocationDataToGeneratedTokens: <span class="hljs-function">-&gt;</span>
+    @scanTokens (token, i, tokens) -&gt;
       <span class="hljs-keyword">return</span> <span class="hljs-number">1</span> <span class="hljs-keyword">if</span>     token[<span class="hljs-number">2</span>]
       <span class="hljs-keyword">return</span> <span class="hljs-number">1</span> <span class="hljs-keyword">unless</span> token.generated <span class="hljs-keyword">or</span> token.explicit
       <span class="hljs-keyword">if</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'{'</span> <span class="hljs-keyword">and</span> nextLocation=tokens[i + <span class="hljs-number">1</span>]?[<span class="hljs-number">2</span>]
-        {<span class="hljs-attribute">first_line</span>: line, <span class="hljs-attribute">first_column</span>: column} = nextLocation
+        {first_line: line, first_column: column} = nextLocation
       <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> prevLocation = tokens[i - <span class="hljs-number">1</span>]?[<span class="hljs-number">2</span>]
-        {<span class="hljs-attribute">last_line</span>: line, <span class="hljs-attribute">last_column</span>: column} = prevLocation
+        {last_line: line, last_column: column} = prevLocation
       <span class="hljs-keyword">else</span>
         line = column = <span class="hljs-number">0</span>
       token[<span class="hljs-number">2</span>] =
-        <span class="hljs-attribute">first_line</span>:   line
-        <span class="hljs-attribute">first_column</span>: column
-        <span class="hljs-attribute">last_line</span>:    line
-        <span class="hljs-attribute">last_column</span>:  column
+        first_line:   line
+        first_column: column
+        last_line:    line
+        last_column:  column
       <span class="hljs-keyword">return</span> <span class="hljs-number">1</span></pre></div></div>
             
         </li>
@@ -876,39 +891,39 @@ blocks are added.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">normalizeLines</span>:<span class="hljs-function"> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>  normalizeLines: <span class="hljs-function">-&gt;</span>
     starter = indent = outdent = <span class="hljs-literal">null</span>
-
-    <span class="hljs-function"><span class="hljs-title">condition</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
+<span class="hljs-function">
+    <span class="hljs-title">condition</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
       token[<span class="hljs-number">1</span>] <span class="hljs-keyword">isnt</span> <span class="hljs-string">';'</span> <span class="hljs-keyword">and</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> SINGLE_CLOSERS <span class="hljs-keyword">and</span>
-      <span class="hljs-keyword">not</span> (token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'TERMINATOR'</span> <span class="hljs-keyword">and</span> <span class="hljs-property">@tag</span>(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">in</span> EXPRESSION_CLOSE) <span class="hljs-keyword">and</span>
+      <span class="hljs-keyword">not</span> (token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'TERMINATOR'</span> <span class="hljs-keyword">and</span> @tag(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">in</span> EXPRESSION_CLOSE) <span class="hljs-keyword">and</span>
       <span class="hljs-keyword">not</span> (token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'ELSE'</span> <span class="hljs-keyword">and</span> starter <span class="hljs-keyword">isnt</span> <span class="hljs-string">'THEN'</span>) <span class="hljs-keyword">and</span>
       <span class="hljs-keyword">not</span> (token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> [<span class="hljs-string">'CATCH'</span>, <span class="hljs-string">'FINALLY'</span>] <span class="hljs-keyword">and</span> starter <span class="hljs-keyword">in</span> [<span class="hljs-string">'-&gt;'</span>, <span class="hljs-string">'=&gt;'</span>]) <span class="hljs-keyword">or</span>
-      token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> CALL_CLOSERS <span class="hljs-keyword">and</span> <span class="hljs-property">@tokens</span>[i - <span class="hljs-number">1</span>].newLine
+      token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> CALL_CLOSERS <span class="hljs-keyword">and</span> @tokens[i - <span class="hljs-number">1</span>].newLine
+<span class="hljs-function">
+    <span class="hljs-title">action</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
+      @tokens.splice (<span class="hljs-keyword">if</span> @tag(i - <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">','</span> <span class="hljs-keyword">then</span> i - <span class="hljs-number">1</span> <span class="hljs-keyword">else</span> i), <span class="hljs-number">0</span>, outdent
 
-    <span class="hljs-function"><span class="hljs-title">action</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
-      <span class="hljs-property">@tokens</span>.splice (<span class="hljs-keyword">if</span> <span class="hljs-property">@tag</span>(i - <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">','</span> <span class="hljs-keyword">then</span> i - <span class="hljs-number">1</span> <span class="hljs-keyword">else</span> i), <span class="hljs-number">0</span>, outdent
-
-    <span class="hljs-property">@scanTokens</span> <span class="hljs-function"><span class="hljs-params">(token, i, tokens)</span> -&gt;</span>
+    @scanTokens (token, i, tokens) -&gt;
       [tag] = token
       <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'TERMINATOR'</span>
-        <span class="hljs-keyword">if</span> <span class="hljs-property">@tag</span>(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'ELSE'</span> <span class="hljs-keyword">and</span> <span class="hljs-property">@tag</span>(i - <span class="hljs-number">1</span>) <span class="hljs-keyword">isnt</span> <span class="hljs-string">'OUTDENT'</span>
-          tokens.splice i, <span class="hljs-number">1</span>, <span class="hljs-property">@indentation</span>()...
+        <span class="hljs-keyword">if</span> @tag(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'ELSE'</span> <span class="hljs-keyword">and</span> @tag(i - <span class="hljs-number">1</span>) <span class="hljs-keyword">isnt</span> <span class="hljs-string">'OUTDENT'</span>
+          tokens.splice i, <span class="hljs-number">1</span>, @indentation()...
           <span class="hljs-keyword">return</span> <span class="hljs-number">1</span>
-        <span class="hljs-keyword">if</span> <span class="hljs-property">@tag</span>(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">in</span> EXPRESSION_CLOSE
+        <span class="hljs-keyword">if</span> @tag(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">in</span> EXPRESSION_CLOSE
           tokens.splice i, <span class="hljs-number">1</span>
           <span class="hljs-keyword">return</span> <span class="hljs-number">0</span>
       <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'CATCH'</span>
-        <span class="hljs-keyword">for</span> j <span class="hljs-keyword">in</span> [<span class="hljs-number">1.</span><span class="hljs-number">.2</span>] <span class="hljs-keyword">when</span> <span class="hljs-property">@tag</span>(i + j) <span class="hljs-keyword">in</span> [<span class="hljs-string">'OUTDENT'</span>, <span class="hljs-string">'TERMINATOR'</span>, <span class="hljs-string">'FINALLY'</span>]
-          tokens.splice i + j, <span class="hljs-number">0</span>, <span class="hljs-property">@indentation</span>()...
+        <span class="hljs-keyword">for</span> j <span class="hljs-keyword">in</span> [<span class="hljs-number">1.</span><span class="hljs-number">.2</span>] <span class="hljs-keyword">when</span> @tag(i + j) <span class="hljs-keyword">in</span> [<span class="hljs-string">'OUTDENT'</span>, <span class="hljs-string">'TERMINATOR'</span>, <span class="hljs-string">'FINALLY'</span>]
+          tokens.splice i + j, <span class="hljs-number">0</span>, @indentation()...
           <span class="hljs-keyword">return</span> <span class="hljs-number">2</span> + j
-      <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">in</span> SINGLE_LINERS <span class="hljs-keyword">and</span> <span class="hljs-property">@tag</span>(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">isnt</span> <span class="hljs-string">'INDENT'</span> <span class="hljs-keyword">and</span>
-         <span class="hljs-keyword">not</span> (tag <span class="hljs-keyword">is</span> <span class="hljs-string">'ELSE'</span> <span class="hljs-keyword">and</span> <span class="hljs-property">@tag</span>(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'IF'</span>)
+      <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">in</span> SINGLE_LINERS <span class="hljs-keyword">and</span> @tag(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">isnt</span> <span class="hljs-string">'INDENT'</span> <span class="hljs-keyword">and</span>
+         <span class="hljs-keyword">not</span> (tag <span class="hljs-keyword">is</span> <span class="hljs-string">'ELSE'</span> <span class="hljs-keyword">and</span> @tag(i + <span class="hljs-number">1</span>) <span class="hljs-keyword">is</span> <span class="hljs-string">'IF'</span>)
         starter = tag
-        [indent, outdent] = <span class="hljs-property">@indentation</span> tokens[i]
+        [indent, outdent] = @indentation tokens[i]
         indent.fromThen   = <span class="hljs-literal">true</span> <span class="hljs-keyword">if</span> starter <span class="hljs-keyword">is</span> <span class="hljs-string">'THEN'</span>
         tokens.splice i + <span class="hljs-number">1</span>, <span class="hljs-number">0</span>, indent
-        <span class="hljs-property">@detectEnd</span> i + <span class="hljs-number">2</span>, condition, action
+        @detectEnd i + <span class="hljs-number">2</span>, condition, action
         tokens.splice i, <span class="hljs-number">1</span> <span class="hljs-keyword">if</span> tag <span class="hljs-keyword">is</span> <span class="hljs-string">'THEN'</span>
         <span class="hljs-keyword">return</span> <span class="hljs-number">1</span>
       <span class="hljs-keyword">return</span> <span class="hljs-number">1</span></pre></div></div>
@@ -927,23 +942,23 @@ different precedence.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">tagPostfixConditionals</span>:<span class="hljs-function"> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>  tagPostfixConditionals: <span class="hljs-function">-&gt;</span>
 
     original = <span class="hljs-literal">null</span>
-
-    <span class="hljs-function"><span class="hljs-title">condition</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
+<span class="hljs-function">
+    <span class="hljs-title">condition</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
       [tag] = token
-      [prevTag] = <span class="hljs-property">@tokens</span>[i - <span class="hljs-number">1</span>]
+      [prevTag] = @tokens[i - <span class="hljs-number">1</span>]
       tag <span class="hljs-keyword">is</span> <span class="hljs-string">'TERMINATOR'</span> <span class="hljs-keyword">or</span> (tag <span class="hljs-keyword">is</span> <span class="hljs-string">'INDENT'</span> <span class="hljs-keyword">and</span> prevTag <span class="hljs-keyword">not</span> <span class="hljs-keyword">in</span> SINGLE_LINERS)
-
-    <span class="hljs-function"><span class="hljs-title">action</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
+<span class="hljs-function">
+    <span class="hljs-title">action</span> = <span class="hljs-params">(token, i)</span> -&gt;</span>
       <span class="hljs-keyword">if</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">isnt</span> <span class="hljs-string">'INDENT'</span> <span class="hljs-keyword">or</span> (token.generated <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> token.fromThen)
         original[<span class="hljs-number">0</span>] = <span class="hljs-string">'POST_'</span> + original[<span class="hljs-number">0</span>]
 
-    <span class="hljs-property">@scanTokens</span> <span class="hljs-function"><span class="hljs-params">(token, i)</span> -&gt;</span>
+    @scanTokens (token, i) -&gt;
       <span class="hljs-keyword">return</span> <span class="hljs-number">1</span> <span class="hljs-keyword">unless</span> token[<span class="hljs-number">0</span>] <span class="hljs-keyword">is</span> <span class="hljs-string">'IF'</span>
       original = token
-      <span class="hljs-property">@detectEnd</span> i + <span class="hljs-number">1</span>, condition, action
+      @detectEnd i + <span class="hljs-number">1</span>, condition, action
       <span class="hljs-keyword">return</span> <span class="hljs-number">1</span></pre></div></div>
             
         </li>
@@ -959,7 +974,7 @@ different precedence.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">indentation</span>: <span class="hljs-function"><span class="hljs-params">(origin)</span> -&gt;</span>
+            <div class="content"><div class='highlight'><pre>  indentation: <span class="hljs-function"><span class="hljs-params">(origin)</span> -&gt;</span>
     indent  = [<span class="hljs-string">'INDENT'</span>, <span class="hljs-number">2</span>]
     outdent = [<span class="hljs-string">'OUTDENT'</span>, <span class="hljs-number">2</span>]
     <span class="hljs-keyword">if</span> origin
@@ -969,7 +984,7 @@ different precedence.</p>
       indent.explicit = outdent.explicit = <span class="hljs-literal">yes</span>
     [indent, outdent]
 
-  <span class="hljs-attribute">generate</span>: generate</pre></div></div>
+  generate: generate</pre></div></div>
             
         </li>
         
@@ -984,7 +999,7 @@ different precedence.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-attribute">tag</span>: <span class="hljs-function"><span class="hljs-params">(i)</span> -&gt;</span> <span class="hljs-property">@tokens</span>[i]?[<span class="hljs-number">0</span>]</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  tag: <span class="hljs-function"><span class="hljs-params">(i)</span> -&gt;</span> @tokens[i]?[<span class="hljs-number">0</span>]</pre></div></div>
             
         </li>
         
@@ -1032,6 +1047,8 @@ different precedence.</p>
   [<span class="hljs-string">'CALL_START'</span>, <span class="hljs-string">'CALL_END'</span>]
   [<span class="hljs-string">'PARAM_START'</span>, <span class="hljs-string">'PARAM_END'</span>]
   [<span class="hljs-string">'INDEX_START'</span>, <span class="hljs-string">'INDEX_END'</span>]
+  [<span class="hljs-string">'STRING_START'</span>, <span class="hljs-string">'STRING_END'</span>]
+  [<span class="hljs-string">'REGEX_START'</span>, <span class="hljs-string">'REGEX_END'</span>]
 ]</pre></div></div>
             
         </li>
@@ -1048,7 +1065,7 @@ look things up from either end.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">exports</span>.INVERSES = INVERSES = {}</pre></div></div>
+            <div class="content"><div class='highlight'><pre>exports.INVERSES = INVERSES = {}</pre></div></div>
             
         </li>
         
@@ -1098,7 +1115,7 @@ EXPRESSION_END   = []
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>IMPLICIT_FUNC    = [<span class="hljs-string">'IDENTIFIER'</span>, <span class="hljs-string">'SUPER'</span>, <span class="hljs-string">')'</span>, <span class="hljs-string">'CALL_END'</span>, <span class="hljs-string">']'</span>, <span class="hljs-string">'INDEX_END'</span>, <span class="hljs-string">'@'</span>, <span class="hljs-string">'THIS'</span>]</pre></div></div>
+            <div class="content"><div class='highlight'><pre>IMPLICIT_FUNC    = [<span class="hljs-string">'IDENTIFIER'</span>, <span class="hljs-string">'PROPERTY'</span>, <span class="hljs-string">'SUPER'</span>, <span class="hljs-string">')'</span>, <span class="hljs-string">'CALL_END'</span>, <span class="hljs-string">']'</span>, <span class="hljs-string">'INDEX_END'</span>, <span class="hljs-string">'@'</span>, <span class="hljs-string">'THIS'</span>]</pre></div></div>
             
         </li>
         
@@ -1114,9 +1131,12 @@ EXPRESSION_END   = []
             </div>
             
             <div class="content"><div class='highlight'><pre>IMPLICIT_CALL    = [
-  <span class="hljs-string">'IDENTIFIER'</span>, <span class="hljs-string">'NUMBER'</span>, <span class="hljs-string">'STRING'</span>, <span class="hljs-string">'JS'</span>, <span class="hljs-string">'REGEX'</span>, <span class="hljs-string">'NEW'</span>, <span class="hljs-string">'PARAM_START'</span>, <span class="hljs-string">'CLASS'</span>
-  <span class="hljs-string">'IF'</span>, <span class="hljs-string">'TRY'</span>, <span class="hljs-string">'SWITCH'</span>, <span class="hljs-string">'THIS'</span>, <span class="hljs-string">'BOOL'</span>, <span class="hljs-string">'NULL'</span>, <span class="hljs-string">'UNDEFINED'</span>, <span class="hljs-string">'UNARY'</span>,
-  <span class="hljs-string">'UNARY_MATH'</span>, <span class="hljs-string">'SUPER'</span>, <span class="hljs-string">'THROW'</span>, <span class="hljs-string">'@'</span>, <span class="hljs-string">'-&gt;'</span>, <span class="hljs-string">'=&gt;'</span>, <span class="hljs-string">'['</span>, <span class="hljs-string">'('</span>, <span class="hljs-string">'{'</span>, <span class="hljs-string">'--'</span>, <span class="hljs-string">'++'</span>
+  <span class="hljs-string">'IDENTIFIER'</span>, <span class="hljs-string">'PROPERTY'</span>, <span class="hljs-string">'NUMBER'</span>, <span class="hljs-string">'INFINITY'</span>, <span class="hljs-string">'NAN'</span>
+  <span class="hljs-string">'STRING'</span>, <span class="hljs-string">'STRING_START'</span>, <span class="hljs-string">'REGEX'</span>, <span class="hljs-string">'REGEX_START'</span>, <span class="hljs-string">'JS'</span>
+  <span class="hljs-string">'NEW'</span>, <span class="hljs-string">'PARAM_START'</span>, <span class="hljs-string">'CLASS'</span>, <span class="hljs-string">'IF'</span>, <span class="hljs-string">'TRY'</span>, <span class="hljs-string">'SWITCH'</span>, <span class="hljs-string">'THIS'</span>
+  <span class="hljs-string">'UNDEFINED'</span>, <span class="hljs-string">'NULL'</span>, <span class="hljs-string">'BOOL'</span>
+  <span class="hljs-string">'UNARY'</span>, <span class="hljs-string">'YIELD'</span>, <span class="hljs-string">'UNARY_MATH'</span>, <span class="hljs-string">'SUPER'</span>, <span class="hljs-string">'THROW'</span>
+  <span class="hljs-string">'@'</span>, <span class="hljs-string">'-&gt;'</span>, <span class="hljs-string">'=&gt;'</span>, <span class="hljs-string">'['</span>, <span class="hljs-string">'('</span>, <span class="hljs-string">'{'</span>, <span class="hljs-string">'--'</span>, <span class="hljs-string">'++'</span>
 ]
 
 IMPLICIT_UNSPACED_CALL = [<span class="hljs-string">'+'</span>, <span class="hljs-string">'-'</span>]</pre></div></div>

documentation/docs/scope.html

@@ -121,13 +121,10 @@ 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>
-<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>
+            <div class="content"><div class='highlight'><pre>exports.Scope = <span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Scope</span></span></pre></div></div>
             
         </li>
         
@@ -138,11 +135,18 @@ with external scopes.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-2">&#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, a reference to the function that
+it belongs to, and a list of variables referenced in the source code
+and therefore should be avoided when generating variables.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-property">@root</span>: <span class="hljs-literal">null</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>  constructor: <span class="hljs-function"><span class="hljs-params">(@parent, @expressions, @method, @referencedVars)</span> -&gt;</span>
+    @variables = [{name: <span class="hljs-string">'arguments'</span>, type: <span class="hljs-string">'arguments'</span>}]
+    @positions = {}
+    @utilities = {} <span class="hljs-keyword">unless</span> @parent</pre></div></div>
             
         </li>
         
@@ -153,17 +157,11 @@ with external scopes.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-3">&#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>The <code>@root</code> is the top-level <strong>Scope</strong> object for a given file.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="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>
+            <div class="content"><div class='highlight'><pre>    @root = @parent?.root ? <span class="hljs-keyword">this</span></pre></div></div>
             
         </li>
         
@@ -178,12 +176,12 @@ it belongs to.</p>
 
             </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
+            <div class="content"><div class='highlight'><pre>  add: <span class="hljs-function"><span class="hljs-params">(name, type, immediate)</span> -&gt;</span>
+    <span class="hljs-keyword">return</span> @parent.add name, type, immediate <span class="hljs-keyword">if</span> @shared <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> immediate
+    <span class="hljs-keyword">if</span> Object::hasOwnProperty.call @positions, name
+      @variables[@positions[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>
+      @positions[name] = @variables.push({name, type}) - <span class="hljs-number">1</span></pre></div></div>
             
         </li>
         
@@ -202,9 +200,9 @@ function object that has a name filled in, or bottoms out.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>  namedMethod: <span class="hljs-function">-&gt;</span>
+    <span class="hljs-keyword">return</span> @method <span class="hljs-keyword">if</span> @method?.name <span class="hljs-keyword">or</span> !@parent
+    @parent.namedMethod()</pre></div></div>
             
         </li>
         
@@ -220,9 +218,9 @@ already exist.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>  find: <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> @check name
+    @add name, <span class="hljs-string">'var'</span>
     <span class="hljs-literal">no</span></pre></div></div>
             
         </li>
@@ -239,9 +237,9 @@ scope. No <code>var</code> required for internal references.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>  parameter: <span class="hljs-function"><span class="hljs-params">(name)</span> -&gt;</span>
+    <span class="hljs-keyword">return</span> <span class="hljs-keyword">if</span> @shared <span class="hljs-keyword">and</span> @parent.check name, <span class="hljs-literal">yes</span>
+    @add name, <span class="hljs-string">'param'</span></pre></div></div>
             
         </li>
         
@@ -257,8 +255,8 @@ walks up to the root scope.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>  check: <span class="hljs-function"><span class="hljs-params">(name)</span> -&gt;</span>
+    !!(@type(name) <span class="hljs-keyword">or</span> @parent?.check(name))</pre></div></div>
             
         </li>
         
@@ -273,11 +271,17 @@ walks up to the root scope.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>  temporary: <span class="hljs-function"><span class="hljs-params">(name, index, single=<span class="hljs-literal">false</span>)</span> -&gt;</span>
+    <span class="hljs-keyword">if</span> single
+      startCode = name.charCodeAt(<span class="hljs-number">0</span>)
+      endCode = <span class="hljs-string">'z'</span>.charCodeAt(<span class="hljs-number">0</span>)
+      diff = endCode - startCode
+      newCode = startCode + index % (diff + <span class="hljs-number">1</span>)
+      letter = String.fromCharCode(newCode)
+      num = index <span class="hljs-regexp">//</span> (diff + <span class="hljs-number">1</span>)
+      <span class="hljs-string">"<span class="hljs-subst">#{letter}</span><span class="hljs-subst">#{num <span class="hljs-keyword">or</span> <span class="hljs-string">''</span>}</span>"</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>
+      <span class="hljs-string">"<span class="hljs-subst">#{name}</span><span class="hljs-subst">#{index <span class="hljs-keyword">or</span> <span class="hljs-string">''</span>}</span>"</span></pre></div></div>
             
         </li>
         
@@ -292,8 +296,8 @@ walks up to the root scope.</p>
 
             </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
+            <div class="content"><div class='highlight'><pre>  type: <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> @variables <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>
@@ -310,10 +314,13 @@ compiler-generated variable. <code>_var</code>, <code>_var2</code>, and so on…
 
             </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>
+            <div class="content"><div class='highlight'><pre>  freeVariable: <span class="hljs-function"><span class="hljs-params">(name, options={})</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
+    <span class="hljs-keyword">loop</span>
+      temp = @temporary name, index, options.single
+      <span class="hljs-keyword">break</span> <span class="hljs-keyword">unless</span> @check(temp) <span class="hljs-keyword">or</span> temp <span class="hljs-keyword">in</span> @root.referencedVars
+      index++
+    @add temp, <span class="hljs-string">'var'</span>, <span class="hljs-literal">yes</span> <span class="hljs-keyword">if</span> options.reserve ? <span class="hljs-literal">true</span>
     temp</pre></div></div>
             
         </li>
@@ -330,9 +337,9 @@ compiler-generated variable. <code>_var</code>, <code>_var2</code>, and so on…
 
             </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>
+            <div class="content"><div class='highlight'><pre>  assign: <span class="hljs-function"><span class="hljs-params">(name, value)</span> -&gt;</span>
+    @add name, {value, assigned: <span class="hljs-literal">yes</span>}, <span class="hljs-literal">yes</span>
+    @hasAssignments = <span class="hljs-literal">yes</span></pre></div></div>
             
         </li>
         
@@ -347,8 +354,8 @@ compiler-generated variable. <code>_var</code>, <code>_var2</code>, and so on…
 
             </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>
+            <div class="content"><div class='highlight'><pre>  hasDeclarations: <span class="hljs-function">-&gt;</span>
+    !!@declaredVariables().length</pre></div></div>
             
         </li>
         
@@ -363,12 +370,8 @@ compiler-generated variable. <code>_var</code>, <code>_var2</code>, and so on…
 
             </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>
+            <div class="content"><div class='highlight'><pre>  declaredVariables: <span class="hljs-function">-&gt;</span>
+    (v.name <span class="hljs-keyword">for</span> v <span class="hljs-keyword">in</span> @variables <span class="hljs-keyword">when</span> v.type <span class="hljs-keyword">is</span> <span class="hljs-string">'var'</span>).sort()</pre></div></div>
             
         </li>
         
@@ -384,8 +387,8 @@ of this scope.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>  assignedVariables: <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> @variables <span class="hljs-keyword">when</span> v.type.assigned</pre></div></div>
             
         </li>
         

documentation/docs/sourcemap.html

@@ -144,15 +144,15 @@ positions for a single line of output JavaScript code.
             </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> = []
+  constructor: <span class="hljs-function"><span class="hljs-params">(@line)</span> -&gt;</span>
+    @columns = []
 
-  <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}
+  add: <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> @columns[column] <span class="hljs-keyword">and</span> options.noReplace
+    @columns[column] = {line: @line, 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>)
+  sourceLocation: <span class="hljs-function"><span class="hljs-params">(column)</span> -&gt;</span>
+    column-- <span class="hljs-keyword">until</span> (mapping = @columns[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>
@@ -186,8 +186,8 @@ 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>
+  constructor: <span class="hljs-function">-&gt;</span>
+    @lines = []</pre></div></div>
             
         </li>
         
@@ -205,9 +205,9 @@ effect.</p>
 
             </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>
+            <div class="content"><div class='highlight'><pre>  add: <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 = (@lines[line] <span class="hljs-keyword">or</span>= <span class="hljs-keyword">new</span> LineMap(line))
     lineMap.add column, sourceLocation, options</pre></div></div>
             
         </li>
@@ -224,8 +224,8 @@ 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>)
+            <div class="content"><div class='highlight'><pre>  sourceLocation: <span class="hljs-function"><span class="hljs-params">([line, column])</span> -&gt;</span>
+    line-- <span class="hljs-keyword">until</span> (lineMap = @lines[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>
@@ -257,7 +257,7 @@ 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>
+            <div class="content"><div class='highlight'><pre>  generate: <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>
@@ -265,7 +265,7 @@ set “sources” and “file”, respectively.</p>
     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> lineMap, lineNumber <span class="hljs-keyword">in</span> @lines <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>
@@ -306,7 +306,7 @@ column for the current line:</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>        buffer += <span class="hljs-property">@encodeVlq</span> mapping.column - lastColumn
+            <div class="content"><div class='highlight'><pre>        buffer += @encodeVlq mapping.column - lastColumn
         lastColumn = mapping.column</pre></div></div>
             
         </li>
@@ -322,7 +322,7 @@ column for the current line:</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>        buffer += <span class="hljs-property">@encodeVlq</span> <span class="hljs-number">0</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>        buffer += @encodeVlq <span class="hljs-number">0</span></pre></div></div>
             
         </li>
         
@@ -337,7 +337,7 @@ column for the current line:</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>        buffer += <span class="hljs-property">@encodeVlq</span> mapping.sourceLine - lastSourceLine
+            <div class="content"><div class='highlight'><pre>        buffer += @encodeVlq mapping.sourceLine - lastSourceLine
         lastSourceLine = mapping.sourceLine</pre></div></div>
             
         </li>
@@ -353,7 +353,7 @@ column for the current line:</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>        buffer += <span class="hljs-property">@encodeVlq</span> mapping.sourceColumn - lastSourceColumn
+            <div class="content"><div class='highlight'><pre>        buffer += @encodeVlq mapping.sourceColumn - lastSourceColumn
         lastSourceColumn = mapping.sourceColumn
         needComma = <span class="hljs-literal">yes</span></pre></div></div>
             
@@ -371,16 +371,16 @@ column for the current line:</p>
             </div>
             
             <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
+      version:    <span class="hljs-number">3</span>
+      file:       options.generatedFile <span class="hljs-keyword">or</span> <span class="hljs-string">''</span>
+      sourceRoot: options.sourceRoot <span class="hljs-keyword">or</span> <span class="hljs-string">''</span>
+      sources:    options.sourceFiles <span class="hljs-keyword">or</span> [<span class="hljs-string">''</span>]
+      names:      []
+      mappings:   buffer
 
-    v3.sourcesContent = [code] <span class="hljs-keyword">if</span> options.inline
+    v3.sourcesContent = [code] <span class="hljs-keyword">if</span> options.inlineMap
 
-    JSON.stringify v3, <span class="hljs-literal">null</span>, <span class="hljs-number">2</span></pre></div></div>
+    v3</pre></div></div>
             
         </li>
         
@@ -416,7 +416,7 @@ bits of the original value encoded into the first byte of the VLQ encoded value.
   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>
+  encodeVlq: <span class="hljs-function"><span class="hljs-params">(value)</span> -&gt;</span>
     answer = <span class="hljs-string">''</span></pre></div></div>
             
         </li>
@@ -466,7 +466,7 @@ bits of the original value encoded into the first byte of the VLQ encoded value.
       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 += @encodeBase64 nextChunk
 
     answer</pre></div></div>
             
@@ -497,7 +497,7 @@ bits of the original value encoded into the first byte of the VLQ encoded value.
             
             <div class="content"><div class='highlight'><pre>  BASE64_CHARS = <span class="hljs-string">'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'</span>
 
-  <span class="hljs-attribute">encodeBase64</span>: <span class="hljs-function"><span class="hljs-params">(value)</span> -&gt;</span>
+  encodeBase64: <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>
@@ -513,7 +513,7 @@ bits of the original value encoded into the first byte of the VLQ encoded value.
 
             </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>
+            <div class="content"><div class='highlight'><pre><span class="hljs-built_in">module</span>.exports = SourceMap</pre></div></div>
             
         </li>
         

documentation/images/just_logo.svg

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

documentation/images/logo.svg

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

documentation/js/aliases.js

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

documentation/js/array_comprehensions.js

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

documentation/js/block_comment.js

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

documentation/js/cake_tasks.js

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

documentation/js/chaining.js

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

documentation/js/classes.js

@@ -1,7 +1,7 @@
-// Generated by CoffeeScript 1.8.0
+// Generated by CoffeeScript 1.11.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; };
+  extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  hasProp = {}.hasOwnProperty;
 
 Animal = (function() {
   function Animal(name) {
@@ -16,8 +16,8 @@ Animal = (function() {
 
 })();
 
-Snake = (function(_super) {
-  __extends(Snake, _super);
+Snake = (function(superClass) {
+  extend(Snake, superClass);
 
   function Snake() {
     return Snake.__super__.constructor.apply(this, arguments);
@@ -32,8 +32,8 @@ Snake = (function(_super) {
 
 })(Animal);
 
-Horse = (function(_super) {
-  __extends(Horse, _super);
+Horse = (function(superClass) {
+  extend(Horse, superClass);
 
   function Horse() {
     return Horse.__super__.constructor.apply(this, arguments);

documentation/js/comparisons.js

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

documentation/js/conditionals.js

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

documentation/js/constructor_destructuring.js

@@ -1,9 +1,10 @@
-// Generated by CoffeeScript 1.8.0
+// Generated by CoffeeScript 1.11.0
 var Person, tim;
 
 Person = (function() {
   function Person(options) {
-    this.name = options.name, this.age = options.age, this.height = options.height;
+    var ref;
+    this.name = options.name, this.age = options.age, this.height = (ref = options.height) != null ? ref : 'average';
   }
 
   return Person;
@@ -11,5 +12,6 @@ Person = (function() {
 })();
 
 tim = new Person({
+  name: 'Tim',
   age: 4
 });

documentation/js/default_args.js

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

documentation/js/do.js

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

documentation/js/embedded.js

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

documentation/js/existence.js

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

documentation/js/expansion.js

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

documentation/js/expressions.js

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

documentation/js/expressions_assignment.js

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

documentation/js/expressions_comprehension.js

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

documentation/js/expressions_try.js

@@ -1,11 +1,11 @@
-// Generated by CoffeeScript 1.8.0
+// Generated by CoffeeScript 1.11.0
 var error;
 
 alert((function() {
   try {
     return nonexistent / void 0;
-  } catch (_error) {
-    error = _error;
+  } catch (error1) {
+    error = error1;
     return "And the error is ... " + error;
   }
 })());

documentation/js/fat_arrow.js

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

documentation/js/functions.js

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

documentation/js/generators.js

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

documentation/js/heredocs.js

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