Changeset 1977 for FCKreleaser/trunk

Timestamp:

2008-05-09 18:21:09 (7 months ago)

Author:

fredck

Message:

Fixed #1239 and #2185 : No semicolon is appended after closing curly brackets it followed by "finally", "while", "'", ";" or ")".

Location:

FCKreleaser/trunk

Files:

• fckreleaser.php (modified) (2 diffs)
• _source/includes/fckpackager/fckjavascriptcompressor.inc (modified) (1 diff)

FCKreleaser/trunk/fckreleaser.php

@@ -1 @@
-#!/usr/bin/php -q
+#!/usr/bin/php -q
 <?php
 /*
@@ -627 +627 @@
                         ' ', $script ) ;
 
-                // Concatenate lines that end with "}" using a ";" (except for "else" and "catch" cases).
+                // Concatenate lines that end with "}" using a ";", except for "else",
+                // "while", "catch" and "finally" cases, or when followed by, "'", ";",
+                // "}" or ")".
                 $script = preg_replace(
-                        '/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|}))/s',
+                        '/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|finally|while|[}\),;]))/s',
                         '};', $script ) ;
 

FCKreleaser/trunk/_source/includes/fckpackager/fckjavascriptcompressor.inc

@@ -72 +72 @@
                         ' ', $script ) ;
 
-                // Concatenate lines that end with "}" using a ";" (except for "else" and "catch" cases).
+                // Concatenate lines that end with "}" using a ";", except for "else",
+                // "while", "catch" and "finally" cases, or when followed by, "'", ";",
+                // "}" or ")".
                 $script = preg_replace(
-                        '/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|}))/s',
+                        '/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|finally|while|[}\),;]))/s',
                         '};', $script ) ;