uglifier 0.2.0 → 0.3.0

data/Gemfile

@@ -3,13 +3,13 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "therubyracer", ">= 0.7.5"
+gem "therubyracer", ">= 0.8.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.0.0"
+  gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.0.pre5"
+  gem "jeweler", "~> 1.5.0"
   gem "rcov", ">= 0"
 end

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/uglify

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'uglifier'
+require 'uglifier/cli'
+
+exit Uglifier::Cli.run!

data/lib/uglifier.rb

@@ -1,4 +1,4 @@
-require "v8"
+require "uglifier/node"
 
 class Uglifier
   # Raised when compilation fails
@@ -12,6 +12,7 @@ class Uglifier
     :dead_code => true, # Remove dead code (e.g. after return)
     :extra => false, # Additional and potentially unsafe optimizations
     :unsafe => false, # Optimizations known to be unsafe in some situations
+    :copyright => true, # Show copyright message
     :beautify => false, # Ouput indented code
     :beautify_options => {
       :indent_level => 4,
@@ -21,27 +22,26 @@ class Uglifier
     }
   }
 
+  # Create new instance of Uglifier with given options
   def initialize(options = {})
     @options = DEFAULTS.merge(options)
-    @exports = {
-      "sys" => {
-        :debug => lambda {|m| puts m }
-      }
-    }
+    @node = Node.new do |cxt|
+      @tokenizer = cxt.require("parse-js")["tokenizer"]
+      process = cxt.require("process")
+      process["set_logger"].call(lambda {|m| $stderr.puts m })
+    end
   end
 
   def compile(source)
-    V8::Context.new do |cxt|
-      cxt["process"] = { :version => "v0.2.0" }
-
-      load_file(cxt, "parse-js")
-      load_file(cxt, "process")
-      begin
-        return generate_code(cxt, ast(cxt, source))
-      rescue Exception => e
-        raise Error.new(e.message)
-      end
-    end
+    str = stringify(source)
+
+    if @options[:copyright]
+      copyright(str)
+    else
+      ""
+    end << generate_code(ast(str))
+  rescue V8::JSError => e
+    raise Error.new(e.message)
   end
 
   def self.compile(source, options = {})
@@ -50,46 +50,58 @@ class Uglifier
 
   private
 
-  def generate_code(cxt, ast)
-    cxt["gen_code"].call(ast, @options[:beautify] && @options[:beautify_options])
+  def stringify(source)
+    if source.respond_to? :read
+      source.read
+    else
+      source.to_s
+    end
   end
 
-  def ast(cxt, source)
-    squeeze_unsafe(cxt, squeeze(cxt, mangle(cxt, cxt["parse"].call(source))))
+  def copyright(source)
+    comments = []
+    
+    tokens = @tokenizer.call(source, false)
+    comment = tokens.call
+    prev = nil
+
+    while (comment["type"].match(/^comment/) && (!prev || prev == comment["type"]))
+      comments << if comment["type"] == "comment1"
+        "//#{comment["value"]}\n"
+      else
+        "/*#{comment["value"]}*/\n"
+      end
+      prev = comment["type"]
+      comment = tokens.call
+    end
+    comments.join
   end
 
-  def mangle(cxt, ast)
+  def generate_code(ast)
+    @node["gen_code"].call(ast, @options[:beautify] && @options[:beautify_options])
+  end
+
+  def ast(source)
+    squeeze_unsafe(squeeze(mangle(@node["parse"].call(source))))
+  end
+
+  def mangle(ast)
     return ast unless @options[:mangle]
-    cxt["ast_mangle"].call(ast, @options[:toplevel])
+    @node["ast_mangle"].call(ast, @options[:toplevel])
   end
 
-  def squeeze(cxt, ast)
+  def squeeze(ast)
     return ast unless @options[:squeeze]
 
