removing sudo from the npm install script.

enabling a variable number of arguments to be passed to constructor f…
…unctions.
…unctions.
jashkenas · jashkenas · jashkenas · jashkenas · jashkenas · jashkenas
diff --git a/Cakefile b/Cakefile
@@ -1,48 +1,48 @@
-fs:            require 'fs'
-{helpers}:     require('./lib/helpers')
-CoffeeScript:  require './lib/coffee-script'
-{spawn, exec}: require('child_process')
+fs            = require 'fs'
+{helpers}     = require './lib/helpers'
+CoffeeScript  = require './lib/coffee-script'
+{spawn, exec} = require 'child_process'
 
 # ANSI Terminal Colors.
-red:   '\033[0;31m'
-green: '\033[0;32m'
-reset: '\033[0m'
+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
+run = (args) ->
+  proc =         spawn 'bin/coffee', args
+  proc.stderr.on 'data', (buffer) -> puts buffer.toString()
+  proc.on        'exit', (status) -> process.exit(1) if status != 0
 
 # Log a message with a color.
-log: (message, color, explanation) ->
-  puts "$color$message$reset ${explanation or ''}"
+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"
+  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 $lib"
-    "ln -sf $lib/bin/coffee $bin/coffee"
-    "ln -sf $lib/bin/cake $bin/cake"
+    "mkdir -p #lib #bin"
+    "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"
+    "ln -sf #lib/lib #node"
   ].join(' && '), (err, stdout, stderr) ->
     if err then print stderr else log 'done', green
   )
 
 
 task 'build', 'build the CoffeeScript language from source', ->
-  files: fs.readdirSync 'src'
-  files: 'src/' + file for file in files when file.match(/\.coffee$/)
+  files = fs.readdirSync 'src'
+  files = 'src/' + file for file in files when file.match(/\.coffee$/)
   run ['-c', '-o', 'lib'].concat(files)
 
 
@@ -55,9 +55,9 @@ task 'build:full', 'rebuild the source twice, and run the tests', ->
 
 task 'build:parser', 'rebuild the Jison parser (run build first)', ->
   require 'jison'
-  parser: require('./lib/grammar').parser
-  js: parser.generate()
-  parserPath: 'lib/parser.js'
+  parser = require('./lib/grammar').parser
+  js = parser.generate()
+  parserPath = 'lib/parser.js'
   fs.writeFile parserPath, js
 
 
@@ -86,34 +86,35 @@ 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) ->
+task 'loc', 'count the lines of source code in the CoffeeScript compiler', ->
+  sources = ['src/coffee-script.coffee', 'src/grammar.coffee', 'src/helpers.coffee', 'src/lexer.coffee', 'src/nodes.coffee', 'src/rewriter.coffee', 'src/scope.coffee']
+  exec "cat #{ sources.join(' ') } | grep -v '^\\( *#\\|\\s*$\\)' | wc -l | tr -s ' '", (err, stdout) ->
     print stdout
 
 
 task 'test', 'run the CoffeeScript language test suite', ->
   helpers.extend global, require 'assert'
-  passedTests: failedTests: 0
-  startTime:   new Date
-  originalOk:  ok
+  passedTests = failedTests = 0
+  startTime   = new Date
+  originalOk  = ok
   helpers.extend global, {
     ok: (args...) -> passedTests += 1; originalOk(args...)
     CoffeeScript: CoffeeScript
   }
-  process.addListener 'exit', ->
-    time: ((new Date - startTime) / 1000).toFixed(2)
-    message: "passed $passedTests tests in $time seconds$reset"
+  process.on 'exit', ->
+    time = ((new Date - startTime) / 1000).toFixed(2)
+    message = "passed #passedTests tests in #time seconds#reset"
     if failedTests
-      log "failed $failedTests and $message", red
+      log "failed #failedTests and #message", red
     else
       log message, green
   fs.readdir 'test', (err, files) ->
     files.forEach (file) ->
       return unless file.match(/\.coffee$/i)
-      source: path.join 'test', file
-      fs.readFile source, (err, code) ->
+      fileName = path.join 'test', file
+      fs.readFile fileName, (err, code) ->
         try
