CoffeeScript 0.2.1

coffee compiles CoffeeScript source files into JavaScript.

Usage:
  coffee path/to/script.coffee
    -i, --interactive                run a CoffeeScript REPL (requires Narwhal)
    -r, --run                        compile and run a script (requires Narwhal)
    -o, --output [DIR]               set the directory for compiled JavaScript
    -w, --watch                      watch scripts for changes, and recompile
    -p, --print                      print the compiled JavaScript to stdout
    -l, --lint                       pipe the compiled JavaScript through JSLint
    -e, --eval                       compile a cli scriptlet or read from stdin
    -t, --tokens                     print the tokens that the lexer produces
    -v, --verbose                    print at every step of code generation
    -n, --no-wrap                    raw output, no safety wrapper or vars
        --install-bundle             install the CoffeeScript TextMate bundle
        --version                    display CoffeeScript version
    -h, --help                       display this help message outside of the coffee-script directory

.gitignore

@@ -1,7 +1,4 @@
-presentation
 test.coffee
 parser.output
-lib/coffee_script/parser.rb
 test/fixtures/underscore
-examples/beautiful_code/parse.coffee
 *.gem

LICENSE

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

README

@@ -36,6 +36,3 @@
 
   The source repository:
   git://github.com/jashkenas/coffee-script.git
-  
-  To build CoffeeScript from source, install the "racc" gem and
-  run "rake build:parser". Then bin/coffee will work.

Rakefile

@@ -29,11 +29,6 @@ namespace :build do
     sh "sudo mv coffeescript.yaml /usr/local/lib/ruby/gems/1.8/gems/ultraviolet-0.10.2/syntax/coffeescript.syntax"
   end
 
-  desc "Rebuild the Underscore.coffee documentation page"
-  task :underscore do
-    sh "uv -s coffeescript -t idle -h examples/underscore.coffee > documentation/underscore.html"
-  end
-
 end
 
 desc "Build the documentation page"

coffee-script.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'coffee-script'
-  s.version   = '0.2.6'         # Keep version in sync with coffee-script.rb
-  s.date      = '2010-1-17'
+  s.version   = '0.2.1'         # Keep version in sync with coffee-script.rb
+  s.date      = '2010-1-5'
 
   s.homepage    = "http://jashkenas.github.com/coffee-script/"
   s.summary     = "The CoffeeScript Compiler"

documentation/coffee/comparisons.coffee

@@ -1,5 +0,0 @@
-cholesterol: 127
-
-healthy: 200 > cholesterol > 60
-
-

documentation/coffee/existence.coffee

@@ -1,8 +1 @@
-solipsism: true if mind? and not world?
-
-speed ?= 140
-
-
-
-
-
+solipsism: true if mind? and not world?

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 property, name in window)[0...10]

documentation/coffee/expressions_try.coffee

@@ -2,5 +2,5 @@ alert(
   try
     nonexistent / undefined
   catch error
-    "Caught an error: " + error
+    "The error is: " + error
 )

documentation/coffee/functions.coffee

@@ -1,2 +1,2 @@
 square: x => x * x
-cube:   x => square(x) * x
+cube:   x => square(x) * x

documentation/coffee/heredocs.coffee

@@ -1,5 +0,0 @@
-html: '''
-      <strong>
-        cup of coffeescript
-      </strong>
-      '''

documentation/coffee/long_arrow.coffee

@@ -1,6 +0,0 @@
-Account: customer, cart =>
-  this.customer: customer
-  this.cart: cart
-
-  $('.shopping_cart').bind('click') event ==>
-    this.customer.purchase(this.cart)

documentation/coffee/multiple_return_values.coffee

@@ -1,5 +0,0 @@
-weather_report: location =>
-  # Make an Ajax request to fetch the weather...
-  [location, 72, "Mostly Sunny"]
-
-[city, temp, forecast]: weather_report("Berkeley, CA")

documentation/coffee/object_comprehensions.coffee

@@ -1,4 +1,3 @@
 years_old: {max: 10, ida: 9, tim: 11}
 
-ages: for child, age of years_old
-  child + " is " + age
+ages: child + " is " + age for age, child in years_old

documentation/coffee/object_extraction.coffee

@@ -1,13 +0,0 @@
-futurists: {
-  sculptor: "Umberto Boccioni"
-  painter:  "Vladimir Burliuk"
-  poet: {
-    name:   "F.T. Marinetti"
-    address: [
-      "Via Roma 42R"
-      "Bellagio, Italy 22021"
-    ]
-  }
-}
-
-{poet: {name: poet, address: [street, city]}}: futurists

documentation/coffee/overview.coffee

@@ -19,7 +19,7 @@ math: {
 }
 
 # Splats:
-race: winner, runners... =>
+race: winner, *runners =>
   print(winner, runners)
 
 # Existence:

documentation/coffee/parallel_assignment.coffee

@@ -1,4 +0,0 @@
-bait: 1000
-and_switch: 0
-
-[bait, and_switch]: [and_switch, bait]

documentation/coffee/range_comprehensions.coffee

@@ -1,6 +1,3 @@
-countdown: num for num in [10..1]
-
-egg_delivery: =>
-  for i in [0...eggs.length] by 12
-    dozen_eggs: eggs[i...i+12]
-    deliver(new egg_carton(dozen))
+for i in [0...eggs.length] by 12
+  dozen_eggs: eggs[i...i+12]
+  deliver(new egg_carton(dozen))

documentation/coffee/splats.coffee

@@ -1,6 +1,6 @@
 gold: silver: the_field: "unknown"
 
-medalists: first, second, rest... =>
+medalists: first, second, *rest =>
   gold:       first
   silver:     second
   the_field:  rest
@@ -18,7 +18,7 @@ contenders: [
   "Usain Bolt"
 ]
 
-medalists(contenders...)
+medalists(*contenders)
 
 alert("Gold: " + gold)
 alert("Silver: " + silver)

documentation/coffee/super.coffee

@@ -1,16 +1,16 @@
 Animal: =>
-Animal::move: meters =>
+Animal.prototype.move: meters =>
   alert(this.name + " moved " + meters + "m.")
 
 Snake: name => this.name: name
 Snake extends Animal
-Snake::move: =>
+Snake.prototype.move: =>
   alert("Slithering...")
   super(5)
 
 Horse: name => this.name: name
 Horse extends Animal
-Horse::move: =>
+Horse.prototype.move: =>
   alert("Galloping...")
   super(45)
 

documentation/coffee/switch.coffee

@@ -1,10 +1,9 @@
 switch day
-  when "Mon" then go_to_work()
-  when "Tue" then go_to_the_park()
-  when "Thu" then go_ice_fishing()
-  when "Fri", "Sat"
+  when "Tuesday"   then eat_breakfast()
+  when "Wednesday" then go_to_the_park()
+  when "Saturday"
     if day is bingo_day
       go_to_bingo()
       go_dancing()
-  when "Sun" then go_to_church()
+  when "Sunday"    then go_to_church()
   else go_to_work()

documentation/coffee/while.coffee

@@ -1,8 +1,5 @@
-if this.studying_economics
-  while supply > demand then buy()
-  while supply < demand then sell()
+while demand > supply
+  sell()
+  restock()
 
-num: 6
-lyrics: while num -= 1
-  num + " little monkeys, jumping on the bed.
-    One fell out and bumped his head."
+while supply > demand then buy()

documentation/index.html.erb

@@ -1,3 +1,18 @@
+<%#
+  TODO:
+  Multiline and nested array comprehensions (and filters with 'when').
+  Range comprehension examples (expression endpoints), with steps.
+  Object comprehension examples.
+  Significant Whitespace Rules.
+  Newline-delimited Matrix.
+  Automatic newline escaping.
+  All functions are named functions.
+  Splats in function definitions.
+  (Multiple) splats as arguments to a function call.
+  Exists?
+  Array assignment splice literals.
+%>
+
 <%
   require 'uv'
   def code_for(file, executable=false)
@@ -40,8 +55,8 @@
     <p>
       <b>Disclaimer:</b>
       CoffeeScript is just for fun and seriously alpha. I'm sure that there are still
-      plenty of holes in the walls and leaks in the roof. <i>There are no guarantees
-      that the syntax won't change between versions.</i> That said,
+      plenty of holes in the lexer and leaks in the syntax. <i>There is no guarantee,
+      explicit or implied, of its suitability for any purpose.</i> That said,
       it compiles into clean JavaScript (the good parts) that can use existing
       JavaScript libraries seamlessly, and passes through
       <a href="http://www.jslint.com/">JSLint</a> without warnings. The compiled
@@ -51,7 +66,7 @@
 
     <p>
       <b>Latest Version:</b>
-      <a href="http://gemcutter.org/gems/coffee-script">0.2.6</a>
+      <a href="http://gemcutter.org/gems/coffee-script">0.2.1</a>
     </p>
 
     <h2>Table of Contents</h2>
@@ -65,9 +80,9 @@
       <a href="#objects_and_arrays">Objects and Arrays</a><br />
       <a href="#lexical_scope">Lexical Scoping and Variable Safety</a><br />
       <a href="#conditionals">Conditionals, Ternaries, and Conditional Assignment</a><br />
-      <a href="#existence">The Existential Operator</a><br />
+      <a href="#existence">The Existence Operator</a><br />
       <a href="#aliases">Aliases</a><br />
-      <a href="#splats">Splats...</a><br />
+      <a href="#splats">Splats</a><br />
       <a href="#arguments">Arguments are Arrays</a><br />
       <a href="#while">While Loops</a><br />
       <a href="#comprehensions">Comprehensions (Arrays, Objects, and Ranges)</a><br />
@@ -75,13 +90,10 @@
       <a href="#expressions">Everything is an Expression</a><br />
       <a href="#inheritance">Inheritance, and Calling Super from a Subclass</a><br />
       <a href="#blocks">Blocks</a><br />
-      <a href="#pattern_matching">Pattern Matching</a><br />
-      <a href="#long_arrow">Function Binding</a><br />
       <a href="#embedded">Embedded JavaScript</a><br />
       <a href="#switch">Switch/When/Else</a><br />
       <a href="#try">Try/Catch/Finally</a><br />
-      <a href="#comparisons">Chained Comparisons</a><br />
-      <a href="#strings">Multiline Strings and Heredocs</a><br />
+      <a href="#strings">Multiline Strings</a><br />
       <a href="#resources">Resources</a><br />
       <a href="#contributing">Contributing</a><br />
       <a href="#change_log">Change Log</a><br />
@@ -96,13 +108,9 @@
     <p>
       For a longer CoffeeScript example, check out
       <a href="documentation/underscore.html">Underscore.coffee</a>, a port
-      of the <a href="http://documentcloud.github.com/underscore/">Underscore.js</a>
-      library of helper functions. Underscore.coffee can pass the entire Underscore.js
-      test suite. The CoffeeScript version is faster than the original for a number
-      of methods (in general, due to the speed of CoffeeScript's array comprehensions), and
-      after being minified and gzipped, is only 241 bytes larger than the original
-      JavaScript version.
-      Additional examples are included in the source repository, inside the
+      of <a href="http://documentcloud.github.com/underscore/">Underscore.js</a>
+      to CoffeeScript, which, when compiled, can pass the complete Underscore test suite.
+      Or, clone the source and take a look in the
       <a href="http://github.com/jashkenas/coffee-script/tree/master/examples/">examples</a> folder.
     </p>
 
@@ -195,15 +203,9 @@ gem install coffee-script</pre>
       <tr>
         <td><code>-n, --no-wrap</code></td>
         <td>
-          Compile the JavaScript without the top-level function safety wrapper.
-          (Used for CoffeeScript as a Narwhal module.)
-        </td>
-      </tr>
-      <tr>
-        <td><code>-g, --globals</code></td>
-        <td>
-          Suppress all variable declarations at the top-level, effectively adding
-          those variables to the global scope. (Used by the REPL.)
+          Compile the JavaScript without the top-level function safety wrapper
+          or var declarations, for situations where you want to add every
+          variable to global scope.
         </td>
       </tr>
       <tr>
@@ -248,19 +250,11 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
       use indentation.
     </p>
 
-    <p>
-      You can use newlines to break up your expression into smaller pieces,
-      as long as CoffeeScript can tell that the line hasn't finished
-      (similar to how Ruby handles it). For example,
-      if the line ends in an operator, dot, or keyword.
-    </p>
-
     <p id="functions">
       <b class="header">Functions and Invocation</b>
       Functions are defined by a list of parameters, an arrow, and the
       function body. The empty function looks like this: <tt>=></tt>. All
-      functions in CoffeeScript are named by default, for the benefit of debug messages.
-      If you'd like to create an anonymous function, just wrap it in parentheses.
+      functions in CoffeeScript are named, for the benefit of debug messages.
     </p>
     <%= code_for('functions', 'cube(5)') %>
 
@@ -331,18 +325,14 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
     </p>
 
     <p id="existence">
-      <b class="header">The Existential Operator</b>
+      <b class="header">The Existence Operator</b>
       It's a little difficult to check for the existence of a variable in
       JavaScript. <tt>if (variable) ...</tt> comes close, but fails for zero,
-      the empty string, and false. The existential operator <tt>?</tt> returns true unless
+      the empty string, and false. The existence operator <tt>?</tt> returns true unless
       a variable is <b>null</b> or <b>undefined</b>, which makes it analogous
       to Ruby's <tt>nil?</tt>
     </p>
-    <p>
-      It can also be used for safer conditional assignment than <tt>||=</tt>
-      provides, for cases where you may be handling numbers or strings.
-    </p>
-    <%= code_for('existence', 'speed') %>
+    <%= code_for('existence') %>
 
     <p id="aliases">
       <b class="header">Aliases</b>
@@ -375,10 +365,10 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
     <%= code_for('aliases') %>
 
     <p id="splats">
-      <b class="header">Splats...</b>
+      <b class="header">Splats</b>
       The JavaScript <b>arguments object</b> is a useful way to work with
       functions that accept variable numbers of arguments. CoffeeScript provides
-      splats <tt>...</tt>, both for function definition as well as invocation,
+      splats <tt>*</tt>, both for function definition as well as invocation,
       making variable arguments a little bit more palatable.
     </p>
     <%= code_for('splats', true) %>
@@ -386,20 +376,17 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
     <p id="arguments">
       <b class="header">Arguments are Arrays</b>
       If you reference the <b>arguments object</b> directly, it will be converted
-      into a real Array, making all of the
-      <a href="https://developer.mozilla.org/En/Core_JavaScript_1.5_Reference/Objects/Array">Array methods</a>
+      into a real Array, making all of the 
+      <a href="https://developer.mozilla.org/En/Core_JavaScript_1.5_Reference/Objects/Array">Array methods</a> 
       available.
     </p>
     <%= code_for('arguments', true) %>
 
     <p id="while">
       <b class="header">While Loops</b>
-      The only low-level loop that CoffeeScript provides is the <b>while</b> loop. The
-      main difference from JavaScript is that the <b>while</b> loop can be used
-      as an expression, returning an array containing the result of each iteration
-      through the loop.
+      The only low-level loop that CoffeeScript provides is the while loop.
     </p>
-    <%= code_for('while', 'lyrics.join("\n")') %>
+    <%= code_for('while') %>
     <p>
       Other JavaScript loops, such as <b>for</b> loops and <b>do-while</b> loops
       can be mimicked by variations on <b>while</b>, but the hope is that you
@@ -420,14 +407,12 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
     <p>
       If you know the start and end of your loop, or would like to step through
       in fixed-size increments, you can use a range to specify the start and
-      end of your comprehension. (The long line-breaking "for" definitions in
-      the compiled JS below allow ranges to count downwards, as well as upwards).
+      end of your comprehension:
     </p>
-    <%= code_for('range_comprehensions', 'countdown') %>
+    <%= code_for('range_comprehensions') %>
     <p>
-      Comprehensions can also be used to iterate over the keys and values in
-      an object. Use <tt>of</tt> to signal comprehension over the properties of
-      an object instead of the values in an array.
+      Comprehensions can also be used to iterate over the values and keys in
+      an object:
     </p>
     <%= code_for('object_comprehensions', 'ages.join(", ")') %>
 
@@ -457,11 +442,6 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
       below.
     </p>
     <%= code_for('expressions', 'eldest') %>
-    <p>
-      Even though functions will always return their final value, it's both possible
-      and encouraged to return early from a function body writing out the explicit
-      return (<tt>return value</tt>), when you know that you're done.
-    </p>
     <p>
       Because variable declarations occur at the top of scope, assignment can
       be used within expressions, even for variables that haven't been seen before:
@@ -479,12 +459,6 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
       into a function call:
     </p>
     <%= code_for('expressions_try', true) %>
-    <p>
-      There are a handful of statements in JavaScript that can't be meaningfully
-      converted into expressions: <tt>break</tt>, <tt>continue</tt>, 
-      and <tt>return</tt>. If you make use of them within a block of code, 
-      CoffeeScript won't try to perform the conversion.
-    </p>
 
     <p id="inheritance">
       <b class="header">Inheritance, and Calling Super from a Subclass</b>
@@ -498,13 +472,10 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
       be completely usable if it weren't for a couple of small exceptions:
       it's awkward to call <b>super</b> (the prototype object's
       implementation of the current function), and it's awkward to correctly
-      set the prototype chain.
-    </p>
-    <p>
-      CoffeeScript provides <tt>extends</tt>
-      to help with prototype setup, <tt>::</tt> for quick access to an
-      object's prototype, and converts <tt>super()</tt> into a call against
-      the immediate ancestor's method of the same name.
+      set the prototype chain. CoffeeScript provides <tt>extends</tt>
+      to help with prototype setup, and converts
+      <tt>super()</tt> calls into calls against the immediate ancestor's
+      method of the same name.
     </p>
     <%= code_for('super', true) %>
 
@@ -516,50 +487,11 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
       so you don't have to close the parentheses on the other side.
     </p>
     <%= code_for('blocks') %>
-    <p>
-      If you prefer not to use blocks, you'll need to add a pair of parentheses
-      to help distinguish the arguments from the definition of the function:
-      <tt>_.map(array, (num => num * 2))</tt>
-    </p>
-
-    <p id="pattern_matching">
-      <b class="header">Pattern Matching (Destructuring Assignment)</b>
-      To make extracting values from complex arrays and objects more convenient,
-      CoffeeScript implements ECMAScript Harmony's proposed
-      <a href="http://wiki.ecmascript.org/doku.php?id=harmony:destructuring">destructuring assignment</a>
-      syntax. When you assign an array or object literal to a value, CoffeeScript
-      breaks up and matches both sides against each other, assigning the values
-      on the right to the variables on the left. In the simplest case, it can be
-      used for parallel assignment:
-    </p>
-    <%= code_for('parallel_assignment', 'bait') %>
-    <p>
-      But it's also helpful for dealing with functions that return multiple
-      values.
-    </p>
-    <%= code_for('multiple_return_values', 'forecast') %>
-    <p>
-      Pattern matching can be used with any depth of array and object nesting,
-      to help pull out deeply nested properties.
-    </p>
-    <%= code_for('object_extraction', 'poet + " — " + street') %>
-
-    <p id="long_arrow">
-      <b class="header">Function binding</b>
-      The long arrow <tt>==></tt> can be used to both define a function, and to bind
-      it to the current value of <tt>this</tt>, right on the spot. This is helpful
-      when using callback-based libraries like Prototype or jQuery, for creating
-      iterator functions to pass to <tt>each</tt>, or event-handler functions
-      to use with <tt>bind</tt>. Functions created with the long arrow are able to access
-      properties of the <tt>this</tt> where they're defined.
-    </p>
-    <%= code_for('long_arrow') %>
 
     <p id="embedded">
       <b class="header">Embedded JavaScript</b>
-      Hopefully, you'll never need to use it, but if you ever need to intersperse
-      snippets of JavaScript within your CoffeeScript, you can
-      use backticks to pass it straight through.
+      If you ever need to interpolate literal JavaScript snippets, you can
+      use backticks to pass JavaScript straight through.
     </p>
     <%= code_for('embedded', 'hi()') %>
 
@@ -573,11 +505,6 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
       in a returnable, assignable expression. The format is: <tt>switch</tt> condition,
       <tt>when</tt> clauses, <tt>else</tt> the default case.
     </p>
-    <p>
-      As in Ruby, <b>switch</b> statements in CoffeeScript can take multiple
-      values for each <b>when</b> clause. If any of the values match, the clause
-      runs.
-    </p>
     <%= code_for('switch') %>
 
     <p id="try">
@@ -587,42 +514,23 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
     </p>
     <%= code_for('try') %>
 
-    <p id="comparisons">
-      <b class="header">Chained Comparisons</b>
-      CoffeeScript borrows
-      <a href="http://docs.python.org/reference/expressions.html#notin">chained comparisons</a>
-      from Python &mdash; making it easy to test if a value falls within a
-      certain range.
-    </p>
-    <%= code_for('comparisons', 'healthy') %>
-
     <p id="strings">
-      <b class="header">Multiline Strings and Heredocs</b>
+      <b class="header">Multiline Strings</b>
       Multiline strings are allowed in CoffeeScript.
     </p>
     <%= code_for('strings', 'moby_dick') %>
