Updating docs for CoffeeScript 0.5.4. Tag it and bag it.

This reverts commit 9503ea3040.

.gitignore

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

Cakefile

@@ -0,0 +1,73 @@
+fs: require 'fs'
+coffee: require 'coffee-script'
+
+# Run a CoffeeScript through our node/coffee interpreter.
+run: (args) ->
+  proc: process.createChildProcess 'bin/coffee', args
+  proc.addListener 'error', (err) -> if err then puts err
+
+
+option '-p', '--prefix [DIR]', 'set the installation prefix for `cake install`'
+
+task 'install', 'install CoffeeScript into /usr/local (or --prefix)', (options) ->
+  base: options.prefix or '/usr/local'
+  lib:  base + '/lib/coffee-script'
+  exec([
+    'mkdir -p ' + lib
+    'cp -rf bin lib LICENSE README package.json src vendor ' + lib
+    'ln -sf ' + lib + '/bin/coffee ' + base + '/bin/coffee'
+    'ln -sf ' + lib + '/bin/cake ' + base + '/bin/cake'
+  ].join(' && '), (err, stdout, stderr) ->
+   if err then print stderr
+  )
+
+
+task 'build', 'build the CoffeeScript language from source', ->
+  files: fs.readdirSync 'src'
+  files: 'src/' + file for file in files when file.match(/\.coffee$/)
+  run ['-c', '-o', 'lib'].concat(files)
+
+
+task 'build:parser', 'rebuild the Jison parser (run build first)', ->
+  require.paths.unshift 'vendor/jison/lib'
+  parser: require('grammar').parser
+  js: parser.generate()
+  parser_path: 'lib/parser.js'
+  fs.writeFile parser_path, js
+
+
+task 'build:ultraviolet', 'build and install the Ultraviolet syntax highlighter', ->
+  exec 'plist2syntax extras/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage', (err) ->
+    exec 'sudo mv coffeescript.yaml /usr/local/lib/ruby/gems/1.8/gems/ultraviolet-0.10.2/syntax/coffeescript.syntax'
+
+
+task 'build:underscore', 'rebuild the Underscore.coffee documentation page', ->
+  exec 'uv -s coffeescript -t idle -h examples/underscore.coffee > documentation/underscore.html'
+
+
+task 'build:browser', 'rebuild the merged script for inclusion in the browser', ->
+  exec 'rake browser', (err) ->
+    throw err if err
+
+
+task 'doc', 'watch and continually rebuild the documentation', ->
+  exec 'rake doc'
+
+
+task 'test', 'run the CoffeeScript language test suite', ->
+  process.mixin require 'assert'
+  test_count: 0
+  start_time: new Date()
+  [original_ok, original_throws]: [ok, throws]
+  process.mixin {
+    ok:     (args...) -> test_count += 1; original_ok(args...)
+    throws: (args...) -> test_count += 1; original_throws(args...)
+  }
+  process.addListener 'exit', ->
+    time: ((new Date() - start_time) / 1000).toFixed(2)
+    puts '\033[0;32mpassed ' + test_count + ' tests in ' + time + ' seconds\033[0m'
+  fs.readdir 'test', (err, files) ->
+    for file in files
+      fs.readFile 'test/' + file, (err, source) ->
+        js: coffee.compile source
+        process.compile js, file

LICENSE

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

README

@@ -22,20 +22,21 @@
                                                         
   CoffeeScript is a little language that compiles into JavaScript.
   
-  Install the compiler:
-  gem install coffee-script
+  Install Node.js, and then the CoffeeScript compiler:
+  sudo bin/cake install
   
   Compile a script:
   coffee /path/to/script.coffee
   
   For documentation, usage, and examples, see:
-  http://jashkenas.github.com/coffee-script/
+  http://coffeescript.org/
   
-  To suggest a feature or report a bug:
+  To suggest a feature, report a bug, or general discussion:
   http://github.com/jashkenas/coffee-script/issues/
+  
+  If you'd like to chat, drop by #coffeescript on Freenode IRC,
+  or on webchat.freenode.net.
 
   The source repository:
   git://github.com/jashkenas/coffee-script.git
-  
-  To build CoffeeScript from source, install the "racc" gem and
-  run "rake build:parser". Then bin/coffee will work.
+

Rakefile

@@ -1,48 +1,15 @@
 require 'erb'
 require 'fileutils'
 require 'rake/testtask'
-
-desc "Run all tests"
-task :test do
-  $LOAD_PATH.unshift(File.expand_path('test'))
-  require 'redgreen' if Gem.available?('redgreen')
-  require 'test/unit'
-  Dir['test/*/**/test_*.rb'].each {|test| require test }
-end
-
-namespace :build do
-
-  desc "Recompile the Racc parser (pass -v and -g for verbose debugging)"
-  task :parser, :racc_args do |t, args|
-    sh "racc #{args[:racc_args]} -o lib/coffee_script/parser.rb lib/coffee_script/grammar.y"
-  end
-
-  desc "Compile the Narwhal interface for --interactive and --run"
-  task :narwhal do
-    sh "bin/coffee lib/coffee_script/narwhal/*.coffee -o lib/coffee_script/narwhal/lib/coffee-script"
-    sh "mv lib/coffee_script/narwhal/lib/coffee-script/coffee-script.js lib/coffee_script/narwhal/lib/coffee-script.js"
-  end
-
-  desc "Compile and install the Ultraviolet syntax highlighter"
-  task :ultraviolet do
-    sh "plist2syntax lib/coffee_script/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage"
-    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
+require 'rubygems'
+require 'yui/compressor'
 
 desc "Build the documentation page"
 task :doc do
   source = 'documentation/index.html.erb'
-  child = fork { exec "bin/coffee documentation/coffee/*.coffee -o documentation/js -w" }
+  child = fork { exec "bin/coffee -c documentation/coffee/*.coffee -o documentation/js -w" }
   at_exit { Process.kill("INT", child) }
   Signal.trap("INT") { exit }
-  # `uv -t idle -s coffeescript -h examples/underscore.coffee > documentation/underscore.html`
   loop do
     mtime = File.stat(source).mtime
     if !@mtime || mtime > @mtime
@@ -54,19 +21,11 @@ task :doc do
   end
 end
 
-namespace :gem do
-
-  desc 'Build and install the coffee-script gem'
-  task :install do
-    sh "gem build coffee-script.gemspec"
-    sh "sudo gem install #{Dir['*.gem'].join(' ')} --local --no-ri --no-rdoc"
-  end
-
-  desc 'Uninstall the coffee-script gem'
-  task :uninstall do
-    sh "sudo gem uninstall -x coffee-script"
-  end
-
+desc "Build the single concatenated and minified script for the browser"
+task :browser do
+  sources = %w(rewriter.js lexer.js parser.js scope.js nodes.js coffee-script.js)
+  code    = sources.map {|s| File.read('lib/' + s) }.join('')
+  code    = YUI::JavaScriptCompressor.new.compress(code)
+  File.open('extras/coffee-script.js', 'w+') {|f| f.write(code) }
 end
 
-task :default => :test

bin/cake

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+
+process.mixin(require('sys'));
+var path = require('path');
+var fs = require('fs');
+var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
+
+require.paths.unshift(lib);
+require('cake').run();

bin/coffee

@@ -1,5 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env node
 
-require "#{File.dirname(__FILE__)}/../lib/coffee_script/command_line.rb"
+process.mixin(require('sys'));
+var path = require('path');
+var fs = require('fs');
+var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
 
-CoffeeScript::CommandLine.new
+require.paths.unshift(lib);
+require('command_line').run();

coffee-script.gemspec

@@ -1,26 +0,0 @@
-Gem::Specification.new do |s|
-  s.name      = 'coffee-script'
-  s.version   = '0.2.2'         # Keep version in sync with coffee-script.rb
-  s.date      = '2010-1-10'
-
-  s.homepage    = "http://jashkenas.github.com/coffee-script/"
-  s.summary     = "The CoffeeScript Compiler"
-  s.description = <<-EOS
-    CoffeeScript is a little language that compiles into JavaScript. Think
-    of it as JavaScript's less ostentatious kid brother -- the same genes,
-    roughly the same height, but a different sense of style. Apart from a
-    handful of bonus goodies, statements in CoffeeScript correspond
-    one-to-one with their equivalent in JavaScript, it's just another
-    way of saying it.
-  EOS
-
-  s.authors           = ['Jeremy Ashkenas']
-  s.email             = 'jashkenas@gmail.com'
-  s.rubyforge_project = 'coffee-script'
-  s.has_rdoc          = false
-
-  s.require_paths     = ['lib']
-  s.executables       = ['coffee']
-
-  s.files = Dir['bin/*', 'examples/*', 'lib/**/*', 'coffee-script.gemspec', 'LICENSE', 'README', 'package.json']
-end

documentation/coffee/aliases.coffee

@@ -5,3 +5,5 @@ volume: 10 if band isnt spinal_tap
 let_the_wild_rumpus_begin() unless answer is no
 
 if car.speed < speed_limit then accelerate()
+
+print "My name is " + @name

documentation/coffee/arguments.coffee

@@ -1,4 +1,4 @@
-backwards: =>
-  alert(arguments.reverse())
+backwards: ->
+  alert arguments.reverse()
 
-backwards("stairway", "to", "heaven")
+backwards "stairway", "to", "heaven"

documentation/coffee/array_comprehensions.coffee

@@ -1,7 +1,7 @@
 # Eat lunch.
-lunch: eat(food) for food in ['toast', 'cheese', 'wine']
+lunch: eat food for food in ['toast', 'cheese', 'wine']
 
 # Naive collision detection.
 for roid in asteroids
   for roid2 in asteroids when roid isnt roid2
-    roid.explode() if roid.overlaps(roid2)
+    roid.explode() if roid.overlaps roid2

documentation/coffee/blocks.coffee

@@ -1,4 +0,0 @@
-$('table.list').each() table =>
-  $('tr.account', table).each() row =>
-    row.show()
-    row.highlight()

documentation/coffee/cake_tasks.coffee

@@ -0,0 +1,5 @@
+process.mixin require 'assert'
+
+task 'test', 'run each of the unit tests', ->
+  for test in test_files
+    fs.readFile test, (err, code) -> eval coffee.compile code

documentation/coffee/classes.coffee

@@ -0,0 +1,29 @@
+class Animal
+  move: (meters) ->
+    alert @name + " moved " + meters + "m."
+
+class Snake extends Animal
+  constructor: (name) ->
+    @name: name
+
+  move: ->
+    alert "Slithering..."
+    super 5
+
+class Horse extends Animal
+  constructor: (name) ->
+    @name: name
+
+  move: ->
+    alert "Galloping..."
+    super 45
+
+sam: new Snake "Sammy the Python"
+tom: new Horse "Tommy the Palomino"
+
+sam.move()
+tom.move()
+
+
+
+

documentation/coffee/comparisons.coffee

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

documentation/coffee/existence.coffee

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

documentation/coffee/expressions.coffee

@@ -1,4 +1,4 @@
-grade: student =>
+grade: (student) ->
   if student.excellent_work
     "A+"
   else if student.okay_stuff

documentation/coffee/expressions_comprehension.coffee

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

documentation/coffee/expressions_try.coffee

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

documentation/coffee/fat_arrow.coffee

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

documentation/coffee/functions.coffee

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

documentation/coffee/heredocs.coffee

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

documentation/coffee/multiple_return_values.coffee

@@ -0,0 +1,5 @@
+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,3 +1,4 @@
 years_old: {max: 10, ida: 9, tim: 11}
 
-ages: child + " is " + age for child, age ino years_old
+ages: for child, age of years_old
+  child + " is " + age

documentation/coffee/object_extraction.coffee

@@ -0,0 +1,13 @@
+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

@@ -6,7 +6,7 @@ opposite_day: true
 number: -42 if opposite_day
 
 # Functions:
-square: x => x * x
+square: (x) -> x * x
 
 # Arrays:
 list: [1, 2, 3, 4, 5]
@@ -15,15 +15,15 @@ list: [1, 2, 3, 4, 5]
 math: {
   root:   Math.sqrt
   square: square
-  cube:   x => x * square(x)
+  cube:   (x) -> x * square x
 }
 
 # Splats:
-race: winner, runners... =>
-  print(winner, runners)
+race: (winner, runners...) ->
+  print winner, runners
 
 # Existence:
-alert("I knew it!") if elvis?
+alert "I knew it!" if elvis?
 
 # Array comprehensions:
-cubed_list: math.cube(num) for num in list
+cubed_list: math.cube num for num in list

documentation/coffee/parallel_assignment.coffee

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

documentation/coffee/prototypes.coffee

@@ -0,0 +1,2 @@
+String::dasherize: ->
+  this.replace(/_/g, "-")

documentation/coffee/range_comprehensions.coffee

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

documentation/coffee/scope.coffee

@@ -1,5 +1,5 @@
 num: 1
-change_numbers: =>
+change_numbers: ->
   new_num: -1
   num: 10
 new_num: change_numbers()

documentation/coffee/soaks.coffee

@@ -0,0 +1 @@
+lottery.draw_winner()?.address?.zipcode

documentation/coffee/splats.coffee

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

documentation/coffee/super.coffee

@@ -1,25 +0,0 @@
-Animal: =>
-Animal::move: meters =>
-  alert(this.name + " moved " + meters + "m.")
-
-Snake: name => this.name: name
-Snake extends Animal
-Snake::move: =>
-  alert("Slithering...")
-  super(5)
-
-Horse: name => this.name: name
-Horse extends Animal
-Horse::move: =>
-  alert("Galloping...")
-  super(45)
-
-sam: new Snake("Sammy the Python")
-tom: new Horse("Tommy the Palomino")
-
-sam.move()
-tom.move()
-
-
-
-

documentation/coffee/switch.coffee

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

documentation/coffee/try.coffee

@@ -2,6 +2,6 @@ try
   all_hell_breaks_loose()
   cats_and_dogs_living_together()
 catch error
-  print(error)
+  print error
 finally
   clean_up()

documentation/coffee/while.coffee

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

documentation/css/amy.css

