Index: /CKPackager/trunk/_source/includes/scriptcompressor.js
===================================================================
--- /CKPackager/trunk/_source/includes/scriptcompressor.js	(revision 6337)
+++ /CKPackager/trunk/_source/includes/scriptcompressor.js	(revision 6338)
@@ -379,5 +379,5 @@
 
 				// Named function expression affects only inner scope.
-				if ( fn.functionType == 2 && name.length() )
+				if ( fn.functionType == fn.FUNCTION_EXPRESSION && name.length() )
 				{
 					scope.declareName( name );
@@ -406,5 +406,5 @@
 
 				// Remove the "scope downcast" provided by Rhino.
-				if ( fn.functionType == 2 && name.length() )
+				if ( fn.functionType == fn.FUNCTION_EXPRESSION && name.length() )
 					funcBody.removeChild( funcBody.getFirstChild() );
 
@@ -417,5 +417,5 @@
 
 				// No trailing semicolon for function expression.
-				if ( fn.functionType != 2 && name.length() )
+				if ( fn.functionType != fn.FUNCTION_EXPRESSION && name.length() )
 					out( ';' );
 				break;
@@ -837,19 +837,19 @@
 					hasCurly = true;
 
-				hasCurly = 
-					( 
-						!block 
-						|| 
-						( 
-							block.getType() == Token.BLOCK 
-							&& 
-							( 
-								!block.getFirstChild() 
-								|| 
-								block.getFirstChild().getNext() 
+				hasCurly =
+					(
+						!block
+						||
+						(
+							block.getType() == Token.BLOCK
+							&&
+							(
+								!block.getFirstChild()
+								||
+								block.getFirstChild().getNext()
 								||
 								(
 									(
-										block.getFirstChild().getType() == Token.BLOCK 
+										block.getFirstChild().getType() == Token.BLOCK
 										||
 										block.getFirstChild().getType() == Token.IFNE
@@ -858,6 +858,6 @@
 									block.getNext().getType() == Token.GOTO
 								)
-							) 
-						) 
+							)
+						)
 					);
 
@@ -987,16 +987,16 @@
 				node = node.getFirstChild();
 
-				var hasPrecedence = 
-						associativityRTL[ node.getType() ] 
+				var hasPrecedence =
+						associativityRTL[ node.getType() ]
 						&& precedence[ node.getType() ]
 						&& ( precedence[ Token.HOOK ] <= precedence[ node.getType() ] );
 
 				if ( hasPrecedence )
-					out( '(' );						
+					out( '(' );
 
 				writeNode( node );
 
 				if ( hasPrecedence )
-					out( ')' );				
+					out( ')' );
 
 				out( '?' );