Ticket #5089: 5089.patch

_source/includes/scriptcompressor.js

@@ -267 +267 @@
                                 break;
 
                         case Token.SETNAME :
-                                var name = node.getFirstChild().getString();
+                                var name = node.getFirstChild().getString(),
+                                        value = node.getLastChild();
 
+                                if ( value.getType() == Token.THISFN )
+                                        break;
+
                                 writeNode( node.getFirstChild() );
 
-                                var value = node.getLastChild();
-
                                 switch ( value.getType() )
                                 {
                                         case Token.MUL :
@@ -399 +401 @@
 
                                 out( '}' );
 
-                                if ( name.length() )
+                                if ( name.length() && ( !opt || !opt.noSemiColon ) )
                                         out( ';' );
                                 break;
 
@@ -441 +443 @@
 
                                 out( '(' );
 
-                                var param = child.getNext();
+                                var opt,
+                                        paramType,
+                                        param = child.getNext();
+
                                 while( param )
                                 {
-                                        if ( param.getType() == Token.COMMA )
+                                        paramType = param.getType();
+
+                                        if ( paramType == Token.COMMA )
                                                 out( '(' );
 
-                                        if ( !writeNode( param ) )
+                                        opt = ( paramType == Token.FUNCTION ) ? { noSemiColon : true } : {};
+
+                                        if ( !writeNode( param, opt ) )
                                                 break;
 
-                                        if ( param.getType() == Token.COMMA )
+                                        if ( paramType == Token.COMMA )
                                                 out( ')' );
 
                                         param = param.getNext();
@@ -683 +692 @@
                                 break;
 
                         case Token.EXPR_RESULT :
-                        case Token.EXPR_VOID :
                                 writeChildren( node );
-
                                 if ( !opt || !opt.noSemiColon )
                                         out( ';' );
+                                break;
 
+                        case Token.EXPR_VOID :
+                                writeChildren( node );
+                                if ( !opt || !opt.noSemiColon )
+                                {
+                                        var child = node.getFirstChild();
+                                        if ( child.getType() != Token.SETNAME || child.getLastChild().getType() != Token.THISFN )
+                                                out( ';' );
+                                }
                                 break;
 
                         case Token.GETPROP :
@@ -924 +940 @@
                                                 out( id );
 
                                         out( ':' );
-                                        if ( !writeNode( child ) )
+
+                                        opt = ( child.getType() == Token.FUNCTION ) ? { noSemiColon : true } : {};
+
+                                        if ( !writeNode( child, opt ) )
                                                 break;
 
                                         child = child.getNext();
@@ -960 +979 @@
                                 out( 'return' );
 
                                 if ( value )
-                                        writeNode( value );
+                                {
+                                        opt = ( value.getType() == Token.FUNCTION ) ? { noSemiColon : true } : {};
+                                        writeNode( value, opt );
+                                }
 
                                 out( ';' );
 

test/test.js

@@ -303 +303 @@
 
                 [       "var a=(1,2,3,4);" ],
 
-                [       "a=(1,2,3,4);" ]
+                [       "a=(1,2,3,4);" ],
+
+                [       "app.on('event',function b(a){return a+1;});" ],
+
+                [       "add('a',{a:'2',init:function b(){return false;}});" ],
+
+                [       "function(){function a(){return function b(b){return b+1;};};}" ]
         ];
 
         var tests =