Baby steps fixing #386

Merging type, children and statement functions
OOP love for nodes.coffee
jashkenas · StanAngeloff · StanAngeloff · StanAngeloff · StanAngeloff · StanAngeloff
diff --git a/Cakefile b/Cakefile
@@ -3,27 +3,40 @@ fs:            require 'fs'
 CoffeeScript:  require './lib/coffee-script'
 {spawn, exec}: require('child_process')
 
+# ANSI Terminal Colors.
+red:   '\033[0;31m'
+green: '\033[0;32m'
+reset: '\033[0m'
+
 # Run a CoffeeScript through our node/coffee interpreter.
 run: (args) ->
   proc: spawn 'bin/coffee', args
   proc.stderr.addListener 'data', (buffer) -> puts buffer.toString()
   proc.addListener 'exit', (status) -> process.exit(1) if status != 0
 
+# Log a message with a color.
+log: (message, color, explanation) ->
+  puts "$color$message$reset ${explanation or ''}"
+
 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"
   bin:  "$base/bin"
+  node: "~/.node_libraries/coffee-script"
+  puts  "Installing CoffeeScript to $lib"
+  puts  "Linking to $node"
+  puts  "Linking 'coffee' to $bin/coffee"
   exec([
     "mkdir -p $lib $bin"
-    "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"
+    "cp -rf bin lib LICENSE README package.json src $lib"
+    "ln -sf $lib/bin/coffee $bin/coffee"
+    "ln -sf $lib/bin/cake $bin/cake"
     "mkdir -p ~/.node_libraries"
-    "ln -sf $lib/lib ~/.node_libraries/coffee-script"
+    "ln -sf $lib/lib $node"
   ].join(' && '), (err, stdout, stderr) ->
-   if err then print stderr
+    if err then print stderr else log 'done', green
   )
 
 
@@ -41,11 +54,11 @@ task 'build:full', 'rebuild the source twice, and run the tests', ->
 
 
 task 'build:parser', 'rebuild the Jison parser (run build first)', ->
-  require.paths.unshift 'vendor/jison/lib'
+  require 'jison'
   parser: require('./lib/grammar').parser
   js: parser.generate()
-  parser_path: 'lib/parser.js'
-  fs.writeFile parser_path, js
+  parserPath: 'lib/parser.js'
+  fs.writeFile parserPath, js
 
 
 task 'build:ultraviolet', 'build and install the Ultraviolet syntax highlighter', ->
@@ -73,22 +86,27 @@ task 'doc:underscore', 'rebuild the Underscore.coffee documentation page', ->
     throw err if err
 
 
+task 'loc', 'count the lines of source code in CoffeeScript', ->
+  exec "cat src/*.coffee | grep -v '^\\( *#\\|\\s*$\\)' | wc -l | tr -s ' '", (err, stdout) ->
+    print stdout
+
+
 task 'test', 'run the CoffeeScript language test suite', ->
   helpers.extend global, require 'assert'
-  passed_tests: failed_tests: 0
-  start_time:   new Date()
-  original_ok:  ok
+  passedTests: failedTests: 0
+  startTime:   new Date()
+  originalOk:  ok
   helpers.extend global, {
-    ok: (args...) -> passed_tests += 1; original_ok(args...)
+    ok: (args...) -> passedTests += 1; originalOk(args...)
     CoffeeScript: CoffeeScript
   }
-  red: '\033[0;31m'
-  green: '\033[0;32m'
-  reset: '\033[0m'
   process.addListener 'exit', ->
-    time: ((new Date() - start_time) / 1000).toFixed(2)
-    message: "passed $passed_tests tests in $time seconds$reset"
-    puts(if failed_tests then "${red}failed $failed_tests and $message" else "$green$message")
+    time: ((new Date() - startTime) / 1000).toFixed(2)
+    message: "passed $passedTests tests in $time seconds$reset"
+    if failedTests
+      log "failed $failedTests and $message", red
+    else
+      log message, green
   fs.readdir 'test', (err, files) ->
     files.forEach (file) ->
       return unless file.match(/\.coffee$/i)
@@ -97,6 +115,5 @@ task 'test', 'run the CoffeeScript language test suite', ->
         try
           CoffeeScript.run code.toString(), {source: source}
         catch err
