Changeset 2268 for FCKpackager/trunk

Timestamp:

2008-07-23 14:29:20 (4 months ago)

Author:

fredck

Message:

Fixed #1422 : Multiple variables declared in a single "var" statement are now properly renamed by the compressor.
This fix impacted also in the renaming of nested functions.

Location:

FCKpackager/trunk

Files:

• fckpackager.exe (modified) (previous)
• fckpackager.php (modified) (8 diffs)
• _source/includes/fckfunctionprocessor.inc (modified) (4 diffs)
• _source/includes/fckjavascriptcompressor.inc (modified) (1 diff)

FCKpackager/trunk/fckpackager.php

@@ -1 @@
-#!/usr/bin/php -q
+#!/usr/bin/php -q
 <?php
 /*
@@ -224 +224 @@
                         $processed = $this->_ProcessVars( $processed, $this->_Parameters ) ;
 
-                $numVarMatches = preg_match_all( '/\bvar\b\s+([\w_][\w\d_]+)/', $processed, $varsMatches ) ;
+                // Match "var" declarations.
+                $numVarMatches = preg_match_all( '/\bvar\b\s+((?:({(?:(?>[^{}]*)|(?2))*})|[^;])+?)(?=(?:\bin\b)|;)/', $processed, $varsMatches ) ;
 
                 if ( $numVarMatches > 0 )
@@ -232 +233 @@
                         for ( $i = 0 ; $i < $numVarMatches ; $i++ )
                         {
-                                $vars[] = $varsMatches[1][$i] ;
+                                $varsMatch = $varsMatches[1][$i];
+                                
+                                // Removed all (...), [...] and {...} blocks from the var
+                                // statement to avoid problems with commas inside them.
+                                $varsMatch = preg_replace( '/(\((?:(?>[^\(\)]*)|(?1))*\))+/', '', $varsMatch ) ;
+                                $varsMatch = preg_replace( '/(\[(?:(?>[^\[\]]*)|(?1))*\])+/', '', $varsMatch ) ;
+                                $varsMatch = preg_replace( '/({(?:(?>[^{}]*)|(?1))*})+/', '', $varsMatch ) ;
+                                
+                                $numVarNameMatches = preg_match_all( '/(?:^|,)\s*([^\s=,]+)/', $varsMatch, $varNameMatches ) ;
+                                
+                                for ( $j = 0 ; $j < $numVarNameMatches ; $j++ )
+                                {
+                                        $vars[] = $varNameMatches[1][$j] ;
+                                }
                         }
 
@@ -246 +260 @@
                 {
                         if ( strlen( $var) > 1 )
-                                $source = preg_replace( '/(?<!\w|\d|\.)' . $var . '(?!\w|\d)/', $this->_GetVarName(), $source ) ;
+                                $source = preg_replace( '/(?<!\w|\d|\.)' . preg_quote( $var ) . '(?!\w|\d)/', $this->_GetVarName(), $source ) ;
                 }
 
@@ -262 +276 @@
                 $var = $this->_VarPrefix . $this->_VarChars[ $this->_LastCharIndex++ ] ;
 
-                if ( preg_match( '/(?<!\w|\d|\.)' . $var . '(?!\w|\d)/', $this->_Function ) )
+                if ( preg_match( '/(?<!\w|\d|\.)' . preg_quote( $var ) . '(?!\w|\d)/', $this->_Function ) )
                         return $this->_GetVarName() ;
                 else
@@ -285 +299 @@
 
 ?>
+
 <?php
 
@@ -405 +420 @@
                         $parameters = preg_split( '/\s*,\s*/', trim( $match[1] ) ) ;
 
-                $funcProcessor = new FCKFunctionProcessor( $match[0], $parameters, false ) ;
-
-                return $funcProcessor->Process() ;
-        }
-}
-
-?>
+                $hasfuncProcessor = isset( $GLOBALS['funcProcessor'] ) ;
+
+                if ( $hasfuncProcessor != TRUE )
+                        $GLOBALS['funcProcessor'] = new FCKFunctionProcessor( $match[0], $parameters, false ) ;
+                else
+                {
+                        $GLOBALS['funcProcessor']->_Function = $match[0];
+                        $GLOBALS['funcProcessor']->_Parameters = $parameters;
+                }
+
+                $processed = $GLOBALS['funcProcessor']->Process() ;
+                
+                $processed = substr_replace( $processed, '', 0, 8 ) ;
+
+                $processed = FCKJavaScriptCompressor::_ProcessFunctions( $processed ) ;
+
+                if ( $hasfuncProcessor != TRUE )
+                        unset( $GLOBALS['funcProcessor'] ) ;
+                
+                return 'function'. $processed ;
+        }
+}
+
+?>
+
 <?php
 