-    <p>
-      Heredocs can be used to hold formatted or indentation-sensitive text
-      (or, if you just don't feel like escaping quotes and apostrophes). The
-      indentation level that begins the heredoc is maintained throughout, so
-      you can keep it all aligned with the body of your code.
-    </p>
-    <%= code_for('heredocs') %>
 
     <h2 id="resources">Resources</h2>
 
     <ul>
       <li>
         <a href="http://github.com/jashkenas/coffee-script/">Source Code</a><br />
-        After checking out the source, make sure to run <tt>rake build:parser</tt>
-        to generate an up-to-date version of the Racc parser.
-        Use <tt>bin/coffee</tt> to test your changes,
-        <tt>rake test</tt> to run the test suite,
-        and <tt>rake gem:install</tt> to
-        create and install a custom version of the gem.
+        Use <tt>bin/coffee</tt> to test your changes, or <tt>rake gem:install</tt> to
+        create and install a custom version of the gem. If you're hacking on the
+        parser, use <tt>rake build:parser</tt> to rebuild it.
       </li>
       <li>
-        <a href="http://github.com/jashkenas/coffee-script/issues">Bugs, Feature Requests, and General Discussion</a>
+        <a href="http://github.com/jashkenas/coffee-script/issues">Bugs and Feature Requests</a>
       </li>
       <li>
         <a href="http://github.com/jnicklas/bistro_car">BistroCar</a><br />
@@ -631,25 +539,24 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
         that includes CoffeeScript helpers,
         bundling and minification.
       </li>
-      <li>
-        <a href="http://github.com/inem/coffee-haml-filter">coffee-haml-filter</a><br />
-        A custom <a href="http://haml-lang.com/">HAML</a> filter, by
-        <a href="http://github.com/inem">Ivan Nemytchenko</a>, that embeds
-        snippets of CoffeeScript within your HAML templates.
-      </li>
     </ul>
 
     <h2 id="contributing">Contributing</h2>
 
     <p>
-      Here's a wish list of things that would be wonderful to have contributed:
+      Here's a wish list of things that would be wonderful to have in
+      CoffeeScript:
     </p>
 
     <ul>
       <li>
-        <a href="http://github.com/jashkenas/coffee-script/issues#issue/8">
-          A CoffeeScript version of the compiler.
-        </a>
+        A clean, safe syntax for manipulating the prototype chain, and performing
+        inheritance. <a href="#inheritance"><b>extends</b> and <b>super</b></a> are the start of this, but
+        aren't a complete answer.
+      </li>
+      <li>
+        A CoffeeScript version of the compiler, perhaps using Alessandro Warth's
+        <a href="http://tinlizzie.org/ometa/">OMeta</a>.
       </li>
       <li>
         Test cases for any syntax errors you encounter that you think CoffeeScript
@@ -672,57 +579,6 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
 
     <h2 id="change_log">Change Log</h2>
 
-    <p>
-      <b class="header" style="margin-top: 20px;">0.2.6</b>
-      Added Python-style chained comparisons, the conditional existence
-      operator <tt>?=</tt>, and some examples from <i>Beautiful Code</i>.
-      Bugfixes relating to statement-to-expression conversion, arguments-to-array
-      conversion, and the TextMate syntax highlighter.
-    </p>
-
-    <p>
-      <b class="header" style="margin-top: 20px;">0.2.5</b>
-      The conditions in switch statements can now take multiple values at once &mdash;
-      If any of them are true, the case will run. Added the long arrow <tt>==></tt>,
-      which defines and immediately binds a function to <tt>this</tt>. While loops can
-      now be used as expressions, in the same way that comprehensions can. Splats
-      can be used within pattern matches to soak up the rest of an array.
-    </p>
-
-    <p>
-      <b class="header" style="margin-top: 20px;">0.2.4</b>
-      Added ECMAScript Harmony style destructuring assignment, for dealing with
-      extracting values from nested arrays and objects. Added indentation-sensitive
-      heredocs for nicely formatted strings or chunks of code.
-    </p>
-
-    <p>
-      <b class="header" style="margin-top: 20px;">0.2.3</b>
-      Axed the unsatisfactory <tt>ino</tt> keyword, replacing it with <tt>of</tt> for
-      object comprehensions. They now look like: <tt>for prop, value of object</tt>.
-    </p>
-
-    <p>
-      <b class="header" style="margin-top: 20px;">0.2.2</b>
-      When performing a comprehension over an object, use <tt>ino</tt>, instead
-      of <tt>in</tt>, which helps us generate smaller, more efficient code at
-      compile time.
-      <br />
-      Added <tt>::</tt> as a shorthand for saying <tt>.prototype.</tt>
-      <br />
-      The "splat" symbol has been changed from a prefix asterisk <tt>*</tt>, to
-      a postfix ellipsis <tt>...</tt>
-      <br />
-      Added JavaScript's <tt>in</tt> operator,
-      empty <tt>return</tt> statements, and empty <tt>while</tt> loops.
-      <br />
-      Constructor functions that start with capital letters now include a
-      safety check to make sure that the new instance of the object is returned.
-      <br />
-      The <tt>extends</tt> keyword now functions identically to <tt>goog.inherits</tt>
-      in Google's Closure Library.
-    </p>
-
     <p>
       <b class="header" style="margin-top: 20px;">0.2.1</b>
       Arguments objects are now converted into real arrays when referenced.
@@ -732,7 +588,7 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
       <b class="header" style="margin-top: 20px;">0.2.0</b>
       Major release. Significant whitespace. Better statement-to-expression
       conversion. Splats. Splice literals. Object comprehensions. Blocks.
-      The existential operator. Many thanks to all the folks who posted issues,
+      The existence operator. Many thanks to all the folks who posted issues,
       with special thanks to
       <a href="http://github.com/kamatsu">Liam O'Connor-Davis</a> for whitespace
       and expression help.

documentation/js/arguments.js

@@ -1,8 +1,7 @@
 (function(){
   var backwards;
   backwards = function backwards() {
-    var arguments = Array.prototype.slice.call(arguments, 0);
-    return alert(arguments.reverse());
+    return alert(Array.prototype.slice.call(arguments, 0).reverse());
   };
   backwards("stairway", "to", "heaven");
 })();

documentation/js/array_comprehensions.js

@@ -1,24 +1,32 @@
 (function(){
-  var __a, __b, __c, __d, __e, __f, __g, food, lunch, roid, roid2;
+  var __a, __b, __c, __d, __e, __f, __g, __h, __i, __j, food, lunch, roid, roid2;
   // Eat lunch.
   lunch = (function() {
-    __a = []; __b = ['toast', 'cheese', 'wine'];
-    for (__c = 0; __c < __b.length; __c++) {
-      food = __b[__c];
-      __a.push(eat(food));
+    __a = ['toast', 'cheese', 'wine'];
+    __c = [];
+    for (__b in __a) {
+      if (__a.hasOwnProperty(__b)) {
+        food = __a[__b];
+        __d = eat(food);
+        __c.push(__d);
+      }
     }
-    return __a;
+    return __c;
   })();
   // Naive collision detection.
-  __d = asteroids;
-  for (__e = 0; __e < __d.length; __e++) {
-    roid = __d[__e];
-    __f = asteroids;
-    for (__g = 0; __g < __f.length; __g++) {
-      roid2 = __f[__g];
-      if (roid !== roid2) {
-        if (roid.overlaps(roid2)) {
-          roid.explode();
+  __e = asteroids;
+  for (__f in __e) {
+    if (__e.hasOwnProperty(__f)) {
+      roid = __e[__f];
+      __h = asteroids;
+      for (__i in __h) {
+        if (__h.hasOwnProperty(__i)) {
+          roid2 = __h[__i];
+          if (roid !== roid2) {
+            if (roid.overlaps(roid2)) {
+              roid.explode();
+            }
+          }
         }
       }
     }

documentation/js/comparisons.js

@@ -1,5 +0,0 @@
-(function(){
-  var cholesterol, healthy;
-  cholesterol = 127;
-  healthy = (200 > cholesterol) && (cholesterol > 60);
-})();

documentation/js/conditionals.js

@@ -1,5 +1,5 @@
 (function(){
-  var date, expensive, mood;
+  var date, mood;
   if (singing) {
     mood = greatly_improved;
   }

documentation/js/existence.js

@@ -1,7 +1,6 @@
 (function(){
-  var solipsism, speed;
+  var solipsism;
   if ((typeof mind !== "undefined" && mind !== null) && !(typeof world !== "undefined" && world !== null)) {
     solipsism = true;
   }
-  speed = (typeof speed !== "undefined" && speed !== null) ? speed : 140;
 })();

documentation/js/expressions_assignment.js

@@ -1,4 +1,4 @@
 (function(){
   var one, six, three, two;
-  six = ((one = 1)) + ((two = 2)) + ((three = 3));
+  six = (one = 1) + (two = 2) + (three = 3);
 })();

documentation/js/expressions_comprehension.js

@@ -1,14 +1,16 @@
 (function(){
-  var __a, __b, globals, name;
-  var __hasProp = Object.prototype.hasOwnProperty;
+  var __a, __b, __c, globals, name, property;
   // The first ten global properties.
   globals = ((function() {
-    __a = []; __b = window;
-    for (name in __b) {
-      if (__hasProp.call(__b, name)) {
-        __a.push(name);
+    __a = window;
+    __b = [];
+    for (name in __a) {
+      if (__a.hasOwnProperty(name)) {
+        property = __a[name];
+        __c = name;
+        __b.push(__c);
       }
     }
-    return __a;
+    return __b;
   })()).slice(0, 10);
 })();

documentation/js/expressions_try.js

@@ -3,7 +3,7 @@
     try {
       return nonexistent / undefined;
     } catch (error) {
-      return "Caught an error: " + error;
+      return "The error is: " + error;
     }
   })());
 })();

documentation/js/heredocs.js

@@ -1,4 +0,0 @@
-(function(){
-  var html;
-  html = "<strong>\n  cup of coffeescript\n</strong>";
-})();

documentation/js/long_arrow.js

@@ -1,17 +0,0 @@
-(function(){
-  var Account;
-  Account = function Account(customer, cart) {
-    var __a;
-    this.customer = customer;
-    this.cart = cart;
-    __a = $('.shopping_cart').bind('click', (function(__this) {
-      var __func = function(event) {
-        return this.customer.purchase(this.cart);
-      };
-      return (function() {
-        return __func.apply(__this, arguments);
-      });
-    })(this));
-    return Account === this.constructor ? this : __a;
-  };
-})();

documentation/js/multiple_return_values.js

@@ -1,11 +0,0 @@
-(function(){
-  var __a, city, forecast, temp, weather_report;
-  weather_report = function weather_report(location) {
-    // Make an Ajax request to fetch the weather...
-    return [location, 72, "Mostly Sunny"];
-  };
-  __a = weather_report("Berkeley, CA");
-  city = __a[0];
-  temp = __a[1];
-  forecast = __a[2];
-})();

documentation/js/object_comprehensions.js

@@ -1,19 +1,20 @@
 (function(){
-  var __a, __b, age, ages, child, years_old;
-  var __hasProp = Object.prototype.hasOwnProperty;
+  var __a, __b, __c, age, ages, child, years_old;
   years_old = {
     max: 10,
     ida: 9,
     tim: 11
   };
   ages = (function() {
-    __a = []; __b = years_old;
-    for (child in __b) {
-      age = __b[child];
-      if (__hasProp.call(__b, child)) {
-        __a.push(child + " is " + age);
+    __a = years_old;
+    __b = [];
+    for (child in __a) {
+      if (__a.hasOwnProperty(child)) {
+        age = __a[child];
+        __c = child + " is " + age;
+        __b.push(__c);
       }
     }
-    return __a;
+    return __b;
   })();
 })();

documentation/js/object_extraction.js

@@ -1,17 +0,0 @@
-(function(){
-  var __a, __b, __c, city, futurists, poet, street;
-  futurists = {
-    sculptor: "Umberto Boccioni",
-    painter: "Vladimir Burliuk",
-    poet: {
-      name: "F.T. Marinetti",
-      address: ["Via Roma 42R", "Bellagio, Italy 22021"]
-    }
-  };
-  __a = futurists;
-  __b = __a.poet;
-  poet = __b.name;
-  __c = __b.address;
-  street = __c[0];
-  city = __c[1];
-})();

documentation/js/overview.js

@@ -1,5 +1,5 @@
 (function(){
-  var __a, __b, __c, cubed_list, list, math, num, number, opposite_day, race, square;
+  var __a, __b, __c, __d, cubed_list, list, math, num, number, opposite_day, race, square;
   // Assignment:
   number = 42;
   opposite_day = true;
@@ -33,11 +33,15 @@
   }
   // Array comprehensions:
   cubed_list = (function() {
-    __a = []; __b = list;
-    for (__c = 0; __c < __b.length; __c++) {
-      num = __b[__c];
-      __a.push(math.cube(num));
+    __a = list;
+    __c = [];
+    for (__b in __a) {
+      if (__a.hasOwnProperty(__b)) {
+        num = __a[__b];
+        __d = math.cube(num);
+        __c.push(__d);
+      }
     }
-    return __a;
+    return __c;
   })();
 })();

documentation/js/parallel_assignment.js

@@ -1,8 +0,0 @@
-(function(){
-  var __a, and_switch, bait;
-  bait = 1000;
-  and_switch = 0;
-  __a = [and_switch, bait];
-  bait = __a[0];
-  and_switch = __a[1];
-})();

documentation/js/range_comprehensions.js

@@ -1,21 +1,9 @@
 (function(){
-  var __a, __b, __c, __d, __e, countdown, egg_delivery, num;
-  countdown = (function() {
-    __a = []; __d = 10; __e = 1;
-    for (__c=0, num=__d; (__d <= __e ? num <= __e : num >= __e); (__d <= __e ? num += 1 : num -= 1), __c++) {
-      __a.push(num);
-    }
-    return __a;
-  })();
-  egg_delivery = function egg_delivery() {
-    var __f, __g, __h, __i, __j, dozen_eggs, i;
-    __f = []; __i = 0; __j = eggs.length;
-    for (__h=0, i=__i; (__i <= __j ? i < __j : i > __j); (__i <= __j ? i += 12 : i -= 12), __h++) {
-      __f.push((function() {
-        dozen_eggs = eggs.slice(i, i + 12);
-        return deliver(new egg_carton(dozen));
-      })());
-    }
-    return __f;
-  };
+  var __a, __b, __c, __d, __e, dozen_eggs, i;
+  __d = 0;
+  __e = eggs.length;
+  for (__c=0, i=__d; (__d <= __e ? i < __e : i > __e); (__d <= __e ? i += 12 : i -= 12), __c++) {
+    dozen_eggs = eggs.slice(i, i + 12);
+    deliver(new egg_carton(dozen));
+  }
 })();

documentation/js/splats.js

@@ -1,6 +1,6 @@
 (function(){
   var contenders, gold, medalists, silver, the_field;
-  gold = (silver = (the_field = "unknown"));
+  gold = silver = the_field = "unknown";
   medalists = function medalists(first, second) {
     var rest;
     rest = Array.prototype.slice.call(arguments, 2);

documentation/js/super.js

@@ -1,32 +1,25 @@
 (function(){
-  var Animal, Horse, Snake, __a, __b, sam, tom;
-  Animal = function Animal() {  };
+  var Animal, Horse, Snake, sam, tom;
+  Animal = function Animal() {
+  };
   Animal.prototype.move = function move(meters) {
     return alert(this.name + " moved " + meters + "m.");
   };
   Snake = function Snake(name) {
-    var __a;
-    __a = this.name = name;
-    return Snake === this.constructor ? this : __a;
+    return this.name = name;
   };
-  __a = function(){};
-  __a.prototype = Animal.prototype;
   Snake.__superClass__ = Animal.prototype;
-  Snake.prototype = new __a();
+  Snake.prototype = new Animal();
   Snake.prototype.constructor = Snake;
   Snake.prototype.move = function move() {
     alert("Slithering...");
     return Snake.__superClass__.move.call(this, 5);
   };
   Horse = function Horse(name) {
-    var __b;
-    __b = this.name = name;
-    return Horse === this.constructor ? this : __b;
+    return this.name = name;
   };
-  __b = function(){};
-  __b.prototype = Animal.prototype;
   Horse.__superClass__ = Animal.prototype;
-  Horse.prototype = new __b();
+  Horse.prototype = new Animal();
   Horse.prototype.constructor = Horse;
   Horse.prototype.move = function move() {
     alert("Galloping...");

documentation/js/switch.js

@@ -1,16 +1,14 @@
 (function(){
-  if (day === "Mon") {
-    go_to_work();
-  } else if (day === "Tue") {
+  if (day === "Tuesday") {
+    eat_breakfast();
+  } else if (day === "Wednesday") {
     go_to_the_park();
-  } else if (day === "Thu") {
-    go_ice_fishing();
-  } else if (day === "Fri" || day === "Sat") {
+  } else if (day === "Saturday") {
     if (day === bingo_day) {
       go_to_bingo();
       go_dancing();
     }
-  } else if (day === "Sun") {
+  } else if (day === "Sunday") {
     go_to_church();
   } else {
     go_to_work();

documentation/js/while.js

@@ -1,20 +1,9 @@
 (function(){
-  var __a, lyrics, num;
-  if (this.studying_economics) {
-    while (supply > demand) {
-      buy();
-    }
-    while (supply < demand) {
-      sell();
-    }
+  while (demand > supply) {
+    sell();
+    restock();
+  }
+  while (supply > demand) {
+    buy();
   }
-  num = 6;
-  lyrics = (function() {
-    __a = [];
-    while (num -= 1) {
-      __a.push(num + " little monkeys, jumping on the bed. \
-One fell out and bumped his head.");
-    }
-    return __a;
-  })();
 })();

documentation/speed.html

@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title>Quickie CoffeeScript Speed Tests</title>
-  <script type="text/javascript" src="http://www.broofa.com/Tools/JSLitmus/JSLitmus.js"></script>
-</head>
-<body>
-
-  <h1>Quickie CoffeeScript Speed Tests</h1>
-
-  <script type="text/javascript">
-    var num = 1000;
-    var arr = [];
-    while (num--) arr.push(num);
-
-    var f1 = function f1() {
-      return arr;
-    };
-
-    JSLitmus.test('regular function', function() {
-      f1();
-    });
-
-    var __this = this;
-
-    var f2 = function f2() {
-      return (function() {
-        return arr;
-      }).apply(__this, arguments);
-    };
-
-    JSLitmus.test('bound function', function() {
-      f2();
-    });
-
-    var f3 = (function() {
-      __b = function() {
-        return arr;
-      };
-      return (function f2() {
-        return __b.apply(__this, arguments);
-      });
-    })();
-
-    JSLitmus.test('prebound function', function() {
-      f3();
-    });
-
-  </script>
-
-</body>
-</html>

documentation/underscore.html

@@ -14,6 +14,7 @@
       font-size: 12px;
     }
   </style>
+
 </head>
 
 <body>
@@ -30,56 +31,56 @@
 <span class="line-numbers">  11 </span>   <span class="Comment"><span class="Comment">#</span> ------------------------- Baseline setup ---------------------------------</span>
 <span class="line-numbers">  12 </span>
 <span class="line-numbers">  13 </span>   <span class="Comment"><span class="Comment">#</span> Establish the root object, &quot;window&quot; in the browser, or &quot;global&quot; on the server.</span>
-<span class="line-numbers">  14 </span>   <span class="FunctionName">root</span><span class="Keyword">:</span> <span class="Variable">this</span>
+<span class="line-numbers">  14 </span>   root<span class="Keyword">:</span> <span class="Variable">this</span>
 <span class="line-numbers">  15 </span>
 <span class="line-numbers">  16 </span>
 <span class="line-numbers">  17 </span>   <span class="Comment"><span class="Comment">#</span> Save the previous value of the &quot;_&quot; variable.</span>
-<span class="line-numbers">  18 </span>   <span class="FunctionName">previousUnderscore</span><span class="Keyword">:</span> root._
+<span class="line-numbers">  18 </span>   previousUnderscore<span class="Keyword">:</span> root._
 <span class="line-numbers">  19 </span>
 <span class="line-numbers">  20 </span>
 <span class="line-numbers">  21 </span>   <span class="Comment"><span class="Comment">#</span> If Underscore is called as a function, it returns a wrapped object that</span>
 <span class="line-numbers">  22 </span>   <span class="Comment"><span class="Comment">#</span> can be used OO-style. This wrapper holds altered versions of all the</span>
 <span class="line-numbers">  23 </span>   <span class="Comment"><span class="Comment">#</span> underscore functions. Wrapped objects may be chained.</span>
-<span class="line-numbers">  24 </span> <span class="FunctionArgument">  wrapper: obj </span><span class="Storage">=&gt;</span>
-<span class="line-numbers">  25 </span>     <span class="FunctionName">this._wrapped</span><span class="Keyword">:</span> obj
+<span class="line-numbers">  24 </span>   <span class="FunctionName">wrapper</span><span class="Keyword">:</span> <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers">  25 </span>     <span class="Variable">this</span>._wrapped<span class="Keyword">:</span> obj
 <span class="line-numbers">  26 </span>     <span class="Variable">this</span>
 <span class="line-numbers">  27 </span>
 <span class="line-numbers">  28 </span>
 <span class="line-numbers">  29 </span>   <span class="Comment"><span class="Comment">#</span> Establish the object that gets thrown to break out of a loop iteration.</span>
-<span class="line-numbers">  30 </span>   <span class="FunctionName">breaker</span><span class="Keyword">:</span> <span class="Keyword">if</span> <span class="Keyword">typeof</span>(StopIteration) <span class="Keyword">is</span> <span class="String"><span class="String">'</span>undefined<span class="String">'</span></span> <span class="Keyword">then</span> <span class="String"><span class="String">'</span>__break__<span class="String">'</span></span> <span class="Keyword">else</span> StopIteration
+<span class="line-numbers">  30 </span>   breaker<span class="Keyword">:</span> <span class="Keyword">if</span> <span class="Keyword">typeof</span>(StopIteration) <span class="Keyword">is</span> <span class="String"><span class="String">'</span>undefined<span class="String">'</span></span> <span class="Keyword">then</span> <span class="String"><span class="String">'</span>__break__<span class="String">'</span></span> <span class="Keyword">else</span> StopIteration
 <span class="line-numbers">  31 </span>
 <span class="line-numbers">  32 </span>
-<span class="line-numbers">  33 </span>   <span class="Comment"><span class="Comment">#</span> Create a safe reference to the Underscore object forreference below.</span>
-<span class="line-numbers">  34 </span> <span class="FunctionArgument">  _: root._: obj </span><span class="Storage">=&gt;</span> <span class="Keyword">new</span> <span class="TypeName">wrapper</span>(obj)
+<span class="line-numbers">  33 </span>   <span class="Comment"><span class="Comment">#</span> Create a safe reference to the Underscore object for reference below.</span>
+<span class="line-numbers">  34 </span>   _<span class="Keyword">:</span> <span class="FunctionName">root._</span><span class="Keyword">:</span> <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> <span class="Keyword">new</span> <span class="TypeName">wrapper</span>(obj)
 <span class="line-numbers">  35 </span>
 <span class="line-numbers">  36 </span>
 <span class="line-numbers">  37 </span>   <span class="Comment"><span class="Comment">#</span> Export the Underscore object for CommonJS.</span>
-<span class="line-numbers">  38 </span>   <span class="Keyword">if</span> <span class="Keyword">typeof</span>(exports) <span class="Keyword">!</span><span class="Keyword">=</span> <span class="String"><span class="String">'</span>undefined<span class="String">'</span></span> <span class="Keyword">then</span> <span class="FunctionName">exports._</span><span class="Keyword">:</span> _
+<span class="line-numbers">  38 </span>   <span class="Keyword">if</span> <span class="Keyword">typeof</span>(exports) <span class="Keyword">!</span><span class="Keyword">=</span> <span class="String"><span class="String">'</span>undefined<span class="String">'</span></span> <span class="Keyword">then</span> exports._<span class="Keyword">:</span> _
 <span class="line-numbers">  39 </span>
 <span class="line-numbers">  40 </span>
 <span class="line-numbers">  41 </span>   <span class="Comment"><span class="Comment">#</span> Create quick reference variables for speed access to core prototypes.</span>
-<span class="line-numbers">  42 </span>   <span class="FunctionName">slice</span><span class="Keyword">:</span>                Array<span class="Keyword">:</span><span class="Keyword">:</span>slice
-<span class="line-numbers">  43 </span>   <span class="FunctionName">unshift</span><span class="Keyword">:</span>              Array<span class="Keyword">:</span><span class="Keyword">:</span>unshift
-<span class="line-numbers">  44 </span>   <span class="FunctionName">toString</span><span class="Keyword">:</span>             Object<span class="Keyword">:</span><span class="Keyword">:</span>toString
-<span class="line-numbers">  45 </span>   <span class="FunctionName">hasOwnProperty</span><span class="Keyword">:</span>       Object<span class="Keyword">:</span><span class="Keyword">:</span>hasOwnProperty
-<span class="line-numbers">  46 </span>   <span class="FunctionName">propertyIsEnumerable</span><span class="Keyword">:</span> Object<span class="Keyword">:</span><span class="Keyword">:</span>propertyIsEnumerable
+<span class="line-numbers">  42 </span>   slice<span class="Keyword">:</span>                Array.prototype.slice
+<span class="line-numbers">  43 </span>   unshift<span class="Keyword">:</span>              Array.prototype.unshift
+<span class="line-numbers">  44 </span>   toString<span class="Keyword">:</span>             Object.prototype.toString
+<span class="line-numbers">  45 </span>   hasOwnProperty<span class="Keyword">:</span>       Object.prototype.hasOwnProperty
+<span class="line-numbers">  46 </span>   propertyIsEnumerable<span class="Keyword">:</span> Object.prototype.propertyIsEnumerable
 <span class="line-numbers">  47 </span>
 <span class="line-numbers">  48 </span>
 <span class="line-numbers">  49 </span>   <span class="Comment"><span class="Comment">#</span> Current version.</span>
-<span class="line-numbers">  50 </span>   <span class="FunctionName">_.VERSION</span><span class="Keyword">:</span> <span class="String"><span class="String">'</span>0.5.5<span class="String">'</span></span>
+<span class="line-numbers">  50 </span>   _.VERSION<span class="Keyword">:</span> <span class="String"><span class="String">'</span>0.5.3<span class="String">'</span></span>
 <span class="line-numbers">  51 </span>
 <span class="line-numbers">  52 </span>
 <span class="line-numbers">  53 </span>   <span class="Comment"><span class="Comment">#</span> ------------------------ Collection Functions: ---------------------------</span>
 <span class="line-numbers">  54 </span>
 <span class="line-numbers">  55 </span>   <span class="Comment"><span class="Comment">#</span> The cornerstone, an each implementation.</span>
 <span class="line-numbers">  56 </span>   <span class="Comment"><span class="Comment">#</span> Handles objects implementing forEach, arrays, and raw objects.</span>
-<span class="line-numbers">  57 </span> <span class="FunctionArgument">  _.each: obj, iterator, context </span><span class="Storage">=&gt;</span>
-<span class="line-numbers">  58 </span>     <span class="FunctionName">index</span><span class="Keyword">:</span> <span class="Number">0</span>
+<span class="line-numbers">  57 </span>   <span class="FunctionName">_.each</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, iterator, context</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers">  58 </span>     index<span class="Keyword">:</span> <span class="Number">0</span>
 <span class="line-numbers">  59 </span>     <span class="Keyword">try</span>
 <span class="line-numbers">  60 </span>       <span class="Keyword">return</span> obj.forEach(iterator, context) <span class="Keyword">if</span> obj.forEach
 <span class="line-numbers">  61 </span>       <span class="Keyword">if</span> _.isArray(obj) <span class="Keyword">or</span> _.isArguments(obj)
 <span class="line-numbers">  62 </span>         <span class="Keyword">return</span> iterator.call(context, obj[i], i, obj) <span class="Keyword">for</span> i <span class="Keyword">in</span> [<span class="Number">0</span>...obj.length]
-<span class="line-numbers">  63 </span>       iterator.call(context, val, key, obj) <span class="Keyword">for</span> key, val <span class="Keyword">of</span> obj
+<span class="line-numbers">  63 </span>       iterator.call(context, val, key, obj) <span class="Keyword">for</span> val, key <span class="Keyword">in</span> obj
 <span class="line-numbers">  64 </span>     <span class="Keyword">catch</span> e
 <span class="line-numbers">  65 </span>       <span class="Keyword">throw</span> e <span class="Keyword">if</span> e <span class="Keyword">isnt</span> breaker
 <span class="line-numbers">  66 </span>     obj
@@ -87,9 +88,9 @@
 <span class="line-numbers">  68 </span>
 <span class="line-numbers">  69 </span>   <span class="Comment"><span class="Comment">#</span> Return the results of applying the iterator to each element. Use JavaScript</span>
 <span class="line-numbers">  70 </span>   <span class="Comment"><span class="Comment">#</span> 1.6's version of map, if possible.</span>
-<span class="line-numbers">  71 </span> <span class="FunctionArgument">  _.map: obj, iterator, context </span><span class="Storage">=&gt;</span>
+<span class="line-numbers">  71 </span>   <span class="FunctionName">_.map</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, iterator, context</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers">  72 </span>     <span class="Keyword">return</span> obj.map(iterator, context) <span class="Keyword">if</span> (obj <span class="Keyword">and</span> _.isFunction(obj.map))
-<span class="line-numbers">  73 </span>     <span class="FunctionName">results</span><span class="Keyword">:</span> []
+<span class="line-numbers">  73 </span>     results<span class="Keyword">:</span> []
 <span class="line-numbers">  74 </span>     _.each(obj)<span class="FunctionArgument"> value, index, list </span><span class="Storage">=&gt;</span>
 <span class="line-numbers">  75 </span>       results.push(iterator.call(context, value, index, list))
 <span class="line-numbers">  76 </span>     results
@@ -97,45 +98,45 @@
 <span class="line-numbers">  78 </span>
 <span class="line-numbers">  79 </span>   <span class="Comment"><span class="Comment">#</span> Reduce builds up a single result from a list of values. Also known as</span>
 <span class="line-numbers">  80 </span>   <span class="Comment"><span class="Comment">#</span> inject, or foldl. Uses JavaScript 1.8's version of reduce, if possible.</span>
-<span class="line-numbers">  81 </span> <span class="FunctionArgument">  _.reduce: obj, memo, iterator, context </span><span class="Storage">=&gt;</span>
+<span class="line-numbers">  81 </span>   <span class="FunctionName">_.reduce</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, memo, iterator, context</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers">  82 </span>     <span class="Keyword">return</span> obj.reduce(_.bind(iterator, context), memo) <span class="Keyword">if</span> (obj <span class="Keyword">and</span> _.isFunction(obj.reduce))
 <span class="line-numbers">  83 </span>     _.each(obj)<span class="FunctionArgument"> value, index, list </span><span class="Storage">=&gt;</span>
-<span class="line-numbers">  84 </span>       <span class="FunctionName">memo</span><span class="Keyword">:</span> iterator.call(context, memo, value, index, list)
+<span class="line-numbers">  84 </span>       memo<span class="Keyword">:</span> iterator.call(context, memo, value, index, list)
 <span class="line-numbers">  85 </span>     memo
 <span class="line-numbers">  86 </span>
 <span class="line-numbers">  87 </span>
 <span class="line-numbers">  88 </span>   <span class="Comment"><span class="Comment">#</span> The right-associative version of reduce, also known as foldr. Uses</span>
 <span class="line-numbers">  89 </span>   <span class="Comment"><span class="Comment">#</span> JavaScript 1.8's version of reduceRight, if available.</span>
-<span class="line-numbers">  90 </span> <span class="FunctionArgument">  _.reduceRight: obj, memo, iterator, context </span><span class="Storage">=&gt;</span>
+<span class="line-numbers">  90 </span>   <span class="FunctionName">_.reduceRight</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, memo, iterator, context</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers">  91 </span>     <span class="Keyword">return</span> obj.reduceRight(_.bind(iterator, context), memo) <span class="Keyword">if</span> (obj <span class="Keyword">and</span> _.isFunction(obj.reduceRight))
 <span class="line-numbers">  92 </span>     _.each(_.clone(_.toArray(obj)).reverse())<span class="FunctionArgument"> value, index </span><span class="Storage">=&gt;</span>
-<span class="line-numbers">  93 </span>       <span class="FunctionName">memo</span><span class="Keyword">:</span> iterator.call(context, memo, value, index, obj)
+<span class="line-numbers">  93 </span>       memo<span class="Keyword">:</span> iterator.call(context, memo, value, index, obj)
 <span class="line-numbers">  94 </span>     memo
 <span class="line-numbers">  95 </span>
 <span class="line-numbers">  96 </span>
 <span class="line-numbers">  97 </span>   <span class="Comment"><span class="Comment">#</span> Return the first value which passes a truth test.</span>
-<span class="line-numbers">  98 </span> <span class="FunctionArgument">  _.detect: obj, iterator, context </span><span class="Storage">=&gt;</span>
-<span class="line-numbers">  99 </span>     <span class="FunctionName">result</span><span class="Keyword">:</span> <span class="BuiltInConstant">null</span>
+<span class="line-numbers">  98 </span>   <span class="FunctionName">_.detect</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, iterator, context</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers">  99 </span>     result<span class="Keyword">:</span> <span class="BuiltInConstant">null</span>
 <span class="line-numbers"> 100 </span>     _.each(obj)<span class="FunctionArgument"> value, index, list </span><span class="Storage">=&gt;</span>
 <span class="line-numbers"> 101 </span>       <span class="Keyword">if</span> iterator.call(context, value, index, list)
-<span class="line-numbers"> 102 </span>         <span class="FunctionName">result</span><span class="Keyword">:</span> value
+<span class="line-numbers"> 102 </span>         result<span class="Keyword">:</span> value
 <span class="line-numbers"> 103 </span>         _.breakLoop()
 <span class="line-numbers"> 104 </span>     result
 <span class="line-numbers"> 105 </span>
 <span class="line-numbers"> 106 </span>
 <span class="line-numbers"> 107 </span>   <span class="Comment"><span class="Comment">#</span> Return all the elements that pass a truth test. Use JavaScript 1.6's</span>
 <span class="line-numbers"> 108 </span>   <span class="Comment"><span class="Comment">#</span> filter(), if it exists.</span>
-<span class="line-numbers"> 109 </span> <span class="FunctionArgument">  _.select: obj, iterator, context </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 109 </span>   <span class="FunctionName">_.select</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, iterator, context</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 110 </span>     <span class="Keyword">if</span> obj <span class="Keyword">and</span> _.isFunction(obj.filter) <span class="Keyword">then</span> <span class="Keyword">return</span> obj.filter(iterator, context)
-<span class="line-numbers"> 111 </span>     <span class="FunctionName">results</span><span class="Keyword">:</span> []
+<span class="line-numbers"> 111 </span>     results<span class="Keyword">:</span> []
 <span class="line-numbers"> 112 </span>     _.each(obj)<span class="FunctionArgument"> value, index, list </span><span class="Storage">=&gt;</span>
 <span class="line-numbers"> 113 </span>       results.push(value) <span class="Keyword">if</span> iterator.call(context, value, index, list)
 <span class="line-numbers"> 114 </span>     results
 <span class="line-numbers"> 115 </span>
 <span class="line-numbers"> 116 </span>
 <span class="line-numbers"> 117 </span>   <span class="Comment"><span class="Comment">#</span> Return all the elements for which a truth test fails.</span>
-<span class="line-numbers"> 118 </span> <span class="FunctionArgument">  _.reject: obj, iterator, context </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 119 </span>     <span class="FunctionName">results</span><span class="Keyword">:</span> []
+<span class="line-numbers"> 118 </span>   <span class="FunctionName">_.reject</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, iterator, context</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 119 </span>     results<span class="Keyword">:</span> []
 <span class="line-numbers"> 120 </span>     _.each(obj)<span class="FunctionArgument"> value, index, list </span><span class="Storage">=&gt;</span>
 <span class="line-numbers"> 121 </span>       results.push(value) <span class="Keyword">if</span> <span class="Keyword">not</span> iterator.call(context, value, index, list)
 <span class="line-numbers"> 122 </span>     results
@@ -143,89 +144,89 @@
 <span class="line-numbers"> 124 </span>
 <span class="line-numbers"> 125 </span>   <span class="Comment"><span class="Comment">#</span> Determine whether all of the elements match a truth test. Delegate to</span>
 <span class="line-numbers"> 126 </span>   <span class="Comment"><span class="Comment">#</span> JavaScript 1.6's every(), if it is present.</span>
-<span class="line-numbers"> 127 </span> <span class="FunctionArgument">  _.all: obj, iterator, context </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 127 </span>   <span class="FunctionName">_.all</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, iterator, context</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 128 </span>     iterator <span class="Keyword">||</span><span class="Keyword">=</span> _.identity
 <span class="line-numbers"> 129 </span>     <span class="Keyword">return</span> obj.every(iterator, context) <span class="Keyword">if</span> obj <span class="Keyword">and</span> _.isFunction(obj.every)
-<span class="line-numbers"> 130 </span>     <span class="FunctionName">result</span><span class="Keyword">:</span> <span class="BuiltInConstant">true</span>
+<span class="line-numbers"> 130 </span>     result<span class="Keyword">:</span> <span class="BuiltInConstant">true</span>
 <span class="line-numbers"> 131 </span>     _.each(obj)<span class="FunctionArgument"> value, index, list </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 132 </span>       _.breakLoop() <span class="Keyword">unless</span> (<span class="FunctionName">result</span><span class="Keyword">:</span> result <span class="Keyword">and</span> iterator.call(context, value, index, list))
+<span class="line-numbers"> 132 </span>       _.breakLoop() <span class="Keyword">unless</span> (result<span class="Keyword">:</span> result <span class="Keyword">and</span> iterator.call(context, value, index, list))
 <span class="line-numbers"> 133 </span>     result
 <span class="line-numbers"> 134 </span>
 <span class="line-numbers"> 135 </span>
 <span class="line-numbers"> 136 </span>   <span class="Comment"><span class="Comment">#</span> Determine if at least one element in the object matches a truth test. Use</span>
 <span class="line-numbers"> 137 </span>   <span class="Comment"><span class="Comment">#</span> JavaScript 1.6's some(), if it exists.</span>
-<span class="line-numbers"> 138 </span> <span class="FunctionArgument">  _.any: obj, iterator, context </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 138 </span>   <span class="FunctionName">_.any</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, iterator, context</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 139 </span>     iterator <span class="Keyword">||</span><span class="Keyword">=</span> _.identity
 <span class="line-numbers"> 140 </span>     <span class="Keyword">return</span> obj.some(iterator, context) <span class="Keyword">if</span> obj <span class="Keyword">and</span> _.isFunction(obj.some)
-<span class="line-numbers"> 141 </span>     <span class="FunctionName">result</span><span class="Keyword">:</span> <span class="BuiltInConstant">false</span>
+<span class="line-numbers"> 141 </span>     result<span class="Keyword">:</span> <span class="BuiltInConstant">false</span>
 <span class="line-numbers"> 142 </span>     _.each(obj)<span class="FunctionArgument"> value, index, list </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 143 </span>       _.breakLoop() <span class="Keyword">if</span> (<span class="FunctionName">result</span><span class="Keyword">:</span> iterator.call(context, value, index, list))
+<span class="line-numbers"> 143 </span>       _.breakLoop() <span class="Keyword">if</span> (result<span class="Keyword">:</span> iterator.call(context, value, index, list))
 <span class="line-numbers"> 144 </span>     result
 <span class="line-numbers"> 145 </span>
 <span class="line-numbers"> 146 </span>
 <span class="line-numbers"> 147 </span>   <span class="Comment"><span class="Comment">#</span> Determine if a given value is included in the array or object,</span>
 <span class="line-numbers"> 148 </span>   <span class="Comment"><span class="Comment">#</span> based on '==='.</span>
-<span class="line-numbers"> 149 </span> <span class="FunctionArgument">  _.include: obj, target </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 149 </span>   <span class="FunctionName">_.include</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, target</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 150 </span>     <span class="Keyword">return</span> _.indexOf(obj, target) <span class="Keyword">isnt</span> <span class="Keyword">-</span><span class="Number">1</span> <span class="Keyword">if</span> _.isArray(obj)
-<span class="line-numbers"> 151 </span>     <span class="Keyword">for</span> key, val <span class="Keyword">of</span> obj
+<span class="line-numbers"> 151 </span>     <span class="Keyword">for</span> val <span class="Keyword">in</span> obj
 <span class="line-numbers"> 152 </span>       <span class="Keyword">return</span> <span class="BuiltInConstant">true</span> <span class="Keyword">if</span> val <span class="Keyword">is</span> target
 <span class="line-numbers"> 153 </span>     <span class="BuiltInConstant">false</span>
 <span class="line-numbers"> 154 </span>
 <span class="line-numbers"> 155 </span>
 <span class="line-numbers"> 156 </span>   <span class="Comment"><span class="Comment">#</span> Invoke a method with arguments on every item in a collection.</span>
-<span class="line-numbers"> 157 </span> <span class="FunctionArgument">  _.invoke: obj, method </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 158 </span>     <span class="FunctionName">args</span><span class="Keyword">:</span> _.rest(arguments, <span class="Number">2</span>)
+<span class="line-numbers"> 157 </span>   <span class="FunctionName">_.invoke</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, method</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 158 </span>     args<span class="Keyword">:</span> _.rest(arguments, <span class="Number">2</span>)
 <span class="line-numbers"> 159 </span>     (<span class="Keyword">if</span> method <span class="Keyword">then</span> val[method] <span class="Keyword">else</span> val).apply(val, args) <span class="Keyword">for</span> val <span class="Keyword">in</span> obj
 <span class="line-numbers"> 160 </span>
 <span class="line-numbers"> 161 </span>
 <span class="line-numbers"> 162 </span>   <span class="Comment"><span class="Comment">#</span> Convenience version of a common use case of map: fetching a property.</span>
-<span class="line-numbers"> 163 </span> <span class="FunctionArgument">  _.pluck: obj, key </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 163 </span>   <span class="FunctionName">_.pluck</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, key</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 164 </span>     _.map(obj, (<span class="FunctionArgument">val </span><span class="Storage">=&gt;</span> val[key]))
 <span class="line-numbers"> 165 </span>
 <span class="line-numbers"> 166 </span>
 <span class="line-numbers"> 167 </span>   <span class="Comment"><span class="Comment">#</span> Return the maximum item or (item-based computation).</span>
-<span class="line-numbers"> 168 </span> <span class="FunctionArgument">  _.max: obj, iterator, context </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 168 </span>   <span class="FunctionName">_.max</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, iterator, context</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 169 </span>     <span class="Keyword">return</span> Math.max.apply(Math, obj) <span class="Keyword">if</span> <span class="Keyword">not</span> iterator <span class="Keyword">and</span> _.isArray(obj)
-<span class="line-numbers"> 170 </span>     <span class="FunctionName">result</span><span class="Keyword">:</span> {<span class="FunctionName">computed</span><span class="Keyword">:</span> <span class="Keyword">-</span><span class="BuiltInConstant">Infinity</span>}
+<span class="line-numbers"> 170 </span>     result<span class="Keyword">:</span> {computed<span class="Keyword">:</span> <span class="Keyword">-</span><span class="BuiltInConstant">Infinity</span>}
 <span class="line-numbers"> 171 </span>     _.each(obj)<span class="FunctionArgument"> value, index, list </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 172 </span>       <span class="FunctionName">computed</span><span class="Keyword">:</span> <span class="Keyword">if</span> iterator <span class="Keyword">then</span> iterator.call(context, value, index, list) <span class="Keyword">else</span> value
-<span class="line-numbers"> 173 </span>       computed <span class="Keyword">&gt;=</span> result.computed <span class="Keyword">and</span> (<span class="FunctionName">result</span><span class="Keyword">:</span> {<span class="FunctionName">value</span><span class="Keyword">:</span> value, <span class="FunctionName">computed</span><span class="Keyword">:</span> computed})
+<span class="line-numbers"> 172 </span>       computed<span class="Keyword">:</span> <span class="Keyword">if</span> iterator <span class="Keyword">then</span> iterator.call(context, value, index, list) <span class="Keyword">else</span> value
+<span class="line-numbers"> 173 </span>       computed <span class="Keyword">&gt;=</span> result.computed <span class="Keyword">and</span> (result<span class="Keyword">:</span> {value<span class="Keyword">:</span> value, computed<span class="Keyword">:</span> computed})
 <span class="line-numbers"> 174 </span>     result.value
 <span class="line-numbers"> 175 </span>
 <span class="line-numbers"> 176 </span>
 <span class="line-numbers"> 177 </span>   <span class="Comment"><span class="Comment">#</span> Return the minimum element (or element-based computation).</span>
-<span class="line-numbers"> 178 </span> <span class="FunctionArgument">  _.min: obj, iterator, context </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 178 </span>   <span class="FunctionName">_.min</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, iterator, context</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 179 </span>     <span class="Keyword">return</span> Math.min.apply(Math, obj) <span class="Keyword">if</span> <span class="Keyword">not</span> iterator <span class="Keyword">and</span> _.isArray(obj)
-<span class="line-numbers"> 180 </span>     <span class="FunctionName">result</span><span class="Keyword">:</span> {<span class="FunctionName">computed</span><span class="Keyword">:</span> <span class="BuiltInConstant">Infinity</span>}
+<span class="line-numbers"> 180 </span>     result<span class="Keyword">:</span> {computed<span class="Keyword">:</span> <span class="BuiltInConstant">Infinity</span>}
 <span class="line-numbers"> 181 </span>     _.each(obj)<span class="FunctionArgument"> value, index, list </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 182 </span>       <span class="FunctionName">computed</span><span class="Keyword">:</span> <span class="Keyword">if</span> iterator <span class="Keyword">then</span> iterator.call(context, value, index, list) <span class="Keyword">else</span> value
-<span class="line-numbers"> 183 </span>       computed <span class="Keyword">&lt;</span> result.computed <span class="Keyword">and</span> (<span class="FunctionName">result</span><span class="Keyword">:</span> {<span class="FunctionName">value</span><span class="Keyword">:</span> value, <span class="FunctionName">computed</span><span class="Keyword">:</span> computed})
+<span class="line-numbers"> 182 </span>       computed<span class="Keyword">:</span> <span class="Keyword">if</span> iterator <span class="Keyword">then</span> iterator.call(context, value, index, list) <span class="Keyword">else</span> value
+<span class="line-numbers"> 183 </span>       computed <span class="Keyword">&lt;</span> result.computed <span class="Keyword">and</span> (result<span class="Keyword">:</span> {value<span class="Keyword">:</span> value, computed<span class="Keyword">:</span> computed})
 <span class="line-numbers"> 184 </span>     result.value
 <span class="line-numbers"> 185 </span>
 <span class="line-numbers"> 186 </span>
 <span class="line-numbers"> 187 </span>   <span class="Comment"><span class="Comment">#</span> Sort the object's values by a criteria produced by an iterator.</span>
-<span class="line-numbers"> 188 </span> <span class="FunctionArgument">  _.sortBy: obj, iterator, context </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 188 </span>   <span class="FunctionName">_.sortBy</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, iterator, context</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 189 </span>     _.pluck(((_.map(obj)<span class="FunctionArgument"> value, index, list </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 190 </span>       {<span class="FunctionName">value</span><span class="Keyword">:</span> value, <span class="FunctionName">criteria</span><span class="Keyword">:</span> iterator.call(context, value, index, list)}
+<span class="line-numbers"> 190 </span>       {value<span class="Keyword">:</span> value, criteria<span class="Keyword">:</span> iterator.call(context, value, index, list)}
 <span class="line-numbers"> 191 </span>     ).sort()<span class="FunctionArgument"> left, right </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 192 </span>       <span class="FunctionName">a</span><span class="Keyword">:</span> left.criteria; <span class="FunctionName">b</span><span class="Keyword">:</span> right.criteria
+<span class="line-numbers"> 192 </span>       a<span class="Keyword">:</span> left.criteria; b<span class="Keyword">:</span> right.criteria
 <span class="line-numbers"> 193 </span>       <span class="Keyword">if</span> a <span class="Keyword">&lt;</span> b <span class="Keyword">then</span> <span class="Keyword">-</span><span class="Number">1</span> <span class="Keyword">else</span> <span class="Keyword">if</span> a <span class="Keyword">&gt;</span> b <span class="Keyword">then</span> <span class="Number">1</span> <span class="Keyword">else</span> <span class="Number">0</span>
 <span class="line-numbers"> 194 </span>     ), <span class="String"><span class="String">'</span>value<span class="String">'</span></span>)
 <span class="line-numbers"> 195 </span>
 <span class="line-numbers"> 196 </span>
 <span class="line-numbers"> 197 </span>   <span class="Comment"><span class="Comment">#</span> Use a comparator function to figure out at what index an object should</span>
 <span class="line-numbers"> 198 </span>   <span class="Comment"><span class="Comment">#</span> be inserted so as to maintain order. Uses binary search.</span>
-<span class="line-numbers"> 199 </span> <span class="FunctionArgument">  _.sortedIndex: array, obj, iterator </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 199 </span>   <span class="FunctionName">_.sortedIndex</span><span class="Keyword">:</span> <span class="FunctionArgument">array, obj, iterator</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 200 </span>     iterator <span class="Keyword">||</span><span class="Keyword">=</span> _.identity
-<span class="line-numbers"> 201 </span>     <span class="FunctionName">low</span><span class="Keyword">:</span> <span class="Number">0</span>; <span class="FunctionName">high</span><span class="Keyword">:</span> array.length
+<span class="line-numbers"> 201 </span>     low<span class="Keyword">:</span> <span class="Number">0</span>; high<span class="Keyword">:</span> array.length
 <span class="line-numbers"> 202 </span>     <span class="Keyword">while</span> low <span class="Keyword">&lt;</span> high
-<span class="line-numbers"> 203 </span>       <span class="FunctionName">mid</span><span class="Keyword">:</span> (low <span class="Keyword">+</span> high) <span class="Keyword">&gt;</span><span class="Keyword">&gt;</span> <span class="Number">1</span>
-<span class="line-numbers"> 204 </span>       <span class="Keyword">if</span> iterator(array[mid]) <span class="Keyword">&lt;</span> iterator(obj) <span class="Keyword">then</span> <span class="FunctionName">low</span><span class="Keyword">:</span> mid <span class="Keyword">+</span> <span class="Number">1</span> <span class="Keyword">else</span> <span class="FunctionName">high</span><span class="Keyword">:</span> mid
+<span class="line-numbers"> 203 </span>       mid<span class="Keyword">:</span> (low <span class="Keyword">+</span> high) <span class="Keyword">&gt;</span><span class="Keyword">&gt;</span> <span class="Number">1</span>
+<span class="line-numbers"> 204 </span>       <span class="Keyword">if</span> iterator(array[mid]) <span class="Keyword">&lt;</span> iterator(obj) <span class="Keyword">then</span> low<span class="Keyword">:</span> mid <span class="Keyword">+</span> <span class="Number">1</span> <span class="Keyword">else</span> high<span class="Keyword">:</span> mid
 <span class="line-numbers"> 205 </span>     low
 <span class="line-numbers"> 206 </span>
 <span class="line-numbers"> 207 </span>
 <span class="line-numbers"> 208 </span>   <span class="Comment"><span class="Comment">#</span> Convert anything iterable into a real, live array.</span>
-<span class="line-numbers"> 209 </span> <span class="FunctionArgument">  _.toArray: iterable </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 209 </span>   <span class="FunctionName">_.toArray</span><span class="Keyword">:</span> <span class="FunctionArgument">iterable</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 210 </span>     <span class="Keyword">return</span> []                   <span class="Keyword">if</span> (<span class="Keyword">!</span>iterable)
 <span class="line-numbers"> 211 </span>     <span class="Keyword">return</span> iterable.toArray()   <span class="Keyword">if</span> (iterable.toArray)
 <span class="line-numbers"> 212 </span>     <span class="Keyword">return</span> iterable             <span class="Keyword">if</span> (_.isArray(iterable))
@@ -234,7 +235,7 @@
 <span class="line-numbers"> 215 </span>
 <span class="line-numbers"> 216 </span>
 <span class="line-numbers"> 217 </span>   <span class="Comment"><span class="Comment">#</span> Return the number of elements in an object.</span>
-<span class="line-numbers"> 218 </span> <span class="FunctionArgument">  _.size: obj </span><span class="Storage">=&gt;</span> _.toArray(obj).length
+<span class="line-numbers"> 218 </span>   <span class="FunctionName">_.size</span><span class="Keyword">:</span> <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> _.toArray(obj).length
 <span class="line-numbers"> 219 </span>
 <span class="line-numbers"> 220 </span>
 <span class="line-numbers"> 221 </span>   <span class="Comment"><span class="Comment">#</span> -------------------------- Array Functions: ------------------------------</span>
@@ -242,7 +243,7 @@
 <span class="line-numbers"> 223 </span>   <span class="Comment"><span class="Comment">#</span> Get the first element of an array. Passing &quot;n&quot; will return the first N</span>
 <span class="line-numbers"> 224 </span>   <span class="Comment"><span class="Comment">#</span> values in the array. Aliased as &quot;head&quot;. The &quot;guard&quot; check allows it to work</span>
 <span class="line-numbers"> 225 </span>   <span class="Comment"><span class="Comment">#</span> with _.map.</span>
-<span class="line-numbers"> 226 </span> <span class="FunctionArgument">  _.first: array, n, guard </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 226 </span>   <span class="FunctionName">_.first</span><span class="Keyword">:</span> <span class="FunctionArgument">array, n, guard</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 227 </span>     <span class="Keyword">if</span> n <span class="Keyword">and</span> <span class="Keyword">not</span> guard <span class="Keyword">then</span> slice.call(array, <span class="Number">0</span>, n) <span class="Keyword">else</span> array[<span class="Number">0</span>]
 <span class="line-numbers"> 228 </span>
 <span class="line-numbers"> 229 </span>
@@ -250,20 +251,20 @@
 <span class="line-numbers"> 231 </span>   <span class="Comment"><span class="Comment">#</span> Especially useful on the arguments object. Passing an &quot;index&quot; will return</span>
 <span class="line-numbers"> 232 </span>   <span class="Comment"><span class="Comment">#</span> the rest of the values in the array from that index onward. The &quot;guard&quot;</span>
 <span class="line-numbers"> 233 </span>   <span class="Comment"><span class="Comment">#</span> check allows it to work with _.map.</span>
-<span class="line-numbers"> 234 </span> <span class="FunctionArgument">  _.rest: array, index, guard </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 234 </span>   <span class="FunctionName">_.rest</span><span class="Keyword">:</span> <span class="FunctionArgument">array, index, guard</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 235 </span>     slice.call(array, <span class="Keyword">if</span> _.isUndefined(index) <span class="Keyword">or</span> guard <span class="Keyword">then</span> <span class="Number">1</span> <span class="Keyword">else</span> index)
 <span class="line-numbers"> 236 </span>
 <span class="line-numbers"> 237 </span>
 <span class="line-numbers"> 238 </span>   <span class="Comment"><span class="Comment">#</span> Get the last element of an array.</span>
-<span class="line-numbers"> 239 </span> <span class="FunctionArgument">  _.last: array </span><span class="Storage">=&gt;</span> array[array.length <span class="Keyword">-</span> <span class="Number">1</span>]
+<span class="line-numbers"> 239 </span>   <span class="FunctionName">_.last</span><span class="Keyword">:</span> <span class="FunctionArgument">array</span> <span class="Storage">=&gt;</span> array[array.length <span class="Keyword">-</span> <span class="Number">1</span>]
 <span class="line-numbers"> 240 </span>
 <span class="line-numbers"> 241 </span>
 <span class="line-numbers"> 242 </span>   <span class="Comment"><span class="Comment">#</span> Trim out all falsy values from an array.</span>
-<span class="line-numbers"> 243 </span> <span class="FunctionArgument">  _.compact: array </span><span class="Storage">=&gt;</span> array[i] <span class="Keyword">for</span> i <span class="Keyword">in</span> [<span class="Number">0</span>...array.length] <span class="Keyword">when</span> array[i]
+<span class="line-numbers"> 243 </span>   <span class="FunctionName">_.compact</span><span class="Keyword">:</span> <span class="FunctionArgument">array</span> <span class="Storage">=&gt;</span> array[i] <span class="Keyword">for</span> i <span class="Keyword">in</span> [<span class="Number">0</span>...array.length] <span class="Keyword">when</span> array[i]
 <span class="line-numbers"> 244 </span>
 <span class="line-numbers"> 245 </span>
 <span class="line-numbers"> 246 </span>   <span class="Comment"><span class="Comment">#</span> Return a completely flattened version of an array.</span>
-<span class="line-numbers"> 247 </span> <span class="FunctionArgument">  _.flatten: array </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 247 </span>   <span class="FunctionName">_.flatten</span><span class="Keyword">:</span> <span class="FunctionArgument">array</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 248 </span>     _.reduce(array, [])<span class="FunctionArgument"> memo, value </span><span class="Storage">=&gt;</span>
 <span class="line-numbers"> 249 </span>       <span class="Keyword">return</span> memo.concat(_.flatten(value)) <span class="Keyword">if</span> _.isArray(value)
 <span class="line-numbers"> 250 </span>       memo.push(value)
@@ -271,15 +272,15 @@
 <span class="line-numbers"> 252 </span>
 <span class="line-numbers"> 253 </span>
 <span class="line-numbers"> 254 </span>   <span class="Comment"><span class="Comment">#</span> Return a version of the array that does not contain the specified value(s).</span>
-<span class="line-numbers"> 255 </span> <span class="FunctionArgument">  _.without: array </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 256 </span>     <span class="FunctionName">values</span><span class="Keyword">:</span> _.rest(arguments)
+<span class="line-numbers"> 255 </span>   <span class="FunctionName">_.without</span><span class="Keyword">:</span> <span class="FunctionArgument">array</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 256 </span>     values<span class="Keyword">:</span> _.rest(arguments)
 <span class="line-numbers"> 257 </span>     val <span class="Keyword">for</span> val <span class="Keyword">in</span> _.toArray(array) <span class="Keyword">when</span> <span class="Keyword">not</span> _.include(values, val)
 <span class="line-numbers"> 258 </span>
 <span class="line-numbers"> 259 </span>
 <span class="line-numbers"> 260 </span>   <span class="Comment"><span class="Comment">#</span> Produce a duplicate-free version of the array. If the array has already</span>
 <span class="line-numbers"> 261 </span>   <span class="Comment"><span class="Comment">#</span> been sorted, you have the option of using a faster algorithm.</span>
-<span class="line-numbers"> 262 </span> <span class="FunctionArgument">  _.uniq: array, isSorted </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 263 </span>     <span class="FunctionName">memo</span><span class="Keyword">:</span> []
+<span class="line-numbers"> 262 </span>   <span class="FunctionName">_.uniq</span><span class="Keyword">:</span> <span class="FunctionArgument">array, isSorted</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 263 </span>     memo<span class="Keyword">:</span> []
 <span class="line-numbers"> 264 </span>     <span class="Keyword">for</span> el, i <span class="Keyword">in</span> _.toArray(array)
 <span class="line-numbers"> 265 </span>       memo.push(el) <span class="Keyword">if</span> i <span class="Keyword">is</span> <span class="Number">0</span> <span class="Keyword">||</span> (<span class="Keyword">if</span> isSorted <span class="Keyword">is</span> <span class="BuiltInConstant">true</span> <span class="Keyword">then</span> _.last(memo) <span class="Keyword">isnt</span> el <span class="Keyword">else</span> <span class="Keyword">not</span> _.include(memo, el))
 <span class="line-numbers"> 266 </span>     memo
@@ -287,8 +288,8 @@
 <span class="line-numbers"> 268 </span>
 <span class="line-numbers"> 269 </span>   <span class="Comment"><span class="Comment">#</span> Produce an array that contains every item shared between all the</span>
 <span class="line-numbers"> 270 </span>   <span class="Comment"><span class="Comment">#</span> passed-in arrays.</span>
-<span class="line-numbers"> 271 </span> <span class="FunctionArgument">  _.intersect: array </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 272 </span>     <span class="FunctionName">rest</span><span class="Keyword">:</span> _.rest(arguments)
+<span class="line-numbers"> 271 </span>   <span class="FunctionName">_.intersect</span><span class="Keyword">:</span> <span class="FunctionArgument">array</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 272 </span>     rest<span class="Keyword">:</span> _.rest(arguments)
 <span class="line-numbers"> 273 </span>     _.select(_.uniq(array))<span class="FunctionArgument"> item </span><span class="Storage">=&gt;</span>
 <span class="line-numbers"> 274 </span>       _.all(rest)<span class="FunctionArgument"> other </span><span class="Storage">=&gt;</span>
 <span class="line-numbers"> 275 </span>         _.indexOf(other, item) <span class="Keyword">&gt;=</span> <span class="Number">0</span>
@@ -296,10 +297,10 @@
 <span class="line-numbers"> 277 </span>
 <span class="line-numbers"> 278 </span>   <span class="Comment"><span class="Comment">#</span> Zip together multiple lists into a single array -- elements that share</span>
 <span class="line-numbers"> 279 </span>   <span class="Comment"><span class="Comment">#</span> an index go together.</span>
-<span class="line-numbers"> 280 </span> <span class="FunctionArgument">  _.zip: </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 281 </span>     <span class="FunctionName">args</span><span class="Keyword">:</span>       _.toArray(arguments)
-<span class="line-numbers"> 282 </span>     <span class="FunctionName">length</span><span class="Keyword">:</span>     _.max(_.pluck(args, <span class="String"><span class="String">'</span>length<span class="String">'</span></span>))
-<span class="line-numbers"> 283 </span>     <span class="FunctionName">results</span><span class="Keyword">:</span>    <span class="Keyword">new</span> <span class="TypeName">Array</span>(length)
+<span class="line-numbers"> 280 </span>   <span class="FunctionName">_.zip</span><span class="Keyword">:</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 281 </span>     args<span class="Keyword">:</span>       _.toArray(arguments)
+<span class="line-numbers"> 282 </span>     length<span class="Keyword">:</span>     _.max(_.pluck(args, <span class="String"><span class="String">'</span>length<span class="String">'</span></span>))
+<span class="line-numbers"> 283 </span>     results<span class="Keyword">:</span>    <span class="Keyword">new</span> <span class="TypeName">Array</span>(length)
 <span class="line-numbers"> 284 </span>     <span class="Keyword">for</span> i <span class="Keyword">in</span> [<span class="Number">0</span>...length]
 <span class="line-numbers"> 285 </span>       results[i]<span class="Keyword">:</span> _.pluck(args, String(i))
 <span class="line-numbers"> 286 </span>     results
@@ -308,9 +309,9 @@
 <span class="line-numbers"> 289 </span>   <span class="Comment"><span class="Comment">#</span> If the browser doesn't supply us with indexOf (I'm looking at you, MSIE),</span>
 <span class="line-numbers"> 290 </span>   <span class="Comment"><span class="Comment">#</span> we need this function. Return the position of the first occurence of an</span>
 <span class="line-numbers"> 291 </span>   <span class="Comment"><span class="Comment">#</span> item in an array, or -1 if the item is not included in the array.</span>
-<span class="line-numbers"> 292 </span> <span class="FunctionArgument">  _.indexOf: array, item </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 292 </span>   <span class="FunctionName">_.indexOf</span><span class="Keyword">:</span> <span class="FunctionArgument">array, item</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 293 </span>     <span class="Keyword">return</span> array.indexOf(item) <span class="Keyword">if</span> array.indexOf
-<span class="line-numbers"> 294 </span>     <span class="FunctionName">i</span><span class="Keyword">:</span> <span class="Number">0</span>; <span class="FunctionName">l</span><span class="Keyword">:</span> array.length
+<span class="line-numbers"> 294 </span>     i<span class="Keyword">:</span> <span class="Number">0</span>; l<span class="Keyword">:</span> array.length
 <span class="line-numbers"> 295 </span>     <span class="Keyword">while</span> l <span class="Keyword">-</span> i
 <span class="line-numbers"> 296 </span>       <span class="Keyword">if</span> array[i] <span class="Keyword">is</span> item <span class="Keyword">then</span> <span class="Keyword">return</span> i <span class="Keyword">else</span> i<span class="Keyword">++</span>
 <span class="line-numbers"> 297 </span>     <span class="Keyword">-</span><span class="Number">1</span>
@@ -318,9 +319,9 @@
 <span class="line-numbers"> 299 </span>
 <span class="line-numbers"> 300 </span>   <span class="Comment"><span class="Comment">#</span> Provide JavaScript 1.6's lastIndexOf, delegating to the native function,</span>
 <span class="line-numbers"> 301 </span>   <span class="Comment"><span class="Comment">#</span> if possible.</span>
-<span class="line-numbers"> 302 </span> <span class="FunctionArgument">  _.lastIndexOf: array, item </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 302 </span>   <span class="FunctionName">_.lastIndexOf</span><span class="Keyword">:</span> <span class="FunctionArgument">array, item</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 303 </span>     <span class="Keyword">return</span> array.lastIndexOf(item) <span class="Keyword">if</span> array.lastIndexOf
-<span class="line-numbers"> 304 </span>     <span class="FunctionName">i</span><span class="Keyword">:</span> array.length
+<span class="line-numbers"> 304 </span>     i<span class="Keyword">:</span> array.length
 <span class="line-numbers"> 305 </span>     <span class="Keyword">while</span> i
 <span class="line-numbers"> 306 </span>       <span class="Keyword">if</span> array[i] <span class="Keyword">is</span> item <span class="Keyword">then</span> <span class="Keyword">return</span> i <span class="Keyword">else</span> i<span class="Keyword">--</span>
 <span class="line-numbers"> 307 </span>     <span class="Keyword">-</span><span class="Number">1</span>
@@ -329,16 +330,16 @@
 <span class="line-numbers"> 310 </span>   <span class="Comment"><span class="Comment">#</span> Generate an integer Array containing an arithmetic progression. A port of</span>
 <span class="line-numbers"> 311 </span>   <span class="Comment"><span class="Comment">#</span> the native Python range() function. See:</span>
 <span class="line-numbers"> 312 </span>   <span class="Comment"><span class="Comment">#</span> http://docs.python.org/library/functions.html#range</span>
-<span class="line-numbers"> 313 </span> <span class="FunctionArgument">  _.range: start, stop, step </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 314 </span>     <span class="FunctionName">a</span><span class="Keyword">:</span>        _.toArray(arguments)
-<span class="line-numbers"> 315 </span>     <span class="FunctionName">solo</span><span class="Keyword">:</span>     a.length <span class="Keyword">&lt;=</span> <span class="Number">1</span>
-<span class="line-numbers"> 316 </span>     <span class="FunctionName">i</span><span class="Keyword">:</span> <span class="FunctionName">start</span><span class="Keyword">:</span> <span class="Keyword">if</span> solo <span class="Keyword">then</span> <span class="Number">0</span> <span class="Keyword">else</span> a[<span class="Number">0</span>];
-<span class="line-numbers"> 317 </span>     <span class="FunctionName">stop</span><span class="Keyword">:</span>     <span class="Keyword">if</span> solo <span class="Keyword">then</span> a[<span class="Number">0</span>] <span class="Keyword">else</span> a[<span class="Number">1</span>];
-<span class="line-numbers"> 318 </span>     <span class="FunctionName">step</span><span class="Keyword">:</span>     a[<span class="Number">2</span>] <span class="Keyword">or</span> <span class="Number">1</span>
-<span class="line-numbers"> 319 </span>     <span class="FunctionName">len</span><span class="Keyword">:</span>      Math.ceil((stop <span class="Keyword">-</span> start) <span class="Keyword">/</span> step)
+<span class="line-numbers"> 313 </span>   <span class="FunctionName">_.range</span><span class="Keyword">:</span> <span class="FunctionArgument">start, stop, step</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 314 </span>     a<span class="Keyword">:</span>        _.toArray(arguments)
+<span class="line-numbers"> 315 </span>     solo<span class="Keyword">:</span>     a.length <span class="Keyword">&lt;=</span> <span class="Number">1</span>
+<span class="line-numbers"> 316 </span>     i<span class="Keyword">:</span> start<span class="Keyword">:</span> <span class="Keyword">if</span> solo <span class="Keyword">then</span> <span class="Number">0</span> <span class="Keyword">else</span> a[<span class="Number">0</span>];
+<span class="line-numbers"> 317 </span>     stop<span class="Keyword">:</span>     <span class="Keyword">if</span> solo <span class="Keyword">then</span> a[<span class="Number">0</span>] <span class="Keyword">else</span> a[<span class="Number">1</span>];
+<span class="line-numbers"> 318 </span>     step<span class="Keyword">:</span>     a[<span class="Number">2</span>] <span class="Keyword">or</span> <span class="Number">1</span>
+<span class="line-numbers"> 319 </span>     len<span class="Keyword">:</span>      Math.ceil((stop <span class="Keyword">-</span> start) <span class="Keyword">/</span> step)
 <span class="line-numbers"> 320 </span>     <span class="Keyword">return</span> [] <span class="Keyword">if</span> len <span class="Keyword">&lt;=</span> <span class="Number">0</span>
-<span class="line-numbers"> 321 </span>     <span class="FunctionName">range</span><span class="Keyword">:</span>    <span class="Keyword">new</span> <span class="TypeName">Array</span>(len)
-<span class="line-numbers"> 322 </span>     <span class="FunctionName">idx</span><span class="Keyword">:</span>      <span class="Number">0</span>
+<span class="line-numbers"> 321 </span>     range<span class="Keyword">:</span>    <span class="Keyword">new</span> <span class="TypeName">Array</span>(len)
+<span class="line-numbers"> 322 </span>     idx<span class="Keyword">:</span>      <span class="Number">0</span>
 <span class="line-numbers"> 323 </span>     <span class="Keyword">while</span> <span class="BuiltInConstant">true</span>
 <span class="line-numbers"> 324 </span>       <span class="Keyword">return</span> range <span class="Keyword">if</span> (<span class="Keyword">if</span> step <span class="Keyword">&gt;</span> <span class="Number">0</span> <span class="Keyword">then</span> i <span class="Keyword">-</span> stop <span class="Keyword">else</span> stop <span class="Keyword">-</span> i) <span class="Keyword">&gt;=</span> <span class="Number">0</span>
 <span class="line-numbers"> 325 </span>       range[idx]<span class="Keyword">:</span> i
@@ -350,94 +351,94 @@
 <span class="line-numbers"> 331 </span>
 <span class="line-numbers"> 332 </span>   <span class="Comment"><span class="Comment">#</span> Create a function bound to a given object (assigning 'this', and arguments,</span>
 <span class="line-numbers"> 333 </span>   <span class="Comment"><span class="Comment">#</span> optionally). Binding with arguments is also known as 'curry'.</span>
-<span class="line-numbers"> 334 </span> <span class="FunctionArgument">  _.bind: func, obj </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 335 </span>     <span class="FunctionName">args</span><span class="Keyword">:</span> _.rest(arguments, <span class="Number">2</span>)
+<span class="line-numbers"> 334 </span>   <span class="FunctionName">_.bind</span><span class="Keyword">:</span> <span class="FunctionArgument">func, obj</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 335 </span>     args<span class="Keyword">:</span> _.rest(arguments, <span class="Number">2</span>)
 <span class="line-numbers"> 336 </span> <span class="FunctionArgument">    </span><span class="Storage">=&gt;</span> func.apply(obj <span class="Keyword">or</span> root, args.concat(_.toArray(arguments)))
 <span class="line-numbers"> 337 </span>
 <span class="line-numbers"> 338 </span>
 <span class="line-numbers"> 339 </span>   <span class="Comment"><span class="Comment">#</span> Bind all of an object's methods to that object. Useful for ensuring that</span>
 <span class="line-numbers"> 340 </span>   <span class="Comment"><span class="Comment">#</span> all callbacks defined on an object belong to it.</span>
-<span class="line-numbers"> 341 </span> <span class="FunctionArgument">  _.bindAll: obj </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 342 </span>     <span class="FunctionName">funcs</span><span class="Keyword">:</span> <span class="Keyword">if</span> arguments.length <span class="Keyword">&gt;</span> <span class="Number">1</span> <span class="Keyword">then</span> _.rest(arguments) <span class="Keyword">else</span> _.functions(obj)
+<span class="line-numbers"> 341 </span>   <span class="FunctionName">_.bindAll</span><span class="Keyword">:</span> <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 342 </span>     funcs<span class="Keyword">:</span> <span class="Keyword">if</span> arguments.length <span class="Keyword">&gt;</span> <span class="Number">1</span> <span class="Keyword">then</span> _.rest(arguments) <span class="Keyword">else</span> _.functions(obj)
 <span class="line-numbers"> 343 </span>     _.each(funcs, (<span class="FunctionArgument">f </span><span class="Storage">=&gt;</span> obj[f]<span class="Keyword">:</span> _.bind(obj[f], obj)))
 <span class="line-numbers"> 344 </span>     obj
 <span class="line-numbers"> 345 </span>
 <span class="line-numbers"> 346 </span>
 <span class="line-numbers"> 347 </span>   <span class="Comment"><span class="Comment">#</span> Delays a function for the given number of milliseconds, and then calls</span>
 <span class="line-numbers"> 348 </span>   <span class="Comment"><span class="Comment">#</span> it with the arguments supplied.</span>
-<span class="line-numbers"> 349 </span> <span class="FunctionArgument">  _.delay: func, wait </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 350 </span>     <span class="FunctionName">args</span><span class="Keyword">:</span> _.rest(arguments, <span class="Number">2</span>)
+<span class="line-numbers"> 349 </span>   <span class="FunctionName">_.delay</span><span class="Keyword">:</span> <span class="FunctionArgument">func, wait</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 350 </span>     args<span class="Keyword">:</span> _.rest(arguments, <span class="Number">2</span>)
 <span class="line-numbers"> 351 </span>     setTimeout((<span class="Storage">=&gt;</span> func.apply(func, args)), wait)
 <span class="line-numbers"> 352 </span>
 <span class="line-numbers"> 353 </span>
 <span class="line-numbers"> 354 </span>   <span class="Comment"><span class="Comment">#</span> Defers a function, scheduling it to run after the current call stack has</span>
 <span class="line-numbers"> 355 </span>   <span class="Comment"><span class="Comment">#</span> cleared.</span>
-<span class="line-numbers"> 356 </span> <span class="FunctionArgument">  _.defer: func </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 356 </span>   <span class="FunctionName">_.defer</span><span class="Keyword">:</span> <span class="FunctionArgument">func</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 357 </span>     _.delay.apply(_, [func, <span class="Number">1</span>].concat(_.rest(arguments)))
 <span class="line-numbers"> 358 </span>
 <span class="line-numbers"> 359 </span>
 <span class="line-numbers"> 360 </span>   <span class="Comment"><span class="Comment">#</span> Returns the first function passed as an argument to the second,</span>
 <span class="line-numbers"> 361 </span>   <span class="Comment"><span class="Comment">#</span> allowing you to adjust arguments, run code before and after, and</span>
 <span class="line-numbers"> 362 </span>   <span class="Comment"><span class="Comment">#</span> conditionally execute the original function.</span>
-<span class="line-numbers"> 363 </span> <span class="FunctionArgument">  _.wrap: func, wrapper </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 363 </span>   <span class="FunctionName">_.wrap</span><span class="Keyword">:</span> <span class="FunctionArgument">func, wrapper</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 364 </span> <span class="FunctionArgument">    </span><span class="Storage">=&gt;</span> wrapper.apply(wrapper, [func].concat(_.toArray(arguments)))
 <span class="line-numbers"> 365 </span>
 <span class="line-numbers"> 366 </span>
 <span class="line-numbers"> 367 </span>   <span class="Comment"><span class="Comment">#</span> Returns a function that is the composition of a list of functions, each</span>
 <span class="line-numbers"> 368 </span>   <span class="Comment"><span class="Comment">#</span> consuming the return value of the function that follows.</span>
-<span class="line-numbers"> 369 </span> <span class="FunctionArgument">  _.compose: </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 370 </span>     <span class="FunctionName">funcs</span><span class="Keyword">:</span> _.toArray(arguments)
+<span class="line-numbers"> 369 </span>   <span class="FunctionName">_.compose</span><span class="Keyword">:</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 370 </span>     funcs<span class="Keyword">:</span> _.toArray(arguments)
 <span class="line-numbers"> 371 </span> <span class="FunctionArgument">    </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 372 </span>       <span class="FunctionName">args</span><span class="Keyword">:</span> _.toArray(arguments)
+<span class="line-numbers"> 372 </span>       args<span class="Keyword">:</span> _.toArray(arguments)
 <span class="line-numbers"> 373 </span>       <span class="Keyword">for</span> i <span class="Keyword">in</span> [(funcs.length <span class="Keyword">-</span> <span class="Number">1</span>)..<span class="Number">0</span>]
-<span class="line-numbers"> 374 </span>         <span class="FunctionName">args</span><span class="Keyword">:</span> [funcs[i].apply(<span class="Variable">this</span>, args)]
+<span class="line-numbers"> 374 </span>         args<span class="Keyword">:</span> [funcs[i].apply(<span class="Variable">this</span>, args)]
 <span class="line-numbers"> 375 </span>       args[<span class="Number">0</span>]
 <span class="line-numbers"> 376 </span>
 <span class="line-numbers"> 377 </span>
 <span class="line-numbers"> 378 </span>   <span class="Comment"><span class="Comment">#</span> ------------------------- Object Functions: ----------------------------</span>
 <span class="line-numbers"> 379 </span>
 <span class="line-numbers"> 380 </span>   <span class="Comment"><span class="Comment">#</span> Retrieve the names of an object's properties.</span>
-<span class="line-numbers"> 381 </span> <span class="FunctionArgument">  _.keys: obj </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 381 </span>   <span class="FunctionName">_.keys</span><span class="Keyword">:</span> <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 382 </span>     <span class="Keyword">return</span> _.range(<span class="Number">0</span>, obj.length) <span class="Keyword">if</span> _.isArray(obj)
-<span class="line-numbers"> 383 </span>     key <span class="Keyword">for</span> key, val <span class="Keyword">of</span> obj
+<span class="line-numbers"> 383 </span>     key <span class="Keyword">for</span> val, key <span class="Keyword">in</span> obj
 <span class="line-numbers"> 384 </span>
 <span class="line-numbers"> 385 </span>
 <span class="line-numbers"> 386 </span>   <span class="Comment"><span class="Comment">#</span> Retrieve the values of an object's properties.</span>
-<span class="line-numbers"> 387 </span> <span class="FunctionArgument">  _.values: obj </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 387 </span>   <span class="FunctionName">_.values</span><span class="Keyword">:</span> <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 388 </span>     _.map(obj, _.identity)
 <span class="line-numbers"> 389 </span>
 <span class="line-numbers"> 390 </span>
 <span class="line-numbers"> 391 </span>   <span class="Comment"><span class="Comment">#</span> Return a sorted list of the function names available in Underscore.</span>
-<span class="line-numbers"> 392 </span> <span class="FunctionArgument">  _.functions: obj </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 392 </span>   <span class="FunctionName">_.functions</span><span class="Keyword">:</span> <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 393 </span>     _.select(_.keys(obj)<span class="FunctionArgument">, key </span><span class="Storage">=&gt;</span> _.isFunction(obj[key])).sort()
 <span class="line-numbers"> 394 </span>
 <span class="line-numbers"> 395 </span>
 <span class="line-numbers"> 396 </span>   <span class="Comment"><span class="Comment">#</span> Extend a given object with all of the properties in a source object.</span>
-<span class="line-numbers"> 397 </span> <span class="FunctionArgument">  _.extend: destination, source </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 398 </span>     <span class="Keyword">for</span> key, val <span class="Keyword">of</span> source
+<span class="line-numbers"> 397 </span>   <span class="FunctionName">_.extend</span><span class="Keyword">:</span> <span class="FunctionArgument">destination, source</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 398 </span>     <span class="Keyword">for</span> val, key <span class="Keyword">in</span> source
 <span class="line-numbers"> 399 </span>       destination[key]<span class="Keyword">:</span> val
 <span class="line-numbers"> 400 </span>     destination
 <span class="line-numbers"> 401 </span>
 <span class="line-numbers"> 402 </span>
 <span class="line-numbers"> 403 </span>   <span class="Comment"><span class="Comment">#</span> Create a (shallow-cloned) duplicate of an object.</span>
-<span class="line-numbers"> 404 </span> <span class="FunctionArgument">  _.clone: obj </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 404 </span>   <span class="FunctionName">_.clone</span><span class="Keyword">:</span> <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 405 </span>     <span class="Keyword">return</span> obj.slice(<span class="Number">0</span>) <span class="Keyword">if</span> _.isArray(obj)
 <span class="line-numbers"> 406 </span>     _.extend({}, obj)
 <span class="line-numbers"> 407 </span>
 <span class="line-numbers"> 408 </span>
 <span class="line-numbers"> 409 </span>   <span class="Comment"><span class="Comment">#</span> Invokes interceptor with the obj, and then returns obj.</span>
 <span class="line-numbers"> 410 </span>   <span class="Comment"><span class="Comment">#</span> The primary purpose of this method is to &quot;tap into&quot; a method chain, in order to perform operations on intermediate results within the chain.</span>
-<span class="line-numbers"> 411 </span> <span class="FunctionArgument">  _.tap: obj, interceptor </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 411 </span>   <span class="FunctionName">_.tap</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, interceptor</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 412 </span>     interceptor(obj)
 <span class="line-numbers"> 413 </span>     obj
 <span class="line-numbers"> 414 </span>
 <span class="line-numbers"> 415 </span>
 <span class="line-numbers"> 416 </span>   <span class="Comment"><span class="Comment">#</span> Perform a deep comparison to check if two objects are equal.</span>
-<span class="line-numbers"> 417 </span> <span class="FunctionArgument">  _.isEqual: a, b </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 417 </span>   <span class="FunctionName">_.isEqual</span><span class="Keyword">:</span> <span class="FunctionArgument">a, b</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 418 </span>     <span class="Comment"><span class="Comment">#</span> Check object identity.</span>
 <span class="line-numbers"> 419 </span>     <span class="Keyword">return</span> <span class="BuiltInConstant">true</span> <span class="Keyword">if</span> a <span class="Keyword">is</span> b
 <span class="line-numbers"> 420 </span>     <span class="Comment"><span class="Comment">#</span> Different types?</span>
-<span class="line-numbers"> 421 </span>     <span class="FunctionName">atype</span><span class="Keyword">:</span> <span class="Keyword">typeof</span>(a); <span class="FunctionName">btype</span><span class="Keyword">:</span> <span class="Keyword">typeof</span>(b)
+<span class="line-numbers"> 421 </span>     atype<span class="Keyword">:</span> <span class="Keyword">typeof</span>(a); btype<span class="Keyword">:</span> <span class="Keyword">typeof</span>(b)
 <span class="line-numbers"> 422 </span>     <span class="Keyword">return</span> <span class="BuiltInConstant">false</span> <span class="Keyword">if</span> atype <span class="Keyword">isnt</span> btype
 <span class="line-numbers"> 423 </span>     <span class="Comment"><span class="Comment">#</span> Basic equality test (watch out for coercions).</span>
 <span class="line-numbers"> 424 </span>     <span class="Keyword">return</span> <span class="BuiltInConstant">true</span> <span class="Keyword">if</span> <span class="String"><span class="String">`</span>a == b<span class="String">`</span></span>
@@ -460,7 +461,7 @@
 <span class="line-numbers"> 441 </span>     <span class="Comment"><span class="Comment">#</span> Check for different array lengths before comparing contents.</span>
 <span class="line-numbers"> 442 </span>     <span class="Keyword">return</span> <span class="BuiltInConstant">false</span> <span class="Keyword">if</span> a.length <span class="Keyword">and</span> (a.length <span class="Keyword">isnt</span> b.length)
 <span class="line-numbers"> 443 </span>     <span class="Comment"><span class="Comment">#</span> Nothing else worked, deep compare the contents.</span>
-<span class="line-numbers"> 444 </span>     <span class="FunctionName">aKeys</span><span class="Keyword">:</span> _.keys(a); <span class="FunctionName">bKeys</span><span class="Keyword">:</span> _.keys(b)
+<span class="line-numbers"> 444 </span>     aKeys<span class="Keyword">:</span> _.keys(a); bKeys<span class="Keyword">:</span> _.keys(b)
 <span class="line-numbers"> 445 </span>     <span class="Comment"><span class="Comment">#</span> Different object sizes?</span>
 <span class="line-numbers"> 446 </span>     <span class="Keyword">return</span> <span class="BuiltInConstant">false</span> <span class="Keyword">if</span> aKeys.length <span class="Keyword">isnt</span> bKeys.length
 <span class="line-numbers"> 447 </span>     <span class="Comment"><span class="Comment">#</span> Recursive comparison of contents.</span>
@@ -469,81 +470,81 @@
 <span class="line-numbers"> 450 </span>
 <span class="line-numbers"> 451 </span>
 <span class="line-numbers"> 452 </span>   <span class="Comment"><span class="Comment">#</span> Is a given array or object empty?</span>
-<span class="line-numbers"> 453 </span> <span class="FunctionArgument">  _.isEmpty:      obj </span><span class="Storage">=&gt;</span> _.keys(obj).length <span class="Keyword">is</span> <span class="Number">0</span>
+<span class="line-numbers"> 453 </span>   <span class="FunctionName">_.isEmpty</span><span class="Keyword">:</span>      <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> _.keys(obj).length <span class="Keyword">is</span> <span class="Number">0</span>
 <span class="line-numbers"> 454 </span>
 <span class="line-numbers"> 455 </span>
 <span class="line-numbers"> 456 </span>   <span class="Comment"><span class="Comment">#</span> Is a given value a DOM element?</span>
-<span class="line-numbers"> 457 </span> <span class="FunctionArgument">  _.isElement:    obj </span><span class="Storage">=&gt;</span> obj <span class="Keyword">and</span> obj.nodeType <span class="Keyword">is</span> <span class="Number">1</span>
+<span class="line-numbers"> 457 </span>   <span class="FunctionName">_.isElement</span><span class="Keyword">:</span>    <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> obj <span class="Keyword">and</span> obj.nodeType <span class="Keyword">is</span> <span class="Number">1</span>
 <span class="line-numbers"> 458 </span>
 <span class="line-numbers"> 459 </span>
 <span class="line-numbers"> 460 </span>   <span class="Comment"><span class="Comment">#</span> Is a given value an array?</span>
-<span class="line-numbers"> 461 </span> <span class="FunctionArgument">  _.isArray:      obj </span><span class="Storage">=&gt;</span> <span class="Keyword">!</span><span class="Keyword">!</span>(obj <span class="Keyword">and</span> obj.concat <span class="Keyword">and</span> obj.unshift)
+<span class="line-numbers"> 461 </span>   <span class="FunctionName">_.isArray</span><span class="Keyword">:</span>      <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> <span class="Keyword">!</span><span class="Keyword">!</span>(obj <span class="Keyword">and</span> obj.concat <span class="Keyword">and</span> obj.unshift)
 <span class="line-numbers"> 462 </span>
 <span class="line-numbers"> 463 </span>
 <span class="line-numbers"> 464 </span>   <span class="Comment"><span class="Comment">#</span> Is a given variable an arguments object?</span>
-<span class="line-numbers"> 465 </span> <span class="FunctionArgument">  _.isArguments:  obj </span><span class="Storage">=&gt;</span> obj <span class="Keyword">and</span> _.isNumber(obj.length) <span class="Keyword">and</span> <span class="Keyword">!</span>_.isArray(obj) <span class="Keyword">and</span> <span class="Keyword">!</span>propertyIsEnumerable.call(obj, <span class="String"><span class="String">'</span>length<span class="String">'</span></span>)
+<span class="line-numbers"> 465 </span>   <span class="FunctionName">_.isArguments</span><span class="Keyword">:</span>  <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> obj <span class="Keyword">and</span> _.isNumber(obj.length) <span class="Keyword">and</span> <span class="Keyword">!</span>_.isArray(obj) <span class="Keyword">and</span> <span class="Keyword">!</span>propertyIsEnumerable.call(obj, <span class="String"><span class="String">'</span>length<span class="String">'</span></span>)
 <span class="line-numbers"> 466 </span>
 <span class="line-numbers"> 467 </span>
 <span class="line-numbers"> 468 </span>   <span class="Comment"><span class="Comment">#</span> Is the given value a function?</span>
-<span class="line-numbers"> 469 </span> <span class="FunctionArgument">  _.isFunction:   obj </span><span class="Storage">=&gt;</span> <span class="Keyword">!</span><span class="Keyword">!</span>(obj <span class="Keyword">and</span> obj.constructor <span class="Keyword">and</span> obj.call <span class="Keyword">and</span> obj.apply)
+<span class="line-numbers"> 469 </span>   <span class="FunctionName">_.isFunction</span><span class="Keyword">:</span>   <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> <span class="Keyword">!</span><span class="Keyword">!</span>(obj <span class="Keyword">and</span> obj.constructor <span class="Keyword">and</span> obj.call <span class="Keyword">and</span> obj.apply)
 <span class="line-numbers"> 470 </span>
 <span class="line-numbers"> 471 </span>
 <span class="line-numbers"> 472 </span>   <span class="Comment"><span class="Comment">#</span> Is the given value a string?</span>
-<span class="line-numbers"> 473 </span> <span class="FunctionArgument">  _.isString:     obj </span><span class="Storage">=&gt;</span> <span class="Keyword">!</span><span class="Keyword">!</span>(obj <span class="Keyword">is</span> <span class="String"><span class="String">'</span><span class="String">'</span></span> <span class="Keyword">or</span> (obj <span class="Keyword">and</span> obj.charCodeAt <span class="Keyword">and</span> obj.substr))
+<span class="line-numbers"> 473 </span>   <span class="FunctionName">_.isString</span><span class="Keyword">:</span>     <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> <span class="Keyword">!</span><span class="Keyword">!</span>(obj <span class="Keyword">is</span> <span class="String"><span class="String">'</span><span class="String">'</span></span> <span class="Keyword">or</span> (obj <span class="Keyword">and</span> obj.charCodeAt <span class="Keyword">and</span> obj.substr))
 <span class="line-numbers"> 474 </span>
 <span class="line-numbers"> 475 </span>
 <span class="line-numbers"> 476 </span>   <span class="Comment"><span class="Comment">#</span> Is a given value a number?</span>
-<span class="line-numbers"> 477 </span> <span class="FunctionArgument">  _.isNumber:     obj </span><span class="Storage">=&gt;</span> toString.call(obj) <span class="Keyword">is</span> <span class="String"><span class="String">'</span>[object Number]<span class="String">'</span></span>
+<span class="line-numbers"> 477 </span>   <span class="FunctionName">_.isNumber</span><span class="Keyword">:</span>     <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> toString.call(obj) <span class="Keyword">is</span> <span class="String"><span class="String">'</span>[object Number]<span class="String">'</span></span>
 <span class="line-numbers"> 478 </span>
 <span class="line-numbers"> 479 </span>
 <span class="line-numbers"> 480 </span>   <span class="Comment"><span class="Comment">#</span> Is a given value a Date?</span>
-<span class="line-numbers"> 481 </span> <span class="FunctionArgument">  _.isDate:       obj </span><span class="Storage">=&gt;</span> <span class="Keyword">!</span><span class="Keyword">!</span>(obj <span class="Keyword">and</span> obj.getTimezoneOffset <span class="Keyword">and</span> obj.setUTCFullYear)
+<span class="line-numbers"> 481 </span>   <span class="FunctionName">_.isDate</span><span class="Keyword">:</span>       <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> <span class="Keyword">!</span><span class="Keyword">!</span>(obj <span class="Keyword">and</span> obj.getTimezoneOffset <span class="Keyword">and</span> obj.setUTCFullYear)
 <span class="line-numbers"> 482 </span>
 <span class="line-numbers"> 483 </span>
 <span class="line-numbers"> 484 </span>   <span class="Comment"><span class="Comment">#</span> Is the given value a regular expression?</span>
-<span class="line-numbers"> 485 </span> <span class="FunctionArgument">  _.isRegExp:     obj </span><span class="Storage">=&gt;</span> <span class="Keyword">!</span><span class="Keyword">!</span>(obj <span class="Keyword">and</span> obj.exec <span class="Keyword">and</span> (obj.ignoreCase <span class="Keyword">or</span> obj.ignoreCase <span class="Keyword">is</span> <span class="BuiltInConstant">false</span>))
+<span class="line-numbers"> 485 </span>   <span class="FunctionName">_.isRegExp</span><span class="Keyword">:</span>     <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> <span class="Keyword">!</span><span class="Keyword">!</span>(obj <span class="Keyword">and</span> obj.exec <span class="Keyword">and</span> (obj.ignoreCase <span class="Keyword">or</span> obj.ignoreCase <span class="Keyword">is</span> <span class="BuiltInConstant">false</span>))
 <span class="line-numbers"> 486 </span>
 <span class="line-numbers"> 487 </span>
 <span class="line-numbers"> 488 </span>   <span class="Comment"><span class="Comment">#</span> Is the given value NaN -- this one is interesting. NaN != NaN, and</span>
 <span class="line-numbers"> 489 </span>   <span class="Comment"><span class="Comment">#</span> isNaN(undefined) == true, so we make sure it's a number first.</span>
-<span class="line-numbers"> 490 </span> <span class="FunctionArgument">  _.isNaN:        obj </span><span class="Storage">=&gt;</span> _.isNumber(obj) <span class="Keyword">and</span> window.isNaN(obj)
+<span class="line-numbers"> 490 </span>   <span class="FunctionName">_.isNaN</span><span class="Keyword">:</span>        <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> _.isNumber(obj) <span class="Keyword">and</span> window.isNaN(obj)
 <span class="line-numbers"> 491 </span>
 <span class="line-numbers"> 492 </span>
 <span class="line-numbers"> 493 </span>   <span class="Comment"><span class="Comment">#</span> Is a given value equal to null?</span>
-<span class="line-numbers"> 494 </span> <span class="FunctionArgument">  _.isNull:       obj </span><span class="Storage">=&gt;</span> obj <span class="Keyword">is</span> <span class="BuiltInConstant">null</span>
+<span class="line-numbers"> 494 </span>   <span class="FunctionName">_.isNull</span><span class="Keyword">:</span>       <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> obj <span class="Keyword">is</span> <span class="BuiltInConstant">null</span>
 <span class="line-numbers"> 495 </span>
 <span class="line-numbers"> 496 </span>
 <span class="line-numbers"> 497 </span>   <span class="Comment"><span class="Comment">#</span> Is a given variable undefined?</span>
-<span class="line-numbers"> 498 </span> <span class="FunctionArgument">  _.isUndefined:  obj </span><span class="Storage">=&gt;</span> <span class="Keyword">typeof</span> obj <span class="Keyword">is</span> <span class="String"><span class="String">'</span>undefined<span class="String">'</span></span>
+<span class="line-numbers"> 498 </span>   <span class="FunctionName">_.isUndefined</span><span class="Keyword">:</span>  <span class="FunctionArgument">obj</span> <span class="Storage">=&gt;</span> <span class="Keyword">typeof</span> obj <span class="Keyword">is</span> <span class="String"><span class="String">'</span>undefined<span class="String">'</span></span>
 <span class="line-numbers"> 499 </span>
 <span class="line-numbers"> 500 </span>
 <span class="line-numbers"> 501 </span>   <span class="Comment"><span class="Comment">#</span> -------------------------- Utility Functions: --------------------------</span>
 <span class="line-numbers"> 502 </span>
 <span class="line-numbers"> 503 </span>   <span class="Comment"><span class="Comment">#</span> Run Underscore.js in noConflict mode, returning the '_' variable to its</span>
 <span class="line-numbers"> 504 </span>   <span class="Comment"><span class="Comment">#</span> previous owner. Returns a reference to the Underscore object.</span>
-<span class="line-numbers"> 505 </span> <span class="FunctionArgument">  _.noConflict: </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 506 </span>     <span class="FunctionName">root._</span><span class="Keyword">:</span> previousUnderscore
+<span class="line-numbers"> 505 </span>   <span class="FunctionName">_.noConflict</span><span class="Keyword">:</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 506 </span>     root._<span class="Keyword">:</span> previousUnderscore
 <span class="line-numbers"> 507 </span>     <span class="Variable">this</span>
 <span class="line-numbers"> 508 </span>
 <span class="line-numbers"> 509 </span>
 <span class="line-numbers"> 510 </span>   <span class="Comment"><span class="Comment">#</span> Keep the identity function around for default iterators.</span>
-<span class="line-numbers"> 511 </span> <span class="FunctionArgument">  _.identity: value </span><span class="Storage">=&gt;</span> value
+<span class="line-numbers"> 511 </span>   <span class="FunctionName">_.identity</span><span class="Keyword">:</span> <span class="FunctionArgument">value</span> <span class="Storage">=&gt;</span> value
 <span class="line-numbers"> 512 </span>
 <span class="line-numbers"> 513 </span>
 <span class="line-numbers"> 514 </span>   <span class="Comment"><span class="Comment">#</span> Break out of the middle of an iteration.</span>
-<span class="line-numbers"> 515 </span> <span class="FunctionArgument">  _.breakLoop: </span><span class="Storage">=&gt;</span> <span class="Keyword">throw</span> breaker
+<span class="line-numbers"> 515 </span>   <span class="FunctionName">_.breakLoop</span><span class="Keyword">:</span> <span class="Storage">=&gt;</span> <span class="Keyword">throw</span> breaker
 <span class="line-numbers"> 516 </span>
 <span class="line-numbers"> 517 </span>
 <span class="line-numbers"> 518 </span>   <span class="Comment"><span class="Comment">#</span> Generate a unique integer id (unique within the entire client session).</span>
 <span class="line-numbers"> 519 </span>   <span class="Comment"><span class="Comment">#</span> Useful for temporary DOM ids.</span>
-<span class="line-numbers"> 520 </span>   <span class="FunctionName">idCounter</span><span class="Keyword">:</span> <span class="Number">0</span>
-<span class="line-numbers"> 521 </span> <span class="FunctionArgument">  _.uniqueId: prefix </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 520 </span>   idCounter<span class="Keyword">:</span> <span class="Number">0</span>
+<span class="line-numbers"> 521 </span>   <span class="FunctionName">_.uniqueId</span><span class="Keyword">:</span> <span class="FunctionArgument">prefix</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 522 </span>     (prefix <span class="Keyword">or</span> <span class="String"><span class="String">'</span><span class="String">'</span></span>) <span class="Keyword">+</span> idCounter<span class="Keyword">++</span>
 <span class="line-numbers"> 523 </span>
 <span class="line-numbers"> 524 </span>
 <span class="line-numbers"> 525 </span>   <span class="Comment"><span class="Comment">#</span> JavaScript templating a-la ERB, pilfered from John Resig's</span>
 <span class="line-numbers"> 526 </span>   <span class="Comment"><span class="Comment">#</span> &quot;Secrets of the JavaScript Ninja&quot;, page 83.</span>
-<span class="line-numbers"> 527 </span> <span class="FunctionArgument">  _.template: str, data </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 527 </span>   <span class="FunctionName">_.template</span><span class="Keyword">:</span> <span class="FunctionArgument">str, data</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 528 </span>     <span class="String"><span class="String">`</span>var fn = new Function('obj',</span>
 <span class="line-numbers"> 529 </span> <span class="String">      'var p=[],print=function(){p.push.apply(p,arguments);};' +</span>
 <span class="line-numbers"> 530 </span> <span class="String">      'with(obj){p.push(<span class="UserDefinedConstant">\'</span>' +</span>
@@ -561,67 +562,55 @@
 <span class="line-numbers"> 542 </span>
 <span class="line-numbers"> 543 </span>   <span class="Comment"><span class="Comment">#</span> ------------------------------- Aliases ----------------------------------</span>
 <span class="line-numbers"> 544 </span>
-<span class="line-numbers"> 545 </span>   <span class="FunctionName">_.forEach</span><span class="Keyword">:</span> _.each
-<span class="line-numbers"> 546 </span>   <span class="FunctionName">_.foldl</span><span class="Keyword">:</span>   <span class="FunctionName">_.inject</span><span class="Keyword">:</span>      _.reduce
-<span class="line-numbers"> 547 </span>   <span class="FunctionName">_.foldr</span><span class="Keyword">:</span>   _.reduceRight
-<span class="line-numbers"> 548 </span>   <span class="FunctionName">_.filter</span><span class="Keyword">:</span>  _.select
-<span class="line-numbers"> 549 </span>   <span class="FunctionName">_.every</span><span class="Keyword">:</span>   _.all
-<span class="line-numbers"> 550 </span>   <span class="FunctionName">_.some</span><span class="Keyword">:</span>    _.any
-<span class="line-numbers"> 551 </span>   <span class="FunctionName">_.head</span><span class="Keyword">:</span>    _.first
-<span class="line-numbers"> 552 </span>   <span class="FunctionName">_.tail</span><span class="Keyword">:</span>    _.rest
-<span class="line-numbers"> 553 </span>   <span class="FunctionName">_.methods</span><span class="Keyword">:</span> _.functions
+<span class="line-numbers"> 545 </span>   _.forEach<span class="Keyword">:</span> _.each
+<span class="line-numbers"> 546 </span>   _.foldl<span class="Keyword">:</span>   _.inject<span class="Keyword">:</span>      _.reduce
+<span class="line-numbers"> 547 </span>   _.foldr<span class="Keyword">:</span>   _.reduceRight
+<span class="line-numbers"> 548 </span>   _.filter<span class="Keyword">:</span>  _.select
+<span class="line-numbers"> 549 </span>   _.every<span class="Keyword">:</span>   _.all
+<span class="line-numbers"> 550 </span>   _.some<span class="Keyword">:</span>    _.any
+<span class="line-numbers"> 551 </span>   _.head<span class="Keyword">:</span>    _.first
+<span class="line-numbers"> 552 </span>   _.tail<span class="Keyword">:</span>    _.rest
+<span class="line-numbers"> 553 </span>   _.methods<span class="Keyword">:</span> _.functions
 <span class="line-numbers"> 554 </span>
 <span class="line-numbers"> 555 </span>
 <span class="line-numbers"> 556 </span>   <span class="Comment"><span class="Comment">#</span>   /*------------------------ Setup the OOP Wrapper: --------------------------*/</span>
 <span class="line-numbers"> 557 </span>
 <span class="line-numbers"> 558 </span>   <span class="Comment"><span class="Comment">#</span> Helper function to continue chaining intermediate results.</span>
-<span class="line-numbers"> 559 </span> <span class="FunctionArgument">  result: obj, chain </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 559 </span>   <span class="FunctionName">result</span><span class="Keyword">:</span> <span class="FunctionArgument">obj, chain</span> <span class="Storage">=&gt;</span>
 <span class="line-numbers"> 560 </span>     <span class="Keyword">if</span> chain <span class="Keyword">then</span> _(obj).chain() <span class="Keyword">else</span> obj
 <span class="line-numbers"> 561 </span>
 <span class="line-numbers"> 562 </span>
 <span class="line-numbers"> 563 </span>   <span class="Comment"><span class="Comment">#</span> Add all of the Underscore functions to the wrapper object.</span>
 <span class="line-numbers"> 564 </span>   _.each(_.functions(_))<span class="FunctionArgument"> name </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 565 </span>     <span class="FunctionName">method</span><span class="Keyword">:</span> _[name]
+<span class="line-numbers"> 565 </span>     method<span class="Keyword">:</span> _[name]
 <span class="line-numbers"> 566 </span>     wrapper.prototype[name]<span class="Keyword">:</span> <span class="Storage">=&gt;</span>
-<span class="line-numbers"> 567 </span>       <span class="FunctionName">args</span><span class="Keyword">:</span> _.toArray(arguments)
-<span class="line-numbers"> 568 </span>       unshift.call(args, <span class="Variable">this</span>._wrapped)
-<span class="line-numbers"> 569 </span>       result(method.apply(_, args), <span class="Variable">this</span>._chain)
+<span class="line-numbers"> 567 </span>       unshift.call(arguments, <span class="Variable">this</span>._wrapped)
+<span class="line-numbers"> 568 </span>       result(method.apply(_, arguments), <span class="Variable">this</span>._chain)
+<span class="line-numbers"> 569 </span>
 <span class="line-numbers"> 570 </span>
-<span class="line-numbers"> 571 </span>
-<span class="line-numbers"> 572 </span>   <span class="Comment"><span class="Comment">#</span> Add all mutator Array functions to the wrapper.</span>
-<span class="line-numbers"> 573 </span>   _.each([<span class="String"><span class="String">'</span>pop<span class="String">'</span></span>, <span class="String"><span class="String">'</span>push<span class="String">'</span></span>, <span class="String"><span class="String">'</span>reverse<span class="String">'</span></span>, <span class="String"><span class="String">'</span>shift<span class="String">'</span></span>, <span class="String"><span class="String">'</span>sort<span class="String">'</span></span>, <span class="String"><span class="String">'</span>splice<span class="String">'</span></span>, <span class="String"><span class="String">'</span>unshift<span class="String">'</span></span>])<span class="FunctionArgument"> name </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 574 </span>     <span class="FunctionName">method</span><span class="Keyword">:</span> Array.prototype[name]
-<span class="line-numbers"> 575 </span>     wrapper.prototype[name]<span class="Keyword">:</span> <span class="Storage">=&gt;</span>
-<span class="line-numbers"> 576 </span>       method.apply(<span class="Variable">this</span>._wrapped, arguments)
-<span class="line-numbers"> 577 </span>       result(<span class="Variable">this</span>._wrapped, <span class="Variable">this</span>._chain)
+<span class="line-numbers"> 571 </span>   <span class="Comment"><span class="Comment">#</span> Add all mutator Array functions to the wrapper.</span>
+<span class="line-numbers"> 572 </span>   _.each([<span class="String"><span class="String">'</span>pop<span class="String">'</span></span>, <span class="String"><span class="String">'</span>push<span class="String">'</span></span>, <span class="String"><span class="String">'</span>reverse<span class="String">'</span></span>, <span class="String"><span class="String">'</span>shift<span class="String">'</span></span>, <span class="String"><span class="String">'</span>sort<span class="String">'</span></span>, <span class="String"><span class="String">'</span>splice<span class="String">'</span></span>, <span class="String"><span class="String">'</span>unshift<span class="String">'</span></span>])<span class="FunctionArgument"> name </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 573 </span>     method<span class="Keyword">:</span> Array.prototype[name]
+<span class="line-numbers"> 574 </span>     wrapper.prototype[name]<span class="Keyword">:</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 575 </span>       method.apply(<span class="Variable">this</span>._wrapped, arguments)
+<span class="line-numbers"> 576 </span>       result(<span class="Variable">this</span>._wrapped, <span class="Variable">this</span>._chain)
+<span class="line-numbers"> 577 </span>
 <span class="line-numbers"> 578 </span>
-<span class="line-numbers"> 579 </span>
-<span class="line-numbers"> 580 </span>   <span class="Comment"><span class="Comment">#</span> Add all accessor Array functions to the wrapper.</span>
-<span class="line-numbers"> 581 </span>   _.each([<span class="String"><span class="String">'</span>concat<span class="String">'</span></span>, <span class="String"><span class="String">'</span>join<span class="String">'</span></span>, <span class="String"><span class="String">'</span>slice<span class="String">'</span></span>])<span class="FunctionArgument"> name </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 582 </span>     <span class="FunctionName">method</span><span class="Keyword">:</span> Array.prototype[name]
-<span class="line-numbers"> 583 </span>     wrapper.prototype[name]<span class="Keyword">:</span> <span class="Storage">=&gt;</span>
-<span class="line-numbers"> 584 </span>       result(method.apply(<span class="Variable">this</span>._wrapped, arguments), <span class="Variable">this</span>._chain)
+<span class="line-numbers"> 579 </span>   <span class="Comment"><span class="Comment">#</span> Add all accessor Array functions to the wrapper.</span>
+<span class="line-numbers"> 580 </span>   _.each([<span class="String"><span class="String">'</span>concat<span class="String">'</span></span>, <span class="String"><span class="String">'</span>join<span class="String">'</span></span>, <span class="String"><span class="String">'</span>slice<span class="String">'</span></span>])<span class="FunctionArgument"> name </span><span class="Storage">=&gt;</span>
+<span class="line-numbers"> 581 </span>     method<span class="Keyword">:</span> Array.prototype[name]
+<span class="line-numbers"> 582 </span>     wrapper.prototype[name]<span class="Keyword">:</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 583 </span>       result(method.apply(<span class="Variable">this</span>._wrapped, arguments), <span class="Variable">this</span>._chain)
+<span class="line-numbers"> 584 </span>
 <span class="line-numbers"> 585 </span>
-<span class="line-numbers"> 586 </span>
-<span class="line-numbers"> 587 </span>   <span class="Comment"><span class="Comment">#</span> Start chaining a wrapped Underscore object.</span>
-<span class="line-numbers"> 588 </span> <span class="FunctionArgument">  wrapper::chain: </span><span class="Storage">=&gt;</span>
-<span class="line-numbers"> 589 </span>     <span class="FunctionName">this._chain</span><span class="Keyword">:</span> <span class="BuiltInConstant">true</span>
-<span class="line-numbers"> 590 </span>     <span class="Variable">this</span>
+<span class="line-numbers"> 586 </span>   <span class="Comment"><span class="Comment">#</span> Start chaining a wrapped Underscore object.</span>
+<span class="line-numbers"> 587 </span>   <span class="FunctionName">wrapper.prototype.chain</span><span class="Keyword">:</span> <span class="Storage">=&gt;</span>
+<span class="line-numbers"> 588 </span>     <span class="Variable">this</span>._chain<span class="Keyword">:</span> <span class="BuiltInConstant">true</span>
+<span class="line-numbers"> 589 </span>     <span class="Variable">this</span>
+<span class="line-numbers"> 590 </span>
 <span class="line-numbers"> 591 </span>
-<span class="line-numbers"> 592 </span>
-<span class="line-numbers"> 593 </span>   <span class="Comment"><span class="Comment">#</span> Extracts the result from a wrapped and chained object.</span>
-<span class="line-numbers"> 594 </span> <span class="FunctionArgument">  wrapper::value: </span><span class="Storage">=&gt;</span> <span class="Variable">this</span>._wrapped
-</pre>  <p>
-    <a href="http://validator.w3.org/check?uri=referer">
-      <img style="border:0"
-           src="http://www.w3.org/Icons/valid-xhtml10"
-           alt="Valid XHTML 1.0 Strict" height="31" width="88" />
-    </a>
-    <a href="http://jigsaw.w3.org/css-validator/check?uri=referer">
-      <img style="border:0;width:88px;height:31px"
-           src="http://jigsaw.w3.org/css-validator/images/vcss"
-           alt="Valid CSS!" />
-    </a>
-  </p>
+<span class="line-numbers"> 592 </span>   <span class="Comment"><span class="Comment">#</span> Extracts the result from a wrapped and chained object.</span>
+<span class="line-numbers"> 593 </span>   <span class="FunctionName">wrapper.prototype.value</span><span class="Keyword">:</span> <span class="Storage">=&gt;</span> <span class="Variable">this</span>._wrapped
+</pre>
 </body>
 </html>

examples/beautiful_code/binary_search.coffee

@@ -1,16 +0,0 @@
-# Beautiful Code, Chapter 6.
-# The implementation of binary search that is tested.
-
-# Return the index of an element in a sorted list. (or -1, if not present)
-index: list, target =>
-  [low, high]: [0, list.length]
-  while low < high
-    mid: (low + high) >> 1
-    val: list[mid]
-    return mid if val is target
-    if val < target then low: mid + 1 else high: mid
-  return -1
-
-print(2 is index([10, 20, 30, 40, 50], 30))
-print(4 is index([-97, 35, 67, 88, 1200], 1200))
-print(0 is index([0, 45, 70], 0))

examples/beautiful_code/quicksort_runtime.coffee

@@ -1,13 +0,0 @@
-# Beautiful Code, Chapter 3.
-# Produces the expected runtime of Quicksort, for every integer from 1 to N.
-
-runtime: N =>
-  [sum, t]: [0, 0]
-  for n in [1..N]
-    sum += 2 * t
-    t: n - 1 + sum / n
-  t
-
-print(runtime(3) is 2.6666666666666665)
-print(runtime(5) is 7.4)
-print(runtime(8) is 16.92142857142857)

examples/beautiful_code/regular_expression_matcher.coffee

@@ -1,34 +0,0 @@
-# Beautiful Code, Chapter 1.
-# Implements a regular expression matcher that supports character matches,
-# '.', '^', '$', and '*'.
-
-# Search for the regexp anywhere in the text.
-match: regexp, text =>
-  return match_here(regexp.slice(1), text) if regexp[0] is '^'
-  while text
-    return true if match_here(regexp, text)
-    text: text.slice(1)
-  false
-
-# Search for the regexp at the beginning of the text.
-match_here: regexp, text =>
-  [cur, next]: [regexp[0], regexp[1]]
-  if regexp.length is 0 then return true
-  if next is '*' then return match_star(cur, regexp.slice(2), text)
-  if cur is '$' and not next then return text.length is 0
-  if text and (cur is '.' or cur is text[0]) then return match_here(regexp.slice(1), text.slice(1))
-  false
-
-# Search for a kleene star match at the beginning of the text.
-match_star: c, regexp, text =>
-  while true
-    return true if match_here(regexp, text)
-    return false unless text and (text[0] is c or c is '.')
-    text: text.slice(1)
-
-print(match("ex", "some text"))
-print(match("s..t", "spit"))
-print(match("^..t", "buttercup"))
-print(match("i..$", "cherries"))
-print(match("o*m", "vrooooommm!"))
-print(match("^hel*o$", "hellllllo"))

examples/code.coffee

@@ -141,18 +141,18 @@ aliquam erat volutpat. Ut wisi enim ad."
 
 # Inheritance and calling super.
 Animal: =>
-Animal::move: meters =>
+Animal.prototype.move: meters =>
   alert(this.name + " moved " + meters + "m.")
 
 Snake: name => this.name: name
 Snake extends Animal
-Snake::move: =>
+Snake.prototype.move: =>
   alert('Slithering...')
   super(5)
 
 Horse: name => this.name: name
 Horse extends Animal
-Horse::move: =>
+Horse.prototype.move: =>
   alert('Galloping...')
   super(45)
 

examples/documents.coffee

@@ -15,8 +15,8 @@ dc.model.Document: dc.Model.extend({
   # document by binding to Metadata, instead of on-the-fly.
   metadata: =>
     docId: this.id
-    _.select(Metadata.models(), (meta =>
-      _.any(meta.get('instances'), instance =>
+    _.select(Metadata.models(), (meta => 
+      _.any(meta.get('instances'), instance => 
         instance.document_id is docId)))
 
   bookmark: pageNumber =>
@@ -60,7 +60,7 @@ dc.model.DocumentSet: dc.model.RESTfulSet.extend({
   # change their selected state.
   _onModelEvent: e, model =>
     this.base(e, model)
-    fire: e is dc.Model.CHANGED and model.hasChanged('selected')
+    fire: e == dc.Model.CHANGED and model.hasChanged('selected')
     if fire then _.defer(_(this.fire).bind(this, this.SELECTION_CHANGED, this))
 
 })

examples/poignant.coffee

@@ -14,9 +14,9 @@
 # end
 
 LotteryTicket: {
-  get_picks:           => this.picks
-  set_picks:      nums => this.picks: nums
-  get_purchase:        => this.purchase
+  get_picks:    => this.picks
+  set_picks:    nums => this.picks: nums
+  get_purchase: => this.purchase
   set_purchase: amount => this.purchase: amount
 }
 

examples/potion.coffee

@@ -1,205 +0,0 @@
-# Examples from _why's Potion, the Readme and "Potion: A Short Pamphlet".
-
-# 5 times: "Odelay!" print.
-
-print("Odelay!") for i in [1..5]
-
-
-# add = (x, y): x + y.
-# add(2, 4) string print
-
-add: x, y => x + y
-print(add(2, 4))
-
-
-# loop: 'quaff' print.
-
-while true
-  print('quaff')
-
-
-# ('cheese', 'bread', 'mayo') at (1) print
-
-print(['cheese', 'bread', 'mayo'][1])
-
-
-# (language='Potion', pointless=true) at (key='language') print
-
-print({language: 'Potion', pointless: true}['language'])
-
-
-# minus = (x, y): x - y.
-# minus (y=10, x=6)
-
-minus: x, y => x - y
-minus(6, 10)
-
-
-# foods = ('cheese', 'bread', 'mayo')
-# foods (2)
-
-foods: ['cheese', 'bread', 'mayo']
-foods[2]
-
-
-# (dog='canine', cat='feline', fox='vulpine') each (key, val):
-#   (key, ' is a ', val) join print.
-
-for key, val of {dog: 'canine', cat: 'feline', fox: 'vulpine'}
-  print(key + ' is a ' + val)
-
-
-# Person = class: /name, /age, /sex.
-# Person print = ():
-#   ('My name is ', /name, '.') join print.
-
-Person: =>
-Person::print: =>
-  print('My name is ' + this.name + '.')
-
-
-# p = Person ()
-# p /name string print
-
-p: new Person()
-print(p.name)
-
-
-# Policeman = Person class (rank): /rank = rank.
-# Policeman print = ():
-#   ('My name is ', /name, ' and I'm a ', /rank, '.') join print.
-#
-# Policeman ('Constable') print
-
-Policeman: rank => this.rank: rank
-Policeman extends Person
-Policeman::print: =>
-  print('My name is ' + this.name + " and I'm a " + this.rank + '.')
-
-print(new Policeman('Constable'))
-
-
-# app = [window (width=200, height=400)
-#         [para 'Welcome.', button 'OK']]
-# app first name
-
-app = {
-  window:  {width: 200, height: 200}
-  para:    'Welcome.'
-  button:  'OK'
-}
-app.window
-
-
-# x = 1
-# y = 2
-#
-# x = 1, y = 2
-
-x: 1
-y: 2
-
-x: 1; y: 2
-
-
-# table = (language='Potion'
-#           pointless=true)
-
-table: {
-  language: 'Potion'
-  pointless: yes
-}
-
-
-# # this foul business...
-# String length = (): 10.
-
-# this foul business...
-String::length: => 10
-
-
-# block = :
-#   'potion' print.
-
-block: =>
-  print('potion')
-
-
-# if (age > 100): 'ancient'.
-
-if age > 100 then 'ancient'
-
-
-# author =
-#   if (title == 'Jonathan Strange & Mr. Norrell'):
-#     'Susanna Clarke'.
-#   elsif (title == 'The Star Diaries'):
-#     'Stanislaw Lem'.
-#   elsif (title == 'The Slynx'):
-#     'Tatyana Tolstaya'.
-#   else:
-#     '... probably Philip K. Dick'.
-
-switch author
-  when 'Jonathan Strange & Mr. Norrell'
-    'Susanna Clarke'
-  when 'The Star Diaries'
-    'Stanislaw Lem'
-  when 'The Slynx'
-    'Tatyana Tolstaya'
-  else
-    '... probably Philip K. Dick'
-
-
-# count = 8
-# while (count > 0):
-#   'quaff' print
-#   count--.
-
-count: 8
-while count > 0
-  print('quaff')
-  count--
-
-
-# 1 to 5 (a):
-#   a string print.
-
-print(a) for a in [1..5]
-
-
-# if (3 ?gender):
-#   "Huh? Numbers are sexed? That's amazing." print.
-
-if (3).gender?
-  print("Huh? Numbers are sexed? That's amazing.")
-
-
-# HomePage get = (url):
-#   session = url query ? at ('session').
-
-HomePage::get: url =>
-  session: url.query.session if url.query?
-
-
-# BTree = class: /left, /right.
-# b = BTree ()
-# b /left = BTree ()
-# b /right = BTree ()
-
-BTree:    =>
-b:        new BTree()
-b.left:   new BTree()
-b.right:  new BTree()
-
-
-# BTree = class: /left, /right.
-# b = BTree ()
-#
-# if (b ? /left):
-#   'left path found!' print.
-
-BTree: =>
-b: new BTree()
-
-print('left path found!') if b.left?

examples/underscore.coffee

@@ -30,7 +30,7 @@
   breaker: if typeof(StopIteration) is 'undefined' then '__break__' else StopIteration
 
 
-  # Create a safe reference to the Underscore object forreference below.
+  # Create a safe reference to the Underscore object for reference below.
   _: root._: obj => new wrapper(obj)
 
 
@@ -39,15 +39,15 @@
 
 
   # Create quick reference variables for speed access to core prototypes.
-  slice:                Array::slice
-  unshift:              Array::unshift
-  toString:             Object::toString
-  hasOwnProperty:       Object::hasOwnProperty
-  propertyIsEnumerable: Object::propertyIsEnumerable
+  slice:                Array.prototype.slice
+  unshift:              Array.prototype.unshift
+  toString:             Object.prototype.toString
+  hasOwnProperty:       Object.prototype.hasOwnProperty
+  propertyIsEnumerable: Object.prototype.propertyIsEnumerable
 
 
   # Current version.
-  _.VERSION: '0.5.5'
+  _.VERSION: '0.5.3'
 
 
   # ------------------------ Collection Functions: ---------------------------
@@ -60,7 +60,7 @@
       return obj.forEach(iterator, context) if obj.forEach
       if _.isArray(obj) or _.isArguments(obj)
         return iterator.call(context, obj[i], i, obj) for i in [0...obj.length]
-      iterator.call(context, val, key, obj) for key, val of obj
+      iterator.call(context, val, key, obj) for val, key in obj
     catch e
       throw e if e isnt breaker
     obj
@@ -148,7 +148,7 @@
   # based on '==='.
   _.include: obj, target =>
     return _.indexOf(obj, target) isnt -1 if _.isArray(obj)
-    for key, val of obj
+    for val in obj
       return true if val is target
     false
 
@@ -380,7 +380,7 @@
   # Retrieve the names of an object's properties.
   _.keys: obj =>
     return _.range(0, obj.length) if _.isArray(obj)
-    key for key, val of obj
+    key for val, key in obj
 
 
   # Retrieve the values of an object's properties.
@@ -395,7 +395,7 @@
 
   # Extend a given object with all of the properties in a source object.
   _.extend: destination, source =>
-    for key, val of source
+    for val, key in source
       destination[key]: val
     destination
 
@@ -564,9 +564,8 @@
   _.each(_.functions(_)) name =>
     method: _[name]
     wrapper.prototype[name]: =>
-      args: _.toArray(arguments)
-      unshift.call(args, this._wrapped)
-      result(method.apply(_, args), this._chain)
+      unshift.call(arguments, this._wrapped)
+      result(method.apply(_, arguments), this._chain)
 
 
   # Add all mutator Array functions to the wrapper.
@@ -585,10 +584,10 @@
 
 
   # Start chaining a wrapped Underscore object.
-  wrapper::chain: =>
+  wrapper.prototype.chain: =>
     this._chain: true
     this
 
 
   # Extracts the result from a wrapped and chained object.
-  wrapper::value: => this._wrapped
+  wrapper.prototype.value: => this._wrapped

lib/coffee-script.rb

@@ -10,7 +10,7 @@ require "coffee_script/parse_error"
 # Namespace for all CoffeeScript internal classes.
 module CoffeeScript
 
-  VERSION = '0.2.6'   # Keep in sync with the gemspec.
+  VERSION = '0.2.1'   # Keep in sync with the gemspec.
 
   # Compile a script (String or IO) to JavaScript.
   def self.compile(script, options={})

lib/coffee_script/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage

@@ -10,10 +10,6 @@
 	</array>
 	<key>name</key>
 	<string>CoffeeScript</string>
-	<key>foldingStartMarker</key>
-	<string>^.*[:=] \{[^\}]*$</string>
-	<key>foldingStopMarker</key>
-	<string>\s*\}</string>
 	<key>patterns</key>
 	<array>
 		<dict>
@@ -43,7 +39,7 @@
 			<key>comment</key>
 			<string>match stuff like: funcName: =&gt; … </string>
 			<key>match</key>
-			<string>([a-zA-Z0-9_?.$:*]*?)\s*(=\b|:\b)\s*([\w,\s]*?)\s*(=+&gt;)</string>
+			<string>([a-zA-Z0-9_?.$*]*)\s*(=|:)\s*([\w,\s]*?)\s*(=&gt;)</string>
 			<key>name</key>
 			<string>meta.function.coffee</string>
 		</dict>
@@ -64,7 +60,7 @@
 			<key>comment</key>
 			<string>match stuff like: a =&gt; … </string>
 			<key>match</key>
-			<string>([a-zA-Z0-9_?., $*]*)\s*(=+&gt;)</string>
+			<string>([a-zA-Z0-9_?., $*]*)\s*(=&gt;)</string>
 			<key>name</key>
 			<string>meta.inline.function.coffee</string>
 		</dict>
@@ -93,30 +89,6 @@
 			<key>name</key>
 			<string>constant.numeric.coffee</string>
 		</dict>
-    <dict>
-      <key>name</key>
-      <string>string.quoted.heredoc.coffee</string>
-      <key>begin</key>
-      <string>("""|''')</string>
-      <key>end</key>
-      <string>("""|''')</string>
-      <key>beginCaptures</key>
-      <dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.coffee</string>
-				</dict>
-			</dict>
-      <key>endCaptures</key>
-      <dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.coffee</string>
-				</dict>
-			</dict>
-    </dict>
 		<dict>
 			<key>begin</key>
 			<string>'</string>
@@ -230,48 +202,15 @@
 			<key>name</key>
 			<string>comment.line.coffee</string>
 		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&lt;=[=(:]|^|return)\s*(/)(?![/*+{}?])</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(/)[igm]*</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.coffee</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.regexp.coffee</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escape.coffee</string>
-				</dict>
-			</array>
-		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(break|by|catch|continue|else|finally|for|in|of|if|return|switch|then|throw|try|unless|when|while)\b</string>
+			<string>\b(break|by|catch|continue|else|finally|for|if|return|switch|then|throw|try|unless|when|while)\b</string>
 			<key>name</key>
 			<string>keyword.control.coffee</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b([a-zA-Z$_](\w|\$|:|\.)*\s*(?=\:))</string>
+			<string>\b([a-zA-Z$_]\w*)(\:)\s</string>
 			<key>name</key>
 			<string>variable.assignment.coffee</string>
 			<key>captures</key>
@@ -281,6 +220,11 @@
 					<key>name</key>
 					<string>entity.name.function.coffee</string>
 				</dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>keyword.operator.coffee</string>
+				</dict>
 			</dict>
 		</dict>
 		<dict>
@@ -315,7 +259,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>!|%|&amp;|\*|\/|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\?|\|\||\:|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=|\b(instanceof|new|delete|typeof|and|or|is|isnt|not)\b</string>
+			<string>!|\$|%|&amp;|\*|\/|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\?|\|\||\:|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=|\b(in|instanceof|new|delete|typeof|and|or|is|isnt|not)\b</string>
 			<key>name</key>
 			<string>keyword.operator.coffee</string>
 		</dict>
@@ -325,6 +269,39 @@
 			<key>name</key>
 			<string>constant.language.coffee</string>
 		</dict>
+		<dict>
+			<key>begin</key>
+			<string>(?&lt;=[=(:]|^|return)\s*(/)(?![/*+{}?])</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.begin.coffee</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>(/)[igm]*</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.string.end.coffee</string>
+				</dict>
+			</dict>
+			<key>name</key>
+			<string>string.regexp.coffee</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\\.</string>
+					<key>name</key>
+					<string>constant.character.escape.coffee</string>
+				</dict>
+			</array>
+		</dict>
 		<dict>
 			<key>match</key>
 			<string>\;</string>

lib/coffee_script/command_line.rb

@@ -1,13 +1,7 @@
 require 'optparse'
 require 'fileutils'
 require 'open3'
-begin
-  require File.expand_path(File.dirname(__FILE__) + '/../coffee-script')
-rescue LoadError => e
-  puts(e.message)
-  puts("use \"rake build:parser\" to regenerate parser.rb")
-  exit(1)
-end
+require File.expand_path(File.dirname(__FILE__) + '/../coffee-script')
 
 module CoffeeScript
 
@@ -139,7 +133,6 @@ Usage:
       begin
         options = {}
         options[:no_wrap] = true if @options[:no_wrap]
-        options[:globals] = true if @options[:globals]
         CoffeeScript.compile(script, options)
       rescue CoffeeScript::ParseError, SyntaxError => e
         STDERR.puts "#{source}: #{e.message}"
@@ -194,12 +187,9 @@ Usage:
         opts.on('-v', '--verbose', 'print at every step of code generation') do |v|
           ENV['VERBOSE'] = 'true'
         end
-        opts.on('-n', '--no-wrap', 'raw output, no function safety wrapper') do |n|
+        opts.on('-n', '--no-wrap', 'raw output, no safety wrapper or vars') do |n|
           @options[:no_wrap] = true
         end
-        opts.on('-g', '--globals', 'attach all top-level variable as globals') do |n|
-          @options[:globals] = true
-        end
         opts.on_tail('--install-bundle', 'install the CoffeeScript TextMate bundle') do |i|
           install_bundle
           exit

lib/coffee_script/grammar.y

@@ -1,14 +1,14 @@
 class Parser
 
-# Declare terminal tokens produced by the lexer.
+# Declare tokens produced by the lexer
 token IF ELSE UNLESS
 token NUMBER STRING REGEX
 token TRUE FALSE YES NO ON OFF
-token IDENTIFIER PROPERTY_ACCESS PROTOTYPE_ACCESS
-token CODE PARAM NEW RETURN
+token IDENTIFIER PROPERTY_ACCESS
+token CODE PARAM PARAM_SPLAT NEW RETURN
 token TRY CATCH FINALLY THROW
 token BREAK CONTINUE
-token FOR IN OF BY WHEN WHILE
+token FOR IN BY WHEN WHILE
 token SWITCH LEADING_WHEN
 token DELETE INSTANCEOF TYPEOF
 token SUPER EXTENDS
@@ -16,13 +16,12 @@ token ARGUMENTS
 token NEWLINE
 token COMMENT
 token JS
-token THIS
 token INDENT OUTDENT
 
 # Declare order of operations.
 prechigh
   left     '?'
-  nonassoc UMINUS NOT '!' '!!' '~' '++' '--'
+  nonassoc UMINUS PARAM_SPLAT SPLAT NOT '!' '!!' '~' '++' '--'
   left     '*' '/' '%'
   left     '+' '-'
   left     '<<' '>>' '>>>'
@@ -35,12 +34,11 @@ prechigh
   left     '.'
   right    INDENT
   left     OUTDENT
-  right    WHEN LEADING_WHEN IN OF BY
+  right    WHEN LEADING_WHEN IN BY
   right    THROW FOR NEW SUPER
   left     EXTENDS
-  left     ASSIGN '||=' '&&=' '?='
-  right    RETURN
-  right    '=>' '==>' UNLESS IF ELSE WHILE
+  left     ASSIGN '||=' '&&='
+  right    RETURN '=>' UNLESS IF ELSE WHILE
 preclow
 
 rule
@@ -60,13 +58,13 @@ rule
   | Expressions Terminator            { result = val[0] }
   ;
 
-  # All types of expressions in our language. The basic unit of CoffeeScript
-  # is the expression.
+  # All types of expressions in our language.
   Expression:
     Value
   | Call
   | Code
   | Operation
+  | Range
   | Assign
   | If
   | Try
@@ -81,20 +79,18 @@ rule
   | Comment
   ;
 
-  # A block of expressions. Note that the Rewriter will convert some postfix
-  # forms into blocks for us, by altering the token stream.
   Block:
     INDENT Expressions OUTDENT        { result = val[1] }
   | INDENT OUTDENT                    { result = Expressions.new }
   ;
 
-  # Tokens that can terminate an expression.
+  # All tokens that can terminate an expression.
   Terminator:
     "\n"
   | ";"
   ;
 
-  # All hard-coded values. These can be printed straight to JavaScript.
+  # All hard-coded values.
   Literal:
     NUMBER                            { result = LiteralNode.new(val[0]) }
   | STRING                            { result = LiteralNode.new(val[0]) }
@@ -103,20 +99,20 @@ rule
   | BREAK                             { result = LiteralNode.new(val[0]) }
   | CONTINUE                          { result = LiteralNode.new(val[0]) }
   | ARGUMENTS                         { result = LiteralNode.new(val[0]) }
-  | TRUE                              { result = LiteralNode.new(Value.new(true)) }
-  | FALSE                             { result = LiteralNode.new(Value.new(false)) }
-  | YES                               { result = LiteralNode.new(Value.new(true)) }
-  | NO                                { result = LiteralNode.new(Value.new(false)) }
-  | ON                                { result = LiteralNode.new(Value.new(true)) }
-  | OFF                               { result = LiteralNode.new(Value.new(false)) }
+  | TRUE                              { result = LiteralNode.new(true) }
+  | FALSE                             { result = LiteralNode.new(false) }
+  | YES                               { result = LiteralNode.new(true) }
+  | NO                                { result = LiteralNode.new(false) }
+  | ON                                { result = LiteralNode.new(true) }
+  | OFF                               { result = LiteralNode.new(false) }
   ;
 
-  # Assignment to a variable (or index).
+  # Assignment to a variable.
   Assign:
     Value ASSIGN Expression           { result = AssignNode.new(val[0], val[2]) }
   ;
 
-  # Assignment within an object literal (can be quoted).
+  # Assignment within an object literal.
   AssignObj:
     IDENTIFIER ASSIGN Expression      { result = AssignNode.new(ValueNode.new(val[0]), val[2], :object) }
   | STRING ASSIGN Expression          { result = AssignNode.new(ValueNode.new(LiteralNode.new(val[0])), val[2], :object) }
@@ -126,7 +122,6 @@ rule
   # A return statement.
   Return:
     RETURN Expression                 { result = ReturnNode.new(val[1]) }
-  | RETURN                            { result = ReturnNode.new(ValueNode.new(Value.new('null'))) }
   ;
 
   # A comment.
@@ -179,7 +174,6 @@ rule
   | Expression '||' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
   | Expression AND Expression         { result = OpNode.new(val[1], val[0], val[2]) }
   | Expression OR Expression          { result = OpNode.new(val[1], val[0], val[2]) }
-  | Expression '?' Expression         { result = OpNode.new(val[1], val[0], val[2]) }
 
   | Expression '-=' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
   | Expression '+=' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
@@ -188,27 +182,18 @@ rule
   | Expression '%=' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
   | Expression '||=' Expression       { result = OpNode.new(val[1], val[0], val[2]) }
   | Expression '&&=' Expression       { result = OpNode.new(val[1], val[0], val[2]) }
-  | Expression '?=' Expression        { result = OpNode.new(val[1], val[0], val[2]) }
 
   | Expression INSTANCEOF Expression  { result = OpNode.new(val[1], val[0], val[2]) }
-  | Expression IN Expression          { result = OpNode.new(val[1], val[0], val[2]) }
   ;
 
-  # The existence operator.
   Existence:
     Expression '?'                    { result = ExistenceNode.new(val[0]) }
   ;
 
   # Function definition.
   Code:
-    ParamList FuncGlyph Block         { result = CodeNode.new(val[0], val[2], val[1]) }
-  | FuncGlyph Block                   { result = CodeNode.new([], val[1], val[0]) }
-  ;
-
-  # The symbols to signify functions, and bound functions.
-  FuncGlyph:
-    '=>'                              { result = :func }
-  | '==>'                             { result = :boundfunc }
+    ParamList "=>" Block              { result = CodeNode.new(val[0], val[2]) }
+  | "=>" Block                        { result = CodeNode.new([], val[1]) }
   ;
 
   # The parameters to a function definition.
@@ -217,15 +202,13 @@ rule
   | ParamList "," Param               { result = val[0] << val[2] }
   ;
 
-  # A Parameter (or ParamSplat) in a function definition.
   Param:
     PARAM
-  | PARAM "." "." "."                 { result = SplatNode.new(val[0]) }
+  | PARAM_SPLAT PARAM                 { result = ParamSplatNode.new(val[1]) }
   ;
 
-  # A regular splat.
   Splat:
-    Expression "." "." "."            { result = SplatNode.new(val[0]) }
+    '*' Value = SPLAT                 { result = ArgSplatNode.new(val[1]) }
   ;
 
   # Expressions that can be treated as values.
@@ -235,16 +218,13 @@ rule
   | Array                             { result = ValueNode.new(val[0]) }
   | Object                            { result = ValueNode.new(val[0]) }
   | Parenthetical                     { result = ValueNode.new(val[0]) }
-  | Range                             { result = ValueNode.new(val[0]) }
   | Value Accessor                    { result = val[0] << val[1] }
   | Invocation Accessor               { result = ValueNode.new(val[0], [val[1]]) }
-  | THIS                              { result = ValueNode.new(ThisNode.new) }
   ;
 
   # Accessing into an object or array, through dot or index notation.
   Accessor:
     PROPERTY_ACCESS IDENTIFIER        { result = AccessorNode.new(val[1]) }
-  | PROTOTYPE_ACCESS IDENTIFIER       { result = AccessorNode.new(val[1], true) }
   | Index                             { result = val[0] }
   | Range                             { result = SliceNode.new(val[0]) }
   ;
@@ -286,9 +266,9 @@ rule
   Invocation:
     Value Arguments                   { result = CallNode.new(val[0], val[1]) }
   | Invocation Arguments              { result = CallNode.new(val[0], val[1]) }
+  # | Invocation Code                   { result = val[0] << val[1] }
   ;
 
-  # The list of arguments to a function invocation.
   Arguments:
     "(" ArgList ")"                   { result = val[1] }
   | "(" ArgList ")" Code              { result = val[1] << val[3] }
@@ -296,7 +276,7 @@ rule
 
   # Calling super.
   Super:
-    SUPER "(" ArgList ")"             { result = CallNode.new(Value.new('super'), val[2]) }
+    SUPER "(" ArgList ")"             { result = CallNode.new(:super, val[2]) }
   ;
 
   # The range literal.
@@ -324,12 +304,6 @@ rule
   | ArgList OUTDENT                   { result = val[0] }
   ;
 
-  # Just simple, comma-separated, required arguments (no fancy syntax).
-  SimpleArgs:
-    Expression                        { result = val[0] }
-  | SimpleArgs "," Expression         { result = ([val[0]] << val[2]).flatten }
-  ;
-
   # Try/catch/finally exception handling blocks.
   Try:
     TRY Block Catch                   { result = TryNode.new(val[1], val[2][0], val[2][1]) }
@@ -356,8 +330,6 @@ rule
   # The while loop. (there is no do..while).
   While:
     WHILE Expression Block            { result = WhileNode.new(val[1], val[2]) }
-  | WHILE Expression                  { result = WhileNode.new(val[1], nil) }
-  | Expression WHILE Expression       { result = WhileNode.new(val[2], Expressions.wrap(val[0])) }
   ;
 
   # Array comprehensions, including guard and current index.
@@ -377,7 +349,6 @@ rule
   # The source of the array comprehension can optionally be filtered.
   ForSource:
     IN Expression                     { result = {:source => val[1]} }
-  | OF Expression                     { result = {:source => val[1], :object => true} }
   | ForSource
     WHEN Expression                   { result = val[0].merge(:filter => val[2]) }
   | ForSource
@@ -400,13 +371,15 @@ rule
 
   # An individual when.
   When:
-    LEADING_WHEN SimpleArgs Block     { result = IfNode.new(val[1], val[2], nil, {:statement => true}) }
-  | LEADING_WHEN SimpleArgs Block
+    LEADING_WHEN Expression Block     { result = IfNode.new(val[1], val[2], nil, {:statement => true}) }
+  | LEADING_WHEN Expression Block
       Terminator                      { result = IfNode.new(val[1], val[2], nil, {:statement => true}) }
-  | Comment Terminator When           { result = val[2].add_comment(val[0]) }
+  | Comment
   ;
 
-  # The most basic form of "if".
+  # All of the following nutso if-else destructuring is to make the
+  # grammar expand unambiguously.
+
   IfBlock:
     IF Expression Block               { result = IfNode.new(val[1], val[2]) }
   ;

lib/coffee_script/lexer.rb

@@ -12,35 +12,31 @@ module CoffeeScript
                   "new", "return",
                   "try", "catch", "finally", "throw",
                   "break", "continue",
-                  "for", "in", "of", "by", "where", "while",
-                  "delete", "instanceof", "typeof",
+                  "for", "in", "by", "where", "while",
                   "switch", "when",
                   "super", "extends",
                   "arguments",
-                  "this"]
+                  "delete", "instanceof", "typeof"]
 
     # Token matching regexes.
-    IDENTIFIER = /\A([a-zA-Z$_](\w|\$)*)/
+    IDENTIFIER = /\A([a-zA-Z$_]\w*)/
     NUMBER     = /\A(\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?(e[+\-]?[0-9]+)?)))\b/i
-    STRING     = /\A(""|''|"(.*?)([^\\]|\\\\)"|'(.*?)([^\\]|\\\\)')/m
-    HEREDOC    = /\A("{6}|'{6}|"{3}\n?(.*?)\n?(\s*)"{3}|'{3}\n?(.*?)\n?(\s*)'{3})/m
-    JS         = /\A(``|`(.*?)([^\\]|\\\\)`)/m
-    OPERATOR   = /\A([+\*&|\/\-%=<>:!?]+)/
+    STRING     = /\A(""|''|"(.*?)[^\\]"|'(.*?)[^\\]')/m
+    JS         = /\A(``|`(.*?)[^\\]`)/m
+    OPERATOR   = /\A([+\*&|\/\-%=<>:!]+)/
     WHITESPACE = /\A([ \t]+)/
     COMMENT    = /\A(((\n?[ \t]*)?#.*$)+)/
-    CODE       = /\A(=?=>)/
-    REGEX      = /\A(\/(.*?)([^\\]|\\\\)\/[imgy]{0,4})/
-    MULTI_DENT = /\A((\n([ \t]*))+)(\.)?/
+    CODE       = /\A(=>)/
+    REGEX      = /\A(\/(.*?)[^\\]\/[imgy]{0,4})/
+    MULTI_DENT = /\A((\n([ \t]*)?)+)/
     LAST_DENT  = /\n([ \t]*)/
     ASSIGNMENT = /\A(:|=)\Z/
 
     # Token cleaning regexes.
-    JS_CLEANER      = /(\A`|`\Z)/
-    MULTILINER      = /\n/
-    STRING_NEWLINES = /\n\s*/
+    JS_CLEANER = /(\A`|`\Z)/
+    MULTILINER = /\n/
     COMMENT_CLEANER = /(^\s*#|\n\s*$)/
-    NO_NEWLINE      = /\A([+\*&|\/\-%=<>:!.\\][<>=&|]*|and|or|is|isnt|not|delete|typeof|instanceof)\Z/
-    HEREDOC_INDENT  = /^\s+/
+    NO_NEWLINE = /\A([+\*&|\/\-%=<>:!.\\][<>=&|]*|and|or|is|isnt|not|delete|typeof|instanceof)\Z/
 
     # Tokens which a regular expression will never immediately follow, but which
     # a division operator might.
@@ -53,12 +49,12 @@ module CoffeeScript
 
     # Scan by attempting to match tokens one character at a time. Slow and steady.
     def tokenize(code)
-      @code    = code.chomp # Cleanup code by remove extra line breaks
-      @i       = 0          # Current character position we're parsing
-      @line    = 1          # The current line.
-      @indent  = 0          # The current indent level.
-      @indents = []         # The stack of all indent levels we are currently within.
-      @tokens  = []         # Collection of all parsed tokens in the form [:TOKEN_TYPE, value]
+      @code = code.chomp  # Cleanup code by remove extra line breaks
+      @i = 0              # Current character position we're parsing
+      @line = 1           # The current line.
+      @indent = 0         # The current indent level.
+      @indents = []       # The stack of all indent levels we are currently within.
+      @tokens = []        # Collection of all parsed tokens in the form [:TOKEN_TYPE, value]
       while @i < @code.length
         @chunk = @code[@i..-1]
         extract_next_token
@@ -73,7 +69,6 @@ module CoffeeScript
     def extract_next_token
       return if identifier_token
       return if number_token
-      return if heredoc_token
       return if string_token
       return if js_token
       return if regex_token
@@ -92,8 +87,7 @@ module CoffeeScript
       # 'if' will result in an [:IF, "if"] token.
       tag = KEYWORDS.include?(identifier) ? identifier.upcase.to_sym : :IDENTIFIER
       tag = :LEADING_WHEN if tag == :WHEN && [:OUTDENT, :INDENT, "\n"].include?(last_tag)
-      @tokens[-1][0] = :PROPERTY_ACCESS if tag == :IDENTIFIER && last_value == '.' && !(@tokens[-2] && @tokens[-2][1] == '.')
-      @tokens[-1][0] = :PROTOTYPE_ACCESS if tag == :IDENTIFIER && last_value == '::'
+      @tokens[-1][0] = :PROPERTY_ACCESS if tag == :IDENTIFIER && last_value == '.' && !(@tokens[-2][1] == '.')
       token(tag, identifier)
       @i += identifier.length
     end
@@ -108,25 +102,14 @@ module CoffeeScript
     # Matches strings, including multi-line strings.
     def string_token
       return false unless string = @chunk[STRING, 1]
-      escaped = string.gsub(STRING_NEWLINES, " \\\n")
+      escaped = string.gsub(MULTILINER) do |match|
+        @line += 1
+        " \\\n"
+      end
       token(:STRING, escaped)
-      @line += string.count("\n")
       @i += string.length
     end
 
-    # Matches heredocs, adjusting indentation to the correct level.
-    def heredoc_token
-      return false unless match = @chunk.match(HEREDOC)
-      doc = match[2] || match[4]
-      indent = doc.scan(HEREDOC_INDENT).min
-      doc.gsub!(/^#{indent}/, "")
-      doc.gsub!("\n", "\\n")
-      doc.gsub!('"', '\\"')
-      token(:STRING, "\"#{doc}\"")
-      @line += match[1].count("\n")
-      @i += match[1].length
-    end
-
     # Matches interpolated JavaScript.
     def js_token
       return false unless script = @chunk[JS, 1]
@@ -156,9 +139,7 @@ module CoffeeScript
       return false unless indent = @chunk[MULTI_DENT, 1]
       @line += indent.scan(MULTILINER).size
       @i += indent.size
-      next_character = @chunk[MULTI_DENT, 4]
-      no_newlines = next_character == '.' || (last_value.to_s.match(NO_NEWLINE) && !last_value.match(CODE))
-      return suppress_newlines(indent) if no_newlines
+      return suppress_newlines(indent) if last_value.to_s.match(NO_NEWLINE) && last_value != "=>"
       size = indent.scan(LAST_DENT).last.last.length
       return newline_token(indent) if size == @indent
       if size > @indent
@@ -240,7 +221,8 @@ module CoffeeScript
         i -= 1
         tok = @tokens[i]
         return if !tok
-        next if ['.', ','].include?(tok[0])
+        next if tok[0] == ','
+        next tok[0] = :PARAM_SPLAT if tok[0] == '*'
         return if tok[0] != :IDENTIFIER
         tok[0] = :PARAM
       end

lib/coffee_script/narwhal/coffee-script.coffee

@@ -29,7 +29,7 @@ exports.run: args =>
   while true
     try
       system.stdout.write('coffee> ').flush()
-      result: exports.evalCS(Readline.readline(), ['--globals'])
+      result: exports.evalCS(Readline.readline())
       print(result) if result isnt undefined
     catch e
       print(e)
@@ -41,15 +41,15 @@ exports.compileFile: path =>
   coffee.stdout.read()
 
 # Compile a string of CoffeeScript into JavaScript.
-exports.compile: source, flags =>
-  coffee: OS.popen([coffeePath, "--eval", "--no-wrap"].concat(flags or []))
+exports.compile: source =>
+  coffee: OS.popen([coffeePath, "--eval", "--no-wrap"])
   coffee.stdin.write(source).flush().close()
   checkForErrors(coffee)
   coffee.stdout.read()
 
 # Evaluating a string of CoffeeScript first compiles it externally.
-exports.evalCS: source, flags =>
-  eval(exports.compile(source, flags))
+exports.evalCS: source =>
+  eval(exports.compile(source))
 
 # Make a factory for the CoffeeScript environment.
 exports.makeNarwhalFactory: path =>

lib/coffee_script/narwhal/lib/coffee-script.js

@@ -20,31 +20,32 @@
   // Run a simple REPL, round-tripping to the CoffeeScript compiler for every
   // command.
   exports.run = function run(args) {
-    var __a, __b, i, path, result;
+    var __a, __b, __c, i, path, result;
     if (args.length) {
       __a = args;
-      for (i = 0; i < __a.length; i++) {
-        path = __a[i];
-        exports.evalCS(File.read(path));
-        delete args[i];
+      __b = [];
+      for (i in __a) {
+        if (__a.hasOwnProperty(i)) {
+          path = __a[i];
+          exports.evalCS(File.read(path));
+          __c = delete args[i];
+          __b.push(__c);
+        }
       }
+      __b;
       return true;
     }
-    __b = [];
     while (true) {
-      __b.push((function() {
-        try {
-          system.stdout.write('coffee> ').flush();
-          result = exports.evalCS(Readline.readline(), ['--globals']);
-          if (result !== undefined) {
-            return print(result);
-          }
-        } catch (e) {
-          return print(e);
+      try {
+        system.stdout.write('coffee> ').flush();
+        result = exports.evalCS(Readline.readline());
+        if (result !== undefined) {
+          print(result);
         }
-      })());
+      } catch (e) {
+        print(e);
+      }
     }
-    return __b;
   };
   // Compile a given CoffeeScript file into JavaScript.
   exports.compileFile = function compileFile(path) {
@@ -54,16 +55,16 @@
     return coffee.stdout.read();
   };
   // Compile a string of CoffeeScript into JavaScript.
-  exports.compile = function compile(source, flags) {
+  exports.compile = function compile(source) {
     var coffee;
-    coffee = OS.popen([coffeePath, "--eval", "--no-wrap"].concat(flags || []));
+    coffee = OS.popen([coffeePath, "--eval", "--no-wrap"]);
     coffee.stdin.write(source).flush().close();
     checkForErrors(coffee);
     return coffee.stdout.read();
   };
   // Evaluating a string of CoffeeScript first compiles it externally.
-  exports.evalCS = function evalCS(source, flags) {
-    return eval(exports.compile(source, flags));
+  exports.evalCS = function evalCS(source) {
+    return eval(exports.compile(source));
   };
   // Make a factory for the CoffeeScript environment.
   exports.makeNarwhalFactory = function makeNarwhalFactory(path) {

lib/coffee_script/narwhal/lib/coffee-script/loader.js

@@ -8,9 +8,9 @@
     // Reload the coffee-script environment from source.
     reload: function reload(topId, path) {
       coffeescript = coffeescript || require('coffee-script');
-      return factories[topId] = function() {
+      return (factories[topId] = function() {
         return coffeescript.makeNarwhalFactory(path);
-      };
+      });
     },
     // Ensure that the coffee-script environment is loaded.
     load: function load(topId, path) {

lib/coffee_script/parse_error.rb

@@ -5,12 +5,6 @@ module CoffeeScript
   # line-number aware.
   class ParseError < Racc::ParseError
 
-    TOKEN_MAP = {
-      'INDENT'  => 'indent',
-      'OUTDENT' => 'outdent',
-      "\n"      => 'newline'
-    }
-
     def initialize(token_id, value, stack)
       @token_id, @value, @stack = token_id, value, stack
     end
@@ -19,7 +13,7 @@ module CoffeeScript
       line      = @value.respond_to?(:line) ? @value.line : "END"
       line_part = "line #{line}:"
       id_part   = @token_id != @value.inspect ? ", unexpected #{@token_id.to_s.downcase}" : ""
-      val_part  = " for #{TOKEN_MAP[@value.to_s] || "'#{@value}'"}"
+      val_part  = ['INDENT', 'OUTDENT'].include?(@token_id) ? '' : " for '#{@value.to_s}'"
       "#{line_part} syntax error#{val_part}#{id_part}"
     end
     alias_method :inspect, :message

lib/coffee_script/rewriter.rb

@@ -26,7 +26,7 @@ module CoffeeScript
 
     # Single-line flavors of block expressions that have unclosed endings.
     # The grammar can't disambiguate them, so we insert the implicit indentation.
-    SINGLE_LINERS  = [:ELSE, "=>", "==>", :TRY, :FINALLY, :THEN]
+    SINGLE_LINERS  = [:ELSE, "=>", :TRY, :FINALLY, :THEN]
     SINGLE_CLOSERS = ["\n", :CATCH, :FINALLY, :ELSE, :OUTDENT, :LEADING_WHEN]
 
     # Rewrite the token stream in multiple passes, one logical filter at
@@ -35,7 +35,6 @@ module CoffeeScript
     def rewrite(tokens)
       @tokens = tokens
       adjust_comments
-      remove_leading_newlines
       remove_mid_expression_newlines
       move_commas_outside_outdents
       add_implicit_indentation
@@ -70,10 +69,6 @@ module CoffeeScript
           @tokens.delete_at(i + 2)
           @tokens.delete_at(i - 2)
           next 0
-        elsif prev[0] == "\n" && [:INDENT, :OUTDENT].include?(after[0])
-          @tokens.delete_at(i + 2)
-          @tokens[i - 1] = after
-          next 1
         elsif !["\n", :INDENT, :OUTDENT].include?(prev[0])
           @tokens.insert(i, ["\n", Value.new("\n", token[1].line)])
           next 2
@@ -83,12 +78,6 @@ module CoffeeScript
       end
     end
 
-    # Leading newlines would introduce an ambiguity in the grammar, so we
-    # dispatch them here.
-    def remove_leading_newlines
-      @tokens.shift if @tokens[0][0] == "\n"
-    end
-
     # Some blocks occur in the middle of expressions -- when we're expecting
     # this, remove their trailing newlines.
     def remove_mid_expression_newlines

lib/coffee_script/scope.rb

@@ -5,13 +5,12 @@ module CoffeeScript
   # whether a variable has been seen before or if it needs to be declared.
   class Scope
 
-    attr_reader :parent, :expressions, :function, :variables, :temp_variable
+    attr_reader :parent, :expressions, :variables, :temp_variable
 
     # Initialize a scope with its parent, for lookups up the chain,
-    # as well as the Expressions body where it should declare its variables,
-    # and the function that it wraps.
-    def initialize(parent, expressions, function)
-      @parent, @expressions, @function = parent, expressions, function
+    # as well as the Expressions body where it should declare its variables.
+    def initialize(parent, expressions)
+      @parent, @expressions = parent, expressions
       @variables = {}
       @temp_variable = @parent ? @parent.temp_variable.dup : '__a'
     end
@@ -45,43 +44,18 @@ module CoffeeScript
     def free_variable
       @temp_variable.succ! while check(@temp_variable)
       @variables[@temp_variable.to_sym] = :var
-      Value.new(@temp_variable.dup)
-    end
-
-    # Ensure that an assignment is made at the top of scope (or top-level
-    # scope, if requested).
-    def assign(name, value, top=false)
-      return @parent.assign(name, value, top) if top && @parent
-      @variables[name.to_sym] = Value.new(value)
+      @temp_variable.dup
     end
 
     def declarations?(body)
       !declared_variables.empty? && body == @expressions
     end
 
-    def assignments?(body)
-      !assigned_variables.empty? && body == @expressions
-    end
-
     # Return the list of variables first declared in current scope.
     def declared_variables
       @variables.select {|k, v| v == :var }.map {|pair| pair[0].to_s }.sort
     end
 
-    # Return the list of variables that are supposed to be assigned at the top
-    # of scope.
-    def assigned_variables
-      @variables.select {|k, v| v.is_a?(Value) }.sort_by {|pair| pair[0].to_s }
-    end
-
-    def compiled_declarations
-      declared_variables.join(', ')
-    end
-
-    def compiled_assignments
-      assigned_variables.map {|name, val| "#{name} = #{val}"}.join(', ')
-    end
-
     def inspect
       "<Scope:#{__id__} #{@variables.inspect}>"
     end

lib/coffee_script/value.rb

@@ -2,12 +2,10 @@ module CoffeeScript
 
   # Instead of producing raw Ruby objects, the Lexer produces values of this
   # class, wrapping native objects tagged with line number information.
-  # Values masquerade as both strings and nodes -- being used both as nodes in
-  # the AST, and as literally-interpolated values in the generated code.
   class Value
     attr_reader :value, :line
 
-    def initialize(value, line=nil)
+    def initialize(value, line)
       @value, @line = value, line
     end
 
@@ -20,10 +18,6 @@ module CoffeeScript
       to_str.to_sym
     end
 
-    def compile(o={})
-      to_s
-    end
-
     def inspect
       @value.inspect
     end
@@ -43,22 +37,6 @@ module CoffeeScript
     def hash
       @value.hash
     end
-
-    def match(regex)
-      @value.match(regex)
-    end
-
-    def children
-      []
-    end
-
-    def statement_only?
-      false
-    end
-
-    def contains?
-      false
-    end
   end
 
 end

package.json

@@ -5,5 +5,5 @@
     "description":  "Unfancy JavaScript",
     "keywords":     ["javascript", "language"],
     "author":       "Jeremy Ashkenas",
-    "version":      "0.2.6"
+    "version":      "0.2.1"
 }

test/fixtures/execution/test_arguments.coffee

@@ -22,11 +22,3 @@ curried: =>
   print(area.apply(this, arguments.concat(20, 20)) is 100)
 
 curried(10, 10)
-
-
-# Arguments is not a special keyword -- it can be assigned to:
-func: =>
-  arguments: 25
-  arguments
-
-print(func(100) is 25)

test/fixtures/execution/test_array_comprehension.coffee

@@ -5,11 +5,11 @@ print(results.join(',') is '2,18')
 
 
 obj:   {one: 1, two: 2, three: 3}
-names: prop + '!' for prop of obj
-odds:  prop + '!' for prop, value of obj when value % 2 isnt 0
+names: key + '!' for value, key in obj
+odds:  key + '!' for value, key in obj when value % 2 isnt 0
 
-print(names.join(' ') is "one! two! three!")
-print(odds.join(' ')  is "one! three!")
+print(names.join(' ')   is "one! two! three!")
+print(odds.join(' ')    is "one! three!")
 
 
 evens: for num in [1, 2, 3, 4, 5, 6] when num % 2 is 0
@@ -19,7 +19,3 @@ evens: for num in [1, 2, 3, 4, 5, 6] when num % 2 is 0
 
 print(evens.join(', ') is '4, 6, 8')
 
-# Make sure that the "in" operator still works.
-
-print(2 in evens)
-

test/fixtures/execution/test_assign_to_try_catch.coffee

@@ -0,0 +1,8 @@
+result: try
+  nonexistent * missing
+catch error
+  true
+  
+result2: try nonexistent * missing catch error then true
+  
+print(result is true and result2 is true)

test/fixtures/execution/test_assignment.coffee

@@ -1,23 +0,0 @@
-# Assign to try/catch.
-
-result: try
-  nonexistent * missing
-catch error
-  true
-
-result2: try nonexistent * missing catch error then true
-
-print(result is true and result2 is true)
-
-
-# Assign to conditional.
-
-get_x: => 10
-
-if x: get_x() then 100
-
-print(x is 10)
-
-x: if get_x() then 100
-
-print(x is 100)

test/fixtures/execution/test_calling_super.coffee

@@ -1,38 +1,23 @@
 Base: =>
-Base::func: string =>
+Base.prototype.func: string =>
   'zero/' + string
 
 FirstChild: =>
 FirstChild extends Base
-FirstChild::func: string =>
+FirstChild.prototype.func: string =>
   super('one/') + string
-
+     
 SecondChild: =>
 SecondChild extends FirstChild
-SecondChild::func: string =>
+SecondChild.prototype.func: string =>
   super('two/') + string
-
+   
 ThirdChild: =>
-  this.array: [1, 2, 3]
 ThirdChild extends SecondChild
-ThirdChild::func: string =>
+ThirdChild.prototype.func: string =>
   super('three/') + string
 
 result: (new ThirdChild()).func('four')
 
 print(result is 'zero/one/two/three/four')
 
-
-TopClass: arg =>
-  this.prop: 'top-' + arg
-
-SuperClass: arg =>
-  super('super-' + arg)
-
-SubClass: =>
-  super('sub')
-
-SuperClass extends TopClass
-SubClass extends SuperClass
-
-print((new SubClass()).prop is 'top-super-sub')

test/fixtures/execution/test_chained_calls.coffee

@@ -2,23 +2,4 @@ identity_wrap: x => => x
 
 result: identity_wrap(identity_wrap(true))()()
 
-print(result)
-
-
-str: 'god'
-
-result: str.
-  split('').
-  reverse().
-  reverse().
-  reverse()
-
-print(result.join('') is 'dog')
-
-result: str
-  .split('')
-  .reverse()
-  .reverse()
-  .reverse()
-
-print(result.join('') is 'dog')
+print(result)

test/fixtures/execution/test_destructuring_assignment.coffee

@@ -1,62 +0,0 @@
-a: -1
-b: -2
-
-[a, b]: [b, a]
-
-print(a is -2)
-print(b is -1)
-
-
-arr: [1, 2, 3]
-
-[a, b, c]: arr
-
-print(a is 1)
-print(b is 2)
-print(c is 3)
-
-
-obj: {x: 10, y: 20, z: 30}
-
-{x: a, y: b, z: c}: obj
-
-print(a is 10)
-print(b is 20)
-print(c is 30)
-
-
-person: {
-  name: "Bob"
-  family: {
-    brother: {
-      addresses: [
-        "first"
-        {
-          street: "101 Deercreek Ln."
-          city:   "Moquasset NY, 10021"
-        }
-      ]
-    }
-  }
-}
-
-{name: a, family: {brother: {addresses: [one, {city: b}]}}}: person
-
-print(a is "Bob")
-print(b is "Moquasset NY, 10021")
-
-
-test: {
-  person: {
-    address: [
-      "------"
-      "Street 101"
-      "Apt 101"
-      "City 101"
-    ]
-  }
-}
-
-{person: {address: [ignore, addr...]}}: test
-
-print(addr.join(', ') is "Street 101, Apt 101, City 101")

test/fixtures/execution/test_everything.coffee

@@ -26,4 +26,4 @@ func: =>
 
   c.single: c.list[1..1][0]
 
-print(func() is '-')
+print(func() == '-')

test/fixtures/execution/test_existence.coffee

@@ -2,32 +2,4 @@ print(if my_special_variable? then false else true)
 
 my_special_variable: false
 
-print(if my_special_variable? then true else false)
-
-
-# Existential assignment.
-
-a: 5
-a: null
-a ?= 10
-b ?= 10
-
-print(a is 10 and b is 10)
-
-
-# The existential operator.
-
-z: null
-x: z ? "EX"
-
-print(z is null and x is "EX")
-
-
-# Only evaluate once.
-
-counter: 0
-get_next_node: =>
-  throw "up" if counter
-  counter++
-
-print(if get_next_node()? then true else false)
+print(if my_special_variable? then true else false)

test/fixtures/execution/test_expressions.coffee

@@ -1,30 +0,0 @@
-# Ensure that we don't wrap Nodes that are "statement_only" in a closure.
-
-items: [1, 2, 3, "bacon", 4, 5]
-
-for item in items
-  break if item is "bacon"
-
-findit: items =>
-  for item in items
-    return item if item is "bacon"
-
-print(findit(items) is "bacon")
-
-
-# When when a closure wrapper is generated for expression conversion, make sure
-# that references to "this" within the wrapper are safely converted as well.
-
-obj: {
-  num: 5
-  func: =>
-    this.result: if false
-      10
-    else
-      "a"
-      "b"
-      this.num
-}
-
-print(obj.num is obj.func())
-print(obj.num is obj.result)

test/fixtures/execution/test_functions.coffee

@@ -1,48 +0,0 @@
-x: 1
-y: {}
-y.x: => 3
-
-print(x is 1)
-print(typeof(y.x) is 'function')
-print(y.x() is 3)
-print(y.x.name is 'x')
-
-
-# The empty function should not cause a syntax error.
-=>
-
-
-obj: {
-  name: "Fred"
-
-  bound: =>
-    (==> print(this.name is "Fred"))()
-
-  unbound: =>
-    (=> print(!this.name?))()
-}
-
-obj.unbound()
-obj.bound()
-
-
-# The named function should be cleared out before a call occurs:
-
-# Python decorator style wrapper that memoizes any function
-memoize: fn =>
-  cache: {}
-  self: this
-  args... =>
-    key: args.toString()
-    return cache[key] if cache[key]
-    cache[key] = fn.apply(self, args)
-
-Math: {
-  Add: a, b => a + b
-  AnonymousAdd: (a, b => a + b)
-  FastAdd: memoize() a, b => a + b
-}
-
-print(Math.Add(5, 5) is 10)
-print(Math.AnonymousAdd(10, 10) is 20)
-print(Math.FastAdd(20, 20) is 40)

test/fixtures/execution/test_funky_comments.coffee

@@ -1,17 +1,8 @@
-  # comment
 func: =>
-# comment
   false
   false   # comment
   false
 # comment
   true
-
-switch 'string'
-  # comment
-  when false then something()
-  # comment
-  when null
-    something_else()
-
-print(func())
+  
+print(func())

test/fixtures/execution/test_heredocs.coffee

@@ -1,37 +0,0 @@
-a: """
-   basic heredoc
-   on two lines
-   """
-
-print(a is "basic heredoc\non two lines")
-
-
-a: '''
-   a
-     "b
-   c
-   '''
-
-print(a is "a\n  \"b\nc")
-
-
-a: '''one-liner'''
-
-print(a is 'one-liner')
-
-
-a: """
-      out
-      here
-"""
-
-print(a is "out\nhere")
-
-
-a: '''
-      a
-    b
-  c
-   '''
-
-print(a is "    a\n  b\nc")

test/fixtures/execution/test_literals.coffee

@@ -11,27 +11,4 @@ print(!!words.match(regex))
 
 neg: (3 -4)
 
-print(neg is -1)
-
-
-func: =>
-  return if true
-
-print(func() is null)
-
-
-str: "\\"
-reg: /\\/
-
-print(reg(str) and str is '\\')
-
-
-i: 10
-while i -= 1
-
-print(i is 0)
-
-
-money$: 'dollars'
-
-print(money$ is 'dollars')
+print(neg is -1)

test/fixtures/execution/test_named_functions.coffee

@@ -0,0 +1,8 @@
+x: 1
+y: {}
+y.x: => 3
+
+print(x is 1)
+print(typeof(y.x) is 'function')
+print(y.x() is 3)
+print(y.x.name is 'x')

test/fixtures/execution/test_operations.coffee

@@ -1,18 +0,0 @@
-# CoffeeScript's operations should be chainable, like Python's.
-
-print(500 > 50 > 5 > -5)
-
-print(true is not false is true is not false)
-
-print(10 < 20 > 10)
-
-print(50 > 10 > 5 is parseInt('5', 10))
-
-
-# Make sure that each argument is only evaluated once, even if used
-# more than once.
-
-i: 0
-func: => i++
-
-print(1 > func() < 1)

test/fixtures/execution/test_ranges_and_slices.coffee

@@ -5,7 +5,4 @@ b: array[2...4]
 
 result: a.concat(b).join(' ')
 
-print(result is "7 8 9 2 3")
-
-countdown: [10..1].join(' ')
-print(countdown is "10 9 8 7 6 5 4 3 2 1")
+print(result is "7 8 9 2 3")

test/fixtures/execution/test_splats.coffee

@@ -1,4 +1,4 @@
-func: first, second, rest... =>
+func: first, second, *rest =>
   rest.join(' ')
 
 result: func(1, 2, 3, 4, 5)
@@ -8,7 +8,7 @@ print(result is "3 4 5")
 
 gold: silver: bronze: the_field: null
 
-medalists: first, second, third, rest... =>
+medalists: first, second, third, *rest =>
   gold:       first
   silver:     second
   bronze:     third
@@ -27,7 +27,7 @@ contenders: [
   "Usain Bolt"
 ]
 
-medalists("Mighty Mouse", contenders...)
+medalists("Mighty Mouse", *contenders)
 
 print(gold is "Mighty Mouse")
 print(silver is "Michael Phelps")

test/fixtures/execution/test_splices.coffee

@@ -1,5 +1,3 @@
-
-
 array: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
 
 array[5..10]: [0, 0, 0]

test/fixtures/execution/test_switch.coffee

@@ -7,25 +7,7 @@ result: switch num
     true
     false
   when 10 then true
-
-
-  # Mid-switch comment with whitespace
-  # and multi line
   when 11 then false
   else false
-
+  
 print(result)
-
-
-func: num =>
-  switch num
-    when 2, 4, 6
-      true
-    when 1, 3, 5
-      false
-    else false
-
-print(func(2))
-print(func(6))
-print(!func(3))
-print(!func(8))

test/fixtures/execution/test_while.coffee

@@ -1,17 +0,0 @@
-i: 100
-while i -= 1
-
-print(i is 0)
-
-
-i: 5
-list: while i -= 1
-  i * 2
-
-print(list.join(' ') is "8 6 4 2")
-
-
-i: 5
-list: (i * 3 while i -= 1)
-
-print(list.join(' ') is "12 9 6 3")

test/fixtures/generation/each.js

@@ -0,0 +1,35 @@
+(function(){
+
+  // The cornerstone, an each implementation.
+  // Handles objects implementing forEach, arrays, and raw objects.
+  _.each = function each(obj, iterator, context) {
+    var __a, __b, __c, __d, __e, i, index, item, key;
+    index = 0;
+    try {
+      if (obj.forEach) {
+        obj.forEach(iterator, context);
+      } else if (_.isArray(obj) || _.isArguments(obj)) {
+        __a = obj;
+        for (i in __a) {
+          if (__a.hasOwnProperty(i)) {
+            item = __a[i];
+            iterator.call(context, item, i, obj);
+          }
+        }
+      } else {
+        __c = _.keys(obj);
+        for (__d in __c) {
+          if (__c.hasOwnProperty(__d)) {
+            key = __c[__d];
+            iterator.call(context, obj[key], key, obj);
+          }
+        }
+      }
+    } catch (e) {
+      if (e !== breaker) {
+        throw e;
+      }
+    }
+    return obj;
+  };
+})();

test/fixtures/generation/each_no_wrap.js

@@ -0,0 +1,33 @@
+
+// The cornerstone, an each implementation.
+// Handles objects implementing forEach, arrays, and raw objects.
+_.each = function each(obj, iterator, context) {
+  var __a, __b, __c, __d, __e, i, index, item, key;
+  index = 0;
+  try {
+    if (obj.forEach) {
+      obj.forEach(iterator, context);
+    } else if (_.isArray(obj) || _.isArguments(obj)) {
+      __a = obj;
+      for (i in __a) {
+        if (__a.hasOwnProperty(i)) {
+          item = __a[i];
+          iterator.call(context, item, i, obj);
+        }
+      }
+    } else {
+      __c = _.keys(obj);
+      for (__d in __c) {
+        if (__c.hasOwnProperty(__d)) {
+          key = __c[__d];
+          iterator.call(context, obj[key], key, obj);
+        }
+      }
+    }
+  } catch (e) {
+    if (e !== breaker) {
+      throw e;
+    }
+  }
+  return obj;
+};

test/unit/test_execution.rb

@@ -4,16 +4,12 @@ class ExecutionTest < Test::Unit::TestCase
 
   NO_WARNINGS = "0 error(s), 0 warning(s)"
 
-  SOURCES = [
-    'test/fixtures/execution/*.coffee',
-    'examples/beautiful_code/*.coffee'
-  ]
-
   # This is by far the most important test. It evaluates all of the
-  # CoffeeScript in test/fixtures/execution, as well as examples/beautiful_code,
-  # ensuring that all our syntax actually works.
+  # CoffeeScript in test/fixtures/execution, ensuring that all our
+  # syntax actually works.
   def test_execution_of_coffeescript
-    (`bin/coffee -r #{SOURCES.join(' ')}`).split("\n").each do |line|
+    sources = ['test/fixtures/execution/*.coffee'].join(' ')
+    (`bin/coffee -r #{sources}`).split("\n").each do |line|
       assert line == "true"
     end
   end

test/unit/test_lexer.rb

@@ -7,14 +7,14 @@ class LexerTest < Test::Unit::TestCase
   end
 
   def test_lexing_an_empty_string
-    assert @lex.tokenize("") == []
+    assert @lex.tokenize("") == [["\n", "\n"]]
   end
 
   def test_lexing_basic_assignment
     code = "a: 'one'\nb: [1, 2]"
-    assert @lex.tokenize(code) == [[:IDENTIFIER, "a"], [:ASSIGN, ":"],
-      [:STRING, "'one'"], ["\n", "\n"], [:IDENTIFIER, "b"], [:ASSIGN, ":"],
-      ["[", "["], [:NUMBER, "1"], [",", ","], [:NUMBER, "2"], ["]", "]"],
+    assert @lex.tokenize(code) == [[:IDENTIFIER, "a"], [:ASSIGN, ":"], 
+      [:STRING, "'one'"], ["\n", "\n"], [:IDENTIFIER, "b"], [:ASSIGN, ":"], 
+      ["[", "["], [:NUMBER, "1"], [",", ","], [:NUMBER, "2"], ["]", "]"], 
       ["\n", "\n"]]
   end
 
@@ -27,7 +27,7 @@ class LexerTest < Test::Unit::TestCase
   def test_lexing_function_definition
     code = "x, y => x * y"
     assert @lex.tokenize(code) == [[:PARAM, "x"], [",", ","], [:PARAM, "y"],
-      ["=>", "=>"], [:INDENT, 2], [:IDENTIFIER, "x"], ["*", "*"],
+      ["=>", "=>"], [:INDENT, 2], [:IDENTIFIER, "x"], ["*", "*"], 
       [:IDENTIFIER, "y"], [:OUTDENT, 2], ["\n", "\n"]]
   end
 

test/unit/test_parser.rb

@@ -17,15 +17,15 @@ class ParserTest < Test::Unit::TestCase
     assert nodes.length == 1
     assign = nodes.first
     assert assign.is_a?(AssignNode)
-    assert assign.variable.base == 'a'
+    assert assign.variable.literal == 'a'
   end
 
   def test_parsing_an_object_literal
     nodes = @par.parse("{one : 1\ntwo : 2}").expressions
-    obj = nodes.first.base
+    obj = nodes.first.literal
     assert obj.is_a?(ObjectNode)
-    assert obj.properties.first.variable.base.value == "one"
-    assert obj.properties.last.variable.base.value == "two"
+    assert obj.properties.first.variable.literal.value == "one"
+    assert obj.properties.last.variable.literal.value == "two"
   end
 
   def test_parsing_an_function_definition
@@ -39,17 +39,17 @@ class ParserTest < Test::Unit::TestCase
   def test_parsing_if_statement
     the_if = @par.parse("clap_your_hands() if happy").expressions.first
     assert the_if.is_a?(IfNode)
-    assert the_if.condition.base == 'happy'
+    assert the_if.condition.literal == 'happy'
     assert the_if.body.is_a?(CallNode)
-    assert the_if.body.variable.base == 'clap_your_hands'
+    assert the_if.body.variable.literal == 'clap_your_hands'
   end
 
   def test_parsing_array_comprehension
     nodes = @par.parse("i for x, i in [10, 9, 8, 7, 6, 5] when i % 2 is 0").expressions
     assert nodes.first.is_a?(ForNode)
-    assert nodes.first.body.base == 'i'
+    assert nodes.first.body.literal == 'i'
     assert nodes.first.filter.operator == '==='
-    assert nodes.first.source.base.objects.last.base.value == "5"
+    assert nodes.first.source.literal.objects.last.literal.value == "5"
   end
 
   def test_parsing_comment
@@ -66,9 +66,15 @@ class ParserTest < Test::Unit::TestCase
     nodes = @par.parse(File.read('test/fixtures/generation/each.coffee'))
     assign = nodes.expressions[1]
     assert assign.is_a?(AssignNode)
-    assert assign.variable.base == '_'
+    assert assign.variable.literal == '_'
     assert assign.value.is_a?(CodeNode)
     assert assign.value.params == ['obj', 'iterator', 'context']
+    assert nodes.compile == File.read('test/fixtures/generation/each.js')
+  end
+
+  def test_no_wrap
+    nodes = @par.parse(File.read('test/fixtures/generation/each.coffee'))
+    assert nodes.compile(:no_wrap => true) == File.read('test/fixtures/generation/each_no_wrap.js')
   end
 
 end