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

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "coffee-script",
-  "version": "1.9.3",
+  "version": "1.11.0",
   "main": [
     "lib/coffee-script/coffee-script.js"
   ],
@@ -14,7 +14,7 @@
   "devDependencies": {
     "uglify-js": "~2.2",
     "jison": ">=0.2.0",
-    "highlight.js": "~8.0.0",
+    "highlight.js": "~9.6.0",
     "underscore": "~1.5.2",
     "docco": "~0.6.2"
   },

documentation/coffee/aliases.js

@@ -1,24 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var volume, winner;
-
-if (ignition === true) {
-  launch();
-}
-
-if (band !== SpinalTap) {
-  volume = 10;
-}
-
-if (answer !== false) {
-  letTheWildRumpusBegin();
-}
-
-if (car.speed < limit) {
-  accelerate();
-}
-
-if (pick === 47 || pick === 92 || pick === 13) {
-  winner = true;
-}
-
-print(inspect("My name is " + this.name));

documentation/coffee/array_comprehensions.js

@@ -1,24 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var courses, dish, food, foods, i, j, k, l, len, len1, len2, ref;
-
-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 = k = 0, len1 = courses.length; k < len1; i = ++k) {
-  dish = courses[i];
-  menu(i + 1, dish);
-}
-
-foods = ['broccoli', 'spinach', 'chocolate'];
-
-for (l = 0, len2 = foods.length; l < len2; l++) {
-  food = foods[l];
-  if (food !== 'chocolate') {
-    eat(food);
-  }
-}

documentation/coffee/block_comment.coffee

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

documentation/coffee/block_comment.js

@@ -1,7 +0,0 @@
-// Generated by CoffeeScript 1.9.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/cake_tasks.js

@@ -1,14 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var fs;
-
-fs = require('fs');
-
-option('-o', '--output [DIR]', 'directory for compiled code');
-
-task('build:parser', 'rebuild the Jison parser', function(options) {
-  var code, dir;
-  require('jison');
-  code = require('./lib/grammar').parser.generate();
-  dir = options.output || 'lib';
-  return fs.writeFile(dir + "/parser.js", code);
-});

documentation/coffee/chaining.coffee

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

documentation/coffee/chaining.js

@@ -1,4 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-$('body').click(function(e) {
-  return $('.box').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/classes.js

@@ -1,57 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var Animal, Horse, Snake, sam, tom,
-  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) {
-    this.name = name;
-  }
-
-  Animal.prototype.move = function(meters) {
-    return alert(this.name + (" moved " + meters + "m."));
-  };
-
-  return Animal;
-
-})();
-
-Snake = (function(superClass) {
-  extend(Snake, superClass);
-
-  function Snake() {
-    return Snake.__super__.constructor.apply(this, arguments);
-  }
-
-  Snake.prototype.move = function() {
-    alert("Slithering...");
-    return Snake.__super__.move.call(this, 5);
-  };
-
-  return Snake;
-
-})(Animal);
-
-Horse = (function(superClass) {
-  extend(Horse, superClass);
-
-  function Horse() {
-    return Horse.__super__.constructor.apply(this, arguments);
-  }
-
-  Horse.prototype.move = function() {
-    alert("Galloping...");
-    return Horse.__super__.move.call(this, 45);
-  };
-
-  return Horse;
-
-})(Animal);
-
-sam = new Snake("Sammy the Python");
-
-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/comparisons.js

@@ -1,6 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var cholesterol, healthy;
-
-cholesterol = 127;
-
-healthy = (200 > cholesterol && cholesterol > 60);

documentation/coffee/conditionals.coffee

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

documentation/coffee/conditionals.js

@@ -1,15 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var date, mood;
-
-if (singing) {
-  mood = greatlyImproved;
-}
-
-if (happy && knowsIt) {
-  clapsHands();
-  chaChaCha();
-} else {
-  showIt();
-}
-
-date = friday ? sue : 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/constructor_destructuring.js

@@ -1,15 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var Person, tim;
-
-Person = (function() {
-  function Person(options) {
-    this.name = options.name, this.age = options.age, this.height = options.height;
-  }
-
-  return Person;
-
-})();
-
-tim = new Person({
-  age: 4
-});

documentation/coffee/default_args.coffee

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

documentation/coffee/default_args.js

@@ -1,9 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var fill;
-
-fill = function(container, liquid) {
-  if (liquid == null) {
-    liquid = "coffee";
-  }
-  return "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/do.js

@@ -1,12 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var filename, fn, i, len;
-
-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);
-}

documentation/coffee/embedded.coffee

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

documentation/coffee/embedded.js

@@ -1,6 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var hi;
-
-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/existence.js

@@ -1,14 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var footprints, solipsism, speed;
-
-if ((typeof mind !== "undefined" && mind !== null) && (typeof world === "undefined" || world === null)) {
-  solipsism = true;
-}
-
-speed = 0;
-
-if (speed == null) {
-  speed = 15;
-}
-
-footprints = typeof yeti !== "undefined" && yeti !== null ? 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/expansion.js

@@ -1,6 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-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];

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.js

@@ -1,18 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var eldest, grade;
-
-grade = function(student) {
-  if (student.excellentWork) {
-    return "A+";
-  } else if (student.okayStuff) {
-    if (student.triedHard) {
-      return "B";
-    } else {
-      return "B-";
-    }
-  } else {
-    return "C";
-  }
-};
-
-eldest = 24 > 21 ? "Liz" : "Ike";

documentation/coffee/expressions_assignment.coffee

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

documentation/coffee/expressions_assignment.js

@@ -1,4 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var one, six, three, two;
-
-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_comprehension.js

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

documentation/coffee/expressions_try.coffee

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

documentation/coffee/expressions_try.js

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

documentation/coffee/fat_arrow.coffee

@@ -3,4 +3,4 @@ Account = (customer, cart) ->
   @cart = cart
 
   $('.shopping_cart').on 'click', (event) =>
-    @customer.purchase @cart
+    @customer.purchase @cart

documentation/coffee/fat_arrow.js

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

documentation/coffee/functions.js

@@ -1,10 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var cube, square;
-
-square = function(x) {
-  return x * x;
-};
-
-cube = function(x) {
-  return square(x) * x;
-};

documentation/coffee/generators.coffee

@@ -5,4 +5,4 @@ perfectSquares = ->
     yield num * num
   return
 
-window.ps or= perfectSquares()
+window.ps or= perfectSquares()

documentation/coffee/generators.js

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

documentation/coffee/heredocs.coffee

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

documentation/coffee/heredocs.js

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

documentation/coffee/heregexes.coffee

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

documentation/coffee/heregexes.js

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

documentation/coffee/interpolation.coffee

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

documentation/coffee/interpolation.js

@@ -1,8 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var author, quote, sentence;
-
-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.js