-    cxt["ast_squeeze"].call(ast, {
+    @node["ast_squeeze"].call(ast, {
       "make_seqs" => @options[:seqs],
       "dead_code" => @options[:dead_code],
       "extra" => @options[:extra]
     })
   end
 
-  def squeeze_unsafe(cxt, ast)
+  def squeeze_unsafe(ast)
     return ast unless @options[:unsafe]
-    cxt["ast_squeeze_more"].call(ast)
-  end
-
-  def load_file(cxt, file)
-    old = cxt["exports"]
-    cxt["exports"] = {}
-    cxt["require"] = lambda {|r|
-      @exports[File.basename(r, ".js")] || begin
-        @exports[file] = cxt["exports"] # Prevent circular dependencies
-        load_file(cxt, File.basename(r, ".js"))
-      end
-    }
-    cxt.load(File.join(File.dirname(__FILE__), "..", "vendor", "uglifyjs", "lib", File.basename(file, ".js") + ".js"))
-    @exports[file] = cxt["exports"]
-    cxt["exports"] = old
-    @exports[file]
+    @node["ast_squeeze_more"].call(ast)
   end
 end

data/lib/uglifier/cli.rb

@@ -0,0 +1,62 @@
+require 'optparse'
+
+class Uglifier
+  module Cli
+    def self.run!
+      options = {}
+      OptionParser.new do |opts|
+        opts.banner = "Usage: uglifier [options] file1 file2 ..."
+
+        opts.on("-M", "--no-mangle", "Don't mangle variable names") do |m|
+          options[:mangle] = m
+        end
+
+        opts.on("-t", "--toplevel", "Mangle top-level variable names") do |m|
+          options[:toplevel] = m
+        end
+
+        opts.on("-S", "--no-squeeze", "Squeeze code resulting in smaller, but less-readable code") do |s|
+          options[:squeeze] = s
+        end
+
+        opts.on("-Q", "--no-seqs", "Reduce consecutive statements in blocks into single statement") do |q|
+          options[:seqs] = q
+        end
+
+        opts.on("-d", "--[no-]dead-code", "Remove dead code (e.g. after return)") do |d|
+          options[:dead_code] = d
+        end
+
+        opts.on("-x", "--extra-optimizations", "Additional and potentially unsafe optimizations") do |x|
+          options[:extra] = x
+        end
+
+        opts.on("-u", "--unsafe-optimizations", "Optimizations known to be unsafe in some situations") do |d|
+          options[:unsafe] = d
+        end
+
+        opts.on("-C", "--no-copyright", "Omit copyright information") do |d|
+          options[:copyright] = d
+        end
+
+        opts.on("-b", "--beautify", "Output indented code") do |d|
+          options[:beautify] = d
+        end
+
+        opts.on("-v", "--verbose", "Run verbosely") do |v|
+          options[:verbose] = v
+        end
+      end.parse!
+
+      uglifier = Uglifier.new(options)
+      if ARGV[0]
+        ARGV.each do |f|
+          puts uglifier.compile(File.open(f, 'r'))
+        end
+      else
+        puts uglifier.compile($stdin)
+      end
+      true
+    end
+  end
+end

data/lib/uglifier/node.rb

@@ -0,0 +1,24 @@
+require "v8"
+
+class Uglifier
+  class Node < V8::Context
+    def initialize(*args, &blk)
+      @exports = {}
+      super(*args, &blk)
+    end
+    def require(file)
+      old = self["exports"]
+      self["exports"] = {}
+      self["require"] = lambda {|r|
+        @exports[File.basename(r, ".js")] || begin
+          @exports[file] = self["exports"] # Prevent circular dependencies
+          self.require(File.basename(r, ".js"))
+        end
+      }
+      load(File.join(File.dirname(__FILE__), "..", "..", "vendor", "uglifyjs", "lib", File.basename(file, ".js") + ".js"))
+      @exports[file] = self["exports"]
+      self["exports"] = old
+      @exports[file]
+    end
+  end
+end

data/spec/uglifier_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Uglifier" do
   it "minifies JS" do
-    source = File.read("vendor/uglifyjs/lib/parse-js.js")
+    source = File.read("vendor/uglifyjs/lib/process.js")
     minified = Uglifier.new.compile(source)
     minified.length.should < source.length
     lambda {
@@ -16,8 +16,8 @@ describe "Uglifier" do
     }.should raise_error(Uglifier::Error)
   end
 
-  it "logs to output" do
-    $stdout.should_receive(:write).at_least(:once)
+  it "logs to stderr" do
+    $stderr.should_receive(:write).at_least(:once)
     lambda {
       Uglifier.new.compile("function uglifyThis() {
         return;
@@ -26,6 +26,38 @@ describe "Uglifier" do
     }.should_not raise_error(Uglifier::Error)
   end
 
+  describe "Copyright Preservation" do
+    before :all do
+      @source = <<-EOS
+        /* Copyright Notice */
+        /* (c) 2011 */
+        // REMOVED
+        function identity(p) { return p; }
+      EOS
+      @minified = Uglifier.compile(@source, :copyright => true)
+    end
+
+    it "preserves copyright notice" do
+      @minified.should match /Copyright Notice/
+    end
+
+    it "handles multiple copyright blocks" do
+      @minified.should match /\(c\) 2011/
+    end
+
+    it "doesn't include different comment types" do
+      @minified.should_not match /REMOVED/
+    end
+
+    it "puts comments on own lines" do
+      @minified.split("\n").should have(3).items
+    end
+
+    it "omits copyright notification if copyright parameter is set to false" do
+      Uglifier.compile(@source, :copyright => false).should_not match /Copyright/
+    end
+  end
+
   it "does additional squeezing when unsafe options is true" do
     unsafe_input = "function a(b){b.toString();}"
     Uglifier.new(:unsafe => true).compile(unsafe_input).length.should < Uglifier.new(:unsafe => false).compile(unsafe_input).length
@@ -40,4 +72,18 @@ describe "Uglifier" do
     code = "function a(a){if(a) { return 0; } else { return 1; }}"
     Uglifier.compile(code, :squeeze => false).length.should > Uglifier.compile(code, :squeeze => true).length
   end
+
+  describe "Input Formats" do
+    it "handles strings" do
+      lambda {
+        Uglifier.new.compile(File.read("vendor/uglifyjs/lib/process.js")).should_not be_empty
+      }.should_not raise_error
+    end
+
+    it "handles files" do
+      lambda {
+        Uglifier.new.compile(File.open("vendor/uglifyjs/lib/process.js", "r")).should_not be_empty
+      }.should_not raise_error
+    end
+  end
 end

data/uglifier.gemspec

@@ -1,16 +1,18 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{uglifier}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ville Lautanala"]
-  s.date = %q{2010-11-24}
+  s.date = %q{2011-01-06}
+  s.default_executable = %q{uglify}
   s.email = %q{lautis@gmail.com}
+  s.executables = ["uglify"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -24,7 +26,10 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "bin/uglify",
     "lib/uglifier.rb",
+    "lib/uglifier/cli.rb",
+    "lib/uglifier/node.rb",
     "spec/spec_helper.rb",
     "spec/uglifier_spec.rb",
     "uglifier.gemspec",
@@ -46,10 +51,10 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<therubyracer>, [">= 0.7.5"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_runtime_dependency(%q<therubyracer>, [">= 0.8.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<therubyracer>, [">= 0.7.5"])
       s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
@@ -57,10 +62,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<therubyracer>, [">= 0.7.5"])
-      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_dependency(%q<therubyracer>, [">= 0.8.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<therubyracer>, [">= 0.7.5"])
       s.add_dependency(%q<rspec>, ["~> 2.0.0"])
@@ -69,10 +74,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<therubyracer>, [">= 0.7.5"])
-    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+    s.add_dependency(%q<therubyracer>, [">= 0.8.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.0"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<therubyracer>, [">= 0.7.5"])
     s.add_dependency(%q<rspec>, ["~> 2.0.0"])

data/vendor/uglifyjs/lib/parse-js.js

@@ -24,29 +24,36 @@
                          <mihai.bazon@gmail.com>
                        http://mihai.bazon.net/blog
 
-  Distributed under the same terms as the original code (ZLIB license):
+  Distributed under the BSD license:
 
     Copyright 2010 (c) Mihai Bazon <mihai.bazon@gmail.com>
     Based on parse-js (http://marijn.haverbeke.nl/parse-js/).
 
-    This software is provided 'as-is', without any express or implied
-    warranty. In no event will the authors be held liable for any
-    damages arising from the use of this software.
-
-    Permission is granted to anyone to use this software for any
-    purpose, including commercial applications, and to alter it and
-    redistribute it freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must
-       not claim that you wrote the original software. If you use this
-       software in a product, an acknowledgment in the product
-       documentation would be appreciated but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must
-       not be misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source
-       distribution.
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+        * Redistributions of source code must retain the above
+          copyright notice, this list of conditions and the following
+          disclaimer.
+
+        * Redistributions in binary form must reproduce the above
+          copyright notice, this list of conditions and the following
+          disclaimer in the documentation and/or other materials
+          provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY
+    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
+    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+    TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+    THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
 
  ***********************************************************************/
 
@@ -118,7 +125,8 @@ var KEYWORDS_BEFORE_EXPRESSION = array_to_hash([
         "new",
         "delete",
         "throw",
-        "else"
+        "else",
+        "case"
 ]);
 
 var KEYWORDS_ATOM = array_to_hash([
@@ -414,6 +422,7 @@ function tokenizer($TEXT, skip_comments) {
                             text = S.text.substring(S.pos, i),
                             tok = token("comment2", text);
                         S.pos = i + 2;
+                        S.line += text.split("\n").length - 1;
                         S.newline_before = text.indexOf("\n") >= 0;
                         return tok;
                 });
@@ -1031,10 +1040,14 @@ function parse($TEXT, strict_mode, embed_tokens) {
                         if (!strict_mode && is("punc", "}"))
                                 // allow trailing comma
                                 break;
+                        var type = S.token.type;
                         var name = as_property_name();
-                        expect(":");
-                        var value = expression(false);
-                        a.push([ name, value ]);
+                        if (type == "name" && (name == "get" || name == "set") && !is("punc", ":")) {
+                                a.push([ as_name(), function_(false), name ]);
+                        } else {
+                                expect(":");
+                                a.push([ name, expression(false) ]);
+                        }
                 }
                 next();
                 return as("object", a);

data/vendor/uglifyjs/lib/process.js

@@ -27,28 +27,35 @@
                          <mihai.bazon@gmail.com>
                        http://mihai.bazon.net/blog
 
-  Distributed under a ZLIB license:
+  Distributed under the BSD license:
 
     Copyright 2010 (c) Mihai Bazon <mihai.bazon@gmail.com>
 
-    This software is provided 'as-is', without any express or implied
-    warranty. In no event will the authors be held liable for any
-    damages arising from the use of this software.
-
-    Permission is granted to anyone to use this software for any
-    purpose, including commercial applications, and to alter it and
-    redistribute it freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must
-       not claim that you wrote the original software. If you use this
-       software in a product, an acknowledgment in the product
-       documentation would be appreciated but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must
-       not be misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source
-       distribution.
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+        * Redistributions of source code must retain the above
+          copyright notice, this list of conditions and the following
+          disclaimer.
+
+        * Redistributions in binary form must reproduce the above
+          copyright notice, this list of conditions and the following
+          disclaimer in the documentation and/or other materials
+          provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY
+    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
+    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+    TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+    THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
 
  ***********************************************************************/
 
@@ -58,13 +65,11 @@ var jsp = require("./parse-js"),
     PRECEDENCE = jsp.PRECEDENCE,
     OPERATORS = jsp.OPERATORS;
 
-var sys = require(/^v0\.[012]/.test(process.version) ? "sys" : "util");
-
 /* -----[ helper for AST traversal ]----- */
 
 function ast_walker(ast) {
         function _vardefs(defs) {
-                return defs.map(function(def){
+                return MAP(defs, function(def){
                         var a = [ def[0] ];
                         if (def.length > 1)
                                 a[1] = walk(def[1]);
@@ -82,12 +87,12 @@ function ast_walker(ast) {
                         return [ "name", name ];
                 },
                 "toplevel": function(statements) {
-                        return [ "toplevel", statements.map(walk) ];
+                        return [ "toplevel", MAP(statements, walk) ];
                 },
                 "block": function(statements) {
                         var out = [ "block" ];
                         if (statements != null)
-                                out.push(statements.map(walk));
+                                out.push(MAP(statements, walk));
                         return out;
                 },
                 "var": function(defs) {
@@ -99,21 +104,21 @@ function ast_walker(ast) {
                 "try": function(t, c, f) {
                         return [
                                 "try",
-                                t.map(walk),
-                                c != null ? [ c[0], c[1].map(walk) ] : null,
-                                f != null ? f.map(walk) : null
+                                MAP(t, walk),
+                                c != null ? [ c[0], MAP(c[1], walk) ] : null,
+                                f != null ? MAP(f, walk) : null
                         ];
                 },
                 "throw": function(expr) {
                         return [ "throw", walk(expr) ];
                 },
                 "new": function(ctor, args) {
-                        return [ "new", walk(ctor), args.map(walk) ];
+                        return [ "new", walk(ctor), MAP(args, walk) ];
                 },
                 "switch": function(expr, body) {
-                        return [ "switch", walk(expr), body.map(function(branch){
+                        return [ "switch", walk(expr), MAP(body, function(branch){
                                 return [ branch[0] ? walk(branch[0]) : null,
-                                         branch[1].map(walk) ];
+                                         MAP(branch[1], walk) ];
                         }) ];
                 },
                 "break": function(label) {
@@ -132,13 +137,13 @@ function ast_walker(ast) {
                         return [ "dot", walk(expr) ].concat(slice(arguments, 1));
                 },
                 "call": function(expr, args) {
-                        return [ "call", walk(expr), args.map(walk) ];
+                        return [ "call", walk(expr), MAP(args, walk) ];
                 },
                 "function": function(name, args, body) {
-                        return [ "function", name, args.slice(), body.map(walk) ];
+                        return [ "function", name, args.slice(), MAP(body, walk) ];
                 },
                 "defun": function(name, args, body) {
-                        return [ "defun", name, args.slice(), body.map(walk) ];
+                        return [ "defun", name, args.slice(), MAP(body, walk) ];
                 },
                 "if": function(conditional, t, e) {
                         return [ "if", walk(conditional), walk(t), walk(e) ];
@@ -171,21 +176,23 @@ function ast_walker(ast) {
                         return [ "sub", walk(expr), walk(subscript) ];
                 },
                 "object": function(props) {
-                        return [ "object", props.map(function(p){
-                                return [ p[0], walk(p[1]) ];
+                        return [ "object", MAP(props, function(p){
+                                return p.length == 2
+                                        ? [ p[0], walk(p[1]) ]
+                                        : [ p[0], walk(p[1]), p[2] ]; // get/set-ter
                         }) ];
                 },
                 "regexp": function(rx, mods) {
                         return [ "regexp", rx, mods ];
                 },
                 "array": function(elements) {
-                        return [ "array", elements.map(walk) ];
+                        return [ "array", MAP(elements, walk) ];
                 },
                 "stat": function(stat) {
                         return [ "stat", walk(stat) ];
                 },
                 "seq": function() {
-                        return [ "seq" ].concat(slice(arguments).map(walk));
+                        return [ "seq" ].concat(MAP(slice(arguments), walk));
                 },
                 "label": function(name, block) {
                         return [ "label", name, walk(block) ];
@@ -225,13 +232,12 @@ function ast_walker(ast) {
                         save[i] = user[i];
                         user[i] = walkers[i];
                 }
-                try { return cont(); }
-                finally {
-                        for (i in save) if (HOP(save, i)) {
-                                if (!save[i]) delete user[i];
-                                else user[i] = save[i];
-                        }
+                var ret = cont();
+                for (i in save) if (HOP(save, i)) {
+                        if (!save[i]) delete user[i];
+                        else user[i] = save[i];
                 }
+                return ret;
         };
 
         return {
@@ -377,8 +383,8 @@ function ast_add_scope(ast) {
 
         function _lambda(name, args, body) {
                 return [ this[0], define(name), args, with_new_scope(function(){
-                        args.map(define);
-                        return body.map(walk);
+                        MAP(args, define);
+                        return MAP(body, walk);
                 })];
         };
 
@@ -392,17 +398,17 @@ function ast_add_scope(ast) {
                                         s.uses_with = true;
                         },
                         "var": function(defs) {
-                                defs.map(function(d){ define(d[0]) });
+                                MAP(defs, function(d){ define(d[0]) });
                         },
                         "const": function(defs) {
-                                defs.map(function(d){ define(d[0]) });
+                                MAP(defs, function(d){ define(d[0]) });
                         },
                         "try": function(t, c, f) {
                                 if (c != null) return [
                                         "try",
-                                        t.map(walk),
-                                        [ define(c[0]), c[1].map(walk) ],
-                                        f != null ? f.map(walk) : null
+                                        MAP(t, walk),
+                                        [ define(c[0]), MAP(c[1], walk) ],
+                                        f != null ? MAP(f, walk) : null
                                 ];
                         },
                         "name": function(name) {
@@ -424,7 +430,7 @@ function ast_add_scope(ast) {
                 // scopes where eval was detected and their parents
                 // are marked with uses_eval, unless they define the
                 // "eval" name.
-                having_eval.map(function(scope){
+                MAP(having_eval, function(scope){
                         if (!scope.has("eval")) while (scope) {
                                 scope.uses_eval = true;
                                 scope = scope.parent;
@@ -466,8 +472,8 @@ function ast_mangle(ast, do_toplevel) {
         function _lambda(name, args, body) {
                 if (name) name = get_mangled(name);
                 body = with_scope(body.scope, function(){
-                        args = args.map(function(name){ return get_mangled(name) });
-                        return body.map(walk);
+                        args = MAP(args, function(name){ return get_mangled(name) });
+                        return MAP(body, walk);
                 });
                 return [ this[0], name, args, body ];
         };
@@ -478,19 +484,32 @@ function ast_mangle(ast, do_toplevel) {
                 for (var i in s.names) if (HOP(s.names, i)) {
                         get_mangled(i, true);
                 }
-                try { var ret = cont(); ret.scope = s; return ret; }
-                finally { scope = _scope; };
+                var ret = cont();
+                ret.scope = s;
+                scope = _scope;
+                return ret;
         };
 
         function _vardefs(defs) {
-                return defs.map(function(d){
+                return MAP(defs, function(d){
                         return [ get_mangled(d[0]), walk(d[1]) ];
                 });
         };
 
         return w.with_walkers({
                 "function": _lambda,
-                "defun": _lambda,
+                "defun": function() {
+                        // move function declarations to the top when
+                        // they are not in some block.
+                        var ast = _lambda.apply(this, arguments);
+                        switch (w.parent()[0]) {
+                            case "toplevel":
+                            case "function":
+                            case "defun":
+                                return MAP.at_top(ast);
+                        }
+                        return ast;
+                },
                 "var": function(defs) {
                         return [ "var", _vardefs(defs) ];
                 },
@@ -502,13 +521,13 @@ function ast_mangle(ast, do_toplevel) {
                 },
                 "try": function(t, c, f) {
                         return [ "try",
-                                 t.map(walk),
-                                 c != null ? [ get_mangled(c[0]), c[1].map(walk) ] : null,
-                                 f != null ? f.map(walk) : null ];
+                                 MAP(t, walk),
+                                 c != null ? [ get_mangled(c[0]), MAP(c[1], walk) ] : null,
+                                 f != null ? MAP(f, walk) : null ];
                 },
                 "toplevel": function(body) {
                         return with_scope(this.scope, function(){
-                                return [ "toplevel", body.map(walk) ];
+                                return [ "toplevel", MAP(body, walk) ];
                         });
                 },
                 "for-in": function(has_var, name, obj, stat) {
@@ -530,9 +549,7 @@ function ast_mangle(ast, do_toplevel) {
      - if (foo) return bar(); else something();  ==> {if(foo)return bar();something()}
    ]----- */
 
-function warn(msg) {
-        sys.debug(msg);
-};
+var warn = function(){};
 
 function best_of(ast1, ast2) {
         return gen_code(ast1).length > gen_code(ast2[0] == "stat" ? ast2[1] : ast2).length ? ast2 : ast1;
@@ -556,13 +573,7 @@ function negate(c) {
         var not_c = [ "unary-prefix", "!", c ];
         switch (c[0]) {
             case "unary-prefix":
-                return c[1] == "!" ? c[2] : c;
-            case "atom":
-                switch (c[1]) {
-                    case "false": return [ "num", 0 ];
-                    case "true": return [ "num", 1 ];
-                }
-                break;
+                return c[1] == "!" ? c[2] : not_c;
             case "binary":
                 var op = c[1], left = c[2], right = c[3];
                 switch (op) {
@@ -602,7 +613,16 @@ function ast_squeeze(ast, options) {
                 extra       : false
         });
 
-        var w = ast_walker(), walk = w.walk;
+        var w = ast_walker(), walk = w.walk, scope;
+
+        function with_scope(s, cont) {
+                var _scope = scope;
+                scope = s;
+                var ret = cont();
+                ret.scope = s;
+                scope = _scope;
+                return ret;
+        };
 
         function is_constant(node) {
                 return node[0] == "string" || node[0] == "num";
@@ -667,7 +687,7 @@ function ast_squeeze(ast, options) {
 
         function clone(obj) {
                 if (obj && obj.constructor == Array)
-                        return obj.map(clone);
+                        return MAP(obj, clone);
                 return obj;
         };
 
@@ -690,7 +710,9 @@ function ast_squeeze(ast, options) {
         };
 
         function _lambda(name, args, body) {
-                return [ this[0], name, args, tighten(body.map(walk), "lambda") ];
+                return [ this[0], name, args, with_scope(body.scope, function(){
+                        return tighten(MAP(body, walk), "lambda");
+                }) ];
         };
 
         // we get here for blocks that have been already transformed.
@@ -925,12 +947,14 @@ function ast_squeeze(ast, options) {
                 },
                 "if": make_if,
                 "toplevel": function(body) {
-                        return [ "toplevel", tighten(body.map(walk)) ];
+                        return [ "toplevel", with_scope(this.scope, function(){
+                                return tighten(MAP(body, walk));
+                        }) ];
                 },
                 "switch": function(expr, body) {
                         var last = body.length - 1;
-                        return [ "switch", walk(expr), body.map(function(branch, i){
-                                var block = tighten(branch[1].map(walk));
+                        return [ "switch", walk(expr), MAP(body, function(branch, i){
+                                var block = tighten(MAP(branch[1], walk));
                                 if (i == last && block.length > 0) {
                                         var node = block[block.length - 1];
                                         if (node[0] == "break" && !node[1])
@@ -942,7 +966,7 @@ function ast_squeeze(ast, options) {
                 "function": _lambda,
                 "defun": _lambda,
                 "block": function(body) {
-                        if (body) return rmblock([ "block", tighten(body.map(walk)) ]);
+                        if (body) return rmblock([ "block", tighten(MAP(body, walk)) ]);
                 },
                 "binary": function(op, left, right) {
                         left = walk(left);
@@ -975,17 +999,45 @@ function ast_squeeze(ast, options) {
                 "try": function(t, c, f) {
                         return [
                                 "try",
-                                tighten(t.map(walk)),
-                                c != null ? [ c[0], tighten(c[1].map(walk)) ] : null,
-                                f != null ? tighten(f.map(walk)) : null
+                                tighten(MAP(t, walk)),
+                                c != null ? [ c[0], tighten(MAP(c[1], walk)) ] : null,
+                                f != null ? tighten(MAP(f, walk)) : null
                         ];
                 },
                 "unary-prefix": function(op, cond) {
-                        if (op == "!")
+                        if (op == "!") {
+                                cond = walk(cond);
+                                if (cond[0] == "unary-prefix" && cond[1] == "!") {
+                                        var p = w.parent();
+                                        if (p[0] == "unary-prefix" && p[1] == "!")
+                                                return cond[2];
+                                        return [ "unary-prefix", "!", cond ];
+                                }
                                 return best_of(this, negate(cond));
+                        }
+                },
+                "name": function(name) {
+                        switch (name) {
+                            case "true": return [ "unary-prefix", "!", [ "num", 0 ]];
+                            case "false": return [ "unary-prefix", "!", [ "num", 1 ]];
+                        }
+                },
+                "new": function(ctor, args) {
+                        if (ctor[0] == "name" && ctor[1] == "Array" && !scope.has("Array")) {
+                                if (args.length != 1) {
+                                        return [ "array", args ];
+                                } else {
+                                        return [ "call", [ "name", "Array" ], args ];
+                                }
+                        }
+                },
+                "call": function(expr, args) {
+                        if (expr[0] == "name" && expr[1] == "Array" && args.length != 1 && !scope.has("Array")) {
+                                return [ "array", args ];
+                        }
                 }
         }, function() {
-                return walk(ast);
+                return walk(ast_add_scope(ast));
         });
 };
 
@@ -1001,6 +1053,28 @@ var DOT_CALL_NO_PARENS = jsp.array_to_hash([
         "regexp"
 ]);
 
+function make_string(str) {
+        var dq = 0, sq = 0;
+        str = str.replace(/[\\\b\f\n\r\t\x22\x27]/g, function(s){
+                switch (s) {
+                    case "\\": return "\\\\";
+                    case "\b": return "\\b";
+                    case "\f": return "\\f";
+                    case "\n": return "\\n";
+                    case "\r": return "\\r";
+                    case "\t": return "\\t";
+                    case '"': ++dq; return '"';
+                    case "'": ++sq; return "'";
+                }
+                return s;
+        });
+        if (dq > sq) {
+                return "'" + str.replace(/\x27/g, "\\'") + "'";
+        } else {
+                return '"' + str.replace(/\x22/g, '\\"') + '"';
+        }
+};
+
 function gen_code(ast, beautify) {
         if (beautify) beautify = defaults(beautify, {
                 indent_start : 0,
@@ -1120,10 +1194,10 @@ function gen_code(ast, beautify) {
                 },
                 "block": make_block,
                 "var": function(defs) {
-                        return "var " + add_commas(defs.map(make_1vardef)) + ";";
+                        return "var " + add_commas(MAP(defs, make_1vardef)) + ";";
                 },
                 "const": function(defs) {
-                        return "const " + add_commas(defs.map(make_1vardef)) + ";";
+                        return "const " + add_commas(MAP(defs, make_1vardef)) + ";";
                 },
                 "try": function(tr, ca, fi) {
                         var out = [ "try", make_block(tr) ];
@@ -1135,7 +1209,7 @@ function gen_code(ast, beautify) {
                         return add_spaces([ "throw", make(expr) ]) + ";";
                 },
                 "new": function(ctor, args) {
-                        args = args.length > 0 ? "(" + add_commas(args.map(make)) + ")" : "";
+                        args = args.length > 0 ? "(" + add_commas(MAP(args, make)) + ")" : "";
                         return add_spaces([ "new", parenthesize(ctor, "seq", "binary", "conditional", "assign", function(expr){
                                 var w = ast_walker(), has_call = {};
                                 try {
@@ -1189,7 +1263,9 @@ function gen_code(ast, beautify) {
                         var f = make(func);
                         if (needs_parens(func))
                                 f = "(" + f + ")";
-                        return f + "(" + add_commas(args.map(make)) + ")";
+                        return f + "(" + add_commas(MAP(args, function(expr){
+                                return parenthesize(expr, "seq");
+                        })) + ")";
                 },
                 "function": make_function,
                 "defun": make_function,
@@ -1265,7 +1341,12 @@ function gen_code(ast, beautify) {
                         if (props.length == 0)
                                 return "{}";
                         return "{" + newline + with_indent(function(){
-                                return props.map(function(p){
+                                return MAP(props, function(p){
+                                        if (p.length == 3) {
+                                                // getter/setter.  The name is in p[0], the arg.list in p[1][2], the
+                                                // body in p[1][3] and type ("get" / "set") in p[2].
+                                                return indent(make_function(p[0], p[1][2], p[1][3], p[2]));
+                                        }
                                         var key = p[0], val = make(p[1]);
                                         if (beautify && beautify.quote_keys) {
                                                 key = make_string(key);
@@ -1285,13 +1366,15 @@ function gen_code(ast, beautify) {
                 },
                 "array": function(elements) {
                         if (elements.length == 0) return "[]";
-                        return add_spaces([ "[", add_commas(elements.map(make)), "]" ]);
+                        return add_spaces([ "[", add_commas(MAP(elements, function(el){
+                                return parenthesize(el, "seq");
+                        })), "]" ]);
                 },
                 "stat": function(stmt) {
                         return make(stmt).replace(/;*\s*$/, ";");
                 },
                 "seq": function() {
-                        return add_commas(slice(arguments).map(make));
+                        return add_commas(MAP(slice(arguments), make));
                 },
                 "label": function(name, block) {
                         return add_spaces([ make_name(name), ":", make(block) ]);
@@ -1341,39 +1424,16 @@ function gen_code(ast, beautify) {
                 return make(th);
         };
 
-        function make_function(name, args, body) {
-                var out = "function";
+        function make_function(name, args, body, keyword) {
+                var out = keyword || "function";
                 if (name) {
                         out += " " + make_name(name);
                 }
-                out += "(" + add_commas(args.map(make_name)) + ")";
+                out += "(" + add_commas(MAP(args, make_name)) + ")";
                 return add_spaces([ out, make_block(body) ]);
         };
 
-        function make_string(str) {
-                // return '"' +
-                //         str.replace(/\x5c/g, "\\\\")
-                //         .replace(/\r?\n/g, "\\n")
-                //         .replace(/\t/g, "\\t")
-                //         .replace(/\r/g, "\\r")
-                //         .replace(/\f/g, "\\f")
-                //         .replace(/[\b]/g, "\\b")
-                //         .replace(/\x22/g, "\\\"")
-                //         .replace(/[\x00-\x1f]|[\x80-\xff]/g, function(c){
-                //                 var hex = c.charCodeAt(0).toString(16);
-                //                 if (hex.length < 2)
-                //                         hex = "0" + hex;
-                //                 return "\\x" + hex;
-                //         })
-                //         + '"';
-                return JSON.stringify(str); // STILL cheating.
-        };
-
         function make_name(name) {
-                switch (name) {
-                    case "true": return beautify ? "true" : "!0";
-                    case "false": return beautify ? "false" : "!1";
-                }
                 return name.toString();
         };
 
@@ -1387,13 +1447,13 @@ function gen_code(ast, beautify) {
                                 a.push(code);
                         }
                 }
-                return a.map(indent);
+                return MAP(a, indent);
         };
 
         function make_switch_block(body) {
                 var n = body.length;
                 if (n == 0) return "{}";
-                return "{" + newline + body.map(function(branch, i){
+                return "{" + newline + MAP(body, function(branch, i){
                         var has_body = branch[1].length > 0, code = with_indent(function(){
                                 return indent(branch[0]
                                               ? add_spaces([ "case", make(branch[0]) + ":" ])
@@ -1471,6 +1531,24 @@ function HOP(obj, prop) {
         return Object.prototype.hasOwnProperty.call(obj, prop);
 };
 
+// some utilities
+
+var MAP;
+
+(function(){
+        MAP = function(a, f, o) {
+                var ret = [];
+                for (var i = 0; i < a.length; ++i) {
+                        var val = f.call(o, a[i], i);
+                        if (val instanceof AtTop) ret.unshift(val.v);
+                        else ret.push(val);
+                }
+                return ret;
+        };
+        MAP.at_top = function(val) { return new AtTop(val) };
+        function AtTop(val) { this.v = val };
+})();
+
 /* -----[ Exports ]----- */
 
 exports.ast_walker = ast_walker;
@@ -1479,3 +1557,4 @@ exports.ast_squeeze = ast_squeeze;
 exports.gen_code = gen_code;
 exports.ast_add_scope = ast_add_scope;
 exports.ast_squeeze_more = require("./squeeze-more").ast_squeeze_more;
+exports.set_logger = function(logger) { warn = logger };

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uglifier
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ville Lautanala
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +02:00
-default_executable: 
+date: 2011-01-06 00:00:00 +02:00
+default_executable: uglify
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -24,12 +24,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 63
         segments: 
         - 0
-        - 7
-        - 5
-        version: 0.7.5
+        - 8
+        - 0
+        version: 0.8.0
   type: :runtime
   name: therubyracer
   prerelease: false
@@ -40,12 +40,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
         - 2
+        - 3
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.3.0
   type: :development
   name: rspec
   prerelease: false
@@ -72,13 +72,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1876988220
+        hash: 3
         segments: 
         - 1
         - 5
         - 0
-        - pre5
-        version: 1.5.0.pre5
+        version: 1.5.0
   type: :development
   name: jeweler
   prerelease: false
@@ -178,8 +177,8 @@ dependencies:
   version_requirements: *id010
 description: 
 email: lautis@gmail.com
-executables: []
-
+executables: 
+- uglify
 extensions: []
 
 extra_rdoc_files: 
@@ -194,7 +193,10 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/uglify
 - lib/uglifier.rb
+- lib/uglifier/cli.rb
+- lib/uglifier/node.rb
 - spec/spec_helper.rb
 - spec/uglifier_spec.rb
 - uglifier.gemspec