scope: refactored

nodes: refactored to reduce parens
removed extra parens from compilations with assignments or conditiona…
…l operators
jashkenas · satyr · satyr · satyr · satyr · satyr
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,6 @@ presentation
 test.coffee
 parser.output
 test/fixtures/underscore
+test/*.js
 examples/beautiful_code/parse.coffee
 *.gem
diff --git a/Cakefile b/Cakefile
@@ -1,23 +1,41 @@
 fs            = require 'fs'
-{helpers}     = require './lib/helpers'
+path          = require 'path'
+{extend}      = require './lib/helpers'
 CoffeeScript  = require './lib/coffee-script'
 {spawn, exec} = require 'child_process'
-path          = require 'path'
 
 # ANSI Terminal Colors.
+bold  = '\033[0;1m'
 red   = '\033[0;31m'
 green = '\033[0;32m'
 reset = '\033[0m'
 
+# Built file header.
+header = """
+  /**
+   * CoffeeScript Compiler v#{CoffeeScript.VERSION}
+   * http://coffeescript.org
+   *
+   * Copyright 2010, Jeremy Ashkenas
+   * Released under the MIT License
+   */
+"""
+
+sources = [
+  'src/coffee-script.coffee', 'src/grammar.coffee'
+  'src/helpers.coffee', 'src/lexer.coffee', 'src/nodes.coffee'
+  'src/rewriter.coffee', 'src/scope.coffee'
+]
+
 # Run a CoffeeScript through our node/coffee interpreter.
 run = (args) ->
   proc =         spawn 'bin/coffee', args
-  proc.stderr.on 'data', (buffer) -> puts buffer.toString()
+  proc.stderr.on 'data', (buffer) -> console.log 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 '')
+  console.log color + message + reset + ' ' + (explanation or '')
 
 option '-p', '--prefix [DIR]', 'set the installation prefix for `cake install`'
 
@@ -26,9 +44,9 @@ task 'install', 'install CoffeeScript into /usr/local (or --prefix)', (options)
   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"
+  console.log   "Installing CoffeeScript to #{lib}"
+  console.log   "Linking to #{node}"
+  console.log   "Linking 'coffee' to #{bin}/coffee"
   exec([
     "mkdir -p #{lib} #{bin}"
     "cp -rf bin lib LICENSE README package.json src #{lib}"
@@ -37,30 +55,28 @@ task 'install', 'install CoffeeScript into /usr/local (or --prefix)', (options)
     "mkdir -p ~/.node_libraries"
     "ln -sf #{lib}/lib #{node}"
   ].join(' && '), (err, stdout, stderr) ->
-    if err then print stderr else log 'done', green
+    if err then console.log stderr.trim() 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 = ('src/' + file for file in files when file.match(/\.coffee$/))
   run ['-c', '-o', 'lib'].concat(files)
 
 
 task 'build:full', 'rebuild the source twice, and run the tests', ->
   exec 'bin/cake build && bin/cake build && bin/cake test', (err, stdout, stderr) ->
-    print stdout if stdout
-    print stderr if stderr
+    console.log stdout.trim() if stdout
+    console.log stderr.trim() if stderr
     throw err    if err
 
 
 task 'build:parser', 'rebuild the Jison parser (run build first)', ->
+  extend global, require('utils')
   require 'jison'
   parser = require('./lib/grammar').parser
-  js = parser.generate()
-  # TODO: Remove this when the Jison patch is released.
-  js = js.replace 'if (require.main === module)', 'if (typeof module !== "undefined" && require.main === module)'
-  fs.writeFile 'lib/parser.js', js
+  fs.writeFile 'lib/parser.js', parser.generate()
 
 
 task 'build:ultraviolet', 'build and install the Ultraviolet syntax highlighter', ->
@@ -70,12 +86,30 @@ task 'build:ultraviolet', 'build and install the Ultraviolet syntax highlighter'
 
 
 task 'build:browser', 'rebuild the merged script for inclusion in the browser', ->
-  exec 'rake browser', (err) ->
-    throw err if err
+  code = ''
+  for name in ['helpers', 'rewriter', 'lexer', 'parser', 'scope', 'nodes', 'coffee-script', 'browser']
+    code += """
+      require['./#{name}'] = new function() {
+        var exports = this;
+        #{fs.readFileSync "lib/#{name}.js"}
+      };
+    """
+  {parser, uglify} = require 'uglify-js'
+  ast = parser.parse """
+    this.CoffeeScript = function() {
+      function require(path){ return require[path]; }
+      #{code}
+      return require['./coffee-script']
+    }()
+  """
+  code = uglify.gen_code uglify.ast_squeeze uglify.ast_mangle ast, extra: yes
+  fs.writeFileSync 'extras/coffee-script.js', header + '\n' + code
+  invoke 'test:browser'
 
 
 task 'doc:site', 'watch and continually rebuild the documentation for the website', ->
-  exec 'rake doc'
+  exec 'rake doc', (err) ->
+    throw err if err
 
 
 task 'doc:source', 'rebuild the internal documentation', ->
@@ -87,23 +121,39 @@ task 'doc:underscore', 'rebuild the Underscore.coffee documentation page', ->
   exec 'docco examples/underscore.coffee && cp -rf docs documentation && rm -r docs', (err) ->
     throw err if err
 
+task 'bench', 'quick benchmark of compilation time', ->
+  {Rewriter} = require './lib/rewriter'
+  co     = sources.map((name) -> fs.readFileSync name).join '\n'
+  fmt    = (ms) -> " #{bold}#{ "   #{ms}".slice -4 }#{reset} ms"
+  total  = 0
+  now    = Date.now()
+  time   = -> total += ms = -(now - now = Date.now()); fmt ms
+  tokens = CoffeeScript.tokens co, rewrite: false
+  console.log "Lex    #{time()} (#{tokens.length} tokens)"
+  tokens = new Rewriter().rewrite tokens
+  console.log "Rewrite#{time()} (#{tokens.length} tokens)"
+  nodes  = CoffeeScript.nodes tokens
+  console.log "Parse  #{time()}"
+  js     = nodes.compile bare: true
+  console.log "Compile#{time()} (#{js.length} chars)"
+  console.log "total  #{ fmt total }"
 
 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
+    console.log stdout.trim()
 
 
-task 'test', 'run the CoffeeScript language test suite', ->
-  helpers.extend global, require 'assert'
+runTests = (CoffeeScript) ->
+  startTime = Date.now()
   passedTests = failedTests = 0
-  startTime   = new Date
-  originalOk  = ok
-  helpers.extend global,
-    ok: (args...) -> passedTests += 1; originalOk(args...)
-    CoffeeScript: CoffeeScript
+  for all name, func of require 'assert'
+    global[name] = ->
+      passedTests += 1
+      func arguments...
+  global.eq = global.strictEqual
+  global.CoffeeScript = CoffeeScript
   process.on 'exit', ->
-    time = ((new Date - startTime) / 1000).toFixed(2)
+    time = ((Date.now() - startTime) / 1000).toFixed(2)
     message = "passed #{passedTests} tests in #{time} seconds#{reset}"
     if failedTests
       log "failed #{failedTests} and #{message}", red
@@ -118,4 +168,15 @@ task 'test', 'run the CoffeeScript language test suite', ->
           CoffeeScript.run code.toString(), {fileName}
         catch err
           failedTests += 1
-          log "failed #{fileName}", red, '\n' + err.stack.toString()
+          log "failed #{fileName}", red, '\n' + err.stack?.toString()
+
+
+task 'test', 'run the CoffeeScript language test suite', ->
+  runTests CoffeeScript
+
+
+task 'test:browser', 'run the test suite against the merged browser script', ->
+  source = fs.readFileSync 'extras/coffee-script.js', 'utf-8'
+  result = {}
+  (-> eval source).call result
+  runTests result.CoffeeScript
diff --git a/README b/README
@@ -1,67 +1,47 @@
-=                              
-            {                   
-         }   }   {              
-        {   {  }  }             
-         }   }{  {               
-        {  }{  }  }                    _____       __  __           
-       ( }{ }{  { )                   / ____|     / _|/ _|          
-     .- { { }  { }} -.               | |     ___ | |_| |_ ___  ___ 
-    (  ( } { } { } }  )              | |    / _ \|  _|  _/ _ \/ _ \ 
-    |`-..________ ..-'|              | |___| (_) | | | ||  __/  __/ 
+=
+            {
+         }   }   {
+        {   {  }  }
+         }   }{  {
+        {  }{  }  }                    _____       __  __
+       ( }{ }{  { )                   / ____|     / _|/ _|
+     .- { { }  { }} -.               | |     ___ | |_| |_ ___  ___
+    (  ( } { } { } }  )              | |    / _ \|  _|  _/ _ \/ _ \
+    |`-..________ ..-'|              | |___| (_) | | | ||  __/  __/
     |                 |               \_____\___/|_| |_| \___|\___|
-    |                 ;--.           
-    |                (__  \            _____           _       _   
-    |                 | )  )          / ____|         (_)     | |  
-    |                 |/  /          | (___   ___ _ __ _ _ __ | |_ 
+    |                 ;--.
+    |                (__  \            _____           _       _
+    |                 | )  )          / ____|         (_)     | |
+    |                 |/  /          | (___   ___ _ __ _ _ __ | |_
     |                 (  /            \___ \ / __| '__| | '_ \| __|
-    |                 |/              ____) | (__| |  | | |_) | |_ 
+    |                 |/              ____) | (__| |  | | |_) | |_
     |                 |              |_____/ \___|_|  |_| .__/ \__|
-     `-.._________..-'                                  | |        
+     `-.._________..-'                                  | |
                                                         |_|
-                  
-                                                        
+
+
   CoffeeScript is a little language that compiles into JavaScript.
-  
+
   Install Node.js, and then the CoffeeScript compiler:
   sudo bin/cake install
-  
+
   Or, if you have the Node Package Manager installed:
-  sudo npm install coffee-script
-  
+  npm install coffee-script
+
   Compile a script:
   coffee /path/to/script.coffee
-  
+
   For documentation, usage, and examples, see:
   http://coffeescript.org/
-  
+
   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
-  
-  
-  Contributors:
-  
-  Stan Angeloff (StanAngeloff)
-  Jeremy Ashkenas (jashkenas)
-  Zach Carter (zaach)
-  Tim Cuthbertson (gfxmonk)
-  Mathieu D'Amours (matehat)
-  Chris Hoffman (cehoffman)
-  Jason Huggins (hugs)
-  Timothy Jones (Tesco)
-  Chris Lloyd (chrislloyd)
-  Matt Lyon (mattly)
-  Satoshi Murakami (satyr)
-  Jeff Olson (olsonjeffery)
-  Nathan Ostgard (noonat)
-  Samuel Reis (grgh)
-  Tom Robinson (tlrobinson)
-  Tim Smart (Tim-Smart)
-  Sam Stephenson (sstephenson)
-  Dr. Nic Williams (drnic)
-  
+
+  All contributors are listed here:
+  http://github.com/jashkenas/coffee-script/contributors
diff --git a/Rakefile b/Rakefile
@@ -1,23 +1,11 @@
 require 'erb'
 require 'fileutils'
 require 'rake/testtask'
-require 'rubygems'
-require 'closure-compiler'
-
-HEADER = <<-EOS
-/**
- * CoffeeScript Compiler v0.9.4
- * 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'
-  child = fork { exec "bin/coffee --no-wrap -cw -o documentation/js documentation/coffee/*.coffee" }
+  child = fork { exec "bin/coffee -bcw -o documentation/js documentation/coffee/*.coffee" }
   at_exit { Process.kill("INT", child) }
   Signal.trap("INT") { exit }
   loop do
@@ -31,23 +19,3 @@ task :doc do
   end
 end
 
-desc "Build the single concatenated and minified script for the browser"
-task :browser do
-  sources = %w(helpers rewriter lexer parser scope nodes coffee-script browser)
-  code = sources.inject '' do |js, name|
-    js << <<-"JS"
-      require['./#{name}'] = new function(){
-        var exports = this;
-        #{ File.read "lib/#{name}.js" }
-      }
-    JS
-  end
-  code = Closure::Compiler.new.compress(<<-"JS")
-    this.CoffeeScript = function(){
-      function require(path){ return require[path] }
-      #{ code }
-      return require['./coffee-script']
-    }()
-  JS
-  File.open('extras/coffee-script.js', 'wb+') {|f| f.write(HEADER + code) }
-end
diff --git a/bin/cake b/bin/cake
@@ -1,8 +1,7 @@
 #!/usr/bin/env node
 
 var path = require('path');
-var fs = require('fs');
-var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
+var fs   = require('fs');
+var lib  = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
 
-require(lib + '/helpers').helpers.extend(global, require('sys'));
 require(lib + '/cake').run();
diff --git a/bin/coffee b/bin/coffee
@@ -1,8 +1,7 @@
 #!/usr/bin/env node
 
 var path = require('path');
-var fs = require('fs');
-var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
+var fs   = require('fs');
+var lib  = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
 
-require(lib + '/helpers').helpers.extend(global, require('sys'));
 require(lib + '/command').run();
diff --git a/documentation/coffee/array_comprehensions.coffee b/documentation/coffee/array_comprehensions.coffee
@@ -2,6 +2,6 @@
 lunch = eat food for food in ['toast', 'cheese', 'wine']
 
 # Naive collision detection.
-for roid in asteroids
+for roid, pos in asteroids
   for roid2 in asteroids when roid isnt roid2
     roid.explode() if roid.overlaps roid2
diff --git a/documentation/coffee/block_comment.coffee b/documentation/coffee/block_comment.coffee
@@ -1,4 +1,4 @@
 ###
-CoffeeScript Compiler v0.9.4
+CoffeeScript Compiler v0.9.5
 Released under the MIT License
 ###
diff --git a/documentation/coffee/default_args.coffee b/documentation/coffee/default_args.coffee
@@ -0,0 +1,8 @@
+fill = (container, liquid = "coffee") ->
+  "Filling the #{container} with #{liquid}..."
+
+
+
+
+
+