Ticket #4692: 4692_3.patch

_source/includes/scriptcompressor.js

@@ -76 +76 @@
         precedence[ Token.COMMA ] = 17;
 
         // Tokens having right-to-left associativity.
-        // From http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Operators:Operator_Precedence
+        // From https://developer.mozilla.org/En/Core_JavaScript_1.5_Reference/Operators/Operator_Precedence
         var associativityRTL = {};
         associativityRTL[ Token.SETNAME ] =
         associativityRTL[ Token.SETPROP ] =
@@ -241 +241 @@
                                         if ( child.getFirstChild() )
                                         {
                                                 out( '=' );
+
+                                                if ( child.getFirstChild().getType() == Token.COMMA )
+                                                        out( '(' );
+
                                                 writeChildren( child );
+
+                                                if ( child.getFirstChild().getType() == Token.COMMA )
+                                                        out( ')' );
                                         }
 
                                         scope.declareName( name );
@@ -289 +296 @@
 
                                         default :
                                                 out( '=' );
+
+                                                if ( value.getType() == Token.COMMA )
+                                                        out( '(' );
+
                                                 writeNode( value );
+
+                                                if ( value.getType() == Token.COMMA )
+                                                        out( ')' );
+
                                                 break;
                                 }
 
@@ -429 +444 @@
                                 var param = child.getNext();
                                 while( param )
                                 {
+                                        if ( param.getType() == Token.COMMA )
+                                                out( '(' );
+
                                         if ( !writeNode( param ) )
                                                 break;
 
+                                        if ( param.getType() == Token.COMMA )
+                                                out( ')' );
+
                                         param = param.getNext();
 
                                         if ( param )
@@ -1115 +1136 @@
                                 out( lang[ type ] );
 
                                 // The right side.
-                                if ( !parenthesis )
-                                        parenthesis = ( precedence[ type ] < ( precedence[ right.getType() ] || 0 ) );
+                                parenthesis = ( precedence[ type ] < ( precedence[ right.getType() ] || 0 ) );
 
                                 if ( !parenthesis && !associativityRTL[ type ] && !noAssociativity[ type ] )
                                         parenthesis = ( precedence[ type ] == ( precedence[ right.getType() ] || 0 ) );

test/test.js

@@ -289 +289 @@
                         "var a=b?c:d;" ],
 
                 [       "var a=(b=c)?d:e;" ],
-                                
+
                 [       "if(a){for(;;){if(B){doB();}}}else{doC();}",
-                        "if(a)for(;;){if(B)doB();}else doC();"
-                ]
+                        "if(a)for(;;){if(B)doB();}else doC();" ],
+
+                [       "a((1,2),3);" ],
+
+                [       "(1,2)+3;" ],
+
+                [       "3+(1,2);" ],
+
+                [       "(1,2);", "1,2;" ],
+
+                [       "var a=(1,2,3,4);" ],
+
+                [       "a=(1,2,3,4);" ]
         ];
 
         var tests =