doc updates -- widened the code segments for the sake of the JavaScript

fixing bug with multiple linebreaks in heredocs
fixing comments as the last line of a block
jashkenas · jashkenas · jashkenas · jashkenas · jashkenas · jashkenas
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 presentation
 test.coffee
 parser.output
-lib/coffee_script/parser.rb
 test/fixtures/underscore
 examples/beautiful_code/parse.coffee
 *.gem
diff --git a/Rakefile b/Rakefile
@@ -25,7 +25,7 @@ namespace :build do
 
   desc "Compile and install the Ultraviolet syntax highlighter"
   task :ultraviolet do
-    sh "plist2syntax lib/coffee_script/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage"
+    sh "plist2syntax extras/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
 
@@ -58,6 +58,8 @@ namespace :gem do
 
   desc 'Build and install the coffee-script gem'
   task :install do
+    verbose = "lib/coffee_script/parser.output"
+    FileUtils.rm(verbose) if File.exists?(verbose)
     sh "gem build coffee-script.gemspec"
     sh "sudo gem install #{Dir['*.gem'].join(' ')} --local --no-ri --no-rdoc"
   end
diff --git a/coffee-script.gemspec b/coffee-script.gemspec
@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'coffee-script'
-  s.version   = '0.2.6'         # Keep version in sync with coffee-script.rb
-  s.date      = '2010-1-17'
+  s.version   = '0.3.0'         # Keep version in sync with coffee-script.rb
+  s.date      = '2010-1-26'
 
   s.homepage    = "http://jashkenas.github.com/coffee-script/"
   s.summary     = "The CoffeeScript Compiler"
@@ -22,5 +22,6 @@ Gem::Specification.new do |s|
   s.require_paths     = ['lib']
   s.executables       = ['coffee']
 
-  s.files = Dir['bin/*', 'examples/*', 'lib/**/*', 'coffee-script.gemspec', 'LICENSE', 'README', 'package.json']
+  s.files = Dir['bin/*', 'examples/*', 'extras/**/*', 'lib/**/*',
+                'coffee-script.gemspec', 'LICENSE', 'README', 'package.json']
 end
diff --git a/documentation/coffee/arguments.coffee b/documentation/coffee/arguments.coffee
@@ -1,4 +1,4 @@
-backwards: =>
-  alert(arguments.reverse())
+backwards: ->
+  alert arguments.reverse()
 
-backwards("stairway", "to", "heaven")
+backwards "stairway", "to", "heaven"
diff --git a/documentation/coffee/array_comprehensions.coffee b/documentation/coffee/array_comprehensions.coffee
@@ -4,4 +4,4 @@ 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
diff --git a/documentation/coffee/blocks.coffee b/documentation/coffee/blocks.coffee
@@ -1,4 +0,0 @@
-$('table.list').each() table =>
-  $('tr.account', table).each() row =>
-    row.show()
-    row.highlight()
diff --git a/documentation/coffee/expressions.coffee b/documentation/coffee/expressions.coffee
@@ -1,4 +1,4 @@
-grade: student =>
+grade: (student) ->
   if student.excellent_work
     "A+"
   else if student.okay_stuff
diff --git a/documentation/coffee/expressions_try.coffee b/documentation/coffee/expressions_try.coffee
@@ -2,5 +2,5 @@ alert(
   try
     nonexistent / undefined
   catch error
-    "Caught an error: " + error
+    "And the error is ... " + error
 )
diff --git a/documentation/coffee/fat_arrow.coffee b/documentation/coffee/fat_arrow.coffee
@@ -0,0 +1,6 @@
+Account: (customer, cart) ->
+  this.customer: customer
+  this.cart: cart
+
+  $('.shopping_cart').bind 'click', (event) =>
+    this.customer.purchase this.cart
diff --git a/documentation/coffee/functions.coffee b/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
diff --git a/documentation/coffee/long_arrow.coffee b/documentation/coffee/long_arrow.coffee
@@ -1,6 +0,0 @@
-Account: customer, cart =>
-  this.customer: customer
-  this.cart: cart
-
-  $('.shopping_cart').bind('click') event ==>
-    this.customer.purchase(this.cart)
diff --git a/documentation/coffee/multiple_return_values.coffee b/documentation/coffee/multiple_return_values.coffee
@@ -1,5 +1,5 @@
-weather_report: location =>
+weather_report: (location) ->
   # Make an Ajax request to fetch the weather...
   [location, 72, "Mostly Sunny"]
 
-[city, temp, forecast]: weather_report("Berkeley, CA")
+[city, temp, forecast]: weather_report "Berkeley, CA"
diff --git a/documentation/coffee/overview.coffee b/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
diff --git a/documentation/coffee/range_comprehensions.coffee b/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)
diff --git a/documentation/coffee/scope.coffee b/documentation/coffee/scope.coffee
@@ -1,5 +1,5 @@
 num: 1
-change_numbers: =>
+change_numbers: ->
   new_num: -1
   num: 10
 new_num: change_numbers()
diff --git a/documentation/coffee/soaks.coffee b/documentation/coffee/soaks.coffee
@@ -0,0 +1 @@
+lottery.draw_winner()?.address?.zipcode
diff --git a/documentation/coffee/splats.coffee b/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
diff --git a/documentation/coffee/super.coffee b/documentation/coffee/super.coffee
@@ -1,21 +1,21 @@
-Animal: =>
-Animal::move: meters =>
-  alert(this.name + " moved " + meters + "m.")
+Animal: ->
+Animal::move: (meters) ->
+  alert this.name + " moved " + meters + "m."
 
-Snake: name => this.name: name
+Snake: (name) -> this.name: name
 Snake extends Animal
-Snake::move: =>
-  alert("Slithering...")
-  super(5)
+Snake::move: ->
+  alert "Slithering..."
+  super 5
 
-Horse: name => this.name: name
+Horse: (name) -> this.name: name
 Horse extends Animal
-Horse::move: =>
-  alert("Galloping...")
-  super(45)
+Horse::move: ->
+  alert "Galloping..."
+  super 45
 
-sam: new Snake("Sammy the Python")
-tom: new Horse("Tommy the Palomino")
+sam: new Snake "Sammy the Python"
+tom: new Horse "Tommy the Palomino"
 
 sam.move()
 tom.move()
diff --git a/documentation/coffee/try.coffee b/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()
diff --git a/documentation/coffee/while.coffee b/documentation/coffee/while.coffee
@@ -1,7 +1,9 @@
+# Econ 101
 if this.studying_economics
   while supply > demand then buy()
   while supply < demand then sell()
 
+# Nursery Rhyme
 num: 6
 lyrics: while num -= 1
   num + " little monkeys, jumping on the bed.
diff --git a/documentation/css/docs.css b/documentation/css/docs.css
@@ -6,7 +6,7 @@ body {
   font-family: Arial, Helvetica, sans-serif;
 }
 div.container {
-  width: 850px;
+  width: 950px;
   margin: 50px 0 50px 50px;
 }
 p {
@@ -77,7 +77,7 @@ div.code {
   }
   div.code pre {
     float: left;
-    width: 410px;
+    width: 450px;
     border-left: 1px dotted #559;
     padding: 0 0 0 12px;
     margin: 0;
diff --git a/documentation/css/idle.css b/documentation/css/idle.css
@@ -28,6 +28,7 @@ pre.idle .LibraryConstant {
    color: #A535AE;
 }
 pre.idle .FunctionArgument {
+   color: #0076ad;
 }
 pre.idle .BuiltInConstant {
    color: #A535AE;