uglifier 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/uglify.js

@@ -959,8 +959,11 @@ function parse($TEXT, exigent_mode, embed_tokens) {
                         init = is("keyword", "var")
                                 ? (next(), var_(true))
                                 : expression(true, true);
-                        if (is("operator", "in"))
+                        if (is("operator", "in")) {
+                                if (init[0] == "var" && init[1].length > 1)
+                                        croak("Only one variable declaration allowed in for..in loop");
                                 return for_in(init);
+                        }
                 }
                 return regular_for(init);
         };
@@ -2133,7 +2136,9 @@ var when_constant = (function(){
                             case "string": ast =  [ "string", val ]; break;
                             case "number": ast =  [ "num", val ]; break;
                             case "boolean": ast =  [ "name", String(val) ]; break;
-                            default: throw new Error("Can't handle constant of type: " + (typeof val));
+                            default:
+                                if (val === null) { ast = [ "atom", "null" ]; break; }
+                                throw new Error("Can't handle constant of type: " + (typeof val));
                         }
                         return yes.call(expr, ast, val);
                 } catch(ex) {
@@ -2575,6 +2580,16 @@ function ast_squeeze(ast, options) {
                 });
         };
 
+        function abort_else(c, t, e) {
+                var ret = [ [ "if", negate(c), e ] ];
+                if (t[0] == "block") {
+                        if (t[1]) ret = ret.concat(t[1]);
+                } else {
+                        ret.push(t);
+                }
+                return walk([ "block", ret ]);
+        };
+
         function make_real_if(c, t, e) {
                 c = walk(c);
                 t = walk(t);
@@ -2608,9 +2623,10 @@ function ast_squeeze(ast, options) {
                 }
                 else if (t[0] == "stat") {
                         if (e) {
-                                if (e[0] == "stat") {
+                                if (e[0] == "stat")
                                         ret = best_of(ret, [ "stat", make_conditional(c, t[1], e[1]) ]);
-                                }
+                                else if (aborts(e))
+                                        ret = abort_else(c, t, e);
                         }
                         else {
                                 ret = best_of(ret, [ "stat", make_conditional(c, t[1]) ]);
@@ -2630,13 +2646,7 @@ function ast_squeeze(ast, options) {
                         ret = walk([ "block", ret ]);
                 }
                 else if (t && aborts(e)) {
-                        ret = [ [ "if", negate(c), e ] ];
-                        if (t[0] == "block") {
-                                if (t[1]) ret = ret.concat(t[1]);
-                        } else {
-                                ret.push(t);
-                        }
-                        ret = walk([ "block", ret ]);
+                        ret = abort_else(c, t, e);
                 }
                 return ret;
         };

data/uglifier.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "uglifier"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ville Lautanala"]
-  s.date = "2011-12-26"
+  s.date = "2012-01-13"
   s.email = "lautis@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uglifier
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-26 00:00:00.000000000 Z
+date: 2012-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70133427222100 !ruby/object:Gem::Requirement
+  requirement: &70201447760420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70133427222100
+  version_requirements: *70201447760420
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70133427218380 !ruby/object:Gem::Requirement
+  requirement: &70201447759260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70133427218380
+  version_requirements: *70201447759260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70133427310640 !ruby/object:Gem::Requirement
+  requirement: &70201447758600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70133427310640
+  version_requirements: *70201447758600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70133427322320 !ruby/object:Gem::Requirement
+  requirement: &70201447758120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70133427322320
+  version_requirements: *70201447758120
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70133427320800 !ruby/object:Gem::Requirement
+  requirement: &70201447757540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *70133427320800
+  version_requirements: *70201447757540
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70133427318980 !ruby/object:Gem::Requirement
+  requirement: &70201447757000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133427318980
+  version_requirements: *70201447757000
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70133427331540 !ruby/object:Gem::Requirement
+  requirement: &70201447756180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *70133427331540
+  version_requirements: *70201447756180
 description: 
 email: lautis@gmail.com
 executables: []
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1948507962225552578
+      hash: 2894982921452621282
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: