Merge branch 'master' of github.com:mishoo/UglifyJS

fitzgen · Aug 16, 2011 · 43c21c7 · 43c21c7
2 parents 0c67f57 + b6575ef
commit 43c21c7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/lib/parse-js.js b/lib/parse-js.js
@@ -1301,7 +1301,7 @@ function array_to_hash(a) {
 };
 
 function slice(a, start) {
-        return Array.prototype.slice.call(a, start == null ? 0 : start);
+        return Array.prototype.slice.call(a, start || 0);
 };
 
 function characters(str) {

diff --git a/test/unit/compress/expected/empty-blocks.js b/test/unit/compress/expected/empty-blocks.js
@@ -1 +1 @@
-function mak(){for(;;);}function foo(){while(bar());}function bar(){return--x}var x=5
+function bar(){return--x}function foo(){while(bar());}function mak(){for(;;);}var x=5
diff --git a/test/unit/compress/expected/ifreturn2.js b/test/unit/compress/expected/ifreturn2.js
@@ -1 +1 @@
-function y(a){return typeof a=="object"?a:null}function x(a){return typeof a=="object"?a:a===42?0:a*2}
+function x(a){return typeof a=="object"?a:a===42?0:a*2}function y(a){return typeof a=="object"?a:null}
diff --git a/test/unit/compress/expected/issue68.js b/test/unit/compress/expected/issue68.js
@@ -1 +1 @@
-function f(){function b(){}a||b()}
+function f(){function b(){}if(a)return;b()}
diff --git a/test/unit/compress/expected/with.js b/test/unit/compress/expected/with.js
@@ -1 +1 @@
-with({})
+with({});