Ticket #3504: 3504_2.patch

_source/includes/scriptcompressor.js

@@ -881 +881 @@
                                 {
                                         var id = String( ids[ counter++ ] );
 
-                                        if ( isReserved( id ) || !/^(?:(?:[a-zA-Z$_][\w$_]*)|(?:\d+))$/.test( id ) )
+                                        if ( isReserved( id ) || !/^(?:(?:[a-zA-Z$_][\w$_]*)|(?:0|[1-9]\d*))$/.test( id ) )
                                                 outString( id );
                                         else
                                                 out( id );

test/test.js

@@ -267 +267 @@
 
                 [       "if(a){if(B)doB();}else if(c)doC();" ],
 
+                [       "var a={'0':'0'};",
+                        "var a={0:'0'};" ],
+
+                [       "var a={'1':'1'};",
+                        "var a={1:'1'};" ],
+
+                [       "var a={'0123':'0123'};",
+                        "var a={'0123':'0123'};" ],
+
+                [       "var a={'123':'123'};",
+                        "var a={123:'123'};" ]
         ];
 
         var tests =
@@ -292 +303 @@
         // Create the auto tests.
         function createAutoTest( counter, source, expected )
         {
-                tests[ 'autoTest' + ( counter + 1000 ).toString().substr( 1 ) ] = function()
+                var test = tests[ 'autoTest' + ( counter + 1000 ).toString().substr( 1 ) ] = function()
                 {
                         assertEquals( expected || source, CKPACKAGER.scriptCompressor.compress( source, true, null, true ) );
                 };
+
+                test.source = source;
+                test.expected = expected || source;
         }
 
         for ( var i = 0 ; i < autoTests.length ; i++ )
@@ -312 +326 @@
                 try
                 {
                         tests[ test ]();
-                        print( 'PASSED: ' + test );
+                        print( 'PASSED: (' + test + ') ' + tests[ test ].expected );
                         passCount++;
                 }
                 catch ( error )
                 {
-                        print( 'FAILED: ' + test );
+                        print( 'FAILED: (' + test + ')' );
 
                         if ( !error.expected )
                                 throw error;