@@ -1,147 +0,0 @@
-pre.amy .PolymorphicVariants {
-   color: #60B0FF;
-   font-style: italic;
-}
-pre.amy .KeywordDecorator {
-   color: #D0D0FF;
-}
-pre.amy .Punctuation {
-   color: #805080;
-}
-pre.amy .InheritedClass {
-}
-pre.amy .InvalidDepricated {
-   background-color: #CC66FF;
-   color: #200020;
-}
-pre.amy .LibraryVariable {
-}
-pre.amy .TokenReferenceOcamlyacc {
-   color: #3CB0D0;
-}
-pre.amy .Storage {
-   color: #B0FFF0;
-}
-pre.amy .KeywordOperator {
-   color: #A0A0FF;
-}
-pre.amy .CharacterConstant {
-   color: #666666;
-}
-pre.amy .line-numbers {
-   background-color: #800000;
-   color: #000000;
-}
-pre.amy .ClassName {
-   color: #70E080;
-}
-pre.amy .Int64Constant {
-   font-style: italic;
-}
-pre.amy .NonTerminalReferenceOcamlyacc {
-   color: #C0F0F0;
-}
-pre.amy .TokenDefinitionOcamlyacc {
-   color: #3080A0;
-}
-pre.amy .ClassType {
-   color: #70E0A0;
-}
-pre.amy .ControlKeyword {
-   color: #80A0FF;
-}
-pre.amy .LineNumberDirectives {
-   text-decoration: underline;
-   color: #C080C0;
-}
-pre.amy .FloatingPointConstant {
-   text-decoration: underline;
-}
-pre.amy .Int32Constant {
-   font-weight: bold;
-}
-pre.amy .TagName {
-   color: #009090;
-}
-pre.amy .ModuleTypeDefinitions {
-   text-decoration: underline;
-   color: #B000B0;
-}
-pre.amy .Integer {
-   color: #7090B0;
-}
-pre.amy .Camlp4TempParser {
-}
-pre.amy .InvalidIllegal {
-   font-weight: bold;
-   background-color: #FFFF00;
-   color: #400080;
-}
-pre.amy .LibraryConstant {
-   background-color: #200020;
-}
-pre.amy .ModuleDefinitions {
-   color: #B000B0;
-}
-pre.amy .Variants {
-   color: #60B0FF;
-}
-pre.amy .CompilerDirectives {
-   color: #C080C0;
-}
-pre.amy .FloatingPointInfixOperator {
-   text-decoration: underline;
-}
-pre.amy .BuiltInConstant1 {
-}
-pre.amy {
-   background-color: #200020;
-   color: #D0D0FF;
-}
-pre.amy .FunctionArgument {
-   color: #80B0B0;
-}
-pre.amy .FloatingPointPrefixOperator {
-   text-decoration: underline;
-}
-pre.amy .NativeintConstant {
-   font-weight: bold;
-}
-pre.amy .BuiltInConstant {
-   color: #707090;
-}
-pre.amy .BooleanConstant {
-   color: #8080A0;
-}
-pre.amy .LibraryClassType {
-}
-pre.amy .TagAttribute {
-}
-pre.amy .Keyword {
-   color: #A080FF;
-}
-pre.amy .UserDefinedConstant {
-}
-pre.amy .String {
-   color: #999999;
-}
-pre.amy .Camlp4Code {
-   background-color: #350060;
-}
-pre.amy .NonTerminalDefinitionOcamlyacc {
-   color: #90E0E0;
-}
-pre.amy .FunctionName {
-   color: #50A0A0;
-}
-pre.amy .SupportModules {
-   color: #A00050;
-}
-pre.amy .Variable {
-   color: #008080;
-}
-pre.amy .Comment {
-   background-color: #200020;
-   color: #404080;
-   font-style: italic;
-}

documentation/css/docs.css

@@ -1,29 +1,29 @@
 body {
   font-size: 14px;
   line-height: 20px;
-  background: #f3f3f9;
   color: #191933;
   font-family: Arial, Helvetica, sans-serif;
 }
 div.container {
-  width: 850px;
-  margin: 50px 0 50px 50px;
+  width: 950px;
+  margin: 100px 0 50px 50px;
 }
 p {
-  padding-left: 13px;
   width: 625px;
 }
 a {
   color: #000055;
 }
 h1, h2, h3, h4, h5, h6 {
-  padding-left: 13px;
   margin-top: 40px;
 }
 br.clear {
   height: 0;
   clear: both;
 }
+ul {
+  padding-left: 20px;
+}
 b.header {
   color: #000055;
   display: block;
@@ -31,7 +31,7 @@ b.header {
   font-size: 16px;
 }
 li {
-  margin-bottom: 7px;
+  margin-bottom: 10px;
 }
 table {
   margin: 16px 0 0 13px; padding: 0;
@@ -43,7 +43,7 @@ table {
     td {
       padding: 9px 15px 9px 0;
     }
-code, pre, tt {
+code, pre, tt, textarea {
   font-family: Monaco, Consolas, "Lucida Console", monospace;
   font-size: 12px;
   line-height: 18px;
@@ -63,10 +63,15 @@ code, pre, tt {
     padding: 3px 0 3px 12px;
     font-size: 12px;
   }
+    pre.no_bar {
+      border-left: 0;
+      margin-left: 0;
+      padding-left: 0;
+    }
 div.code {
   position: relative;
   border: 1px solid #cacaca;
-  background: #fff;
+  background: #fafaff;
   padding: 7px 0 10px 0;
   -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px;
   -webkit-box-shadow: 0px 0px 7px #cacaca;
@@ -75,13 +80,187 @@ div.code {
     position: absolute;
     right: 8px; bottom: 8px;
   }
-  div.code pre {
+  div.code pre, div.code textarea {
     float: left;
-    width: 410px;
+    width: 450px;
+    background: #fafaff;
     border-left: 1px dotted #559;
     padding: 0 0 0 12px;
     margin: 0;
   }
     div.code pre:first-child {
       border-left: 0;
-    }
+    }
+
+#fadeout {
+  z-index: 50;
+  position: fixed;
+  left: 0; top: 0; right: 0;
+  height: 100px;
+  background: -webkit-gradient(linear, left top, left bottom, from(rgba(255, 255, 255, 255)), to(rgba(255, 255, 255, 0)));
+  background: -moz-linear-gradient(top, rgba(255, 255, 255, 255), rgba(255, 255, 255, 0));
+}
+
+#flybar {
+  position: fixed;
+  z-index: 100;
+  height: 50px;
+  left: 40px; right: 40px; top: 25px;
+  background: #ddd;
+  padding-left: 235px;
+  background: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#d0d0d0));
+  background: -moz-linear-gradient(top, #f5f5f5, #d0d0d0);
+  filter: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr='#F5F5F5', EndColorStr='#D0D0D0');
+  -webkit-border-radius: 20px; -moz-border-radius: 20px; border-radius: 20px;
+  -webkit-box-shadow: 0 0 25px #777; -moz-box-shadow: 0 0 25px #777;
+}
+  #logo {
+    display: block;
+    width: 215px; height: 50px;
+    background: url('../images/logo.png');
+    position: absolute;
+    top: 0px; left: 10px;
+  }
+  #error {
+    position: absolute;
+    -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px;
+    right: 15px; top: 15px; left: 565px;
+    height: 15px;
+    padding: 2px 5px;
+    background: #fdcdcc;
+    color: #864544;
+    border: 1px solid #864544;
+    font: 10px/15px Arial;
+    overflow: hidden;
+    text-transform: uppercase;
+  }
+  .navigation {
+    height: 50px;
+    font: bold 11px/50px Arial;
+    text-transform: uppercase;
+    position: relative;
+    float: left;
+    padding: 0 20px;
+    border: 1px solid #bbb;
+    border-top: 0; border-bottom: 0;
+    cursor: pointer;
+  }
+    body.full_screen .navigation {
+      position: static;
+    }
+    .navigation.try {
+      border-left: 0;
+    }
+    .navigation:hover,
+    .navigation.active {
+      background: #d0d0d0;
+      background: -webkit-gradient(linear, left top, left bottom, from(#f0f0f0), to(#c0c0c0));
+      background: -moz-linear-gradient(top, #f0f0f0, #c0c0c0);
+      filter: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr='#F0F0F0', EndColorStr='#C0C0C0');
+    }
+    .navigation .contents {
+      display: none;
+      position: absolute;
+      background: #fff;
+      top: 50px; left: 0;
+      padding: 5px 0;
+      -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px;
+      -webkit-border-top-left-radius: 0; -moz-border-radius-topleft: 0;
+      -webkit-border-top-right-radius: 0; -moz-border-radius-topright: 0;
+      -webkit-box-shadow: 0 0 25px #777; -moz-box-shadow: 0 0 25px #777;
+    }
+      .navigation.active .contents {
+        display: block;
+      }
+        .navigation .contents.repl_wrapper {
+          left: -162px;
+          width: 700px;
+          padding: 0;
+        }
+          body.full_screen .navigation .contents.repl_wrapper {
+            position: fixed;
+            width: auto; height: auto;
+            left: 60px; top: 75px; right: 60px; bottom: 30px;
+          }
+          .navigation .contents.repl_wrapper .code {
+            -webkit-box-shadow: none; -moz-box-shadow: none;
+            background: transparent;
+            border: 0;
+            position: static;
+          }
+            body.full_screen .navigation .contents.repl_wrapper .code {
+              height: 100%;
+              padding: 0; margin: 0;
+            }
+          .navigation .code button {
+            bottom: 10px;
+            text-transform: none;
+          }
+          .navigation .full_screen, .navigation .minimize {
+            right: auto;
+            left: 10px;
+            display: none;
+          }
+            body.minimized .full_screen, body.full_screen .minimize {
+              display: inline;
+            }
+      .navigation .contents a {
+        display: block;
+        width: 300px;
+        text-transform: none;
+        text-decoration: none;
+        font-weight: normal;
+        height: 12px;
+        line-height: 12px;
+        padding: 4px 10px;
+      }
+        .navigation .contents a:hover {
+          background: #f0f0f0;
+        }
+
+.bookmark {
+  display: block;
+  width: 0; height: 0;
+  position: relative;
+  top: -90px;
+}
+
+#repl_source, #repl_results {
+  background: transparent;
+  outline: none;
+  margin: 5px 0 20px;
+}
+  #repl_source_wrap {
+    margin-left: 5px;
+    height: 250px;
+    width: 307px;
+    position: relative;
+    float: left;
+  }
+    #repl_source {
+      width: 96%;
+      height: 100%;
+      border: 0;
+      resize: none;
+    }
+  #repl_results {
+    font-family: Monaco, Consolas, "Lucida Console", monospace;
+    text-transform: none;
+    font-weight: normal;
+    height: 260px;
+    margin-bottom: 25px;
+    overflow-y: auto;
+    width: 370px;
+  }
+    body.full_screen #repl_results, body.full_screen #repl_source_wrap {
+      width: auto; height: auto;
+      position: absolute;
+      margin-bottom: 0;
+      top: 10px; left: 10px; right: 10px; bottom: 40px;
+    }
+      body.full_screen #repl_source_wrap {
+        right: 50%;
+      }
+      body.full_screen #repl_results {
+        left: 50%;
+      }

documentation/css/idle.css