@@ -1,8 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var modulo = function(a, b) { return (+a % (b = +b) + b) % b; };
-
--7 % 5 === -2;
-
-modulo(-7, 5) === 3;
-
-tabs.selectTabAtIndex(modulo(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/multiple_return_values.js

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

documentation/coffee/object_comprehensions.js

@@ -1,18 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var age, ages, child, yearsOld;
-
-yearsOld = {
-  max: 10,
-  ida: 9,
-  tim: 11
-};
-
-ages = (function() {
-  var results;
-  results = [];
-  for (child in yearsOld) {
-    age = yearsOld[child];
-    results.push(child + " is " + age);
-  }
-  return results;
-})();

documentation/coffee/object_extraction.coffee

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

documentation/coffee/object_extraction.js

@@ -1,13 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var city, futurists, name, ref, ref1, street;
-
-futurists = {
-  sculptor: "Umberto Boccioni",
-  painter: "Vladimir Burliuk",
-  poet: {
-    name: "F.T. Marinetti",
-    address: ["Via Roma 42R", "Bellagio, Italy 22021"]
-  }
-};
-
-ref = futurists.poet, name = ref.name, (ref1 = ref.address, street = ref1[0], city = ref1[1]);

documentation/coffee/objects_and_arrays.coffee

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

documentation/coffee/objects_and_arrays.js

@@ -1,22 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var bitlist, kids, singers, song;
-
-song = ["do", "re", "mi", "fa", "so"];
-
-singers = {
-  Jagger: "Rock",
-  Elvis: "Roll"
-};
-
-bitlist = [1, 0, 1, 0, 0, 1, 1, 1, 0];
-
-kids = {
-  brother: {
-    name: "Max",
-    age: 11
-  },
-  sister: {
-    name: "Ida",
-    age: 9
-  }
-};

documentation/coffee/objects_reserved.coffee

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

documentation/coffee/objects_reserved.js

@@ -1,6 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-$('.account').attr({
-  "class": 'active'
-});
-
-log(object["class"]);

documentation/coffee/overview.js

@@ -1,45 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var cubes, list, math, num, number, opposite, race, square,
-  slice = [].slice;
-
-number = 42;
-
-opposite = true;
-
-if (opposite) {
-  number = -42;
-}
-
-square = function(x) {
-  return x * x;
-};
-
-list = [1, 2, 3, 4, 5];
-
-math = {
-  root: Math.sqrt,
-  square: square,
-  cube: function(x) {
-    return x * square(x);
-  }
-};
-
-race = function() {
-  var runners, winner;
-  winner = arguments[0], runners = 2 <= arguments.length ? slice.call(arguments, 1) : [];
-  return print(winner, runners);
-};
-
-if (typeof elvis !== "undefined" && elvis !== null) {
-  alert("I knew it!");
-}
-
-cubes = (function() {
-  var i, len, results;
-  results = [];
-  for (i = 0, len = list.length; i < len; i++) {
-    num = list[i];
-    results.push(math.cube(num));
-  }
-  return results;
-})();

documentation/coffee/parallel_assignment.coffee

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

documentation/coffee/parallel_assignment.js

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

documentation/coffee/patterns_and_splats.coffee

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

documentation/coffee/patterns_and_splats.js

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

documentation/coffee/prototypes.coffee

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

documentation/coffee/prototypes.js

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

documentation/coffee/range_comprehensions.coffee

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

documentation/coffee/range_comprehensions.js

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

documentation/coffee/scope.coffee

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

documentation/coffee/scope.js

@@ -1,12 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var changeNumbers, inner, outer;
-
-outer = 1;
-
-changeNumbers = function() {
-  var inner;
-  inner = -1;
-  return outer = 10;
-};
-
-inner = changeNumbers();

documentation/coffee/slices.js

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

documentation/coffee/soaks.js

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

documentation/coffee/splats.coffee

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

documentation/coffee/splats.js

@@ -1,23 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var awardMedals, contenders, gold, rest, silver,
-  slice = [].slice;
-
-gold = silver = rest = "unknown";
-
-awardMedals = function() {
-  var first, others, second;
-  first = arguments[0], second = arguments[1], others = 3 <= arguments.length ? slice.call(arguments, 2) : [];
-  gold = first;
-  silver = second;
-  return rest = others;
-};
-
-contenders = ["Michael Phelps", "Liu Xiang", "Yao Ming", "Allyson Felix", "Shawn Johnson", "Roman Sebrle", "Guo Jingjing", "Tyson Gay", "Asafa Powell", "Usain Bolt"];
-
-awardMedals.apply(null, 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/splices.js

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

documentation/coffee/strings.coffee

@@ -4,5 +4,3 @@ mobyDick = "Call me Ishmael. Some years ago --
   to interest me on shore, I thought I would sail
   about a little and see the watery part of the
   world..."
-
-

documentation/coffee/strings.js

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

documentation/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/switch.js

@@ -1,24 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-switch (day) {
-  case "Mon":
-    go(work);
-    break;
-  case "Tue":
-    go(relax);
-    break;
-  case "Thu":
-    go(iceFishing);
-    break;
-  case "Fri":
-  case "Sat":
-    if (day === bingoDay) {
-      go(bingo);
-      go(dancing);
-    }
-    break;
-  case "Sun":
-    go(church);
-    break;
-  default:
-    go(work);
-}

documentation/coffee/switch_with_no_expression.js

@@ -1,19 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var grade, score;
-
-score = 76;
-
-grade = (function() {
-  switch (false) {
-    case !(score < 60):
-      return 'F';
-    case !(score < 70):
-      return 'D';
-    case !(score < 80):
-      return 'C';
-    case !(score < 90):
-      return 'B';
-    default:
-      return 'A';
-  }
-})();

documentation/coffee/try.coffee

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

documentation/coffee/try.js

@@ -1,12 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var error;
-
-try {
-  allHellBreaksLoose();
-  catsAndDogsLivingTogether();
-} catch (_error) {
-  error = _error;
-  print(error);
-} finally {
-  cleanUp();
-}

documentation/coffee/while.js

@@ -1,22 +0,0 @@
-// Generated by CoffeeScript 1.9.3
-var lyrics, num;
-
-if (this.studyingEconomics) {
-  while (supply > demand) {
-    buy();
-  }
-  while (!(supply > demand)) {
-    sell();
-  }
-}
-
-num = 6;
-
-lyrics = (function() {
-  var results;
-  results = [];
-  while (num -= 1) {
-    results.push(num + " little monkeys, jumping on the bed. One fell out and bumped his head.");
-  }
-  return results;
-})();

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,8 +257,8 @@ 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">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,

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.9.3'</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,18 +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> 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>
+            <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>
         
@@ -194,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>
@@ -204,11 +225,12 @@ 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
 
   tokens = lexer.tokenize code, options</pre></div></div>
@@ -216,11 +238,11 @@ lookups.</p>
         </li>
         
         
-        <li id="section-6">
+        <li id="section-7">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-6">&#182;</a>
+                <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>
@@ -228,8 +250,27 @@ 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.variable
-  )
+    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
 
@@ -243,69 +284,17 @@ the same name.</p>
         </li>
         
         
-        <li id="section-7">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-7">&#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</pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-8">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-8">&#182;</a>
-              </div>
-              <p>Do not include empty, whitespace, or semicolon-only fragments.</p>
-
-            </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]
-          {<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-9">
             <div class="annotation">
               
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-9">&#182;</a>
               </div>
-              <p>Copy the code from each fragment into the final JavaScript.</p>
+              <p>Update the sourcemap with data from each fragment</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>
+            <div class="content"><div class='highlight'><pre>    <span class="hljs-keyword">if</span> generateSourceMap</pre></div></div>
             
         </li>
         
@@ -316,12 +305,21 @@ the same name.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-10">&#182;</a>
               </div>
-              <p>Tokenize a string of CoffeeScript code, and return the array of tokens.</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>.tokens = withPrettyErrors <span class="hljs-function"><span class="hljs-params">(code, options)</span> -&gt;</span>
-  lexer.tokenize code, options</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>
         
@@ -332,17 +330,33 @@ the same name.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-11">&#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>Copy the code from each fragment into the final JavaScript.</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
+            <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>
-    parser.parse source</pre></div></div>
+    js</pre></div></div>
             
         </li>
         
@@ -353,13 +367,12 @@ or traverse it by using <code>.traverseChildren()</code> with a callback.</p>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-12">&#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>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>.<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>exports.tokens = withPrettyErrors (code, options) -&gt;
+  lexer.tokenize code, options</pre></div></div>
             
         </li>
         
@@ -370,6 +383,44 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
               <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>
@@ -380,11 +431,11 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
         </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>Clear the module cache.</p>
 
@@ -395,11 +446,11 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
         </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>Assign paths for node_modules loading</p>
 
@@ -414,11 +465,11 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
         </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>Compile.</p>
 
@@ -433,22 +484,22 @@ setting <code>__filename</code>, <code>__dirname</code>, and relative <code>requ
         </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>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()
   createContext = vm.Script.createContext ? vm.createContext
 
-  isContext = vm.isContext ? <span class="hljs-function"><span class="hljs-params">(ctx)</span> -&gt;</span>
+  isContext = vm.isContext ? (ctx) -&gt;
     options.sandbox <span class="hljs-keyword">instanceof</span> createContext().constructor
 
   <span class="hljs-keyword">if</span> createContext
@@ -467,11 +518,11 @@ The CoffeeScript REPL uses this to run the input.</p>
         </li>
         
         
-        <li id="section-18">
+        <li id="section-20">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-18">&#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>
 
@@ -480,63 +531,10 @@ 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>
-            
-        </li>
-        
-        
-        <li id="section-19">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-19">&#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
-  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>
-  js = compile code, o
-  <span class="hljs-keyword">if</span> sandbox <span class="hljs-keyword">is</span> <span class="hljs-built_in">global</span>
-    vm.runInThisContext js
-  <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>
-            
-        </li>
-        
-        
-        <li id="section-20">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-20">&#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">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>
-  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})
-  <span class="hljs-keyword">catch</span> err</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>
         