-          failed_tests += 1
-          puts "${red}failed:${reset} $source"
-          puts err.stack
+          failedTests += 1
+          log "failed $source", red, '\n' + err.stack.toString()
diff --git a/Rakefile b/Rakefile
@@ -4,6 +4,16 @@ require 'rake/testtask'
 require 'rubygems'
 require 'yui/compressor'
 
+HEADER = <<-EOS
+/**
+ * CoffeeScript Compiler v0.7.0
+ * http://coffeescript.org
+ *
+ * Copyright 2010, Jeremy Ashkenas
+ * Released under the MIT License
+ */
+EOS
+
 desc "Build the documentation page"
 task :doc do
   source = 'documentation/index.html.erb'
@@ -26,6 +36,6 @@ task :browser do
   sources = %w(helpers.js 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) }
+  File.open('extras/coffee-script.js', 'w+') {|f| f.write(HEADER + code) }
 end
 
diff --git a/documentation/coffee/aliases.coffee b/documentation/coffee/aliases.coffee
@@ -1,9 +1,11 @@
 launch() if ignition is on
 
-volume: 10 if band isnt spinal_tap
+volume: 10 if band isnt SpinalTap
 
-let_the_wild_rumpus_begin() unless answer is no
+letTheWildRumpusBegin() unless answer is no
 
-if car.speed < speed_limit then accelerate()
+if car.speed < limit then accelerate()
+
+winner: yes if pick in [47, 92, 13]
 
 print "My name is " + @name
diff --git a/documentation/coffee/binding.coffee b/documentation/coffee/binding.coffee
@@ -1,5 +0,0 @@
-url: "documentation/coffee/binding.coffee"
-
-get_source: jQuery.get <- jQuery, url
-
-get_source (response) -> alert response
diff --git a/documentation/coffee/cake_tasks.coffee b/documentation/coffee/cake_tasks.coffee
@@ -1,3 +1,3 @@
 task 'test', 'run each of the unit tests', ->
-  for test in test_files
+  for test in files
     fs.readFile test, (err, code) -> eval coffee.compile code
diff --git a/documentation/coffee/conditionals.coffee b/documentation/coffee/conditionals.coffee
@@ -1,9 +1,9 @@
-mood: greatly_improved if singing
+mood: greatlyImproved if singing
 
-if happy and knows_it
-  claps_hands()
-  cha_cha_cha()
+if happy and knowsIt
+  clapsHands()
+  chaChaCha()
 
 date: if friday then sue else jill
 
-expensive: or do_the_math()
+options: or defaultOptions
diff --git a/documentation/coffee/expressions.coffee b/documentation/coffee/expressions.coffee
@@ -1,8 +1,8 @@
 grade: (student) ->
-  if student.excellent_work
+  if student.excellentWork
     "A+"
-  else if student.okay_stuff
-    if student.tried_hard then "B" else "B-"
+  else if student.okayStuff
+    if student.triedHard then "B" else "B-"
   else
     "C"
 
diff --git a/documentation/coffee/multiple_return_values.coffee b/documentation/coffee/multiple_return_values.coffee
@@ -1,5 +1,5 @@
-weather_report: (location) ->
+weatherReport: (location) ->
   # Make an Ajax request to fetch the weather...
   [location, 72, "Mostly Sunny"]
 
-[city, temp, forecast]: weather_report "Berkeley, CA"
+[city, temp, forecast]: weatherReport "Berkeley, CA"
diff --git a/documentation/coffee/object_comprehensions.coffee b/documentation/coffee/object_comprehensions.coffee
@@ -1,4 +1,4 @@
-years_old: {max: 10, ida: 9, tim: 11}
+yearsOld: {max: 10, ida: 9, tim: 11}
 
-ages: for child, age of years_old
+ages: for child, age of yearsOld
   child + " is " + age
diff --git a/documentation/coffee/objects_reserved.coffee b/documentation/coffee/objects_reserved.coffee
@@ -0,0 +1 @@
+$('.account').css {class: 'active'}
diff --git a/documentation/coffee/overview.coffee b/documentation/coffee/overview.coffee
@@ -1,9 +1,9 @@
 # Assignment:
 number: 42
-opposite_day: true
+opposite: true
 
 # Conditions:
-number: -42 if opposite_day
+number: -42 if opposite
 
 # Functions:
 square: (x) -> x * x
@@ -26,4 +26,4 @@ race: (winner, runners...) ->
 alert "I knew it!" if elvis?
 
 # Array comprehensions:
