Changeset 2370

Timestamp:

2008-08-20 09:56:39 (5 months ago)

Author:

fredck

Message:

CKCKPackager now passes the YUI code compression.

Location:

CKEditor/branches/prototype/_dev/packager/ckpackager

Files:

• _dev/dump.bat (modified) (1 diff)
• includes/scriptcompressor.js (modified) (5 diffs)
• test/test.js (modified) (1 diff)

CKEditor/branches/prototype/_dev/packager/ckpackager/_dev/dump.bat

@@ -7 +7 @@
 
 java -jar ../js.jar -opt -1 ../ckpackager.js -dump script.js
+
+:: To save the output to file
+:: java -jar ../js.jar -opt -1 ../ckpackager.js -dump script.js > dump.txt

CKEditor/branches/prototype/_dev/packager/ckpackager/includes/scriptcompressor.js

@@ -85 +85 @@
                 {
                         var first = String( arguments[ 0 ] );
+                        first = first.substr( 0, 1 );
 
                         if (
-                                ( first == '++' && out.last == '+' ) ||
-                                ( first == '--' && out.last == '-' ) ||
-                                ( out.last == '++' && first == '+' ) ||
-                                ( out.last == '--' && first == '-' ) ||
-                                ( out.mayNeedSpace && !noSpaceChars[ first.substr( 0, 1 ) ] ) )
+                                ( first == '+' && out.last == '+' ) ||
+                                ( first == '-' && out.last == '-' ) ||
+                                ( out.mayNeedSpace && !noSpaceChars[ first ] && !noSpaceChars[ out.last ] ) )
                         {
                                 output.push( ' ' );
@@ -98 +97 @@
                 }
 
-                var last = out.last = String( arguments[ arguments.length - 1 ] );
-                out.mayNeedSpace = ( last == '++' || last == '--' || !noSpaceChars[ last.substr( last.length - 1 ) ] );
+                var last = String( arguments[ arguments.length - 1 ] );
+                last = out.last = last.substr( last.length - 1 );
+                out.mayNeedSpace = ( last == '+' || last == '-' || !noSpaceChars[ last ] );
 
                 for ( var i = 0 ; i < arguments.length ; i++ )
@@ -484 +484 @@
 
                                                 if ( expression.getFirstChild().getType() != Token.TRUE )
-                                                        writeNode( expression );
+                                                        writeNode( expression, { noSemiColon : true } );
 
                                                 out( ';' );
 
-                                                writeNode( incrementExpression );
-
-                                                // Removes the ";" sent by EXPR_VOID.
-                                                output.pop();
-                                                outputSize--;
+                                                writeNode( incrementExpression, { noSemiColon : true } );
 
                                                 out( ')' );
@@ -545 +541 @@
                                         {
                                                 out( ';' );
-                                                writeNode( child.target.getNext() );
+                                                writeNode( child.target.getNext(), { noSemiColon : true } );
                                                 out( ';' );
 
@@ -555 +551 @@
                                                 if ( incrementExpression.getType() == Token.EXPR_VOID )
                                                 {
-                                                        writeNode( incrementExpression );
-
-                                                        // Removes the ";" sent by EXPR_VOID.
-                                                        output.pop();
-                                                        outputSize--;
+                                                        writeNode( incrementExpression, { noSemiColon : true } );
                                                 }
                                         }

CKEditor/branches/prototype/_dev/packager/ckpackager/test/test.js

@@ -249 +249 @@
                 [       "o={'\\b':'\\\\b','\\t':'\\\\t','\\n':'\\\\n','\\f':'\\\\f','\\r':'\\\\r','\"':'\\\\\"','\\\\':'\\\\\\\\'};" ],
 
-                [       "if(a){}else{}" ]
+                [       "if(a){}else{}" ],
+                
+                [       "a=b+c*1;",
+                        "a=b+ +c;" ]
         ];