@@ -547,6 +545,64 @@ The CoffeeScript REPL uses this to run the input.</p>
               <div class="pilwrap ">
                 <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.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>
+  js = compile code, o
+  <span class="hljs-keyword">if</span> sandbox <span class="hljs-keyword">is</span> <span class="hljs-built_in">global</span>
+    vm.runInThisContext js
+  <span class="hljs-keyword">else</span>
+    vm.runInContext js, sandbox
+
+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-22">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <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> @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>
+
+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, inlineMap
+      sourceFiles: [filename]
+      literate: helpers.isLiterate filename
+    }
+  <span class="hljs-keyword">catch</span> err</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-23">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <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
 information to error so it can be pretty-printed later.</p>
@@ -560,11 +616,11 @@ information to error so it can be pretty-printed later.</p>
         </li>
         
         
-        <li id="section-22">
+        <li id="section-24">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-22">&#182;</a>
+                <a class="pilcrow" href="#section-24">&#182;</a>
               </div>
               <p>Instantiate a Lexer for our use here.</p>
 
@@ -575,11 +631,11 @@ information to error so it can be pretty-printed later.</p>
         </li>
         
         
-        <li id="section-23">
+        <li id="section-25">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-23">&#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
@@ -588,62 +644,62 @@ 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 = parser.tokens[<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
+      [tag, @yytext, @yylloc] = token
       parser.errorToken = token.origin <span class="hljs-keyword">or</span> token
-      <span class="hljs-property">@yylineno</span> = <span class="hljs-property">@yylloc</span>.first_line
+      @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">(tokens)</span> -&gt;</span>
+  setInput: <span class="hljs-function"><span class="hljs-params">(tokens)</span> -&gt;</span>
     parser.tokens = tokens
-    <span class="hljs-property">@pos</span> = <span class="hljs-number">0</span>
-  <span class="hljs-attribute">upcomingInput</span>:<span class="hljs-function"> -&gt;</span>
+    @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-24">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-24">&#182;</a>
-              </div>
-              <p>Make all the AST nodes visible to the parser.</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>parser.yy = <span class="hljs-built_in">require</span> <span class="hljs-string">'./nodes'</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>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>
-            
-        </li>
-        
-        
         <li id="section-26">
             <div class="annotation">
               
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-26">&#182;</a>
               </div>
-              <p>Disregard Jison’s message, it contains redundant line numer information.
+              <p>Make all the AST nodes visible to the parser.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>parser.yy = <span class="hljs-built_in">require</span> <span class="hljs-string">'./nodes'</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-27">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <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.parseError = <span class="hljs-function"><span class="hljs-params">(message, {token})</span> -&gt;</span></pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-28">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-28">&#182;</a>
+              </div>
+              <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>
 
@@ -657,7 +713,7 @@ the error is caused by a generated token which might refer to its origin.</p>
       <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">'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-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>
@@ -665,11 +721,11 @@ the error is caused by a generated token which might refer to its origin.</p>
         </li>
         
         
-        <li id="section-27">
+        <li id="section-29">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-27">&#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>
@@ -683,11 +739,11 @@ from the lexer.</p>
         </li>
         
         
-        <li id="section-28">
+        <li id="section-30">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-28">&#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>
@@ -715,11 +771,11 @@ Modified to handle sourceMap</p>
         </li>
         
         
-        <li id="section-29">
+        <li id="section-31">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-29">&#182;</a>
+                <a class="pilcrow" href="#section-31">&#182;</a>
               </div>
               <p>Check for a sourceMap position</p>
 
@@ -760,11 +816,11 @@ Modified to handle sourceMap</p>
         </li>
         
         
-        <li id="section-30">
+        <li id="section-32">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-30">&#182;</a>
+                <a class="pilcrow" href="#section-32">&#182;</a>
               </div>
               <p>Map of filenames -&gt; sourceMap object.</p>
 
@@ -775,11 +831,11 @@ Modified to handle sourceMap</p>
         </li>
         
         
-        <li id="section-31">
+        <li id="section-33">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-31">&#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>
 
@@ -787,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-32">
+        <li id="section-34">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-32">&#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
@@ -807,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

@@ -160,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>
         
@@ -206,6 +206,7 @@ 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>]
@@ -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,7 @@ 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
@@ -306,9 +307,9 @@ Many flags cause us to divert before compiling anything. Flags passed after
   <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
