Ticket #5089: 5089_2.patch

trunk/test/test.js

@@ -309 +309 @@
 
                 [       "var a=(1,2,3,4);" ],
 
-                [       "a=(1,2,3,4);" ]
+                [       "a=(1,2,3,4);" ],
+
+                [       "var A=function B(){var C=1;B();};", "var a=function c(){var b=1;c();};" ],
+
+                [       "var A={foo:function C(){}};", "var a={foo:function b(){}};" ],
+
+                [       "call(function A(){});", "call(function a(){});" ]
         ];
 
         var tests =

trunk/_source/includes/scriptcompressor.js

@@ -368 +368 @@
 
                                 out( 'function' );
 
-                                if ( name.length() )
-                                        out( ' ', scope.getNewName( name, true ) );
-
                                 var currentTree = tree,
                                         fnIndex = node.getExistingIntProp( Node.FUNCTION_PROP ),
                                         fn = tree.getFunctionNode(fnIndex);
 
+                                if ( fn.functionType != 2 && name.length() )
+                                        out( ' ', scope.getNewName( name, 1 ) );
+
                                 scope = new CKPACKAGER.scope( fn, scope );
 
+                                // Named function expression affects only inner scope.
+                                if ( fn.functionType == 2 && name.length() )
+                                {
+                                        scope.declareName( name );
+                                        out( ' ', scope.getNewName( name, 1 ) );
+                                }
+
                                 out( '(' );
 
                                 for ( var i = 0, len = scope.args.length ; i < len ; i++ )
@@ -394 +401 @@
                                         out( 'var ', scope.getNewName( 'this' ), '=this;' );
 
                                 tree = fn;
-                                writeNode( fn.getFirstChild(), { isFunction : true } );
 
+                                var funcBody =  fn.getFirstChild();
+
+                                // Remove the "scope downcast" provided by Rhino.
+                                if ( fn.functionType == 2 && name.length() )
+                                        funcBody.removeChild( funcBody.getFirstChild() );
+
+                                writeNode( funcBody, { isFunction : true } );
+
                                 scope = scope.parent;
                                 tree = currentTree;
 
                                 out( '}' );
 
-                                if ( name.length() )
+                                // No trailing semicolon for function expression.
+                                if ( fn.functionType != 2 && name.length() )
                                         out( ';' );
                                 break;