Empty expression interpolations evaluate as empty strings now.

broke the flag for --no-wrap, fixed.
jashkenas · StanAngeloff · StanAngeloff · jashkenas · jashkenas · jashkenas
diff --git a/Cakefile b/Cakefile
@@ -1,5 +1,6 @@
 fs: require 'fs'
-CoffeeScript: require 'coffee-script'
+helpers: require('./lib/helpers').helpers
+CoffeeScript: require './lib/coffee-script'
 
 # Run a CoffeeScript through our node/coffee interpreter.
 run: (args) ->
@@ -28,23 +29,24 @@ task 'build', 'build the CoffeeScript language from source', ->
   run ['-c', '-o', 'lib'].concat(files)
 
 
-task 'build:full', 'checkout /lib, rebuild the source twice, and run the tests', ->
-  exec 'git co lib && bin/cake build && bin/cake build && bin/cake test', (err, stdout, stderr) ->
+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
     throw err    if err
 
 
 task 'build:parser', 'rebuild the Jison parser (run build first)', ->
   require.paths.unshift 'vendor/jison/lib'
-  parser: require('grammar').parser
+  parser: require('./lib/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 'plist2syntax ../coffee-script-tmbundle/Syntaxes/CoffeeScript.tmLanguage', (err) ->
+    throw err if err
     exec 'sudo mv coffeescript.yaml /usr/local/lib/ruby/gems/1.8/gems/ultraviolet-0.10.2/syntax/coffeescript.syntax'
 
 
@@ -63,22 +65,35 @@ task 'doc:source', 'rebuild the internal documentation', ->
 
 
 task 'doc:underscore', 'rebuild the Underscore.coffee documentation page', ->
-  exec 'uv -s coffeescript -t idle -h examples/underscore.coffee > documentation/underscore.html'
+  exec 'docco examples/underscore.coffee && cp -rf docs documentation && rm -r docs', (err) ->
+    throw err if err
 
 
 task 'test', 'run the CoffeeScript language test suite', ->
-  process.mixin require 'assert'
-  test_count: 0
+  helpers.extend global, require 'assert'
+  passed_tests: failed_tests: 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...)
+  original_ok: ok
+  helpers.extend global, {
+    ok: (args...) -> passed_tests += 1; original_ok(args...)
+    CoffeeScript: CoffeeScript
   }
-  process.addListener 'exit', ->
+  red: '\033[0;31m'
+  green: '\033[0;32m'
+  reset: '\033[0m'
+  on_exit:  ->
     time: ((new Date() - start_time) / 1000).toFixed(2)
-    puts '\033[0;32mpassed ' + test_count + ' tests in ' + time + ' seconds\033[0m'
+    message: "passed $passed_tests tests in $time seconds$reset"
+    puts(if failed_tests then "${red}failed $failed_tests and $message" else "$green$message")
+  process.addListener 'exit', on_exit
   fs.readdir 'test', (err, files) ->
-    for file in files
-      fs.readFile 'test/' + file, (err, code) ->
-        CoffeeScript.run code, {source: file}
+    files.forEach (file) ->
+      return unless file.match(/\.coffee$/i)
+      source: path.join 'test', file
+      fs.readFile source, (err, code) ->
+        try
+          CoffeeScript.run code, {source: source}
+        catch err
+          failed_tests += 1
+          puts "${red}failed:${reset} $source"
+          puts err.stack
diff --git a/Rakefile b/Rakefile
@@ -23,7 +23,7 @@ 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)
+  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) }
diff --git a/bin/cake b/bin/cake
@@ -1,9 +1,8 @@
 #!/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();
+require(lib + '/helpers').helpers.extend(global, require('sys'));
+require(lib + '/cake').run();
diff --git a/bin/coffee b/bin/coffee
@@ -1,9 +1,8 @@
 #!/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('command').run();
+require(lib + '/helpers').helpers.extend(global, require('sys'));
+require(lib + '/command').run();
diff --git a/documentation/coffee/arguments.coffee b/documentation/coffee/arguments.coffee
@@ -1,4 +0,0 @@
-backwards: ->
-  alert arguments.reverse()
-
-backwards "stairway", "to", "heaven"
diff --git a/documentation/coffee/binding.coffee b/documentation/coffee/binding.coffee
@@ -0,0 +1,5 @@
+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,5 +1,3 @@
-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
diff --git a/documentation/coffee/conditionals.coffee b/documentation/coffee/conditionals.coffee
@@ -6,4 +6,4 @@ if happy and knows_it
 
 date: if friday then sue else jill
 