-
-<span class="hljs-function"><span class="hljs-title">makePrelude</span> = <span class="hljs-params">(requires)</span> -&gt;</span>
-  requires.map <span class="hljs-function"><span class="hljs-params">(<span class="hljs-built_in">module</span>)</span> -&gt;</span>
+<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>
@@ -366,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>
@@ -425,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>
@@ -447,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>
         
@@ -471,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>
@@ -495,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>
@@ -505,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>
@@ -519,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()
 
@@ -552,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
@@ -568,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
 
@@ -578,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
@@ -609,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
@@ -656,12 +657,12 @@ the compiled JS version as well.</p>
             <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> <span class="hljs-function"><span class="hljs-title">mkdirs</span> = <span class="hljs-params">(p = dir, fn)</span> -&gt;</span>
+  <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>
+        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>
@@ -686,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>
@@ -792,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
@@ -804,15 +806,15 @@ 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>
@@ -834,9 +836,9 @@ 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">stdio</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>

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>
@@ -315,7 +315,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>.some = <span class="hljs-attribute">Array</span>::some ? <span class="hljs-function"><span class="hljs-params">(fn)</span> -&gt;</span>
+            <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>
             
@@ -334,7 +334,7 @@ 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,10 +363,10 @@ 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>
         
@@ -383,8 +383,8 @@ 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>
+            <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)
 
