Changeset 28986

Timestamp:

07/04/2014 01:14:08 AM (12 years ago)

Author:

wonderboymusic

Message:

Optimize regexp usage in wptexturize() for a "3x Performance Boost."

Props miqrogroove.
See #28724.

File:

• trunk/src/wp-includes/formatting.php (modified) (7 diffs)

trunk/src/wp-includes/formatting.php

@@ -97 +97 @@
                 $static_replacements = array_merge( array( '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
 
+
+                // Pattern-based replacements of characters.
+                // Sort the remaining patterns into several arrays for performance tuning.
+                $dynamic_characters = array( 'apos' => array(), 'quote' => array(), 'dash' => array() );
+                $dynamic_replacements = array( 'apos' => array(), 'quote' => array(), 'dash' => array() );
+                $dynamic = array();
                 $spaces = wp_spaces_regexp();
-
-
-                // Pattern-based replacements of characters.
-                $dynamic = array();
 
                 // '99' and '99" are ambiguous among other patterns; assume it's an abbreviated year at the end of a quotation.
@@ -116 +118 @@
                 }
 
-                // Quoted Numbers like "42" or '42.00'
-                if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
-                        $dynamic[ '/(?<=\A|' . $spaces . ')"(\d[.,\d]*)"/' ] = $opening_quote . '$1' . $closing_quote;
-                }
+                // Quoted Numbers like '0.42'
                 if ( "'" !== $opening_single_quote && "'" !== $closing_single_quote ) {
                         $dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[.,\d]*)\'/' ] = $opening_single_quote . '$1' . $closing_single_quote;
@@ -134 +133 @@
                 }
 
+                // 9' (prime)
+                if ( "'" !== $prime ) {
+                        $dynamic[ '/(?<=\d)\'/' ] = $prime;
+                }
+
+                // Single quotes followed by spaces or ending punctuation.
+                if ( "'" !== $closing_single_quote ) {
+                        $dynamic[ '/\'(?=\Z|[.,)}\-\]]|&gt;|' . $spaces . ')/' ] = $closing_single_quote;
+                }
+
+                $dynamic_characters['apos'] = array_keys( $dynamic );
+                $dynamic_replacements['apos'] = array_values( $dynamic );
+                $dynamic = array();
+                
+                // Quoted Numbers like "42"
+                if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
+                        $dynamic[ '/(?<=\A|' . $spaces . ')"(\d[.,\d]*)"/' ] = $opening_quote . '$1' . $closing_quote;
+                }
+
                 // 9" (double prime)
                 if ( '"' !== $double_prime ) {
@@ -139 +157 @@
                 }
 
-                // 9' (prime)
-                if ( "'" !== $prime ) {
-                        $dynamic[ '/(?<=\d)\'/' ] = $prime;
-                }
-
                 // Double quote at start, or preceded by (, {, <, [, -, or spaces, and not followed by spaces.
                 if ( '"' !== $opening_quote ) {
@@ -153 +166 @@
                         $dynamic[ '/"/' ] = $closing_quote;
                 }
-
-                // Single quotes followed by spaces or ending punctuation.
-                if ( "'" !== $closing_single_quote ) {
-                        $dynamic[ '/\'(?=\Z|[.,)}\-\]]|&gt;|' . $spaces . ')/' ] = $closing_single_quote;
-                }
-
+                
+                $dynamic_characters['quote'] = array_keys( $dynamic );
+                $dynamic_replacements['quote'] = array_values( $dynamic );
+                $dynamic = array();
+                
                 // Dashes and spaces
                 $dynamic[ '/---/' ] = $em_dash;
@@ -165 +177 @@
                 $dynamic[ '/(?<=' . $spaces . ')-(?=' . $spaces . ')/' ] = $en_dash;
 
-                $dynamic_characters = array_keys( $dynamic );
-                $dynamic_replacements = array_values( $dynamic );
+                $dynamic_characters['dash'] = array_keys( $dynamic );
+                $dynamic_replacements['dash'] = array_values( $dynamic );
         }
 
@@ -238 +250 @@
 
                         $curl = str_replace( $static_characters, $static_replacements, $curl );
-                        $curl = preg_replace( $dynamic_characters, $dynamic_replacements, $curl );
+
+                        if ( false !== strpos( $curl, "'" ) ) {
+                                $curl = preg_replace( $dynamic_characters['apos'], $dynamic_replacements['apos'], $curl );
+                        }
+                        if ( false !== strpos( $curl, '"' ) ) {
+                                $curl = preg_replace( $dynamic_characters['quote'], $dynamic_replacements['quote'], $curl );
+                        }
+                        if ( false !== strpos( $curl, '-' ) ) {
+                                $curl = preg_replace( $dynamic_characters['dash'], $dynamic_replacements['dash'], $curl );
+                        }
 
                         // 9x9 (times), but never 0x9999