Merge branch 'master' of https://github.com/cadorn/uglify-js into cad…

…orn-master
isaacs · Feb 19, 2011 · 57ee9e7 · 57ee9e7
2 parents 15604c4 + 5eaa12f
commit 57ee9e7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+.DS_Store
+.tmp*~
+*.local.*
+.pinf-*
diff --git a/lib/process.js b/lib/process.js
@@ -457,11 +457,13 @@ function ast_add_scope(ast) {
 
 /* -----[ mangle names ]----- */
 
-function ast_mangle(ast, do_toplevel) {
+function ast_mangle(ast, do_toplevel, options) {
         var w = ast_walker(), walk = w.walk, scope;
+        options = options || {};
 
         function get_mangled(name, newMangle) {
                 if (!do_toplevel && !scope.parent) return name; // don't mangle toplevel
+                if (options.reservedNames && options.reservedNames.indexOf(name)!=-1) return name;
                 return scope.get_mangled(name, newMangle);
         };