-cubed_list: math.cube num for num in list
+cubes: math.cube num for num in list
diff --git a/documentation/coffee/parallel_assignment.coffee b/documentation/coffee/parallel_assignment.coffee
@@ -1,4 +1,4 @@
-bait: 1000
-and_switch: 0
+theBait: 1000
+theSwitch: 0
 
-[bait, and_switch]: [and_switch, bait]
+[theBait, theSwitch]: [theSwitch, theBait]
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]
+countdown: num for num in [10..1] by -1
 
-egg_delivery: ->
+deliverEggs: ->
   for i in [0...eggs.length] by 12
-    dozen_eggs: eggs[i...i+12]
-    deliver new egg_carton(dozen)
+    dozen: eggs[i...i+12]
+    deliver new eggCarton(dozen)
diff --git a/documentation/coffee/scope.coffee b/documentation/coffee/scope.coffee
@@ -1,5 +1,5 @@
-num: 1
-change_numbers: ->
-  new_num: -1
-  num: 10
-new_num: change_numbers()
+outer: 1
+changeNumbers: ->
+  inner: -1
+  outer: 10
+inner: changeNumbers()
diff --git a/documentation/coffee/slices.coffee b/documentation/coffee/slices.coffee
@@ -1,6 +1,6 @@
 numbers: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
 
-three_to_six: numbers[3..6]
+threeToSix: numbers[3..6]
 
-numbers_copy: numbers[0...numbers.length]
+copy: numbers[0...numbers.length]
 
diff --git a/documentation/coffee/soaks.coffee b/documentation/coffee/soaks.coffee
@@ -1 +1 @@
-lottery.draw_winner()?.address?.zipcode
+lottery.drawWinner()?.address?.zipcode
diff --git a/documentation/coffee/splats.coffee b/documentation/coffee/splats.coffee
@@ -1,9 +1,9 @@
-gold: silver: the_field: "unknown"
+gold: silver: rest: "unknown"
 
-award_medals: (first, second, rest...) ->
-  gold:       first
-  silver:     second
-  the_field:  rest
+awardMedals: (first, second, rest...) ->
+  gold:   first
+  silver: second
+  rest:   rest
 
 contenders: [
   "Michael Phelps"
@@ -18,8 +18,8 @@ contenders: [
   "Usain Bolt"
 ]
 
-award_medals contenders...
+awardMedals contenders...
 
 alert "Gold: " + gold
 alert "Silver: " + silver
-alert "The Field: " + the_field
+alert "The Field: " + rest
diff --git a/documentation/coffee/strings.coffee b/documentation/coffee/strings.coffee
@@ -1,4 +1,4 @@
-moby_dick: "Call me Ishmael. Some years ago --
+mobyDick: "Call me Ishmael. Some years ago --
 never mind how long precisely -- having little
 or no money in my purse, and nothing particular
 to interest me on shore, I thought I would sail
diff --git a/documentation/coffee/switch.coffee b/documentation/coffee/switch.coffee
@@ -1,10 +1,10 @@
 switch day
-  when "Mon" then go_to_work()
-  when "Tue" then go_to_the_park()
-  when "Thu" then go_ice_fishing()
+  when "Mon" then goToWork()
+  when "Tue" then goToThePark()
+  when "Thu" then goIceFishing()
   when "Fri", "Sat"
-    if day is bingo_day
-      go_to_bingo()
-      go_dancing()
-  when "Sun" then go_to_church()
-  else go_to_work()
+    if day is bingoDay
+      goToBingo()
+      goDancing()
+  when "Sun" then goToChurch()
+  else goToWork()
diff --git a/documentation/coffee/try.coffee b/documentation/coffee/try.coffee
@@ -1,7 +1,7 @@
 try
-  all_hell_breaks_loose()
-  cats_and_dogs_living_together()
+  allHellBreaksLoose()
+  catsAndDogsLivingTogether()
 catch error
   print error
 finally
-  clean_up()
+  cleanUp()
diff --git a/documentation/coffee/while.coffee b/documentation/coffee/while.coffee
@@ -1,10 +1,10 @@
 # Econ 101
-if this.studying_economics
+if this.studyingEconomics
   buy()  while supply > demand
   sell() until supply > demand
 
 # Nursery Rhyme
 num: 6
-lyrics: while num -= 1
+lyrics: while num: - 1
   num + " little monkeys, jumping on the bed.
     One fell out and bumped his head."