Ticket #4695: 4695.patch

test/test.js

@@ -267 +267 @@
 
                 [       "if(a){if(B)doB();}else if(c)doC();" ],
 
+                [       "if(a){for(;;){if(B){doB();}}}else{doC();}",
+                        "if(a)for(;;){if(B)doB();}else doC();"
+                ],
         ];
 
         var tests =

_source/includes/scriptcompressor.js

@@ -623 +623 @@
 
                                 var hasCurly = ( !block || !block.getFirstChild() || !!block.getFirstChild().getNext() );
 
+                                // Avoid single enclosed 'if...elseif' block combines with any 'else/elseif'
+                                // statement following the loop. (#4695)
+                                // E.g. if()for(){if()elseif()}else AND ..elseif()for(){if()}else
+                                if( !hasCurly )
+                                {
+                                        try
+                                        {
+                                                block.getFirstChild().getFirstChild().getType() == Token.IFNE && ( hasCurly = 1 );
+                                        }
+                                        catch( er ){}
+                                }
+
                                 if ( hasCurly )
                                         out( '{' );