@@ -404,7 +404,7 @@ 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">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
 
@@ -427,8 +427,8 @@ 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">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>
@@ -450,7 +450,7 @@ 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">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.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>
         
@@ -465,7 +465,7 @@ 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">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.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>
         
@@ -483,7 +483,7 @@ 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>
+            <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>
@@ -521,7 +521,7 @@ 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>
         
@@ -541,16 +541,16 @@ 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>
@@ -585,18 +585,18 @@ it already.</p>
             <div class="content"><div class='highlight'><pre>  <span class="hljs-keyword">if</span> process?
     colorsEnabled = process.stdout?.isTTY <span class="hljs-keyword">and</span> <span class="hljs-keyword">not</span> process.env?.NODE_DISABLE_COLORS
 
-  <span class="hljs-keyword">if</span> <span class="hljs-property">@colorful</span> ? colorsEnabled
-    <span class="hljs-function"><span class="hljs-title">colorize</span> = <span class="hljs-params">(str)</span> -&gt;</span> <span class="hljs-string">"\x1B[1;31m<span class="hljs-subst">#{str}</span>\x1B[0m"</span>
+  <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>
         
@@ -208,7 +208,7 @@ parens. Unwrap all that.</p>
             </div>
             
             <div class="content"><div class='highlight'><pre>      referencedVars = (
-        token[<span class="hljs-number">1</span>] <span class="hljs-keyword">for</span> token <span class="hljs-keyword">in</span> tokens <span class="hljs-keyword">when</span> token.variable
+        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>
@@ -242,7 +242,7 @@ parens. Unwrap all that.</p>
             <div class="content"><div class='highlight'><pre>      ast = <span class="hljs-keyword">new</span> Block [
         <span class="hljs-keyword">new</span> Assign (<span class="hljs-keyword">new</span> Value <span class="hljs-keyword">new</span> Literal <span class="hljs-string">'_'</span>), ast, <span class="hljs-string">'='</span>
       ]
-      js = ast.compile {<span class="hljs-attribute">bare</span>: <span class="hljs-literal">yes</span>, <span class="hljs-attribute">locals</span>: Object.keys(context), referencedVars}
+      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>
             
@@ -261,14 +261,14 @@ parens. Unwrap all that.</p>
             
             <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-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>
+<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>
@@ -287,10 +287,10 @@ parens. Unwrap all that.</p>
             <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>
+    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>
         
@@ -504,13 +504,13 @@ parens. Unwrap all that.</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>
+    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>
+    <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>
         
@@ -528,7 +528,7 @@ parens. Unwrap all that.</p>
             <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.<span class="hljs-literal">on</span> <span class="hljs-string">'exit'</span>,<span class="hljs-function"> -&gt;</span> fs.close fd</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>
         
@@ -544,12 +544,12 @@ parens. Unwrap all that.</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>
+    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>
+<span class="hljs-function">
+<span class="hljs-title">getCommandId</span> = <span class="hljs-params">(repl, commandName)</span> -&gt;</span></pre></div></div>
             
         </li>
         
@@ -567,9 +567,9 @@ parens. Unwrap all that.</p>
             <div class="content"><div class='highlight'><pre>  commandsHaveLeadingDot = repl.commands[<span class="hljs-string">'.help'</span>]?
   <span class="hljs-keyword">if</span> commandsHaveLeadingDot <span class="hljs-keyword">then</span> <span class="hljs-string">".<span class="hljs-subst">#{commandName}</span>"</span> <span class="hljs-keyword">else</span> commandName
 
-<span class="hljs-built_in">module</span>.<span class="hljs-built_in">exports</span> =
-  <span class="hljs-attribute">start</span>: <span class="hljs-function"><span class="hljs-params">(opts = {})</span> -&gt;</span>
-    [major, minor, build] = process.versions.node.split<span class="hljs-function"><span class="hljs-params">(<span class="hljs-string">'.'</span>)</span>.<span class="hljs-title">map</span> <span class="hljs-params">(n)</span> -&gt;</span> parseInt(n)
+<span class="hljs-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>
@@ -580,7 +580,7 @@ parens. Unwrap all that.</p>
     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
+    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>
             

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>
@@ -321,13 +321,13 @@ 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">indexOfTag</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-number">1</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-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>
@@ -345,16 +345,14 @@ 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-keyword">return</span> <span class="hljs-literal">yes</span> <span class="hljs-keyword">if</span> <span class="hljs-property">@indexOfTag</span>(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> <span class="hljs-property">@indexOfTag</span>(j, <span class="hljs-literal">null</span>, <span class="hljs-string">':'</span>) &gt; -<span class="hljs-number">1</span>
-    index = <span class="hljs-property">@indexOfTag</span>(j, EXPRESSION_START)
-    <span class="hljs-keyword">if</span> index &gt; -<span class="hljs-number">1</span>
+            <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>
-      <span class="hljs-property">@detectEnd</span> index + <span class="hljs-number">1</span>, <span class="hljs-function"><span class="hljs-params">((token) -&gt; token[<span class="hljs-number">0</span>] <span class="hljs-keyword">in</span> EXPRESSION_END)</span>, <span class="hljs-params">((token, i) -&gt; end = i)</span>
-      <span class="hljs-title">return</span> <span class="hljs-title">yes</span> <span class="hljs-title">if</span> @<span class="hljs-title">tag</span><span class="hljs-params">(end + <span class="hljs-number">1</span>)</span> <span class="hljs-title">is</span> ':'
-    <span class="hljs-title">no</span>
-
-</span></pre></div></div>
+      @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>
         
@@ -371,16 +369,16 @@ 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>
         
@@ -396,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>
         
@@ -414,11 +412,11 @@ add them.</p>
             <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>
@@ -435,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>
         
@@ -450,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>
         
@@ -468,28 +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>, [<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>]
+        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
@@ -510,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>
@@ -612,19 +610,19 @@ 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>
@@ -632,8 +630,8 @@ 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">@indexOfTag</span>(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> <span class="hljs-property">@looksObjectish</span>(i + <span class="hljs-number">2</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>,
+         @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>]
@@ -668,10 +666,10 @@ that creates grammatical ambiguities.</p>
             </div>
             
             <div class="content"><div class='highlight'><pre>        s = <span class="hljs-keyword">switch</span>
-          <span class="hljs-keyword">when</span> <span class="hljs-property">@tag</span>(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> <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> i - <span class="hljs-number">2</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> <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>
+        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>
         
@@ -686,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>
         
@@ -705,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)
@@ -723,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>
@@ -773,7 +771,7 @@ 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>
+            <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>
             
@@ -793,7 +791,7 @@ 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>
@@ -812,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>
         
@@ -859,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>
@@ -893,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>
@@ -944,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>
@@ -976,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
@@ -986,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>
         
@@ -1001,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>
         
@@ -1067,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>
         
@@ -1117,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>
         
@@ -1133,9 +1131,11 @@ 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">'STRING_START'</span>, <span class="hljs-string">'JS'</span>, <span class="hljs-string">'REGEX'</span>, <span class="hljs-string">'REGEX_START'</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">'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">'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>
 ]