@@ -771 +804 @@
 
 ?>
+
 <?php
 

FCKpackager/trunk/_source/includes/fckfunctionprocessor.inc

@@ -57 +57 @@
                         $processed = $this->_ProcessVars( $processed, $this->_Parameters ) ;
 
-                $numVarMatches = preg_match_all( '/\bvar\b\s+([\w_][\w\d_]+)/', $processed, $varsMatches ) ;
+                // Match "var" declarations.
+                $numVarMatches = preg_match_all( '/\bvar\b\s+((?:({(?:(?>[^{}]*)|(?2))*})|[^;])+?)(?=(?:\bin\b)|;)/', $processed, $varsMatches ) ;
 
                 if ( $numVarMatches > 0 )
@@ -65 +66 @@
                         for ( $i = 0 ; $i < $numVarMatches ; $i++ )
                         {
-                                $vars[] = $varsMatches[1][$i] ;
+                                $varsMatch = $varsMatches[1][$i];
+                                
+                                // Removed all (...), [...] and {...} blocks from the var
+                                // statement to avoid problems with commas inside them.
+                                $varsMatch = preg_replace( '/(\((?:(?>[^\(\)]*)|(?1))*\))+/', '', $varsMatch ) ;
+                                $varsMatch = preg_replace( '/(\[(?:(?>[^\[\]]*)|(?1))*\])+/', '', $varsMatch ) ;
+                                $varsMatch = preg_replace( '/({(?:(?>[^{}]*)|(?1))*})+/', '', $varsMatch ) ;
+                                
+                                $numVarNameMatches = preg_match_all( '/(?:^|,)\s*([^\s=,]+)/', $varsMatch, $varNameMatches ) ;
+                                
+                                for ( $j = 0 ; $j < $numVarNameMatches ; $j++ )
+                                {
+                                        $vars[] = $varNameMatches[1][$j] ;
+                                }
                         }
 
@@ -79 +93 @@
                 {
                         if ( strlen( $var) > 1 )
-                                $source = preg_replace( '/(?<!\w|\d|\.)' . $var . '(?!\w|\d)/', $this->_GetVarName(), $source ) ;
+                                $source = preg_replace( '/(?<!\w|\d|\.)' . preg_quote( $var ) . '(?!\w|\d)/', $this->_GetVarName(), $source ) ;
                 }
 
@@ -95 +109 @@
                 $var = $this->_VarPrefix . $this->_VarChars[ $this->_LastCharIndex++ ] ;
 
-                if ( preg_match( '/(?<!\w|\d|\.)' . $var . '(?!\w|\d)/', $this->_Function ) )
+                if ( preg_match( '/(?<!\w|\d|\.)' . preg_quote( $var ) . '(?!\w|\d)/', $this->_Function ) )
                         return $this->_GetVarName() ;
                 else

FCKpackager/trunk/_source/includes/fckjavascriptcompressor.inc

@@ -140 +140 @@
                         $parameters = preg_split( '/\s*,\s*/', trim( $match[1] ) ) ;
 
-                $funcProcessor = new FCKFunctionProcessor( $match[0], $parameters, false ) ;
+                $hasfuncProcessor = isset( $GLOBALS['funcProcessor'] ) ;
 
-                return $funcProcessor->Process() ;
+                if ( $hasfuncProcessor != TRUE )
+                        $GLOBALS['funcProcessor'] = new FCKFunctionProcessor( $match[0], $parameters, false ) ;
+                else
+                {
+                        $GLOBALS['funcProcessor']->_Function = $match[0];
+                        $GLOBALS['funcProcessor']->_Parameters = $parameters;
+                }
+
+                $processed = $GLOBALS['funcProcessor']->Process() ;
+                
+                $processed = substr_replace( $processed, '', 0, 8 ) ;
+
+                $processed = FCKJavaScriptCompressor::_ProcessFunctions( $processed ) ;
+
+                if ( $hasfuncProcessor != TRUE )
+                        unset( $GLOBALS['funcProcessor'] ) ;
+                
+                return 'function'. $processed ;
         }
 }