merging jcoglan's splat declaration patch.

dbrans · Mar 12, 2011 · 963adb5 · 963adb5
2 parents b785585 + b9343b4
commit 963adb5
Show file tree

Hide file tree

Showing 22 changed files with 485 additions and 214 deletions.
diff --git a/Cakefile b/Cakefile
@@ -94,15 +94,16 @@ task 'build:browser', 'rebuild the merged script for inclusion in the browser',
         #{fs.readFileSync "lib/#{name}.js"}
       };
     """
-  {parser, uglify} = require 'uglify-js'
-  ast = parser.parse """
+  code = """
     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
+  unless process.env.MINIFY is 'false'
+    {parser, uglify} = require 'uglify-js'
+    code = uglify.gen_code uglify.ast_squeeze uglify.ast_mangle parser.parse code
   fs.writeFileSync 'extras/coffee-script.js', header + '\n' + code
   console.log "built ... running browser tests:"
   invoke 'test:browser'

diff --git a/lib/coffee-script.js b/lib/coffee-script.js
@@ -15,7 +15,7 @@
       return compile(content);
     });
   }
-  exports.VERSION = '1.0.2-pre';
+  exports.VERSION = '1.1.0-pre';
   exports.RESERVED = RESERVED;
   exports.helpers = require('./helpers');
   exports.compile = compile = function(code, options) {

diff --git a/lib/command.js b/lib/command.js
diff --git a/lib/grammar.js b/lib/grammar.js
diff --git a/lib/lexer.js b/lib/lexer.js
diff --git a/lib/nodes.js b/lib/nodes.js