@@ -28,6 +28,7 @@ pre.idle .LibraryConstant {
    color: #A535AE;
 }
 pre.idle .FunctionArgument {
+   color: #0076ad;
 }
 pre.idle .BuiltInConstant {
    color: #A535AE;
@@ -56,6 +57,7 @@ pre.idle .FunctionName {
    color: #21439C;
 }
 pre.idle .Variable {
+  color: #A535AE;
 }
 pre.idle .Comment {
    color: #919191;

documentation/index.html.erb

@@ -1,7 +1,7 @@
 <%
   require 'uv'
   def code_for(file, executable=false)
-    @stripper ||= /(\A\(function\(\)\{\n|\}\)\(\);\Z|^  )/
+    @stripper ||= /(\A\(function\(\)\{\n|\}\)\(\);\n*\Z|^  )/
     return '' unless File.exists?("documentation/js/#{file}.js")
     cs = File.read("documentation/coffee/#{file}.coffee")
     js = File.read("documentation/js/#{file}.js").gsub(@stripper, '')
@@ -22,12 +22,73 @@
   <title>CoffeeScript</title>
   <link rel="stylesheet" type="text/css" href="documentation/css/docs.css" />
   <link rel="stylesheet" type="text/css" href="documentation/css/idle.css" />
+  <link rel="shortcut icon" href="documentation/images/favicon.ico" />
 </head>
-<body>
+<body class="minimized">
+
+  <div id="fadeout"></div>
+
+  <div id="flybar">
+    <a id="logo" href="#top"> </a>
+    <div class="navigation">
+      <div class="button">
+        Table of Contents
+      </div>
+      <div class="contents">
+        <a href="#overview">Mini Overview</a>
+        <a href="#installation">Installation and Usage</a>
+        <a href="#language">Language Reference</a>
+        <a href="#whitespace">Significant Whitespace</a>
+        <a href="#functions">Functions and Invocation</a>
+        <a href="#assignment">Assignment</a>
+        <a href="#objects_and_arrays">Objects and Arrays</a>
+        <a href="#lexical_scope">Lexical Scoping and Variable Safety</a>
+        <a href="#conditionals">Conditionals, Ternaries, and Conditional Assignment</a>
+        <a href="#aliases">Aliases</a>
+        <a href="#splats">Splats...</a>
+        <a href="#arguments">Arguments are Arrays</a>
+        <a href="#while">While Loops</a>
+        <a href="#comprehensions">Comprehensions (Arrays, Objects, and Ranges)</a>
+        <a href="#slice_splice">Array Slicing and Splicing with Ranges</a>
+        <a href="#expressions">Everything is an Expression</a>
+        <a href="#existence">The Existential Operator</a>
+        <a href="#classes">Classes, Inheritance, and Super</a>
+        <a href="#pattern_matching">Pattern Matching</a>
+        <a href="#fat_arrow">Function Binding</a>
+        <a href="#embedded">Embedded JavaScript</a>
+        <a href="#switch">Switch/When/Else</a>
+        <a href="#try">Try/Catch/Finally</a>
+        <a href="#comparisons">Chained Comparisons</a>
+        <a href="#strings">Multiline Strings and Heredocs</a>
+        <a href="#cake">Cake, and Cakefiles</a>
+        <a href="#scripts">"text/coffeescript" Script Tags</a>
+        <a href="#resources">Resources</a>
+        <a href="#change_log">Change Log</a>
+      </div>
+    </div>
+    <div class="navigation try">
+      <div class="button">
+        Try CoffeeScript
+      </div>
+      <div class="contents repl_wrapper">
+        <div class="code">
+          <div id="repl_source_wrap"><textarea id="repl_source">reverse: (string) ->
+  string.split('').reverse().join ''
+
+alert reverse '!tpircseeffoC'</textarea></div>
+          <pre id="repl_results"></pre>
+          <button class="full_screen">go full screen</button>
+          <button class="minimize">minimize</button>
+          <button class="run">run</button>
+          <br class="clear" />
+        </div>
+      </div>
+    </div>
+    <div id="error" style="display:none;"></div>
+  </div>
 
   <div class="container">
-
-    <h1><sub style="font-size: 100px;">&#9749;</sub> CoffeeScript</h1>
+    <span class="bookmark" id="top"></span>
 
     <p>
       CoffeeScript is a little language that compiles into JavaScript. Think
@@ -39,8 +100,7 @@
 
     <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
+      CoffeeScript is just for fun. Until it reaches 1.0, <i>there are no guarantees
       that the syntax won't change between versions.</i> That said,
       it compiles into clean JavaScript (the good parts) that can use existing
       JavaScript libraries seamlessly, and passes through
@@ -51,40 +111,13 @@
 
     <p>
       <b>Latest Version:</b>
-      <a href="http://gemcutter.org/gems/coffee-script">0.2.2</a>
+      <a href="http://github.com/jashkenas/coffee-script/tarball/0.5.4">0.5.4</a>
     </p>
 
-    <h2>Table of Contents</h2>
-
-    <p>
-      <a href="#overview">Mini Overview</a><br />
-      <a href="#installation">Installation and Usage</a><br />
-      <a href="#whitespace">Significant Whitespace</a><br />
-      <a href="#functions">Functions and Invocation</a><br />
-      <a href="#assignment">Assignment</a><br />
-      <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 Existence Operator</a><br />
-      <a href="#aliases">Aliases</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 />
-      <a href="#slice_splice">Array Slicing and Splicing with Ranges</a><br />
-      <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="#embedded">Embedded JavaScript</a><br />
-      <a href="#switch">Switch/When/Else</a><br />
-      <a href="#try">Try/Catch/Finally</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 />
-    </p>
-
-    <h2 id="overview">Mini Overview</h2>
+    <h2>
+      <span id="overview" class="bookmark"></span>
+      Mini Overview
+    </h2>
 
     <p><i>CoffeeScript on the left, compiled JavaScript output on the right.</i></p>
 
@@ -95,7 +128,7 @@
       <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 
+      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.
@@ -103,22 +136,40 @@
       <a href="http://github.com/jashkenas/coffee-script/tree/master/examples/">examples</a> folder.
     </p>
 
-    <h2 id="installation">Installation and Usage</h2>
+    <h2>
+      <span id="installation" class="bookmark"></span>
+      Installation and Usage
+    </h2>
 
     <p>
-      The CoffeeScript compiler is written in pure Ruby, and is available
-      as a Ruby Gem.
+      The CoffeeScript compiler is written in pure CoffeeScript, using a
+      <a href="http://github.com/jashkenas/coffee-script/blob/master/src/grammar.coffee">small DSL</a>
+      on top of the <a href="http://github.com/zaach/jison">Jison parser generator</a>, and is available
+      as a <a href="http://nodejs.org/">Node.js</a> utility. The core compiler however,
+      does not depend on Node, and can be run in other server-side-JavaScript environments,
+      or in the browser (see "Try CoffeeScript", above). This may be helpful,
+      as Node only run on flavors of nix, and not Windows, for the time being.
+    </p>
+
+    <p>
+      To install, first make sure you have a working version of
+      <a href="http://nodejs.org/">Node.js</a> greater than version 0.1.30 (Node
+      moves quickly, using the latest master is your best bet). 
+      Then clone the CoffeeScript
+      <a href="http://github.com/jashkenas/coffee-script">source repository</a>
+      from GitHub, or download the latest
+      release: <a href="http://github.com/jashkenas/coffee-script/tarball/0.5.4">0.5.4</a>.
+      To install the CoffeeScript compiler system-wide
+      under <tt>/usr/local</tt>, open the directory and run:
     </p>
 
     <pre>
-gem install coffee-script</pre>
+sudo bin/cake install</pre>
 
     <p>
-      Installing the gem provides the <tt>coffee</tt> command, which can
-      be used to compile CoffeeScript <tt>.coffee</tt> files into JavaScript, as
-      well as debug them. In conjunction with
-      <a href="http://narwhaljs.org/">Narwhal</a>, the <tt>coffee</tt>
-      command also provides direct evaluation and an interactive REPL.
+      This provides the <tt>coffee</tt> command, which will execute CoffeeScripts
+      under Node.js by default, but is also used to compile CoffeeScript
+      <tt>.coffee</tt> files into JavaScript, or to run an an interactive REPL.
       When compiling to JavaScript, <tt>coffee</tt> writes the output
       as <tt>.js</tt> files in the same directory by default, but output
       can be customized with the following options:
@@ -126,23 +177,23 @@ gem install coffee-script</pre>
 
     <table>
       <tr>
-        <td width="25%"><code>-i, --interactive</code></td>
+        <td><code>-c, --compile</code></td>
         <td>
-          Launch an interactive CoffeeScript session.
-          Requires <a href="http://narwhaljs.org/">Narwhal</a>.
+          Compile a <tt>.coffee</tt> script into a <tt>.js</tt> JavaScript file
+          of the same name.
         </td>
       </tr>
       <tr>
-        <td><code>-r, --run</code></td>
+        <td width="25%"><code>-i, --interactive</code></td>
         <td>
-          Compile and execute scripts without saving the intermediate
-          JavaScript. Requires <a href="http://narwhaljs.org/">Narwhal</a>.
+          Launch an interactive CoffeeScript session to try short snippets.
         </td>
       </tr>
       <tr>
         <td><code>-o, --output [DIR]</code></td>
         <td>
           Write out all compiled JavaScript files into the specified directory.
+          Use in conjunction with <tt>--compile</tt> or <tt>--watch</tt>.
         </td>
       </tr>
       <tr>
@@ -162,51 +213,55 @@ gem install coffee-script</pre>
       <tr>
         <td><code>-l, --lint</code></td>
         <td>
-          If the <tt>jsl</tt> (JavaScript Lint) command is installed, use it
+          If the <tt>jsl</tt>
+          (<a href="http://www.javascriptlint.com/">JavaScript Lint</a>)
+          command is installed, use it
           to check the compilation of a CoffeeScript file. (Handy in
           conjunction with <tt>--watch</tt>)
         </td>
       </tr>
+      <tr>
+        <td><code>-s, --stdio</code></td>
+        <td>
+          Pipe in CoffeeScript to STDIN and get back JavaScript over STDOUT.
+          Good for use with processes written in other languages. An example:<br />
+          <tt>cat src/cake.coffee | coffee -s</tt>
+        </td>
+      </tr>
       <tr>
         <td><code>-e, --eval</code></td>
         <td>
           Compile and print a little snippet of CoffeeScript directly from the
-          command line (or from <b>stdin</b>). For example:<br /><tt>coffee -e "square: x => x * x"</tt>
+          command line. For example:<br /><tt>coffee -e "square: (x) -> x * x"</tt>
+        </td>
+      </tr>
+      <tr>
+        <td><code>--no-wrap</code></td>
+        <td>
+          Compile the JavaScript without the top-level function safety wrapper.
+          (Used for CoffeeScript as a Node.js module.)
         </td>
       </tr>
       <tr>
         <td><code>-t, --tokens</code></td>
         <td>
           Instead of parsing the CoffeeScript, just lex it, and print out the
-          token stream: <tt>[:IDENTIFIER, "square"], [":", ":"], [:PARAM, "x"]</tt> ...
+          token stream: <tt>[IDENTIFIER square] [ASSIGN :] [PARAM_START (]</tt> ...
         </td>
       </tr>
       <tr>
-        <td><code>-v, --verbose</code></td>
+        <td><code>-n, --nodes</code></td>
         <td>
-          As the JavaScript is being generated, print out every step of code
-          generation, including lexical scope and the node in the
-          AST.
-        </td>
-      </tr>
-      <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.)
-        </td>
-      </tr>
-      <tr>
-        <td><code>--install-bundle</code></td>
-        <td>
-          Install the TextMate bundle for CoffeeScript syntax highlighting.
+          Instead of compiling the CoffeeScript, just lex and parse it, and print
+          out the parse tree:
+<pre class="no_bar">
+Expressions
+  Assign
+    Value "square"
+    Code "x"
+      Op *
+        Value "x"
+        Value "x"</pre>
         </td>
       </tr>
     </table>
@@ -216,12 +271,15 @@ gem install coffee-script</pre>
     </p>
 
     <pre>
-coffee path/to/script.coffee
+coffee -c path/to/script.coffee
 coffee --interactive
 coffee --watch --lint experimental.coffee
 coffee --print app/scripts/*.coffee > concatenation.js</pre>
 
-    <h2>Language Reference</h2>
+    <h2>
+      <span id="language" class="bookmark"></span>
+      Language Reference
+    </h2>
 
     <p>
       <i>
@@ -233,7 +291,14 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
       </i>
     </p>
 
-    <p id="whitespace">
+    <p>
+      <i>
+        Many of the examples can be run (where it makes sense) by pressing the "run"
+        button towards the bottom right. You can also paste examples into
+        "Try CoffeeScript" in the toolbar, and play with them from there.
+      </i>
+    <p>
+      <span id="whitespace" class="bookmark"></span>
       <b class="header">Significant Whitespace</b>
       CoffeeScript uses Python-style significant whitespace: You don't need to
       use semicolons <tt>;</tt> to terminate expressions, ending
@@ -246,43 +311,57 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
     </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.
+      You don't need to use parentheses to invoke a function if you're passing
+      arguments:<br /><tt>print "coffee"</tt>
     </p>
 
-    <p id="functions">
+    <p>
+      You can use newlines to break up your expression into smaller pieces,
+      as long as CoffeeScript can determine that the line hasn't finished yet,
+      because it ends with an operator or a dot.
+    </p>
+
+    <p>
+      <span id="functions" class="bookmark"></span>
       <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, for the benefit of debug messages.
+      function body. The empty function looks like this: <tt>-></tt> All
+      functions in CoffeeScript are named by default, for easier debugging.
     </p>
     <%= code_for('functions', 'cube(5)') %>
+    <p>
+      If you'd like to assign a function literal to a variable, but not have
+      it be named, just wrap the function definition in parentheses:
+      <tt>((x) -> x * x)</tt>
+    </p>
 
-    <p id="assignment">
+    <p>
+      <span id="assignment" class="bookmark"></span>
       <b class="header">Assignment</b>
       Use a colon <tt>:</tt> to assign, as in
       <a href="http://json.org">JSON</a>. Equal signs are only needed for
-      mathy things.
+      mathy things. While colons are preferred, the two may be used interchangeably,
+      even within object literals.
     </p>
     <%= code_for('assignment', 'greeting') %>
     <p>
-      Declarations of new variables are pushed up to the top of the nearest
+      All declaration of new variables is pushed up to the top of the nearest
       lexical scope, so that assignment may always be performed within expressions.
     </p>
 
-    <p id="objects_and_arrays">
+    <p>
+      <span id="objects_and_arrays" class="bookmark"></span>
       <b class="header">Objects and Arrays</b>
       Object and Array literals look very similar to their JavaScript cousins.
       When you spread out each assignment on a separate line, the commas are
       optional. In this way, assigning object properties looks the same as
-      assigning local variables, and can be moved around freely. You can mix
+      assigning local variables, and can be moved around freely. Feel free to mix
       and match the two styles.
     </p>
     <%= code_for('objects_and_arrays', 'song.join(",")') %>
 
-    <p id="lexical_scope">
+    <p>
+      <span id="lexical_scope" class="bookmark"></span>
       <b class="header">Lexical Scoping and Variable Safety</b>
       The CoffeeScript compiler takes care to make sure that all of your variables
       are properly declared within lexical scope &mdash; you never need to write
@@ -302,12 +381,18 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
       CoffeeScript output is wrapped in an anonymous function:
       <tt>(function(){ ... })();</tt> This safety wrapper, combined with the
       automatic generation of the <tt>var</tt> keyword, make it exceedingly difficult
-      to pollute the global namespace by accident. If you'd like to create
-      global variables, attach them as properties on <b>window</b>,
-      or on the <b>exports</b> object in CommonJS.
+      to pollute the global namespace by accident.
+    </p>
+    <p>
+      If you'd like to create top-level variables for other scripts to use,
+      attach them as properties on <b>window</b>, or on the <b>exports</b>
+      object in CommonJS. The <b>existential operator</b> (below), gives you a
+      reliable way to figure out where to add them, if you're targeting both
+      CommonJS and the browser: <tt>root: exports ? this</tt>
     </p>
 
-    <p id="conditionals">
+    <p>
+      <span id="conditionals" class="bookmark"></span>
       <b class="header">Conditionals, Ternaries, and Conditional Assignment</b>
       <b>If/else</b> statements can be written without the use of parentheses and
       curly brackets. As with functions and other block expressions,
@@ -326,17 +411,8 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
       truthy variables.
     </p>
 
-    <p id="existence">
-      <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 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>
-    <%= code_for('existence') %>
-
-    <p id="aliases">
+    <p>
+      <span id="aliases" class="bookmark"></span>
       <b class="header">Aliases</b>
       Because the <tt>==</tt> operator frequently causes undesirable coercion,
       is intransitive, and has a different meaning than in other languages,
@@ -364,18 +440,23 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
     <p>
       For single-line statements, <tt>unless</tt> can be used as the inverse of <tt>if</tt>.
     </p>
+    <p>
+      As a shortcut for <tt>this.property</tt>, you can use <tt>@property</tt>.
+    </p>
     <%= code_for('aliases') %>
 
-    <p id="splats">
+    <p>
+      <span id="splats" class="bookmark"></span>
       <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,
-      making variable arguments a little bit more palatable.
+      making variable numbers of arguments a little bit more palatable.
     </p>
     <%= code_for('splats', true) %>
 
-    <p id="arguments">
+    <p>
+      <span id="arguments" class="bookmark"></span>
       <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
@@ -384,11 +465,15 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
     </p>
     <%= code_for('arguments', true) %>
 
-    <p id="while">
+    <p>
+      <span id="while" class="bookmark"></span>
       <b class="header">While Loops</b>
-      The only low-level loop that CoffeeScript provides is the while loop.
+      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.
     </p>
-    <%= code_for('while') %>
+    <%= code_for('while', 'lyrics.join("\n")') %>
     <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
@@ -396,7 +481,8 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
       <b>each</b> (<b>forEach</b>) style iterators, or...
     </p>
 
-    <p id="comprehensions">
+    <p>
+      <span id="comprehensions" class="bookmark"></span>
       <b class="header">Comprehensions (Arrays, Objects, and Ranges)</b>
       For your looping needs, CoffeeScript provides array comprehensions
       similar to Python's. They replace (and compile into) <b>for</b> loops, with
@@ -415,12 +501,13 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
     <%= code_for('range_comprehensions', 'countdown') %>
     <p>
       Comprehensions can also be used to iterate over the keys and values in
-      an object. Use <tt>ino</tt> to signal comprehension over an object instead
-      of an array.
+      an object. Use <tt>of</tt> to signal comprehension over the properties of
+      an object instead of the values in an array.
     </p>
     <%= code_for('object_comprehensions', 'ages.join(", ")') %>
 
-    <p id="slice_splice">
+    <p>
+      <span id="slice_splice" class="bookmark"></span>
       <b class="header">Array Slicing and Splicing with Ranges</b>
       CoffeeScript borrows Ruby's
       <a href="http://ruby-doc.org/core/classes/Range.html">range syntax</a>
@@ -436,7 +523,8 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
     </p>
     <%= code_for('splices', 'numbers') %>
 
-    <p id="expressions">
+    <p>
+      <span id="expressions" class="bookmark"></span>
       <b class="header">Everything is an Expression (at least, as much as possible)</b>
       You might have noticed how even though we don't add return statements
       to CoffeeScript functions, they nonetheless return their final value.
@@ -468,9 +556,46 @@ 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, namely <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>
+    <p>
+      <span id="existence" class="bookmark"></span>
+      <b class="header">The Existential 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. CoffeeScript's existential 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') %>
+    <p>
+      The accessor variant of the existential operator <tt>?.</tt> can be used to soak
+      up null references in a chain of properties. Use it instead
+      of the dot accessor <tt>.</tt> in cases where the base value may be <b>null</b>
+      or <b>undefined</b>. If all of the properties exist then you'll get the expected
+      result, if the chain is broken, <b>undefined</b> is returned instead of
+      the <b>TypeError</b> that would be raised otherwise.
+    </p>
+    <%= code_for('soaks') %>
+    <p>
+      Soaking up nulls is similar to Ruby's
+      <a href="http://andand.rubyforge.org/">andand gem</a>, and to the
+      <a href="http://groovy.codehaus.org/Operators#Operators-SafeNavigationOperator%28%3F.%29">safe navigation operator</a>
+      in Groovy.
+    </p>
+
+    <p>
+      <span id="classes" class="bookmark"></span>
+      <b class="header">Classes, Inheritance, and Super</b>
       JavaScript's prototypal inheritance has always been a bit of a
       brain-bender, with a whole family tree of libraries that provide a cleaner
       syntax for classical inheritance on top of JavaScript's prototypes:
@@ -481,33 +606,70 @@ 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. 
+      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.
+      Instead of repetitively attaching functions to a prototype, CoffeeScript
+      provides a basic <tt>class</tt> structure that allows you to name your class,
+      set the superclass, assign prototypal properties, and define the constructor,
+      in a single assignable expression.
     </p>
-    <%= code_for('super', true) %>
-
-    <p id="blocks">
-      <b class="header">Blocks</b>
-      Many common looping functions (in Prototype, jQuery, and Underscore,
-      for example) take a single function as their final argument. To make
-      final functions easier to pass, CoffeeScript includes block syntax,
-      so you don't have to close the parentheses on the other side.
+    <%= code_for('classes', true) %>
+    <p>
+      If structuring your prototypes classically isn't your cup of tea, CoffeeScript
+      provides a couple of lower-level conveniences. The <tt>extends</tt> operator
+      helps with proper prototype setup, as seen above, <tt>::</tt> gives you
+      quick access to an object's prototype, and <tt>super()</tt>
+      is converted into a call against the immediate ancestor's method of the same name.
     </p>
-    <%= code_for('blocks') %>
+    <%= code_for('prototypes', '"one_two".dasherize()') %>
 
-    <p id="embedded">
+    <p>
+      <span id="pattern_matching" class="bookmark"></span>
+      <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>
+      <span id="fat_arrow" class="bookmark"></span>
+      <b class="header">Function binding</b>
+      The fat 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 fat arrow are able to access
+      properties of the <tt>this</tt> where they're defined.
+    </p>
+    <%= code_for('fat_arrow') %>
+
+    <p>
+      <span id="embedded" class="bookmark"></span>
       <b class="header">Embedded JavaScript</b>
-      If you ever need to interpolate literal JavaScript snippets, you can
-      use backticks to pass JavaScript straight through.
+      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.
     </p>
     <%= code_for('embedded', 'hi()') %>
 
-    <p id="switch">
+    <p>
+      <span id="switch" class="bookmark"></span>
       <b class="header">Switch/When/Else</b>
       <b>Switch</b> statements in JavaScript are rather broken. You can only
       do comparisons based on string equality, and need to remember to <b>break</b> at the end of
@@ -517,77 +679,217 @@ 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">
+    <p>
+      <span id="try" class="bookmark"></span>
       <b class="header">Try/Catch/Finally</b>
       Try/catch statements are just about the same as JavaScript (although
       they work as expressions).
     </p>
     <%= code_for('try') %>
 
-    <p id="strings">
-      <b class="header">Multiline Strings</b>
+    <p>
+      <span id="comparisons" class="bookmark"></span>
+      <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>
+      <span id="strings" class="bookmark"></span>
+      <b class="header">Multiline Strings and Heredocs</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>
+    <h2>
+      <span id="cake" class="bookmark"></span>
+      Cake, and Cakefiles
+    </h2>
+
+    <p>
+      CoffeeScript includes a simple build system similar to Make and Rake. Naturally,
+      it's called Cake, and is used for the build and test tasks for the CoffeeScript
+      language itself. Tasks are defined in a file named <tt>Cakefile</tt>, and
+      can be invoked by running <tt>cake taskname</tt> from within the directory.
+      To print a list of all the tasks, just run <tt>cake</tt>.
+    </p>
+
+    <p>
+      Task definitions are written in CoffeeScript, so you can put arbitrary code
+      in your Cakefile. Define a task with a name, a long description, and the
+      function to invoke when the task is run. Here's a hypothetical task
+      that uses the Node.js API.
+    </p>
+    <%= code_for('cake_tasks') %>
+
+    <h2>
+      <span id="scripts" class="bookmark"></span>
+      "text/coffeescript" Script Tags
+    </h2>
+
+    <p>
+      While it's not recommended for serious use, CoffeeScripts may be included
+      directly within the browser using <tt>&lt;script type="text/coffeescript"&gt;</tt>
+      tags. The source includes a compressed and minified version of the compiler
+      (<a href="extras/coffee-script.js">Download current version here, 43k when gzipped</a>)
+      as <tt>extras/coffee-script.js</tt>. Include this file on a page with
+      inline CoffeeScript tags, and it will compile and evaluate them in order.
+    </p>
+
+    <p>
+      In fact, the little bit of glue script that runs "Try CoffeeScript" above,
+      as well as jQuery for the menu, is implemented in just this way.
+      View source and look at the bottom of the page to see the example.
+      Including the script also gives you access to <tt>CoffeeScript.compile()</tt>
+      so you can pop open Firebug and try compiling some strings.
+    </p>
+
+    <p>
+      The usual caveats about CoffeeScript apply &mdash; your inline scripts will
+      run within a closure wrapper, so if you want to expose global variables or
+      functions, attach them to the <tt>window</tt> object.
+    </p>
+
+    <h2>
+      <span id="resources" class="bookmark"></span>
+      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,<br />
+        <tt>bin/cake test</tt> to run the test suite,<br />
+        <tt>bin/cake build</tt> to rebuild the CoffeeScript compiler, and <br />
+        <tt>bin/cake build:parser</tt> to regenerate the Jison parser if you're
+        working on the grammar.
       </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">CoffeeScript Issues</a><br />
+        Bugs reports, feature requests, and general discussion all belong here.
       </li>
       <li>
-        <a href="http://github.com/jnicklas/bistro_car">BistroCar</a><br />
-        A Rails plugin by
-        <a href="http://github.com/jnicklas">Jonas Nicklas</a>
-        that includes CoffeeScript helpers,
-        bundling and minification.
+        If you'd like to chat, stop by <tt>#coffeescript</tt> on Freenode in the
+        IRC client of your choice, or on
+        <a href="http://webchat.freenode.net/">webchat.freenode.net</a>.
       </li>
     </ul>
 
-    <h2 id="contributing">Contributing</h2>
-
+    <h2>
+      <span id="change_log" class="bookmark"></span>
+      Change Log
+    </h2>
+    
     <p>
-      Here's a wish list of things that would be wonderful to have contributed:
+      <b class="header" style="margin-top: 20px;">0.5.4</b>
+      Bugfix that corrects the Node.js global constants <tt>__filename</tt> and
+      <tt>__dirname</tt>. Tweaks for more flexible parsing of nested function
+      literals and improperly-indented comments. Updates for the latest Node.js API.
+    </p>
+    
+    <p>
+      <b class="header" style="margin-top: 20px;">0.5.3</b>
+      CoffeeScript now has a syntax for defining classes. Many of the core 
+      components (Nodes, Lexer, Rewriter, Scope, Optparse) are using them.
+      Cakefiles can use <tt>optparse.coffee</tt> to define options for tasks.
+      <tt>--run</tt> is now the default flag for the <tt>coffee</tt> command,
+      use <tt>--compile</tt> to save JavaScripts. Bugfix for an ambiguity between
+      RegExp literals and chained divisions.
     </p>
 
-    <ul>
-      <li>
-        <a href="http://github.com/jashkenas/coffee-script/issues#issue/8">
-          A CoffeeScript version of the compiler.
-        </a>
-      </li>
-      <li>
-        Test cases for any syntax errors you encounter that you think CoffeeScript
-        should be able to compile properly.
-      </li>
-      <li>
-        A tutorial that introduces CoffeeScript from the ground up for folks
-        without knowledge of JavaScript.
-      </li>
-      <li>
-        Integration with Processing.js's JavaScript API (this would depend on
-        having a JavaScript version of the compiler).
-      </li>
-      <li>
-        A lot of the code generation in <tt>nodes.rb</tt> gets into messy
-        string manipulation. Techniques for cleaning this up across the board
-        would be appreciated.
-      </li>
-    </ul>
+    <p>
+      <b class="header" style="margin-top: 20px;">0.5.2</b>
+      Added a compressed version of the compiler for inclusion in web pages as
+      <br  /><tt>extras/coffee-script.js</tt>. It'll automatically run any script tags
+      with type <tt>text/coffeescript</tt> for you. Added a <tt>--stdio</tt> option
+      to the <tt>coffee</tt> command, for piped-in compiles.
+    </p>
 
-    <h2 id="change_log">Change Log</h2>
+
+    <p>
+      <b class="header" style="margin-top: 20px;">0.5.1</b>
+      Improvements to null soaking with the existential operator, including
+      soaks on indexed properties. Added conditions to <tt>while</tt> loops,
+      so you can use them as filters with <tt>when</tt>, in the same manner as
+      comprehensions.
+    </p>
+
+    <p>
+      <b class="header" style="margin-top: 20px;">0.5.0</b>
+      CoffeeScript 0.5.0 is a major release, While there are no language changes,
+      the Ruby compiler has been removed in favor of a self-hosting
+      compiler written in pure CoffeeScript.
+    </p>
+
+    <p>
+      <b class="header" style="margin-top: 20px;">0.3.2</b>
+      <tt>@property</tt> is now a shorthand for <tt>this.property</tt>.<br />
+      Switched the default JavaScript engine from Narwhal to Node.js. Pass
+      the <tt>--narwhal</tt> flag if you'd like to continue using it.
+    </p>
+
+    <p>
+      <b class="header" style="margin-top: 20px;">0.3.0</b>
+      CoffeeScript 0.3 includes major syntax changes:
+      <br />
+      The function symbol was changed to
+      <tt>-></tt>, and the bound function symbol is now <tt>=></tt>.
+      <br />
+      Parameter lists in function definitions must now be wrapped in parentheses.
+      <br />
+      Added property soaking, with the <tt>?.</tt> operator.
+      <br />
+      Made parentheses optional, when invoking functions with arguments.
+      <br />
+      Removed the obsolete block literal syntax.
+    </p>
+
+    <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>
@@ -619,7 +921,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 existence operator. Many thanks to all the folks who posted issues,
+      The existential 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.
@@ -691,5 +993,60 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
 
   </div>
 
+  <script type="text/coffeescript">
+
+    # Set up the compilation function, to run when you stop typing.
+    compile_source: ->
+      source: $('#repl_source').val()
+      window.compiled_js: ''
+      try
+        window.compiled_js: CoffeeScript.compile source, {no_wrap: true}
+        $('#repl_results').text window.compiled_js
+        $('#error').hide();
+      catch error
+        $('#error').text(error.message).show();
+
+    # Listen for keypresses and recompile.
+    $('#repl_source').keyup -> compile_source()
+
+    # Eval the compiled js.
+    $('button.run').click ->
+      try
+        eval window.compiled_js
+      catch error then alert error
+
+    current_nav: null
+
+    # Helper to hide the menus.
+    close_menus: ->
+      if current_nav
+        current_nav.removeClass 'active'
+        document.body.className: 'minimized'
+      current_nav: null
+
+    # Bind navigation buttons to open the menus.
+    $('.navigation').click (e) ->
+      return if e.target.tagName.toLowerCase() is 'a'
+      if this isnt (current_nav and current_nav[0])
+        close_menus();
+        current_nav: $(this)
+        current_nav.addClass 'active'
+      false
+
+    $(document.body).click -> close_menus()
+
+    $('.navigation .full_screen').click ->
+      document.body.className: 'full_screen'
+
+    $('.navigation .minimize').click ->
+      document.body.className: 'minimized'
+
+    compile_source()
+
+  </script>
+
+  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
+  <script src="extras/coffee-script.js"></script>
+
 </body>
 </html>

documentation/js/aliases.js

@@ -10,4 +10,5 @@
     let_the_wild_rumpus_begin();
   }
   car.speed < speed_limit ? accelerate() : null;
-})();
+  print("My name is " + this.name);
+})();

documentation/js/arguments.js

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

documentation/js/array_comprehensions.js

@@ -1,21 +1,21 @@
 (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() {
-    __c = []; __a = ['toast', 'cheese', 'wine'];
-    for (__b=0; __b<__a.length; __b++) {
-      food = __a[__b];
-      __c.push(eat(food));
+    _a = []; _b = ['toast', 'cheese', 'wine'];
+    for (_c = 0, _d = _b.length; _c < _d; _c++) {
+      food = _b[_c];
+      _a.push(eat(food));
     }
-    return __c;
-  })();
+    return _a;
+  }).call(this);
   // 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];
+  _e = asteroids;
+  for (_f = 0, _g = _e.length; _f < _g; _f++) {
+    roid = _e[_f];
+    _h = asteroids;
+    for (_i = 0, _j = _h.length; _i < _j; _i++) {
+      roid2 = _h[_i];
       if (roid !== roid2) {
         if (roid.overlaps(roid2)) {
           roid.explode();
@@ -23,4 +23,4 @@
       }
     }
   }
-})();
+})();

documentation/js/assignment.js

@@ -2,4 +2,4 @@
   var difficulty, greeting;
   greeting = "Hello CoffeeScript";
   difficulty = 0.5;
-})();
+})();

documentation/js/blocks.js

@@ -1,8 +0,0 @@
-(function(){
-  $('table.list').each(function(table) {
-    return $('tr.account', table).each(function(row) {
-      row.show();
-      return row.highlight();
-    });
-  });
-})();

documentation/js/cake_tasks.js

@@ -0,0 +1,14 @@
+(function(){
+  process.mixin(require('assert'));
+  task('test', 'run each of the unit tests', function() {
+    var _a, _b, _c, _d, test;
+    _a = []; _b = test_files;
+    for (_c = 0, _d = _b.length; _c < _d; _c++) {
+      test = _b[_c];
+      _a.push(fs.readFile(test, function(err, code) {
+        return eval(coffee.compile(code));
+      }));
+    }
+    return _a;
+  });
+})();

documentation/js/classes.js

@@ -0,0 +1,36 @@
+(function(){
+  var Animal, Horse, Snake, sam, tom;
+  var __extends = function(child, parent) {
+    var ctor = function(){ };
+    ctor.prototype = parent.prototype;
+    child.__superClass__ = parent.prototype;
+    child.prototype = new ctor();
+    child.prototype.constructor = child;
+  };
+  Animal = function Animal() {  };
+  Animal.prototype.move = function move(meters) {
+    return alert(this.name + " moved " + meters + "m.");
+  };
+  Snake = function Snake(name) {
+    this.name = name;
+    return this;
+  };
+  __extends(Snake, Animal);
+  Snake.prototype.move = function move() {
+    alert("Slithering...");
+    return Snake.__superClass__.move.call(this, 5);
+  };
+  Horse = function Horse(name) {
+    this.name = name;
+    return this;
+  };
+  __extends(Horse, Animal);
+  Horse.prototype.move = function move() {
+    alert("Galloping...");
+    return Horse.__superClass__.move.call(this, 45);
+  };
+  sam = new Snake("Sammy the Python");
+  tom = new Horse("Tommy the Palomino");
+  sam.move();
+  tom.move();
+})();

documentation/js/comparisons.js

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

documentation/js/conditionals.js

@@ -1,5 +1,5 @@
 (function(){
-  var date, mood;
+  var date, expensive, mood;
   if (singing) {
     mood = greatly_improved;
   }
@@ -9,4 +9,4 @@
   }
   date = friday ? sue : jill;
   expensive = expensive || do_the_math();
-})();
+})();

documentation/js/embedded.js

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

documentation/js/existence.js

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

documentation/js/expressions.js

@@ -10,4 +10,4 @@
     }
   };
   eldest = 24 > 21 ? "Liz" : "Ike";
-})();
+})();

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,13 +1,12 @@
 (function(){
-  var __a, __b, globals, name;
+  var _a, _b, globals, name;
+  var __hasProp = Object.prototype.hasOwnProperty;
   // The first ten global properties.
-  globals = ((function() {
-    __b = []; __a = window;
-    for (name in __a) {
-      if (__a.hasOwnProperty(name)) {
-        __b.push(name);
-      }
-    }
-    return __b;
-  })()).slice(0, 10);
-})();
+  globals = (function() {
+    _a = []; _b = window;
+    for (name in _b) { if (__hasProp.call(_b, name)) {
+      _a.push(name);
+    }}
+    return _a;
+  }).call(this).slice(0, 10);
+})();

documentation/js/expressions_try.js

@@ -3,7 +3,7 @@
     try {
       return nonexistent / undefined;
     } catch (error) {
-      return "Caught an error: " + error;
+      return "And the error is ... " + error;
     }
-  })());
-})();
+  }).call(this));
+})();

documentation/js/fat_arrow.js

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

documentation/js/functions.js

@@ -6,4 +6,4 @@
   cube = function cube(x) {
     return square(x) * x;
   };
-})();
+})();

documentation/js/heredocs.js

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

documentation/js/multiple_return_values.js

@@ -0,0 +1,11 @@
+(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,18 +1,17 @@
 (function(){
-  var __a, __b, age, ages, child, years_old;
+  var _a, _b, age, ages, child, years_old;
+  var __hasProp = Object.prototype.hasOwnProperty;
   years_old = {
     max: 10,
     ida: 9,
     tim: 11
   };
   ages = (function() {
-    __b = []; __a = years_old;
-    for (child in __a) {
-      age = __a[child];
-      if (__a.hasOwnProperty(child)) {
-        __b.push(child + " is " + age);
-      }
-    }
-    return __b;
-  })();
-})();
+    _a = []; _b = years_old;
+    for (child in _b) { if (__hasProp.call(_b, child)) {
+      age = _b[child];
+      _a.push(child + " is " + age);
+    }}
+    return _a;
+  }).call(this);
+})();

documentation/js/object_extraction.js

@@ -0,0 +1,17 @@
+(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/objects_and_arrays.js

@@ -7,4 +7,4 @@
     tim: 11
   };
   matrix = [1, 0, 1, 0, 0, 1, 1, 1, 0];
-})();
+})();

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,11 @@
   }
   // Array comprehensions:
   cubed_list = (function() {
-    __c = []; __a = list;
-    for (__b=0; __b<__a.length; __b++) {
-      num = __a[__b];
-      __c.push(math.cube(num));
+    _a = []; _b = list;
+    for (_c = 0, _d = _b.length; _c < _d; _c++) {
+      num = _b[_c];
+      _a.push(math.cube(num));
     }
-    return __c;
-  })();
-})();
+    return _a;
+  }).call(this);
+})();

documentation/js/parallel_assignment.js

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

documentation/js/prototypes.js

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

documentation/js/range_comprehensions.js

@@ -1,21 +1,21 @@
 (function(){
-  var __a, __b, __c, __d, __e, countdown, egg_delivery, num;
+  var _a, _b, _c, _d, _e, countdown, egg_delivery, num;
   countdown = (function() {
-    __b = []; __d = 10; __e = 1;
-    for (__c=0, num=__d; (__d <= __e ? num <= __e : num >= __e); (__d <= __e ? num += 1 : num -= 1), __c++) {
-      __b.push(num);
+    _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 __b;
-  })();
+    return _a;
+  }).call(this);
   egg_delivery = function egg_delivery() {
-    var __f, __g, __h, __i, __j, dozen_eggs, i;
-    __g = []; __i = 0; __j = eggs.length;
-    for (__h=0, i=__i; (__i <= __j ? i < __j : i > __j); (__i <= __j ? i += 12 : i -= 12), __h++) {
-      __g.push((function() {
+    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));
-      })());
+      }).call(this));
     }
-    return __g;
+    return _f;
   };
-})();
+})();

documentation/js/scope.js

@@ -7,4 +7,4 @@
     return num = 10;
   };
   new_num = change_numbers();
-})();
+})();

documentation/js/slices.js

@@ -3,4 +3,4 @@
   numbers = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
   three_to_six = numbers.slice(3, 6 + 1);
   numbers_copy = numbers.slice(0, numbers.length);
-})();
+})();

documentation/js/soaks.js

@@ -0,0 +1,4 @@
+(function(){
+  var _a;
+  (_a = lottery.draw_winner()) == undefined ? undefined : _a.address == undefined ? undefined : _a.address.zipcode;
+})();

documentation/js/splats.js

@@ -1,7 +1,7 @@
 (function(){
-  var contenders, gold, medalists, silver, the_field;
-  gold = silver = the_field = "unknown";
-  medalists = function medalists(first, second) {
+  var award_medals, contenders, gold, silver, the_field;
+  gold = (silver = (the_field = "unknown"));
+  award_medals = function award_medals(first, second) {
     var rest;
     rest = Array.prototype.slice.call(arguments, 2);
     gold = first;
@@ -9,8 +9,8 @@
     return the_field = rest;
   };
   contenders = ["Michael Phelps", "Liu Xiang", "Yao Ming", "Allyson Felix", "Shawn Johnson", "Roman Sebrle", "Guo Jingjing", "Tyson Gay", "Asafa Powell", "Usain Bolt"];
-  medalists.apply(this, contenders);
+  award_medals.apply(this, contenders);
   alert("Gold: " + gold);
   alert("Silver: " + silver);
   alert("The Field: " + the_field);
-})();
+})();

documentation/js/splices.js

@@ -2,4 +2,4 @@
   var numbers;
   numbers = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
   numbers.splice.apply(numbers, [3, 6 - 3 + 1].concat([-3, -4, -5, -6]));
-})();
+})();

documentation/js/strings.js

@@ -6,4 +6,4 @@ or no money in my purse, and nothing particular \
 to interest me on shore, I thought I would sail \
 about a little and see the watery part of the \
 world...";
-})();
+})();

documentation/js/super.js

@@ -1,40 +0,0 @@
-(function(){
-  var Animal, Horse, Snake, __a, __b, 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;
-  };
-  __a = function(){};
-  __a.prototype = Animal.prototype;
-  Snake.__superClass__ = Animal.prototype;
-  Snake.prototype = new __a();
-  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;
-  };
-  __b = function(){};
-  __b.prototype = Animal.prototype;
-  Horse.__superClass__ = Animal.prototype;
-  Horse.prototype = new __b();
-  Horse.prototype.constructor = Horse;
-  Horse.prototype.move = function move() {
-    alert("Galloping...");
-    return Horse.__superClass__.move.call(this, 45);
-  };
-  sam = new Snake("Sammy the Python");
-  tom = new Horse("Tommy the Palomino");
-  sam.move();
-  tom.move();
-})();

documentation/js/switch.js

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

documentation/js/try.js

@@ -7,4 +7,4 @@
   } finally {
     clean_up();
   }
-})();
+})();

documentation/js/while.js

@@ -1,9 +1,22 @@
 (function(){
-  while (demand > supply) {
-    sell();
-    restock();
+  var _a, lyrics, num;
+  // Econ 101
+  if (this.studying_economics) {
+    while (supply > demand) {
+      buy();
+    }
+    while (supply < demand) {
+      sell();
+    }
   }
-  while (supply > demand) {
-    buy();
-  }
-})();
+  // Nursery Rhyme
+  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;
+  }).call(this);
+})();

documentation/speed.html

@@ -1,77 +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);
-
-    JSLitmus.test('current comprehensions', function() {
-      __a = arr;
-      __c = [];
-      for (__b in __a) {
-        if (__a.hasOwnProperty(__b)) {
-          num = __a[__b];
-          __d = num;
-          __c.push(num);
-        }
-      }
-    });
-
-    JSLitmus.test('raw for loop (best we can do)', function() {
-      __a = arr;
-      __c = new Array(__a.length);
-      for (__b=0; __b < __a.length; __b++) {
-        __c[__b] = __a[__b];
-      }
-    });
-
-    JSLitmus.test('current without hasOwnProperty check', function() {
-      __a = arr;
-      __c = [];
-      for (__b in __a) {
-        num = __a[__b];
-        __d = num;
-        __c.push(num);
-      }
-    });
-
-    JSLitmus.test('raw for..in loop', function() {
-      __a = arr;
-      __c = new Array(__a.length);
-      for (__b in __a) {
-        __c[__b] = __a[__b];
-      }
-    });
-
-    JSLitmus.test('weepy\'s comprehensions', function() {
-      __c = []; __a = arr;
-      __d = function(num, __b) {
-        __c.push(num);
-      };
-      if (__a instanceof Array) {
-        for (__b=0; __b<__a.length; __b++) __d(__a[__b], __b);
-      } else {
-        for (__b in __a) { if (__a.hasOwnProperty(__b)) __d(__a[__b], __b); }
-      }
-    });
-
-    JSLitmus.test('CoffeeScript 0.2.2 comprehensions', function() {
-      __c = []; __a = arr;
-      for (__b=0; __b<__a.length; __b++) {
-        num = __a[__b];
-        __c.push(num);
-      }
-    });
-  </script>
-
-</body>
-</html>

examples/beautiful_code/binary_search.coffee

@@ -0,0 +1,16 @@
+# 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
+
+puts 2 is index([10, 20, 30, 40, 50], 30)
+puts 4 is index([-97, 35, 67, 88, 1200], 1200)
+puts 0 is index([0, 45, 70], 0)

examples/beautiful_code/quicksort_runtime.coffee

@@ -0,0 +1,13 @@
+# 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
+
+puts runtime(3) is 2.6666666666666665
+puts runtime(5) is 7.4
+puts runtime(8) is 16.92142857142857

examples/beautiful_code/regular_expression_matcher.coffee

@@ -0,0 +1,34 @@
+# 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)
+
+puts match("ex", "some text")
+puts match("s..t", "spit")
+puts match("^..t", "buttercup")
+puts match("i..$", "cherries")
+puts match("o*m", "vrooooommm!")
+puts match("^hel*o$", "hellllllo")

examples/blocks.coffee

@@ -0,0 +1,57 @@
+# After wycats' http://yehudakatz.com/2010/02/07/the-building-blocks-of-ruby/
+
+# Sinatra.
+get '/hello', ->
+  'Hello World'
+
+
+# Append.
+append: (location, data) ->
+  path: new Pathname location
+  throw new Error("Location does not exist") unless path.exists()
+
+  File.open path, 'a', (file) ->
+    file.puts YAML.dump data
+
+  data
+
+
+# Rubinius' File.open implementation.
+File.open: (path, mode, block) ->
+  io: new File path, mode
+
+  return io unless block
+
+  try
+    block io
+  finally
+    try
+      io.close() unless io.closed()
+    catch error
+      # nothing, just swallow them.
+
+
+# Write.
+write: (location, data) ->
+  path = new Pathname location
+  raise "Location does not exist" unless path.exists()
+
+  File.open path, 'w', (file) ->
+    return false if Digest.MD5.hexdigest(file.read()) is data.hash()
+    file.puts YAML.dump data
+    true
+
+
+# Rails' respond_to.
+index: ->
+  people: Person.find 'all'
+
+  respond_to (format) ->
+    format.html()
+    format.xml -> render { xml: people.xml() }
+
+
+# Synchronization.
+synchronize: (block) ->
+  lock()
+  try block() finally unlock()

examples/code.coffee

@@ -1,14 +1,14 @@
 # Functions:
-square: x => x * x
+square: (x) -> x * x
 
-sum: x, y => x + y
+sum: (x, y) -> x + y
 
-odd: x => x % 2 is 0
+odd: (x) -> x % 2 isnt 0
 
-even: x => x % 2 isnt 0
+even: (x) -> x % 2 is 0
 
-run_loop: =>
-  fire_events(e => e.stopPropagation())
+run_loop: ->
+  fire_events((e) -> e.stopPropagation())
   listen()
   wait()
 
@@ -22,14 +22,14 @@ spaced_out_multiline_object: {
   three: new Idea()
 
   inner_obj: {
-    freedom: => _.freedom()
+    freedom: -> _.freedom()
   }
 }
 
 # Arrays:
 stooges: [{moe: 45}, {curly: 43}, {larry: 46}]
 
-exponents: [(x => x), (x => x * x), (x => x * x * x)]
+exponents: [(x) -> x, (x) -> x * x, (x) -> x * x * x]
 
 empty: []
 
@@ -54,7 +54,7 @@ decoration: medal_of_honor if war_hero
 go_to_sleep() unless coffee
 
 # Returning early:
-race: =>
+race: ->
   run()
   walk()
   crawl()
@@ -103,7 +103,7 @@ while true
 
 # Lexical scoping.
 v_1: 5
-change_a_and_set_b: =>
+change_a_and_set_b: ->
   v_1: 10
   v_2: 15
 v_2: 20
@@ -128,7 +128,7 @@ activity: switch day
   else go_to_work()
 
 # Semicolons can optionally be used instead of newlines.
-wednesday: => eat_breakfast(); go_to_work(); eat_dinner()
+wednesday: -> eat_breakfast(); go_to_work(); eat_dinner()
 
 # Array slice literals.
 zero_to_nine: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
@@ -140,24 +140,28 @@ sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna
 aliquam erat volutpat. Ut wisi enim ad."
 
 # Inheritance and calling super.
-Animal: =>
-Animal::move: meters =>
-  alert(this.name + " moved " + meters + "m.")
+class Animal
+  move: (meters) ->
+    alert this.name + " moved " + meters + "m."
 
-Snake: name => this.name: name
-Snake extends Animal
-Snake::move: =>
-  alert('Slithering...')
-  super(5)
+class Snake extends Animal
+  constructor: (name) ->
+    @name: name
 
-Horse: name => this.name: name
-Horse extends Animal
-Horse::move: =>
-  alert('Galloping...')
-  super(45)
+  move: ->
+    alert 'Slithering...'
+    super 5
 
-sam: new Snake("Sammy the Snake")
-tom: new Horse("Tommy the Horse")
+class Horse extends Animal
+  constructor: (name) ->
+    @name: name
+
+  move: ->
+    alert 'Galloping...'
+    super 45
+
+sam: new Snake "Sammy the Snake"
+tom: new Horse "Tommy the Horse"
 
 sam.move()
 tom.move()

examples/computer_science/README

@@ -0,0 +1,4 @@
+Ported from Nicholas Zakas' collection of computer science fundamentals, written
+in JavaScript. Originals available here:
+
+http://github.com/nzakas/computer-science-in-javascript

examples/computer_science/binary_search.coffee

@@ -0,0 +1,25 @@
+# Uses a binary search algorithm to locate a value in the specified array.
+binary_search: (items, value) ->
+
+  start: 0
+  stop:  items.length - 1
+  pivot: Math.floor((start + stop) / 2)
+
+  while items[pivot] isnt value and start < stop
+
+    # Adjust the search area.
+    stop:   pivot - 1 if value < items[pivot]
+    start:  pivot + 1 if value > items[pivot]
+
+    # Recalculate the pivot.
+    pivot: Math.floor((stop + start) / 2)
+
+  # Make sure we've found the correct value.
+  if items[pivot] is value then pivot else -1
+
+
+# Test the function.
+puts(2 is binary_search([10, 20, 30, 40, 50], 30))
+puts(4 is binary_search([-97, 35, 67, 88, 1200], 1200))
+puts(0 is binary_search([0, 45, 70], 0))
+puts(-1 is binary_search([0, 45, 70], 10))

examples/computer_science/bubble_sort.coffee

@@ -0,0 +1,11 @@
+# A bubble sort implementation, sorting the given array in-place.
+bubble_sort: (list) ->
+  for i in [0...list.length]
+    for j in [0...list.length - i]
+      [list[j], list[j+1]]: [list[j+1], list[j]] if list[j] > list[j+1]
+  list
+
+
+# Test the function.
+puts(bubble_sort([3, 2, 1]).join(' ') is '1 2 3')
+puts(bubble_sort([9, 2, 7, 0, 1]).join(' ') is '0 1 2 7 9')

examples/computer_science/linked_list.coffee

@@ -0,0 +1,108 @@
+# "Classic" linked list implementation that doesn't keep track of its size.
+class LinkedList
+
+  constructor: ->
+    this._head: null # Pointer to the first item in the list.
+
+
+  # Appends some data to the end of the list. This method traverses the existing
+  # list and places the value at the end in a new node.
+  add: (data) ->
+
+    # Create a new node object to wrap the data.
+    node: {data: data, next: null}
+
+    current: this._head ||= node
+
+    if this._head isnt node
+      current: current.next while current.next
+      current.next: node
+
+    this
+
+
+  # Retrieves the data at the given position in the list.
+  item: (index) ->
+
+    # Check for out-of-bounds values.
+    return null if index < 0
+
+    current: this._head or null
+    i: -1
+
+    # Advance through the list.
+    current: current.next while current and index > (i += 1)
+
+    # Return null if we've reached the end.
+    current and current.data
+
+
+  # Remove the item from the given location in the list.
+  remove: (index) ->
+
+    # Check for out-of-bounds values.
+    return null if index < 0
+
+    current: this._head or null
+    i: -1
+
+    # Special case: removing the first item.
+    if index is 0
+      this._head: current.next
+    else
+
+      # Find the right location.
+      [previous, current]: [current, current.next] while index > (i += 1)
+
+      # Skip over the item to remove.
+      previous.next: current.next
+
+    # Return the value.
+    current and current.data
+
+
+  # Calculate the number of items in the list.
+  size: ->
+    current: this._head
+    count:   0
+
+    while current
+      count += 1
+      current: current.next
+
+    count
+
+
+  # Convert the list into an array.
+  toArray: ->
+    result:   []
+    current:  this._head
+
+    while current
+      result.push(current.data)
+      current: current.next
+
+    result
+
+
+  # The string representation of the linked list.
+  toString: -> this.toArray().toString()
+
+
+# Tests.
+list: new LinkedList()
+
+list.add("Hi")
+puts(list.size()  is 1)
+puts(list.item(0) is "Hi")
+puts(list.item(1) is null)
+
+list: new LinkedList()
+list.add("zero").add("one").add("two")
+puts(list.size()     is 3)
+puts(list.item(2)    is "two")
+puts(list.remove(1)  is "one")
+puts(list.item(0)    is "zero")
+puts(list.item(1)    is "two")
+puts(list.size()     is 2)
+puts(list.item(-10)  is null)

examples/computer_science/luhn_algorithm.coffee

@@ -0,0 +1,36 @@
+# Use the Luhn algorithm to validate a numeric identifier, such as credit card
+# numbers, national insurance numbers, etc.
+# See: http://en.wikipedia.org/wiki/Luhn_algorithm
+
+is_valid_identifier: (identifier) ->
+
+  sum: 0
+  alt: false
+
+  for i in [(identifier.length - 1)..0]
+
+    # Get the next digit.
+    num: parseInt(identifier.charAt(i), 10)
+
+    # If it's not a valid number, abort.
+    return false if isNaN(num)
+
+    # If it's an alternate number...
+    if alt
+      num *= 2
+      num: (num % 10) + 1 if num > 9
+
+    # Flip the alternate bit.
+    alt: !alt
+
+    # Add to the rest of the sum.
+    sum += num
+
+  # Determine if it's valid.
+  sum % 10 is 0
+
+
+# Tests.
+puts(is_valid_identifier("49927398716")      is true)
+puts(is_valid_identifier("4408041234567893") is true)
+puts(is_valid_identifier("4408041234567890") is false)

examples/computer_science/merge_sort.coffee

@@ -0,0 +1,19 @@
+# Sorts an array in ascending natural order using merge sort.
+merge_sort: (list) ->
+
+  return list if list.length is 1
+
+  result: []
+  pivot: Math.floor(list.length / 2)
+  left:  merge_sort(list.slice(0, pivot))
+  right: merge_sort(list.slice(pivot))
+
+  while left.length and right.length
+    result.push(if left[0] < right[0] then left.shift() else right.shift())
+
+  result.concat(left).concat(right)
+
+
+# Test the function.
+puts(merge_sort([3, 2, 1]).join(' ') is '1 2 3')
+puts(merge_sort([9, 2, 7, 0, 1]).join(' ') is '0 1 2 7 9')

examples/computer_science/selection_sort.coffee

@@ -0,0 +1,23 @@
+# An in-place selection sort.
+selection_sort: (list) ->
+  len: list.length
+
+  # For each item in the list.
+  for i in [0...len]
+
+    # Set the minimum to this position.
+    min: i
+
+    # Check the rest of the array to see if anything is smaller.
+    (min: j if list[j] < list[min]) for j in [(i+1)...len]
+
+    # Swap if a smaller item has been found.
+    [list[i], list[min]]: [list[min], list[i]] if i isnt min
+
+  # The list is now sorted.
+  list
+
+
+# Test the function.
+puts(selection_sort([3, 2, 1]).join(' ') is '1 2 3')
+puts(selection_sort([9, 2, 7, 0, 1]).join(' ') is '0 1 2 7 9')

examples/documents.coffee

@@ -1,72 +0,0 @@
-# Document Model
-dc.model.Document: dc.Model.extend({
-
-  constructor: attributes => this.base(attributes)
-
-  # For display, show either the highlighted search results, or the summary,
-  # if no highlights are available.
-  # The import process will take care of this in the future, but the inline
-  # version of the summary has all runs of whitespace squeezed out.
-  displaySummary: =>
-    text: this.get('highlight') or this.get('summary') or ''
-    text and text.replace(/\s+/g, ' ')
-
-  # Return a list of the document's metadata. Think about caching this on the
-  # document by binding to Metadata, instead of on-the-fly.
-  metadata: =>
-    docId: this.id
-    _.select(Metadata.models(), (meta => 
-      _.any(meta.get('instances'), instance => 
-        instance.document_id is docId)))
-
-  bookmark: pageNumber =>
-    bookmark: new dc.model.Bookmark({title: this.get('title'), page_number: pageNumber, document_id: this.id})
-    Bookmarks.create(bookmark)
-
-  # Inspect.
-  toString: => 'Document ' + this.id + ' "' + this.get('title') + '"'
-
-})
-
-# Document Set
-dc.model.DocumentSet: dc.model.RESTfulSet.extend({
-
-  resource: 'documents'
-
-  SELECTION_CHANGED: 'documents:selection_changed'
-
-  constructor: options =>
-    this.base(options)
-    _.bindAll(this, 'downloadSelectedViewers', 'downloadSelectedPDF', 'downloadSelectedFullText')
-
-  selected: => _.select(this.models(), m => m.get('selected'))
-
-  selectedIds: => _.pluck(this.selected(), 'id')
-
-  countSelected: => this.selected().length
-
-  downloadSelectedViewers: =>
-    dc.app.download('/download/' + this.selectedIds().join('/') + '/document_viewer.zip')
-
-  downloadSelectedPDF: =>
-    if this.countSelected() <= 1 then return window.open(this.selected()[0].get('pdf_url'))
-    dc.app.download('/download/' + this.selectedIds().join('/') + '/document_pdfs.zip')
-
-  downloadSelectedFullText: =>
-    if this.countSelected() <= 1 then return window.open(this.selected()[0].get('full_text_url'))
-    dc.app.download('/download/' + this.selectedIds().join('/') + '/document_text.zip')
-
-  # We override "_onModelEvent" to fire selection changed events when documents
-  # change their selected state.
-  _onModelEvent: e, model =>
-    this.base(e, model)
-    fire: e == dc.Model.CHANGED and model.hasChanged('selected')
-    if fire then _.defer(_(this.fire).bind(this, this.SELECTION_CHANGED, this))
-
-})
-
-# The main set of Documents, used by the search tab.
-window.Documents: new dc.model.DocumentSet()
-
-# The set of documents that is used to look at a particular label.
-dc.app.LabeledDocuments: new dc.model.DocumentSet()

examples/poignant.coffee

@@ -2,7 +2,7 @@
 
 # ['toast', 'cheese', 'wine'].each { |food| print food.capitalize }
 
-['toast', 'wine', 'cheese'].each(food => print(food.capitalize()))
+['toast', 'wine', 'cheese'].each (food) -> print(food.capitalize())
 
 
 
@@ -14,10 +14,43 @@
 # end
 
 LotteryTicket: {
-  get_picks:           => this.picks
-  set_picks:      nums => this.picks: nums
-  get_purchase:        => this.purchase
-  set_purchase: amount => this.purchase: amount
+  get_picks:          -> this.picks
+  set_picks:      (nums) -> this.picks: nums
+  get_purchase:       -> this.purchase
+  set_purchase: (amount) -> this.purchase: amount
+}
+
+
+
+# class << LotteryDraw
+#   def play
+#     result = LotteryTicket.new_random
+#     winners = {}
+#     @@tickets.each do |buyer, ticket_list|
+#       ticket_list.each do |ticket|
+#         score = ticket.score( result )
+#         next if score.zero?
+#         winners[buyer] ||= []
+#         winners[buyer] << [ ticket, score ]
+#       end
+#     end
+#     @@tickets.clear
+#     winners
+#   end
+# end
+
+LotteryDraw: {
+  play: ->
+    result:   LotteryTicket.new_random()
+    winners:  {}
+    this.tickets.each (buyer, ticket_list) ->
+      ticket_list.each (ticket) ->
+        score: ticket.score(result)
+        return if score is 0
+        winners[buyer] ||= []
+        winners[buyer].push([ticket, score])
+    this.tickets: {}
+    winners
 }
 
 
@@ -32,8 +65,8 @@ LotteryTicket: {
 # end
 
 WishScanner: {
-  scan_for_a_wish: =>
-    wish: this.read().detect(thought => thought.index('wish: ') is 0)
+  scan_for_a_wish: ->
+    wish: this.read().detect((thought) -> thought.index('wish: ') is 0)
     wish.replace('wish: ', '')
 }
 
@@ -78,7 +111,7 @@ WishScanner: {
 Creature : {
 
   # This method applies a hit taken during a fight.
-  hit: damage =>
+  hit: (damage) ->
     p_up: Math.rand(this.charisma)
     if p_up % 9 is 7
       this.life += p_up / 4
@@ -87,7 +120,7 @@ Creature : {
     if this.life <= 0 then puts("[" + this.name + " has died.]")
 
   # This method takes one turn in a fight.
-  fight: enemy, weapon =>
+  fight: (enemy, weapon) ->
     if this.life <= 0 then return puts("[" + this.name + "is too dead to fight!]")
 
     # Attack the opponent.
@@ -123,12 +156,12 @@ Creature : {
 # Get evil idea and swap in code words
 print("Enter your new idea: ")
 idea: gets()
-code_words.each(real, code => idea.replace(real, code))
+code_words.each((real, code) -> idea.replace(real, code))
 
 # Save the jibberish to a new file
 print("File encoded. Please enter a name for this idea: ")
 idea_name: gets().strip()
-File.open("idea-" + idea_name + '.txt', 'w', file => file.write(idea))
+File.open("idea-" + idea_name + '.txt', 'w', (file) -> file.write(idea))
 
 
 
@@ -144,7 +177,7 @@ File.open("idea-" + idea_name + '.txt', 'w', file => file.write(idea))
 #   end
 # end
 
-wipe_mutterings_from: sentence =>
+wipe_mutterings_from: (sentence) ->
   throw new Error("cannot wipe mutterings") unless sentence.indexOf
   while sentence.indexOf('(') >= 0
     open:     sentence.indexOf('(') - 1

examples/potion.coffee

@@ -0,0 +1,206 @@
+# 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.
+
+class 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
+
+class Policeman extends Person
+  constructor: (rank) ->
+    @rank: rank
+  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/syntax_errors.coffee

@@ -1,20 +0,0 @@
-# Identifiers run together:
-# a b c
-
-# Trailing comma in array:
-# array: [1, 2, 3, 4, 5,]
-
-# Unterminated object literal:
-# obj: { one: 1, two: 2
-
-# Numbers run together:
-# 101 202
-
-# Strings run together:
-# str: "broken" "words"
-
-# Forgot to terminate a function:
-# obj: {
-#   first: a => a[0].
-#   last: a => a[a.length-1]
-# }

examples/underscore.coffee

@@ -1,6 +1,6 @@
 
   # Underscore.coffee
-  # (c) 2009 Jeremy Ashkenas, DocumentCloud Inc.
+  # (c) 2010 Jeremy Ashkenas, DocumentCloud Inc.
   # Underscore is freely distributable under the terms of the MIT license.
   # Portions of Underscore are inspired by or borrowed from Prototype.js,
   # Oliver Steele's Functional, and John Resig's Micro-Templating.
@@ -18,49 +18,69 @@
   previousUnderscore: root._
 
 
-  # If Underscore is called as a function, it returns a wrapped object that
-  # can be used OO-style. This wrapper holds altered versions of all the
-  # underscore functions. Wrapped objects may be chained.
-  wrapper: obj =>
-    this._wrapped: obj
-    this
-
-
   # Establish the object that gets thrown to break out of a loop iteration.
   breaker: if typeof(StopIteration) is 'undefined' then '__break__' else StopIteration
 
 
-  # Create a safe reference to the Underscore object forreference below.
-  _: root._: obj => new wrapper(obj)
+  # Quick regexp-escaping function, because JS doesn't have RegExp.escape().
+  escapeRegExp: (string) -> string.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1')
+
+
+  # Save bytes in the minified (but not gzipped) version:
+  ArrayProto:           Array.prototype
+  ObjProto:             Object.prototype
+
+
+  #Create quick reference variables for speed access to core prototypes.
+  slice:                ArrayProto.slice
+  unshift:              ArrayProto.unshift
+  toString:             ObjProto.toString
+  hasOwnProperty:       ObjProto.hasOwnProperty
+  propertyIsEnumerable: ObjProto.propertyIsEnumerable
+
+
+  # All ECMA5 native implementations we hope to use are declared here.
+  nativeForEach:        ArrayProto.forEach
+  nativeMap:            ArrayProto.map
+  nativeReduce:         ArrayProto.reduce
+  nativeReduceRight:    ArrayProto.reduceRight
+  nativeFilter:         ArrayProto.filter
+  nativeEvery:          ArrayProto.every
+  nativeSome:           ArrayProto.some
+  nativeIndexOf:        ArrayProto.indexOf
+  nativeLastIndexOf:    ArrayProto.lastIndexOf
+  nativeIsArray:        Array.isArray
+  nativeKeys:           Object.keys
+
+
+  # Create a safe reference to the Underscore object for use below.
+  _: (obj) -> new wrapper(obj)
 
 
   # Export the Underscore object for CommonJS.
   if typeof(exports) != 'undefined' then exports._: _
 
 
-  # 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
+  # Export Underscore to global scope.
+  root._: _
 
 
   # Current version.
-  _.VERSION: '0.5.5'
+  _.VERSION: '0.6.0'
 
 
   # ------------------------ Collection Functions: ---------------------------
 
   # The cornerstone, an each implementation.
   # Handles objects implementing forEach, arrays, and raw objects.
-  _.each: obj, iterator, context =>
-    index: 0
+  _.each: (obj, iterator, context) ->
     try
-      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 ino obj
+      if nativeForEach and obj.forEach is nativeForEach
+        obj.forEach iterator, context
+      else if _.isNumber obj.length
+        iterator.call(context, obj[i], i, obj) for i in [0...obj.length]
+      else
+        iterator.call(context, val, key, obj) for key, val of obj
     catch e
       throw e if e isnt breaker
     obj
@@ -68,37 +88,37 @@
 
   # Return the results of applying the iterator to each element. Use JavaScript
   # 1.6's version of map, if possible.
-  _.map: obj, iterator, context =>
-    return obj.map(iterator, context) if (obj and _.isFunction(obj.map))
+  _.map: (obj, iterator, context) ->
+    return obj.map(iterator, context) if nativeMap and obj.map is nativeMap
     results: []
-    _.each(obj) value, index, list =>
-      results.push(iterator.call(context, value, index, list))
+    _.each obj, (value, index, list) ->
+      results.push iterator.call context, value, index, list
     results
 
 
   # Reduce builds up a single result from a list of values. Also known as
   # inject, or foldl. Uses JavaScript 1.8's version of reduce, if possible.
-  _.reduce: obj, memo, iterator, context =>
-    return obj.reduce(_.bind(iterator, context), memo) if (obj and _.isFunction(obj.reduce))
-    _.each(obj) value, index, list =>
-      memo: iterator.call(context, memo, value, index, list)
+  _.reduce: (obj, memo, iterator, context) ->
+    return obj.reduce(_.bind(iterator, context), memo) if nativeReduce and obj.reduce is nativeReduce
+    _.each obj, (value, index, list) ->
+      memo: iterator.call context, memo, value, index, list
     memo
 
 
   # The right-associative version of reduce, also known as foldr. Uses
   # JavaScript 1.8's version of reduceRight, if available.
-  _.reduceRight: obj, memo, iterator, context =>
-    return obj.reduceRight(_.bind(iterator, context), memo) if (obj and _.isFunction(obj.reduceRight))
-    _.each(_.clone(_.toArray(obj)).reverse()) value, index =>
-      memo: iterator.call(context, memo, value, index, obj)
+  _.reduceRight: (obj, memo, iterator, context) ->
+    return obj.reduceRight(_.bind(iterator, context), memo) if nativeReduceRight and obj.reduceRight is nativeReduceRight
+    _.each _.clone(_.toArray(obj)).reverse(), (value, index) ->
+      memo: iterator.call context, memo, value, index, obj
     memo
 
 
   # Return the first value which passes a truth test.
-  _.detect: obj, iterator, context =>
+  _.detect: (obj, iterator, context) ->
     result: null
-    _.each(obj) value, index, list =>
-      if iterator.call(context, value, index, list)
+    _.each obj, (value, index, list) ->
+      if iterator.call context, value, index, list
         result: value
         _.breakLoop()
     result
@@ -106,99 +126,100 @@
 
   # Return all the elements that pass a truth test. Use JavaScript 1.6's
   # filter(), if it exists.
-  _.select: obj, iterator, context =>
-    if obj and _.isFunction(obj.filter) then return obj.filter(iterator, context)
+  _.filter: (obj, iterator, context) ->
+    return obj.filter iterator, context if nativeFilter and obj.filter is nativeFilter
     results: []
-    _.each(obj) value, index, list =>
-      results.push(value) if iterator.call(context, value, index, list)
+    _.each obj, (value, index, list) ->
+      results.push value if iterator.call context, value, index, list
     results
 
 
   # Return all the elements for which a truth test fails.
-  _.reject: obj, iterator, context =>
+  _.reject: (obj, iterator, context) ->
     results: []
-    _.each(obj) value, index, list =>
-      results.push(value) if not iterator.call(context, value, index, list)
+    _.each obj, (value, index, list) ->
+      results.push value if not iterator.call context, value, index, list
     results
 
 
   # Determine whether all of the elements match a truth test. Delegate to
   # JavaScript 1.6's every(), if it is present.
-  _.all: obj, iterator, context =>
+  _.every: (obj, iterator, context) ->
     iterator ||= _.identity
-    return obj.every(iterator, context) if obj and _.isFunction(obj.every)
+    return obj.every iterator, context if nativeEvery and obj.every is nativeEvery
     result: true
-    _.each(obj) value, index, list =>
+    _.each obj, (value, index, list) ->
       _.breakLoop() unless (result: result and iterator.call(context, value, index, list))
     result
 
 
   # Determine if at least one element in the object matches a truth test. Use
   # JavaScript 1.6's some(), if it exists.
-  _.any: obj, iterator, context =>
+  _.some: (obj, iterator, context) ->
     iterator ||= _.identity
-    return obj.some(iterator, context) if obj and _.isFunction(obj.some)
+    return obj.some iterator, context if nativeSome and obj.some is nativeSome
     result: false
-    _.each(obj) value, index, list =>
+    _.each obj, (value, index, list) ->
       _.breakLoop() if (result: iterator.call(context, value, index, list))
     result
 
 
   # Determine if a given value is included in the array or object,
   # based on '==='.
-  _.include: obj, target =>
-    return _.indexOf(obj, target) isnt -1 if _.isArray(obj)
-    for key, val ino obj
+  _.include: (obj, target) ->
+    return _.indexOf(obj, target) isnt -1 if nativeIndexOf and obj.indexOf is nativeIndexOf
+    for key, val of obj
       return true if val is target
     false
 
 
   # Invoke a method with arguments on every item in a collection.
-  _.invoke: obj, method =>
-    args: _.rest(arguments, 2)
+  _.invoke: (obj, method) ->
+    args: _.rest arguments, 2
     (if method then val[method] else val).apply(val, args) for val in obj
 
 
   # Convenience version of a common use case of map: fetching a property.
-  _.pluck: obj, key =>
-    _.map(obj, (val => val[key]))
+  _.pluck: (obj, key) ->
+    _.map(obj, (val) -> val[key])
 
 
   # Return the maximum item or (item-based computation).
-  _.max: obj, iterator, context =>
+  _.max: (obj, iterator, context) ->
     return Math.max.apply(Math, obj) if not iterator and _.isArray(obj)
     result: {computed: -Infinity}
-    _.each(obj) value, index, list =>
+    _.each obj, (value, index, list) ->
       computed: if iterator then iterator.call(context, value, index, list) else value
       computed >= result.computed and (result: {value: value, computed: computed})
     result.value
 
 
   # Return the minimum element (or element-based computation).
-  _.min: obj, iterator, context =>
+  _.min: (obj, iterator, context) ->
     return Math.min.apply(Math, obj) if not iterator and _.isArray(obj)
     result: {computed: Infinity}
-    _.each(obj) value, index, list =>
+    _.each obj, (value, index, list) ->
       computed: if iterator then iterator.call(context, value, index, list) else value
       computed < result.computed and (result: {value: value, computed: computed})
     result.value
 
 
-  # Sort the object's values by a criteria produced by an iterator.
-  _.sortBy: obj, iterator, context =>
-    _.pluck(((_.map(obj) value, index, list =>
+  # Sort the object's values by a criterion produced by an iterator.
+  _.sortBy: (obj, iterator, context) ->
+    _.pluck(((_.map obj, (value, index, list) ->
       {value: value, criteria: iterator.call(context, value, index, list)}
-    ).sort() left, right =>
+    ).sort((left, right) ->
       a: left.criteria; b: right.criteria
       if a < b then -1 else if a > b then 1 else 0
-    ), 'value')
+    )), 'value')
 
 
   # Use a comparator function to figure out at what index an object should
   # be inserted so as to maintain order. Uses binary search.
-  _.sortedIndex: array, obj, iterator =>
+  _.sortedIndex: (array, obj, iterator) ->
     iterator ||= _.identity
-    low: 0; high: array.length
+    low:  0
+    high: array.length
     while low < high
       mid: (low + high) >> 1
       if iterator(array[mid]) < iterator(obj) then low: mid + 1 else high: mid
@@ -206,7 +227,7 @@
 
 
   # Convert anything iterable into a real, live array.
-  _.toArray: iterable =>
+  _.toArray: (iterable) ->
     return []                   if (!iterable)
     return iterable.toArray()   if (iterable.toArray)
     return iterable             if (_.isArray(iterable))
@@ -215,7 +236,7 @@
 
 
   # Return the number of elements in an object.
-  _.size: obj => _.toArray(obj).length
+  _.size: (obj) -> _.toArray(obj).length
 
 
   # -------------------------- Array Functions: ------------------------------
@@ -223,7 +244,7 @@
   # Get the first element of an array. Passing "n" will return the first N
   # values in the array. Aliased as "head". The "guard" check allows it to work
   # with _.map.
-  _.first: array, n, guard =>
+  _.first: (array, n, guard) ->
     if n and not guard then slice.call(array, 0, n) else array[0]
 
 
@@ -231,66 +252,65 @@
   # Especially useful on the arguments object. Passing an "index" will return
   # the rest of the values in the array from that index onward. The "guard"
   # check allows it to work with _.map.
-  _.rest: array, index, guard =>
+  _.rest: (array, index, guard) ->
     slice.call(array, if _.isUndefined(index) or guard then 1 else index)
 
 
   # Get the last element of an array.
-  _.last: array => array[array.length - 1]
+  _.last: (array) -> array[array.length - 1]
 
 
   # Trim out all falsy values from an array.
-  _.compact: array => array[i] for i in [0...array.length] when array[i]
+  _.compact: (array) -> item for item in array when item
 
 
   # Return a completely flattened version of an array.
-  _.flatten: array =>
-    _.reduce(array, []) memo, value =>
-      return memo.concat(_.flatten(value)) if _.isArray(value)
-      memo.push(value)
+  _.flatten: (array) ->
+    _.reduce array, [], (memo, value) ->
+      return memo.concat(_.flatten(value)) if _.isArray value
+      memo.push value
       memo
 
 
   # Return a version of the array that does not contain the specified value(s).
-  _.without: array =>
-    values: _.rest(arguments)
-    val for val in _.toArray(array) when not _.include(values, val)
+  _.without: (array) ->
+    values: _.rest arguments
+    val for val in _.toArray(array) when not _.include values, val
 
 
   # Produce a duplicate-free version of the array. If the array has already
   # been sorted, you have the option of using a faster algorithm.
-  _.uniq: array, isSorted =>
+  _.uniq: (array, isSorted) ->
     memo: []
-    for el, i in _.toArray(array)
-      memo.push(el) if i is 0 || (if isSorted is true then _.last(memo) isnt el else not _.include(memo, el))
+    for el, i in _.toArray array
+      memo.push el if i is 0 || (if isSorted is true then _.last(memo) isnt el else not _.include(memo, el))
     memo
 
 
   # Produce an array that contains every item shared between all the
   # passed-in arrays.
-  _.intersect: array =>
-    rest: _.rest(arguments)
-    _.select(_.uniq(array)) item =>
-      _.all(rest) other =>
+  _.intersect: (array) ->
+    rest: _.rest arguments
+    _.select _.uniq(array), (item) ->
+      _.all rest, (other) ->
         _.indexOf(other, item) >= 0
 
 
   # Zip together multiple lists into a single array -- elements that share
   # an index go together.
-  _.zip: =>
-    args:       _.toArray(arguments)
-    length:     _.max(_.pluck(args, 'length'))
-    results:    new Array(length)
+  _.zip: ->
+    length:  _.max _.pluck arguments, 'length'
+    results: new Array length
     for i in [0...length]
-      results[i]: _.pluck(args, String(i))
+      results[i]: _.pluck arguments, String i
     results
 
 
   # If the browser doesn't supply us with indexOf (I'm looking at you, MSIE),
   # we need this function. Return the position of the first occurence of an
   # item in an array, or -1 if the item is not included in the array.
-  _.indexOf: array, item =>
-    return array.indexOf(item) if array.indexOf
+  _.indexOf: (array, item) ->
+    return array.indexOf item if nativeIndexOf and array.indexOf is nativeIndexOf
     i: 0; l: array.length
     while l - i
       if array[i] is item then return i else i++
@@ -299,8 +319,8 @@
 
   # Provide JavaScript 1.6's lastIndexOf, delegating to the native function,
   # if possible.
-  _.lastIndexOf: array, item =>
-    return array.lastIndexOf(item) if array.lastIndexOf
+  _.lastIndexOf: (array, item) ->
+    return array.lastIndexOf(item) if nativeLastIndexOf and array.lastIndexOf is nativeLastIndexOf
     i: array.length
     while i
       if array[i] is item then return i else i--
@@ -310,15 +330,15 @@
   # Generate an integer Array containing an arithmetic progression. A port of
   # the native Python range() function. See:
   # http://docs.python.org/library/functions.html#range
-  _.range: start, stop, step =>
-    a:        _.toArray(arguments)
+  _.range: (start, stop, step) ->
+    a:        arguments
     solo:     a.length <= 1
-    i: start: if solo then 0 else a[0];
-    stop:     if solo then a[0] else a[1];
+    i: start: if solo then 0 else a[0]
+    stop:     if solo then a[0] else a[1]
     step:     a[2] or 1
     len:      Math.ceil((stop - start) / step)
     return [] if len <= 0
-    range:    new Array(len)
+    range:    new Array len
     idx:      0
     while true
       return range if (if step > 0 then i - stop else stop - i) >= 0
@@ -331,45 +351,45 @@
 
   # Create a function bound to a given object (assigning 'this', and arguments,
   # optionally). Binding with arguments is also known as 'curry'.
-  _.bind: func, obj =>
-    args: _.rest(arguments, 2)
-    => func.apply(obj or root, args.concat(_.toArray(arguments)))
+  _.bind: (func, obj) ->
+    args: _.rest arguments, 2
+    -> func.apply obj or root, args.concat arguments
 
 
   # Bind all of an object's methods to that object. Useful for ensuring that
   # all callbacks defined on an object belong to it.
-  _.bindAll: obj =>
+  _.bindAll: (obj) ->
     funcs: if arguments.length > 1 then _.rest(arguments) else _.functions(obj)
-    _.each(funcs, (f => obj[f]: _.bind(obj[f], obj)))
+    _.each funcs, (f) -> obj[f]: _.bind obj[f], obj
     obj
 
 
   # Delays a function for the given number of milliseconds, and then calls
   # it with the arguments supplied.
-  _.delay: func, wait =>
-    args: _.rest(arguments, 2)
-    setTimeout((=> func.apply(func, args)), wait)
+  _.delay: (func, wait) ->
+    args: _.rest arguments, 2
+    setTimeout((-> func.apply(func, args)), wait)
 
 
   # Defers a function, scheduling it to run after the current call stack has
   # cleared.
-  _.defer: func =>
-    _.delay.apply(_, [func, 1].concat(_.rest(arguments)))
+  _.defer: (func) ->
+    _.delay.apply _, [func, 1].concat _.rest arguments
 
 
   # Returns the first function passed as an argument to the second,
   # allowing you to adjust arguments, run code before and after, and
   # conditionally execute the original function.
-  _.wrap: func, wrapper =>
-    => wrapper.apply(wrapper, [func].concat(_.toArray(arguments)))
+  _.wrap: (func, wrapper) ->
+    -> wrapper.apply wrapper, [func].concat arguments
 
 
   # Returns a function that is the composition of a list of functions, each
   # consuming the return value of the function that follows.
-  _.compose: =>
-    funcs: _.toArray(arguments)
-    =>
-      args: _.toArray(arguments)
+  _.compose: ->
+    funcs: arguments
+    ->
+      args: arguments
       for i in [(funcs.length - 1)..0]
         args: [funcs[i].apply(this, args)]
       args[0]
@@ -378,43 +398,42 @@
   # ------------------------- Object Functions: ----------------------------
 
   # Retrieve the names of an object's properties.
-  _.keys: obj =>
-    return _.range(0, obj.length) if _.isArray(obj)
-    key for key, val ino obj
+  _.keys: nativeKeys or (obj) ->
+    return _.range 0, obj.length if _.isArray(obj)
+    key for key, val of obj
 
 
   # Retrieve the values of an object's properties.
-  _.values: obj =>
-    _.map(obj, _.identity)
+  _.values: (obj) ->
+    _.map obj, _.identity
 
 
   # Return a sorted list of the function names available in Underscore.
-  _.functions: obj =>
-    _.select(_.keys(obj), key => _.isFunction(obj[key])).sort()
+  _.functions: (obj) ->
+    _.filter(_.keys(obj), (key) -> _.isFunction(obj[key])).sort()
 
 
   # Extend a given object with all of the properties in a source object.
-  _.extend: destination, source =>
-    for key, val ino source
-      destination[key]: val
+  _.extend: (destination, source) ->
+    (destination[key]: val) for key, val of source
     destination
 
 
   # Create a (shallow-cloned) duplicate of an object.
-  _.clone: obj =>
-    return obj.slice(0) if _.isArray(obj)
-    _.extend({}, obj)
+  _.clone: (obj) ->
+    return obj.slice 0 if _.isArray obj
+    _.extend {}, obj
 
 
   # Invokes interceptor with the obj, and then returns obj.
   # The primary purpose of this method is to "tap into" a method chain, in order to perform operations on intermediate results within the chain.
-  _.tap: obj, interceptor =>
-    interceptor(obj)
+  _.tap: (obj, interceptor) ->
+    interceptor obj
     obj
 
 
   # Perform a deep comparison to check if two objects are equal.
-  _.isEqual: a, b =>
+  _.isEqual: (a, b) ->
     # Check object identity.
     return true if a is b
     # Different types?
@@ -445,98 +464,129 @@
     # Different object sizes?
     return false if aKeys.length isnt bKeys.length
     # Recursive comparison of contents.
-    # for (var key in a) if (!_.isEqual(a[key], b[key])) return false;
-    return true
+    (return false) for key, val of a when !_.isEqual(val, b[key])
+    true
 
 
   # Is a given array or object empty?
-  _.isEmpty:      obj => _.keys(obj).length is 0
+  _.isEmpty: (obj) ->
+    return obj.length is 0 if _.isArray obj
+    (return false) for key of obj when hasOwnProperty.call(obj, key)
+    true
 
 
   # Is a given value a DOM element?
-  _.isElement:    obj => obj and obj.nodeType is 1
+  _.isElement:    (obj) -> obj and obj.nodeType is 1
 
 
   # Is a given value an array?
-  _.isArray:      obj => !!(obj and obj.concat and obj.unshift)
+  _.isArray:      nativeIsArray or (obj) -> !!(obj and obj.concat and obj.unshift)
 
 
   # Is a given variable an arguments object?
-  _.isArguments:  obj => obj and _.isNumber(obj.length) and !_.isArray(obj) and !propertyIsEnumerable.call(obj, 'length')
+  _.isArguments:  (obj) -> obj and _.isNumber(obj.length) and not obj.concat and
+                           not obj.substr and not obj.apply and not propertyIsEnumerable.call(obj, 'length')
 
 
   # Is the given value a function?
-  _.isFunction:   obj => !!(obj and obj.constructor and obj.call and obj.apply)
+  _.isFunction:   (obj) -> !!(obj and obj.constructor and obj.call and obj.apply)
 
 
   # Is the given value a string?
-  _.isString:     obj => !!(obj is '' or (obj and obj.charCodeAt and obj.substr))
+  _.isString:     (obj) -> !!(obj is '' or (obj and obj.charCodeAt and obj.substr))
 
 
   # Is a given value a number?
-  _.isNumber:     obj => toString.call(obj) is '[object Number]'
+  _.isNumber:     (obj) -> (obj is +obj) or toString.call(obj) is '[object Number]'
+
+
+  # Is a given value a boolean?
+  _.isBoolean:    (obj) -> obj is true or obj is false
 
 
   # Is a given value a Date?
-  _.isDate:       obj => !!(obj and obj.getTimezoneOffset and obj.setUTCFullYear)
+  _.isDate:       (obj) -> !!(obj and obj.getTimezoneOffset and obj.setUTCFullYear)
 
 
   # Is the given value a regular expression?
-  _.isRegExp:     obj => !!(obj and obj.exec and (obj.ignoreCase or obj.ignoreCase is false))
+  _.isRegExp:     (obj) -> !!(obj and obj.exec and (obj.ignoreCase or obj.ignoreCase is false))
 
 
   # Is the given value NaN -- this one is interesting. NaN != NaN, and
   # isNaN(undefined) == true, so we make sure it's a number first.
-  _.isNaN:        obj => _.isNumber(obj) and window.isNaN(obj)
+  _.isNaN:        (obj) -> _.isNumber(obj) and window.isNaN(obj)
 
 
   # Is a given value equal to null?
-  _.isNull:       obj => obj is null
+  _.isNull:       (obj) -> obj is null
 
 
   # Is a given variable undefined?
-  _.isUndefined:  obj => typeof obj is 'undefined'
+  _.isUndefined:  (obj) -> typeof obj is 'undefined'
 
 
   # -------------------------- Utility Functions: --------------------------
 
   # Run Underscore.js in noConflict mode, returning the '_' variable to its
   # previous owner. Returns a reference to the Underscore object.
-  _.noConflict: =>
+  _.noConflict: ->
     root._: previousUnderscore
     this
 
 
   # Keep the identity function around for default iterators.
-  _.identity: value => value
+  _.identity: (value) -> value
+
+
+  # Run a function n times.
+  _.times: (n, iterator, context) ->
+    iterator.call(context, i) for i in [0...n]
 
 
   # Break out of the middle of an iteration.
-  _.breakLoop: => throw breaker
+  _.breakLoop: -> throw breaker
+
+
+  # Add your own custom functions to the Underscore object, ensuring that
+  # they're correctly added to the OOP wrapper as well.
+  _.mixin: (obj) ->
+    for name in _.functions(obj)
+      addToWrapper name, _[name]: obj[name]
 
 
   # Generate a unique integer id (unique within the entire client session).
   # Useful for temporary DOM ids.
   idCounter: 0
-  _.uniqueId: prefix =>
+  _.uniqueId: (prefix) ->
     (prefix or '') + idCounter++
 
 
+  # By default, Underscore uses ERB-style template delimiters, change the
+  # following template settings to use alternative delimiters.
+  _.templateSettings: {
+    start:        '<%'
+    end:          '%>'
+    interpolate:  /<%=(.+?)%>/g
+  }
+
+
   # JavaScript templating a-la ERB, pilfered from John Resig's
   # "Secrets of the JavaScript Ninja", page 83.
-  _.template: str, data =>
-    `var fn = new Function('obj',
+  # Single-quote fix from Rick Strahl's version.
+  _.template: (str, data) ->
+    c: _.templateSettings
+    endMatch: new RegExp("'(?=[^"+c.end.substr(0, 1)+"]*"+escapeRegExp(c.end)+")","g")
+    fn: new Function 'obj',
       'var p=[],print=function(){p.push.apply(p,arguments);};' +
       'with(obj){p.push(\'' +
-      str.
-        replace(/[\r\t\n]/g, " ").
-        split("<%").join("\t").
-        replace(/((^|%>)[^\t]*)'/g, "$1\r").
-        replace(/\t=(.*?)%>/g, "',$1,'").
-        split("\t").join("');").
-        split("%>").join("p.push('").
-        split("\r").join("\\'") +
-      "');}return p.join('');")`
+      str.replace(/[\r\t\n]/g, " ")
+         .replace(endMatch,"\t")
+         .split("'").join("\\'")
+         .split("\t").join("'")
+         .replace(c.interpolate, "',$1,'")
+         .split(c.start).join("');")
+         .split(c.end).join("p.push('") +
+         "');}return p.join('');"
     if data then fn(data) else fn
 
 
@@ -545,50 +595,61 @@
   _.forEach: _.each
   _.foldl:   _.inject:      _.reduce
   _.foldr:   _.reduceRight
-  _.filter:  _.select
-  _.every:   _.all
-  _.some:    _.any
+  _.select:  _.filter
+  _.all:     _.every
+  _.any:     _.some
   _.head:    _.first
   _.tail:    _.rest
   _.methods: _.functions
 
 
-  #   /*------------------------ Setup the OOP Wrapper: --------------------------*/
+  # ------------------------ Setup the OOP Wrapper: --------------------------
+
+  # If Underscore is called as a function, it returns a wrapped object that
+  # can be used OO-style. This wrapper holds altered versions of all the
+  # underscore functions. Wrapped objects may be chained.
+  wrapper: (obj) ->
+    this._wrapped: obj
+    this
+
 
   # Helper function to continue chaining intermediate results.
-  result: obj, chain =>
+  result: (obj, chain) ->
     if chain then _(obj).chain() else obj
 
 
+  # A method to easily add functions to the OOP wrapper.
+  addToWrapper: (name, func) ->
+    wrapper.prototype[name]: ->
+      args: _.toArray arguments
+      unshift.call args, this._wrapped
+      result func.apply(_, args), this._chain
+
+
   # Add all of the Underscore functions to the wrapper object.
-  _.each(_.functions(_)) name =>
-    method: _[name]
-    wrapper.prototype[name]: =>
-      args: _.toArray(arguments)
-      unshift.call(args, this._wrapped)
-      result(method.apply(_, args), this._chain)
+  _.mixin _
 
 
   # Add all mutator Array functions to the wrapper.
-  _.each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift']) name =>
+  _.each ['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], (name) ->
     method: Array.prototype[name]
-    wrapper.prototype[name]: =>
+    wrapper.prototype[name]: ->
       method.apply(this._wrapped, arguments)
       result(this._wrapped, this._chain)
 
 
   # Add all accessor Array functions to the wrapper.
-  _.each(['concat', 'join', 'slice']) name =>
+  _.each ['concat', 'join', 'slice'], (name) ->
     method: Array.prototype[name]
-    wrapper.prototype[name]: =>
+    wrapper.prototype[name]: ->
       result(method.apply(this._wrapped, arguments), this._chain)
 
 
   # Start chaining a wrapped Underscore object.
-  wrapper::chain: =>
+  wrapper::chain: ->
     this._chain: true
     this
 
 
   # Extracts the result from a wrapped and chained object.
-  wrapper::value: => this._wrapped
+  wrapper::value: -> this._wrapped

examples/web_server.coffee

@@ -0,0 +1,12 @@
+# Contributed by Jason Huggins
+
+http: require 'http'
+
+server: http.createServer (req, res) ->
+  res.sendHeader 200, {'Content-Type': 'text/plain'}
+  res.write 'Hello, World!'
+  res.close()
+
+server.listen 3000
+
+puts "Server running at http://localhost:3000/"

extras/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage

@@ -19,52 +19,31 @@
 		<dict>
 			<key>captures</key>
 			<dict>
-				<key>1</key>
+			  <key>1</key>
 				<dict>
 					<key>name</key>
-					<string>entity.name.function.coffee</string>
+					<string>variable.parameter.function.coffee</string>
 				</dict>
 				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.coffee</string>
-				</dict>
-				<key>3</key>
 				<dict>
 					<key>name</key>
 					<string>variable.parameter.function.coffee</string>
 				</dict>
 				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.function.coffee</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>match stuff like: funcName: =&gt; … </string>
-			<key>match</key>
-			<string>([a-zA-Z0-9_?.$:*]*)\s*(=|:)\s*([\w,\s]*?)\s*(=&gt;)</string>
-			<key>name</key>
-			<string>meta.function.coffee</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
 				<dict>
 					<key>name</key>
 					<string>variable.parameter.function.coffee</string>
 				</dict>
-				<key>2</key>
+				<key>5</key>
 				<dict>
 					<key>name</key>
 					<string>storage.type.function.coffee</string>
 				</dict>
 			</dict>
 			<key>comment</key>
-			<string>match stuff like: a =&gt; … </string>
+			<string>match stuff like: a -&gt; … </string>
 			<key>match</key>
-			<string>([a-zA-Z0-9_?., $:*]*)\s*(=&gt;)</string>
+			<string>(\()([a-zA-Z0-9_?.$]*(,\s*[a-zA-Z0-9_?.$]+)*)(\))\s*((=|-)&gt;)</string>
 			<key>name</key>
 			<string>meta.inline.function.coffee</string>
 		</dict>
@@ -93,6 +72,36 @@
 			<key>name</key>
 			<string>constant.numeric.coffee</string>
 		</dict>
+		<dict>
+		  <key>match</key>
+		  <string>(@)([a-zA-Z_$]\w*)?</string>
+		  <key>name</key>
+		  <string>variable.other.readwrite.instance.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>
@@ -206,73 +215,6 @@
 			<key>name</key>
 			<string>comment.line.coffee</string>
 		</dict>
-		<dict>
-			<key>match</key>
-			<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>
-			<key>name</key>
-			<string>variable.assignment.coffee</string>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.coffee</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.coffee</string>
-				</dict>
-			</dict>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(true|on|yes)\b</string>
-			<key>name</key>
-			<string>constant.language.boolean.true.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(false|off|no)\b</string>
-			<key>name</key>
-			<string>constant.language.boolean.false.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\bnull\b</string>
-			<key>name</key>
-			<string>constant.language.null.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(super|this|extends)\b</string>
-			<key>name</key>
-			<string>variable.language.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(debugger|\\)\b</string>
-			<key>name</key>
-			<string>keyword.other.coffee</string>
-		</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(in|ino|instanceof|new|delete|typeof|and|or|is|isnt|not)\b</string>
-			<key>name</key>
-			<string>keyword.operator.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(Infinity|NaN|undefined)\b</string>
-			<key>name</key>
-			<string>constant.language.coffee</string>
-		</dict>
 		<dict>
 			<key>begin</key>
 			<string>(?&lt;=[=(:]|^|return)\s*(/)(?![/*+{}?])</string>
@@ -306,6 +248,74 @@
 				</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>
+			<key>name</key>
+			<string>keyword.control.coffee</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b([a-zA-Z$_](\w|\$|:|\.)*\s*(?=\:))</string>
+			<key>name</key>
+			<string>variable.assignment.coffee</string>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>entity.name.function.coffee</string>
+				</dict>
+			</dict>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(true|on|yes)\b</string>
+			<key>name</key>
+			<string>constant.language.boolean.true.coffee</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(false|off|no)\b</string>
+			<key>name</key>
+			<string>constant.language.boolean.false.coffee</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\bnull\b</string>
+			<key>name</key>
+			<string>constant.language.null.coffee</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(super|this|extends|class)\b</string>
+			<key>name</key>
+			<string>variable.language.coffee</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(debugger|\\)\b</string>
+			<key>name</key>
+			<string>keyword.other.coffee</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>(=|-)&gt;</string>
+			<key>name</key>
+			<string>storage.type.function.coffee</string>
+		</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>
+			<key>name</key>
+			<string>keyword.operator.coffee</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(Infinity|NaN|undefined)\b</string>
+			<key>name</key>
+			<string>constant.language.coffee</string>
+		</dict>
 		<dict>
 			<key>match</key>
 			<string>\;</string>