-          CoffeeScript.run code.toString(), {source: source}
+          CoffeeScript.run code.toString(), {fileName}
         catch err
           failedTests += 1
-          log "failed $source", red, '\n' + err.stack.toString()
+          log "failed #fileName", red, '\n' + err.stack.toString()
diff --git a/Rakefile b/Rakefile
@@ -6,7 +6,7 @@ require 'yui/compressor'
 
 HEADER = <<-EOS
 /**
- * CoffeeScript Compiler v0.7.2
+ * CoffeeScript Compiler v0.9.0
  * http://coffeescript.org
  *
  * Copyright 2010, Jeremy Ashkenas
@@ -17,7 +17,7 @@ EOS
 desc "Build the documentation page"
 task :doc do
   source = 'documentation/index.html.erb'
-  child = fork { exec "bin/coffee -c documentation/coffee/*.coffee -o documentation/js -w" }
+  child = fork { exec "bin/coffee --no-wrap -cw -o documentation/js documentation/coffee/*.coffee" }
   at_exit { Process.kill("INT", child) }
   Signal.trap("INT") { exit }
   loop do
diff --git a/documentation/coffee/aliases.coffee b/documentation/coffee/aliases.coffee
@@ -1,11 +1,11 @@
 launch() if ignition is on
 
-volume: 10 if band isnt SpinalTap
+volume = 10 if band isnt SpinalTap
 
 letTheWildRumpusBegin() unless answer is no
 
 if car.speed < limit then accelerate()
 
-winner: yes if pick in [47, 92, 13]
+winner = yes if pick in [47, 92, 13]
 
-print "My name is " + @name
+print inspect "My name is " + @name
diff --git a/documentation/coffee/array_comprehensions.coffee b/documentation/coffee/array_comprehensions.coffee
@@ -1,5 +1,5 @@
 # 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
diff --git a/documentation/coffee/assignment.coffee b/documentation/coffee/assignment.coffee
@@ -1,2 +0,0 @@
-greeting: "Hello CoffeeScript"
-difficulty: 0.5
diff --git a/documentation/coffee/block_comment.coffee b/documentation/coffee/block_comment.coffee
@@ -0,0 +1,4 @@
+###
+CoffeeScript Compiler v0.9.0
+Released under the MIT License
+###
diff --git a/documentation/coffee/cake_tasks.coffee b/documentation/coffee/cake_tasks.coffee
@@ -1,3 +1,9 @@
-task 'test', 'run each of the unit tests', ->
-  for test in files
-    fs.readFile test, (err, code) -> eval coffee.compile code
+fs = require 'fs'
+
+option '-o', '--output [DIR]', 'directory for compiled code'
+
+task 'build:parser', 'rebuild the Jison parser', ->
+  require 'jison'
+  code = require('./lib/grammar').parser.generate()
+  dir  = options.output or 'lib'
+  fs.writeFile "#dir/parser.js", code
diff --git a/documentation/coffee/classes.coffee b/documentation/coffee/classes.coffee
@@ -1,25 +1,21 @@
 class Animal
+  constructor: (@name) ->
+
   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 = new Snake "Sammy the Python"
+tom = new Horse "Tommy the Palomino"
 
 sam.move()
 tom.move()
diff --git a/documentation/coffee/comparisons.coffee b/documentation/coffee/comparisons.coffee
@@ -1,5 +1,5 @@
-cholesterol: 127
+cholesterol = 127
 
-healthy: 200 > cholesterol > 60
+healthy = 200 > cholesterol > 60
 
 
diff --git a/documentation/coffee/conditionals.coffee b/documentation/coffee/conditionals.coffee
@@ -1,9 +1,11 @@
-mood: greatlyImproved if singing
+mood = greatlyImproved if singing
 
 if happy and knowsIt
   clapsHands()
   chaChaCha()
+else
+  showIt()
 
-date: if friday then sue else jill
+date = if friday then sue else jill
 
-options: or defaultOptions
+options or= defaults
diff --git a/documentation/coffee/embedded.coffee b/documentation/coffee/embedded.coffee
@@ -1,4 +1,4 @@
-hi: `function() {
+hi = `function() {
   return [document.title, "Hello JavaScript"].join(": ");
 }`
 
diff --git a/documentation/coffee/existence.coffee b/documentation/coffee/existence.coffee
@@ -1,4 +1,4 @@
-solipsism: true if mind? and not world?
+solipsism = true if mind? and not world?
 
 speed ?= 140
 
diff --git a/documentation/coffee/expressions.coffee b/documentation/coffee/expressions.coffee
@@ -1,9 +1,9 @@
-grade: (student) ->
+grade = (student) ->
   if student.excellentWork
     "A+"
   else if student.okayStuff
     if student.triedHard then "B" else "B-"
   else
     "C"
 
-eldest: if 24 > 21 then "Liz" else "Ike"
+eldest = if 24 > 21 then "Liz" else "Ike"
diff --git a/documentation/coffee/expressions_assignment.coffee b/documentation/coffee/expressions_assignment.coffee
@@ -1 +1 @@
-six: (one: 1) + (two: 2) + (three: 3)
+six = (one = 1) + (two = 2) + (three = 3)
diff --git a/documentation/coffee/expressions_comprehension.coffee b/documentation/coffee/expressions_comprehension.coffee
@@ -1,3 +1,3 @@
 # The first ten global properties.
 
-globals: (name for name of window)[0...10]
+globals = (name for name of window)[0...10]
diff --git a/documentation/coffee/fat_arrow.coffee b/documentation/coffee/fat_arrow.coffee
@@ -1,6 +1,6 @@
-Account: (customer, cart) ->
-  @customer: customer
-  @cart: cart
+Account = (customer, cart) ->
+  @customer = customer
+  @cart = cart
 
   $('.shopping_cart').bind 'click', (event) =>
     @customer.purchase @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/heredocs.coffee b/documentation/coffee/heredocs.coffee
@@ -1,5 +1,5 @@
-html: '''
-      <strong>
-        cup of coffeescript
-      </strong>
-      '''
+html = '''
+       <strong>
+         cup of coffeescript
+       </strong>
+       '''
diff --git a/documentation/coffee/interpolation.coffee b/documentation/coffee/interpolation.coffee
@@ -1,2 +1,2 @@
-author: "Wittgenstein"
-quote:  "A picture is a fact. -- $author"
+author = "Wittgenstein"
+quote  = "A picture is a fact. -- #author"
diff --git a/documentation/coffee/interpolation_expression.coffee b/documentation/coffee/interpolation_expression.coffee
@@ -1,6 +1,6 @@
-sentence: "${ 22 / 7 } is a decent approximation of π"
+sentence = "#{ 22 / 7 } is a decent approximation of π"
 
-sep:   "[.\\/\\- ]"
-dates: /\d+$sep\d+$sep\d+/g
+sep   = "[.\\/\\- ]"
+dates = /\d+#sep\d+#sep\d+/g
 
 
diff --git a/documentation/coffee/multiple_return_values.coffee b/documentation/coffee/multiple_return_values.coffee
@@ -1,5 +1,5 @@
-weatherReport: (location) ->
+weatherReport = (location) ->
   # Make an Ajax request to fetch the weather...
   [location, 72, "Mostly Sunny"]
 
-[city, temp, forecast]: weatherReport "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 @@
-yearsOld: {max: 10, ida: 9, tim: 11}
+yearsOld = max: 10, ida: 9, tim: 11
 
-ages: for child, age of yearsOld
+ages = for child, age of yearsOld
   child + " is " + age
diff --git a/documentation/coffee/object_extraction.coffee b/documentation/coffee/object_extraction.coffee
@@ -1,13 +1,11 @@
-futurists: {
+futurists =
   sculptor: "Umberto Boccioni"
   painter:  "Vladimir Burliuk"
-  poet: {
+  poet:
     name:   "F.T. Marinetti"
     address: [
       "Via Roma 42R"
       "Bellagio, Italy 22021"
     ]
-  }
-}
 
-{poet: {name, address: [street, city]}}: futurists
+{poet: {name, address: [street, city]}} = futurists