-expensive ||= do_the_math()
+expensive: or do_the_math()
diff --git a/documentation/coffee/interpolation_expression.coffee b/documentation/coffee/interpolation_expression.coffee
@@ -1,4 +1,6 @@
 sentence: "${ 22 / 7 } is a decent approximation of π"
 
+sep:   "[.\\/\\- ]"
+dates: /\d+$sep\d+$sep\d+/g
 
 
diff --git a/documentation/coffee/patterns_and_splats.coffee b/documentation/coffee/patterns_and_splats.coffee
@@ -0,0 +1,7 @@
+tag: "<impossible>"
+
+[open, contents..., close]: tag.split("")
+
+
+
+
diff --git a/documentation/css/docs.css b/documentation/css/docs.css
@@ -105,6 +105,7 @@ div.code {
   position: fixed;
   z-index: 100;
   height: 50px;
+  min-width: 490px;
   left: 40px; right: 40px; top: 25px;
   background: #ddd;
   padding-left: 235px;
diff --git a/documentation/docs/cake.html b/documentation/docs/cake.html
@@ -1,16 +1,17 @@
-<!DOCTYPE html>  <html> <head>   <title>cake.coffee</title>   <meta http-equiv="content-type" content="text/html; charset=UTF-8">   <link rel="stylesheet" media="all" href="docco.css" /> </head> <body>   <div id="container">     <div id="background"></div>            <div id="jump_to">         Jump To &hellip;         <div id="jump_wrapper">           <div id="jump_page">                                           <a class="source" href="cake.html">                 cake.coffee               </a>                                           <a class="source" href="coffee-script.html">                 coffee-script.coffee               </a>                                           <a class="source" href="command.html">                 command.coffee               </a>                                           <a class="source" href="grammar.html">                 grammar.coffee               </a>                                           <a class="source" href="lexer.html">                 lexer.coffee               </a>                                           <a class="source" href="nodes.html">                 nodes.coffee               </a>                                           <a class="source" href="optparse.html">                 optparse.coffee               </a>                                           <a class="source" href="repl.html">                 repl.coffee               </a>                                           <a class="source" href="rewriter.html">                 rewriter.coffee               </a>                                           <a class="source" href="scope.html">                 scope.coffee               </a>                        </div>         </div>       </div>          <table cellpadding="0" cellspacing="0">       <thead>         <tr>           <th class="docs">             <h1>               cake.coffee             </h1>           </th>           <th class="code">           </th>         </tr>       </thead>       <tbody>                               <tr id="section-1">             <td class="docs">               <div class="octowrap">                 <a class="octothorpe" href="#section-1">#</a>               </div>               <p><code>cake</code> is a simplified version of <a href="http://www.gnu.org/software/make/">Make</a>
+<!DOCTYPE html>  <html> <head>   <title>cake.coffee</title>   <meta http-equiv="content-type" content="text/html; charset=UTF-8">   <link rel="stylesheet" media="all" href="docco.css" /> </head> <body>   <div id="container">     <div id="background"></div>            <div id="jump_to">         Jump To &hellip;         <div id="jump_wrapper">           <div id="jump_page">                                           <a class="source" href="cake.html">                 cake.coffee               </a>                                           <a class="source" href="coffee-script.html">                 coffee-script.coffee               </a>                                           <a class="source" href="command.html">                 command.coffee               </a>                                           <a class="source" href="grammar.html">                 grammar.coffee               </a>                                           <a class="source" href="helpers.html">                 helpers.coffee               </a>                                           <a class="source" href="lexer.html">                 lexer.coffee               </a>                                           <a class="source" href="nodes.html">                 nodes.coffee               </a>                                           <a class="source" href="optparse.html">                 optparse.coffee               </a>                                           <a class="source" href="repl.html">                 repl.coffee               </a>                                           <a class="source" href="rewriter.html">                 rewriter.coffee               </a>                                           <a class="source" href="scope.html">                 scope.coffee               </a>                        </div>         </div>       </div>          <table cellpadding="0" cellspacing="0">       <thead>         <tr>           <th class="docs">             <h1>               cake.coffee             </h1>           </th>           <th class="code">           </th>         </tr>       </thead>       <tbody>                               <tr id="section-1">             <td class="docs">               <div class="octowrap">                 <a class="octothorpe" href="#section-1">#</a>               </div>               <p><code>cake</code> is a simplified version of <a href="http://www.gnu.org/software/make/">Make</a>
 (<a href="http://rake.rubyforge.org/">Rake</a>, <a href="http://github.com/280north/jake">Jake</a>)
 for CoffeeScript. You define tasks with names and descriptions in a Cakefile,
 and can call them from the command line, or invoke them from other tasks.</p>
 
 <p>Running <code>cake</code> with no arguments will print out a list of all the tasks in the
 current directory's Cakefile.</p>             </td>             <td class="code">               <div class="highlight"><pre></pre></div>             </td>           </tr>                               <tr id="section-2">             <td class="docs">               <div class="octowrap">                 <a class="octothorpe" href="#section-2">#</a>               </div>               <p>External dependencies.</p>             </td>             <td class="code">               <div class="highlight"><pre><span class="nv">fs: </span>          <span class="nx">require</span> <span class="s1">&#39;fs&#39;</span>
 <span class="nv">path: </span>        <span class="nx">require</span> <span class="s1">&#39;path&#39;</span>
-<span class="nv">optparse: </span>    <span class="nx">require</span> <span class="s1">&#39;optparse&#39;</span>
-<span class="nv">CoffeeScript: </span><span class="nx">require</span> <span class="s1">&#39;coffee-script&#39;</span></pre></div>             </td>           </tr>                               <tr id="section-3">             <td class="docs">               <div class="octowrap">                 <a class="octothorpe" href="#section-3">#</a>               </div>               <p>Keep track of the list of defined tasks, the accepted options, and so on.</p>             </td>             <td class="code">               <div class="highlight"><pre><span class="nv">tasks: </span><span class="p">{}</span>
+<span class="nv">helpers: </span>     <span class="nx">require</span><span class="p">(</span><span class="s1">&#39;./helpers&#39;</span><span class="p">).</span><span class="nx">helpers</span>
+<span class="nv">optparse: </span>    <span class="nx">require</span> <span class="s1">&#39;./optparse&#39;</span>
+<span class="nv">CoffeeScript: </span><span class="nx">require</span> <span class="s1">&#39;./coffee-script&#39;</span></pre></div>             </td>           </tr>                               <tr id="section-3">             <td class="docs">               <div class="octowrap">                 <a class="octothorpe" href="#section-3">#</a>               </div>               <p>Keep track of the list of defined tasks, the accepted options, and so on.</p>             </td>             <td class="code">               <div class="highlight"><pre><span class="nv">tasks: </span><span class="p">{}</span>
 <span class="nv">options: </span><span class="p">{}</span>
 <span class="nv">switches: </span><span class="p">[]</span>
-<span class="nv">oparse: </span><span class="kc">null</span></pre></div>             </td>           </tr>                               <tr id="section-4">             <td class="docs">               <div class="octowrap">                 <a class="octothorpe" href="#section-4">#</a>               </div>               <p>Mixin the top-level Cake functions for Cakefiles to use directly.</p>             </td>             <td class="code">               <div class="highlight"><pre><span class="nx">process</span><span class="p">.</span><span class="nx">mixin</span> <span class="p">{</span></pre></div>             </td>           </tr>                               <tr id="section-5">             <td class="docs">               <div class="octowrap">                 <a class="octothorpe" href="#section-5">#</a>               </div>               <p>Define a Cake task with a short name, a sentence description,
+<span class="nv">oparse: </span><span class="kc">null</span></pre></div>             </td>           </tr>                               <tr id="section-4">             <td class="docs">               <div class="octowrap">                 <a class="octothorpe" href="#section-4">#</a>               </div>               <p>Mixin the top-level Cake functions for Cakefiles to use directly.</p>             </td>             <td class="code">               <div class="highlight"><pre><span class="nx">helpers</span><span class="p">.</span><span class="nx">extend</span> <span class="nx">global</span><span class="p">,</span> <span class="p">{</span></pre></div>             </td>           </tr>                               <tr id="section-5">             <td class="docs">               <div class="octowrap">                 <a class="octothorpe" href="#section-5">#</a>               </div>               <p>Define a Cake task with a short name, a sentence description,
 and the function to run as the action itself.</p>             </td>             <td class="code">               <div class="highlight"><pre>  <span class="nv">task: </span><span class="p">(</span><span class="nx">name</span><span class="p">,</span> <span class="nx">description</span><span class="p">,</span> <span class="nx">action</span><span class="p">)</span> <span class="o">-&gt;</span>
     <span class="nx">tasks</span><span class="p">[</span><span class="nx">name</span><span class="p">]</span><span class="o">:</span> <span class="p">{</span><span class="nv">name: </span><span class="nx">name</span><span class="p">,</span> <span class="nv">description: </span><span class="nx">description</span><span class="p">,</span> <span class="nv">action: </span><span class="nx">action</span><span class="p">}</span></pre></div>             </td>           </tr>                               <tr id="section-6">             <td class="docs">               <div class="octowrap">                 <a class="octothorpe" href="#section-6">#</a>               </div>               <p>Define an option that the Cakefile accepts. The parsed options hash,
 containing all of the command-line options passed, will be made available